From ticho at claws-mail.org  Fri Dec  2 12:49:15 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Fri,  2 Dec 2016 12:49:15 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-26-gbac0338
Message-ID: <20161202114915.A535236A4523@mx.colino.net>

The branch, master has been updated
       via  bac0338c953b47c86c788aaa7302c973c99a7155 (commit)
      from  681532e4c5ece8ee0229a030770979b3e4f81871 (commit)

Summary of changes:
 src/main.c |    4 ++++
 1 file changed, 4 insertions(+)


- Log -----------------------------------------------------------------
commit bac0338c953b47c86c788aaa7302c973c99a7155
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Dec 2 12:48:30 2016 +0100

    Enable icons of stock GTK buttons on Windows.

diff --git a/src/main.c b/src/main.c
index 3d2ecce..a38cbd8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1067,6 +1067,10 @@ int main(int argc, char *argv[])
 			"gtk-auto-mnemonics",
 			TRUE,
 			"XProperty");
+	gtk_settings_set_long_property(gtk_settings_get_default(),
+			"gtk-button-images",
+			TRUE,
+			"XProperty");
 #endif
 
 #ifdef HAVE_NETWORKMANAGER_SUPPORT

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Tue Dec  6 13:17:42 2016
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Tue,  6 Dec 2016 13:17:42 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-28-g7794350
Message-ID: <20161206121742.B68E236A4593@mx.colino.net>

The branch, master has been updated
       via  7794350956ca507b4d9da510480997cae7a3d972 (commit)
       via  828fdc64ec1c2cfb391d44ba7b5785bb85f4f388 (commit)
      from  bac0338c953b47c86c788aaa7302c973c99a7155 (commit)

Summary of changes:
 AUTHORS           |    1 +
 src/folder.c      |   30 +++++++++++++++---------------
 src/gtk/authors.h |    1 +
 3 files changed, 17 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit 7794350956ca507b4d9da510480997cae7a3d972
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Dec 6 13:17:06 2016 +0100

    Update authors lists

diff --git a/AUTHORS b/AUTHORS
index 0cab1a8..7eda15f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -309,3 +309,4 @@ contributors (in addition to the above; based on Changelog)
 	Hanno Boeck
 	Ben Hutchings
 	Ralf Bormann
+	Darac Marjal
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 06d0c2d..cc5bffa 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -203,6 +203,7 @@ static char *CONTRIBS_LIST[] = {
 "Jindrich Makovicka",
 "Igor Mammedov",
 "Tim Mann",
+"Darac Marjal",
 "HIRAMATSU Masami",
 "Yasuzaki Masayoshi",
 "Jason McCarver",

commit 828fdc64ec1c2cfb391d44ba7b5785bb85f4f388
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Dec 6 13:07:32 2016 +0100

    Fix Debian bug #846170: incorrect IMAP UID handling
    
    Patch by Darac Marjal <darac at darac.org.uk>

diff --git a/src/folder.c b/src/folder.c
index 18da649..ad75045 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2196,22 +2196,22 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 		cache_list_last = g_slist_last(cache_list);
 		cache_max_num = ((MsgInfo *)cache_list_last->data)->msgnum;
 	} else {
-		cache_cur_num = G_MAXINT;
+		cache_cur_num = G_MAXUINT;
 		cache_max_num = 0;
 	}
 
 	if (folder_list_cur != NULL) {
 		GSList *folder_list_last;
 	
-		folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+		folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
 		folder_list_last = g_slist_last(folder_list);
-		folder_max_num = GPOINTER_TO_INT(folder_list_last->data);
+		folder_max_num = GPOINTER_TO_UINT(folder_list_last->data);
 	} else {
-		folder_cur_num = G_MAXINT;
+		folder_cur_num = G_MAXUINT;
 		folder_max_num = 0;
 	}
 
-	while ((cache_cur_num != G_MAXINT) || (folder_cur_num != G_MAXINT)) {
+	while ((cache_cur_num != G_MAXUINT) || (folder_cur_num != G_MAXUINT)) {
 		/*
 		 *  Message only exists in the folder
 		 *  Remember message for fetching
@@ -2240,8 +2240,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 			}
 			
 			if (add) {
-				new_list = g_slist_prepend(new_list, GINT_TO_POINTER(folder_cur_num));
-				debug_print("Remembered message %d for fetching\n", folder_cur_num);
+				new_list = g_slist_prepend(new_list, GUINT_TO_POINTER(folder_cur_num));
+				debug_print("Remembered message %u for fetching\n", folder_cur_num);
 			}
 
 			/* Move to next folder number */
@@ -2249,9 +2249,9 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 				folder_list_cur = folder_list_cur->next;
 
 			if (folder_list_cur != NULL)
-				folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+				folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
 			else
-				folder_cur_num = G_MAXINT;
+				folder_cur_num = G_MAXUINT;
 
 			continue;
 		}
@@ -2262,7 +2262,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 		 */
 		if (cache_cur_num < folder_cur_num) {
 			msgcache_remove_msg(item->cache, cache_cur_num);
-			debug_print("Removed message %d from cache.\n", cache_cur_num);
+			debug_print("Removed message %u from cache.\n", cache_cur_num);
 
 			/* Move to next cache number */
 			if (cache_list_cur)
@@ -2271,7 +2271,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 			if (cache_list_cur != NULL)
 				cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
 			else
-				cache_cur_num = G_MAXINT;
+				cache_cur_num = G_MAXUINT;
 
 			update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
 
@@ -2291,7 +2291,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 				new_list = g_slist_prepend(new_list, GINT_TO_POINTER(msginfo->msgnum));
 				procmsg_msginfo_free(&msginfo);
 
-				debug_print("Remembering message %d to update...\n", folder_cur_num);
+				debug_print("Remembering message %u to update...\n", folder_cur_num);
 			} else if (msginfo) {
 				exists_list = g_slist_prepend(exists_list, msginfo);
 
@@ -2312,12 +2312,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 			if (cache_list_cur != NULL)
 				cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
 			else
-				cache_cur_num = G_MAXINT;
+				cache_cur_num = G_MAXUINT;
 
 			if (folder_list_cur != NULL)
-				folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+				folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
 			else
-				folder_cur_num = G_MAXINT;
+				folder_cur_num = G_MAXUINT;
 
 			continue;
 		}

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Dec  9 16:22:29 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri,  9 Dec 2016 16:22:29 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-29-gfe0f832
Message-ID: <20161209152229.D4D1936A44D6@mx.colino.net>

The branch, master has been updated
       via  fe0f832b37541ee1ab7350bc5ab645034d469990 (commit)
      from  7794350956ca507b4d9da510480997cae7a3d972 (commit)

Summary of changes:
 src/compose.c |  120 ---------------------------------------------------------
 1 file changed, 120 deletions(-)


- Log -----------------------------------------------------------------
commit fe0f832b37541ee1ab7350bc5ab645034d469990
Author: wwp <wwp at free.fr>
Date:   Fri Dec 9 16:21:29 2016 +0100

    Remove dead code, this changed signal doesn't exist and we've also
    probably removed parts of the highlight-active-account field feature
    a while ago.

diff --git a/src/compose.c b/src/compose.c
index 21274bb..b085beb 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -376,8 +376,6 @@ static void compose_notebook_size_alloc (GtkNotebook *notebook,
 static gboolean compose_edit_size_alloc (GtkEditable	*widget,
 					 GtkAllocation	*allocation,
 					 GtkSHRuler	*shruler);
-static void account_activated		(GtkComboBox *optmenu,
-					 gpointer	 data);
 static void attach_selected		(GtkTreeView	*tree_view, 
 					 GtkTreePath	*tree_path,
 					 GtkTreeViewColumn *column, 
@@ -8163,9 +8161,6 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), def_menu);
 
-	g_signal_connect(G_OBJECT(optmenu), "changed",
-			G_CALLBACK(account_activated),
-			compose);
 	g_signal_connect(G_OBJECT(from_name), "populate-popup",
 			 G_CALLBACK(compose_entry_popup_extend),
 			 NULL);
@@ -9733,121 +9728,6 @@ typedef struct {
 	gboolean		entry_marked;
 } HeaderEntryState;
 
-static void account_activated(GtkComboBox *optmenu, gpointer data)
-{
-	Compose *compose = (Compose *)data;
-
-	PrefsAccount *ac;
-	gchar *folderidentifier;
-	gint account_id = 0;
-	GtkTreeModel *menu;
-	GtkTreeIter iter;
-	GSList *list, *saved_list = NULL;
-	HeaderEntryState *state;
-	GtkRcStyle *style = NULL;
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	static GdkColor yellow;
-	static gboolean color_set = FALSE;
-#else
-	static GdkColor yellow = { (guint32)0, (guint32)0xf5, (guint32)0xf6, (guint32)0xbe };
-#endif
-
-	/* Get ID of active account in the combo box */
-	menu = gtk_combo_box_get_model(optmenu);
-	cm_return_if_fail(gtk_combo_box_get_active_iter(optmenu, &iter));
-	gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
-
-	ac = account_find_from_id(account_id);
-	cm_return_if_fail(ac != NULL);
-
-	if (ac != compose->account) {
-		compose_select_account(compose, ac, FALSE);
-
-		for (list = compose->header_list; list; list = list->next) {
-			ComposeHeaderEntry *hentry=(ComposeHeaderEntry *)list->data;
-			
-			if (hentry->type == PREF_ACCOUNT || !list->next) {
-				compose_destroy_headerentry(compose, hentry);
-				continue;
-			}
-			
-			state = g_malloc0(sizeof(HeaderEntryState));
-			state->header = gtk_editable_get_chars(GTK_EDITABLE(
-					gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
-			state->entry = gtk_editable_get_chars(
-					GTK_EDITABLE(hentry->entry), 0, -1);
-			state->type = hentry->type;
-				
-#if !GTK_CHECK_VERSION(3, 0, 0)
-			if (!color_set) {
-				gdk_color_parse("#f5f6be", &yellow);
-				color_set = gdk_colormap_alloc_color(
-							gdk_colormap_get_system(),
-							&yellow, FALSE, TRUE);
-			}
-#endif
-				
-			style = gtk_widget_get_modifier_style(hentry->entry);
-			state->entry_marked = gdk_color_equal(&yellow,
-						&style->base[GTK_STATE_NORMAL]);
-
-			saved_list = g_slist_append(saved_list, state);
-			compose_destroy_headerentry(compose, hentry);
-		}
-
-		compose->header_last = NULL;
-		g_slist_free(compose->header_list);
-		compose->header_list = NULL;
-		compose->header_nextrow = 1;
-		compose_create_header_entry(compose);
-		
-		if (ac->set_autocc && ac->auto_cc)
-			compose_entry_append(compose, ac->auto_cc,
-						COMPOSE_CC, PREF_ACCOUNT);
-
-		if (ac->set_autobcc && ac->auto_bcc) 
-			compose_entry_append(compose, ac->auto_bcc,
-						COMPOSE_BCC, PREF_ACCOUNT);
-	
-		if (ac->set_autoreplyto && ac->auto_replyto)
-			compose_entry_append(compose, ac->auto_replyto,
-						COMPOSE_REPLYTO, PREF_ACCOUNT);
-		
-		for (list = saved_list; list; list = list->next) {
-			state = (HeaderEntryState *) list->data;
-			
-			compose_add_header_entry(compose, state->header,
-						state->entry, state->type);
-			if (state->entry_marked)
-				compose_entry_mark_default_to(compose, state->entry);
-			
-			g_free(state->header);	
-			g_free(state->entry);
-			g_free(state);
-		}
-		g_slist_free(saved_list);
-		
-		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
-					(ac->protocol == A_NNTP) ? 
-					COMPOSE_NEWSGROUPS : COMPOSE_TO);
-	}
-
-	/* Set message save folder */
-	if (account_get_special_folder(compose->account, F_OUTBOX)) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
-	}
-	g_signal_connect(G_OBJECT(compose->savemsg_checkbtn), "toggled",
-			 G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
-			   
-	compose_set_save_to(compose, NULL);
-	if (account_get_special_folder(compose->account, F_OUTBOX)) {
-		folderidentifier = folder_item_get_identifier(account_get_special_folder
-				  (compose->account, F_OUTBOX));
-		compose_set_save_to(compose, folderidentifier);
-		g_free(folderidentifier);
-	}
-}
-
 static void attach_selected(GtkTreeView *tree_view, GtkTreePath *tree_path,
 			    GtkTreeViewColumn *column, Compose *compose)
 {

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Dec  9 16:26:31 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri,  9 Dec 2016 16:26:31 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-30-g627f711
Message-ID: <20161209152631.3FFA136A44D5@mx.colino.net>

The branch, master has been updated
       via  627f7110c99e0170182d8a62fe0b62f213998f96 (commit)
      from  fe0f832b37541ee1ab7350bc5ab645034d469990 (commit)

Summary of changes:
 src/compose.c |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)


- Log -----------------------------------------------------------------
commit 627f7110c99e0170182d8a62fe0b62f213998f96
Author: wwp <wwp at free.fr>
Date:   Fri Dec 9 16:26:21 2016 +0100

    Revert "Remove dead code, this changed signal doesn't exist and we've also".
    
    This reverts commit fe0f832b37541ee1ab7350bc5ab645034d469990.

diff --git a/src/compose.c b/src/compose.c
index b085beb..21274bb 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -376,6 +376,8 @@ static void compose_notebook_size_alloc (GtkNotebook *notebook,
 static gboolean compose_edit_size_alloc (GtkEditable	*widget,
 					 GtkAllocation	*allocation,
 					 GtkSHRuler	*shruler);
+static void account_activated		(GtkComboBox *optmenu,
+					 gpointer	 data);
 static void attach_selected		(GtkTreeView	*tree_view, 
 					 GtkTreePath	*tree_path,
 					 GtkTreeViewColumn *column, 
@@ -8161,6 +8163,9 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), def_menu);
 
+	g_signal_connect(G_OBJECT(optmenu), "changed",
+			G_CALLBACK(account_activated),
+			compose);
 	g_signal_connect(G_OBJECT(from_name), "populate-popup",
 			 G_CALLBACK(compose_entry_popup_extend),
 			 NULL);
@@ -9728,6 +9733,121 @@ typedef struct {
 	gboolean		entry_marked;
 } HeaderEntryState;
 
+static void account_activated(GtkComboBox *optmenu, gpointer data)
+{
+	Compose *compose = (Compose *)data;
+
+	PrefsAccount *ac;
+	gchar *folderidentifier;
+	gint account_id = 0;
+	GtkTreeModel *menu;
+	GtkTreeIter iter;
+	GSList *list, *saved_list = NULL;
+	HeaderEntryState *state;
+	GtkRcStyle *style = NULL;
+#if !GTK_CHECK_VERSION(3, 0, 0)
+	static GdkColor yellow;
+	static gboolean color_set = FALSE;
+#else
+	static GdkColor yellow = { (guint32)0, (guint32)0xf5, (guint32)0xf6, (guint32)0xbe };
+#endif
+
+	/* Get ID of active account in the combo box */
+	menu = gtk_combo_box_get_model(optmenu);
+	cm_return_if_fail(gtk_combo_box_get_active_iter(optmenu, &iter));
+	gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
+
+	ac = account_find_from_id(account_id);
+	cm_return_if_fail(ac != NULL);
+
+	if (ac != compose->account) {
+		compose_select_account(compose, ac, FALSE);
+
+		for (list = compose->header_list; list; list = list->next) {
+			ComposeHeaderEntry *hentry=(ComposeHeaderEntry *)list->data;
+			
+			if (hentry->type == PREF_ACCOUNT || !list->next) {
+				compose_destroy_headerentry(compose, hentry);
+				continue;
+			}
+			
+			state = g_malloc0(sizeof(HeaderEntryState));
+			state->header = gtk_editable_get_chars(GTK_EDITABLE(
+					gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
+			state->entry = gtk_editable_get_chars(
+					GTK_EDITABLE(hentry->entry), 0, -1);
+			state->type = hentry->type;
+				
+#if !GTK_CHECK_VERSION(3, 0, 0)
+			if (!color_set) {
+				gdk_color_parse("#f5f6be", &yellow);
+				color_set = gdk_colormap_alloc_color(
+							gdk_colormap_get_system(),
+							&yellow, FALSE, TRUE);
+			}
+#endif
+				
+			style = gtk_widget_get_modifier_style(hentry->entry);
+			state->entry_marked = gdk_color_equal(&yellow,
+						&style->base[GTK_STATE_NORMAL]);
+
+			saved_list = g_slist_append(saved_list, state);
+			compose_destroy_headerentry(compose, hentry);
+		}
+
+		compose->header_last = NULL;
+		g_slist_free(compose->header_list);
+		compose->header_list = NULL;
+		compose->header_nextrow = 1;
+		compose_create_header_entry(compose);
+		
+		if (ac->set_autocc && ac->auto_cc)
+			compose_entry_append(compose, ac->auto_cc,
+						COMPOSE_CC, PREF_ACCOUNT);
+
+		if (ac->set_autobcc && ac->auto_bcc) 
+			compose_entry_append(compose, ac->auto_bcc,
+						COMPOSE_BCC, PREF_ACCOUNT);
+	
+		if (ac->set_autoreplyto && ac->auto_replyto)
+			compose_entry_append(compose, ac->auto_replyto,
+						COMPOSE_REPLYTO, PREF_ACCOUNT);
+		
+		for (list = saved_list; list; list = list->next) {
+			state = (HeaderEntryState *) list->data;
+			
+			compose_add_header_entry(compose, state->header,
+						state->entry, state->type);
+			if (state->entry_marked)
+				compose_entry_mark_default_to(compose, state->entry);
+			
+			g_free(state->header);	
+			g_free(state->entry);
+			g_free(state);
+		}
+		g_slist_free(saved_list);
+		
+		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
+					(ac->protocol == A_NNTP) ? 
+					COMPOSE_NEWSGROUPS : COMPOSE_TO);
+	}
+
+	/* Set message save folder */
+	if (account_get_special_folder(compose->account, F_OUTBOX)) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+	}
+	g_signal_connect(G_OBJECT(compose->savemsg_checkbtn), "toggled",
+			 G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
+			   
+	compose_set_save_to(compose, NULL);
+	if (account_get_special_folder(compose->account, F_OUTBOX)) {
+		folderidentifier = folder_item_get_identifier(account_get_special_folder
+				  (compose->account, F_OUTBOX));
+		compose_set_save_to(compose, folderidentifier);
+		g_free(folderidentifier);
+	}
+}
+
 static void attach_selected(GtkTreeView *tree_view, GtkTreePath *tree_path,
 			    GtkTreeViewColumn *column, Compose *compose)
 {

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Dec  9 17:43:44 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri,  9 Dec 2016 17:43:44 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-31-gd21adbd
Message-ID: <20161209164344.721F936A44D5@mx.colino.net>

The branch, master has been updated
       via  d21adbda39220af55d316f864b4aa4c7631d09eb (commit)
      from  627f7110c99e0170182d8a62fe0b62f213998f96 (commit)

Summary of changes:
 src/compose.c         |   48 +++++++++++++-----------------
 src/gtk/quicksearch.c |   78 ++++++++++++++++++++++++-------------------------
 src/prefs_common.c    |   17 +++++++++++
 src/prefs_common.h    |    8 +++++
 src/textview.c        |   42 +++++++++++++-------------
 5 files changed, 107 insertions(+), 86 deletions(-)


- Log -----------------------------------------------------------------
commit d21adbda39220af55d316f864b4aa4c7631d09eb
Author: wwp <wwp at free.fr>
Date:   Fri Dec 9 17:42:46 2016 +0100

    Make last colors configurable using hidden prefs: tags bg/fg colors in
    message view, default-to header field in compose view, and quicksearch
    active + error.

diff --git a/src/compose.c b/src/compose.c
index 21274bb..da8c9a0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -183,6 +183,20 @@ typedef enum {
 #define COMPOSE_DRAFT_TIMEOUT_UNSET -1
 #define COMPOSE_DRAFT_TIMEOUT_FORBIDDEN -2
 
+static GdkColor default_to_bgcolor = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
+static GdkColor default_to_color = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
 static GList *compose_list = NULL;
 static GSList *extra_headers = NULL;
 
@@ -2661,44 +2675,19 @@ void compose_entry_append(Compose *compose, const gchar *address,
 
 static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 {
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	static GdkColor yellow;
-	static GdkColor black;
-	static gboolean yellow_initialised = FALSE;
-#else
-	static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
-	static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
-#endif
 	GSList *h_list;
 	GtkEntry *entry;
 		
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	if (!yellow_initialised) {
-		gdk_color_parse("#f5f6be", &yellow);
-		gdk_color_parse("#000000", &black);
-		yellow_initialised = gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &yellow, FALSE, TRUE);
-		yellow_initialised &= gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &black, FALSE, TRUE);
-	}
-#endif
-
 	for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
 		entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
 		if (gtk_entry_get_text(entry) && 
 		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
-			if (yellow_initialised) {
-#endif
 				gtk_widget_modify_base(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &yellow);
+					GTK_STATE_NORMAL, &default_to_bgcolor);
 				gtk_widget_modify_text(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &black);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-			}
-#endif
+					GTK_STATE_NORMAL, &default_to_color);
 		}
 	}
 }
@@ -8103,6 +8092,11 @@ static Compose *compose_create(PrefsAccount *account,
 		gtk_widget_show(window);
 	}
 	
+	gtkut_convert_int_to_gdk_color(prefs_common.default_to_bgcolor,
+					   &default_to_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_to_color,
+					   &default_to_color);
+
 	return compose;
 }
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 6f4dc00..4efbaf0 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -91,6 +91,34 @@ struct _QuickSearch
 	gboolean			 want_history;
 };
 
+static GdkColor qs_active_bgcolor = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
+static GdkColor qs_active_color = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
+static GdkColor qs_error_bgcolor = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
+static GdkColor qs_error_color = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
 void quicksearch_set_on_progress_cb(QuickSearch* search,
 		gboolean (*cb)(gpointer data, guint at, guint matched, guint total), gpointer data)
 {
@@ -820,6 +848,15 @@ QuickSearch *quicksearch_new()
 	
 	update_extended_buttons(quicksearch);
 
+	gtkut_convert_int_to_gdk_color(prefs_common.qs_active_bgcolor,
+					   &qs_active_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.qs_active_color,
+					   &qs_active_color);
+	gtkut_convert_int_to_gdk_color(prefs_common.qs_error_bgcolor,
+					   &qs_error_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.qs_error_color,
+					   &qs_error_color);
+
 	return quicksearch;
 }
 
@@ -917,35 +954,10 @@ gboolean quicksearch_has_sat_predicate(QuickSearch *quicksearch)
 
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
 {
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	static GdkColor yellow;
-	static GdkColor red;
-	static GdkColor black;
-	static gboolean colors_initialised = FALSE;
-#else
-	static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
-	static GdkColor red = { (guint32)0, (guint16)0xff, (guint16)0x70, (guint16)0x70 };
-	static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
-#endif
 	gboolean error = FALSE;
 
-	
 	quicksearch->active = active;
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	if (!colors_initialised) {
-		gdk_color_parse("#f5f6be", &yellow);
-		gdk_color_parse("#000000", &black);
-		gdk_color_parse("#ff7070", &red);
-		colors_initialised = gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &yellow, FALSE, TRUE);
-		colors_initialised &= gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &black, FALSE, TRUE);
-		colors_initialised &= gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &red, FALSE, TRUE);
-	}
-#endif
-
 	if (active && 
 		(prefs_common.summary_quicksearch_type == ADVANCED_SEARCH_EXTENDED
 		 && !advsearch_has_proper_predicate(quicksearch->asearch)))
@@ -953,32 +965,20 @@ static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
 
 	if (active) {
 		gtk_widget_set_sensitive(quicksearch->clear_search, TRUE);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		if (colors_initialised) {
-#endif
 			gtk_widget_modify_base(
 				gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
-				GTK_STATE_NORMAL, error ? &red : &yellow);
+				GTK_STATE_NORMAL, error ? &qs_error_bgcolor : &qs_active_bgcolor);
 			gtk_widget_modify_text(
 				gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
-				GTK_STATE_NORMAL, &black);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		}
-#endif
+				GTK_STATE_NORMAL, error ? &qs_error_color : &qs_active_color);
 	} else {
 		gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		if (colors_initialised) {
-#endif
 			gtk_widget_modify_base(
 				gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
 				GTK_STATE_NORMAL, NULL);
 			gtk_widget_modify_text(
 				gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
 				GTK_STATE_NORMAL, NULL);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		}
-#endif
 	}
 
 	if (!active) {
diff --git a/src/prefs_common.c b/src/prefs_common.c
index bf273a9..63e1816 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -726,6 +726,23 @@ static PrefParam param[] = {
 	{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
 	 P_BOOL, NULL, NULL, NULL},
 
+	{"default_to_color", "#000000", &prefs_common.default_to_color, P_COLOR,
+	 NULL, NULL, NULL},
+	{"default_to_bgcolor", "#f5f6be", &prefs_common.default_to_bgcolor, P_COLOR,
+	 NULL, NULL, NULL},
+	{"tags_color", "#000000", &prefs_common.tags_color, P_COLOR,
+	 NULL, NULL, NULL},
+	{"tags_bgcolor", "#f5f6be", &prefs_common.tags_bgcolor, P_COLOR,
+	 NULL, NULL, NULL},
+	{"qs_active_color", "#000000", &prefs_common.qs_active_color, P_COLOR,
+	 NULL, NULL, NULL},
+	{"qs_active_bgcolor", "#f5f6be", &prefs_common.qs_active_bgcolor, P_COLOR,
+	 NULL, NULL, NULL},
+	{"qs_error_color", "#000000", &prefs_common.qs_error_color, P_COLOR,
+	 NULL, NULL, NULL},
+	{"qs_error_bgcolor", "#ff7070", &prefs_common.qs_error_bgcolor, P_COLOR,
+	 NULL, NULL, NULL},
+
 	{"display_header_pane", "FALSE", &prefs_common.display_header_pane,
 	 P_BOOL, NULL, NULL, NULL},
 	{"display_header", "TRUE", &prefs_common.display_header, P_BOOL,
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 533c0dd..58df319 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -328,6 +328,14 @@ struct _PrefsCommon
 	gulong signature_col;
 	gulong emphasis_col;
 	gboolean recycle_quote_colors;
+	gulong default_to_bgcolor;
+	gulong default_to_color;
+	gulong tags_bgcolor;
+	gulong tags_color;
+	gulong qs_active_bgcolor;
+	gulong qs_active_color;
+	gulong qs_error_bgcolor;
+	gulong qs_error_color;
 	gboolean display_header_pane;
 	gboolean display_header;
 	gboolean display_xface;
diff --git a/src/textview.c b/src/textview.c
index 916b8d2..b73071f 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -123,6 +123,20 @@ static GdkColor diff_hunk_color = {
 	(gushort)0
 };
 
+static GdkColor tags_bgcolor = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
+static GdkColor tags_color = {
+	(gulong)0,
+	(gushort)0,
+	(gushort)0,
+	(gushort)0
+};
+
 static GdkCursor *hand_cursor = NULL;
 static GdkCursor *text_cursor = NULL;
 static GdkCursor *watch_cursor= NULL;
@@ -401,26 +415,8 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
 {
 	GtkTextBuffer *buffer;
 	GtkTextTag *tag, *qtag;
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	static GdkColor yellow, black;
-	static gboolean color_init = FALSE;
-#else
-	static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
-	static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
-#endif
 	static PangoFontDescription *font_desc, *bold_font_desc;
 	
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	if (!color_init) {
-		gdk_color_parse("#f5f6be", &yellow);
-		gdk_color_parse("#000000", &black);
-		color_init = gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &yellow, FALSE, TRUE);
-		color_init &= gdk_colormap_alloc_color(
-			gdk_colormap_get_system(), &black, FALSE, TRUE);
-	}
-#endif
-
 	if (!font_desc)
 		font_desc = pango_font_description_from_string
 			(NORMAL_FONT);
@@ -488,8 +484,8 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
 				NULL);
 	}
 	gtk_text_buffer_create_tag(buffer, "tags",
-			"foreground-gdk", &black,
-			"paragraph-background-gdk", &yellow,
+			"foreground-gdk", &tags_color,
+			"paragraph-background-gdk", &tags_bgcolor,
 			NULL);
 	gtk_text_buffer_create_tag(buffer, "emphasis",
 			"foreground-gdk", &emphasis_color,
@@ -565,6 +561,7 @@ static void textview_update_message_colors(TextView *textview)
 	quote_colors[0] = quote_colors[1] = quote_colors[2] = black;
 	uri_color = emphasis_color = signature_color = diff_added_color =
 		diff_deleted_color = diff_hunk_color = black;
+	tags_bgcolor = tags_color = black;
 
 	if (prefs_common.enable_color) {
 		/* grab the quote colors, converting from an int to a GdkColor */
@@ -612,6 +609,11 @@ static void textview_update_message_colors(TextView *textview)
 	CHANGE_TAG_COLOR("diff-add-file", &diff_added_color, NULL);
 	CHANGE_TAG_COLOR("diff-del-file", &diff_deleted_color, NULL);
 	CHANGE_TAG_COLOR("diff-hunk", &diff_hunk_color, NULL);
+
+	gtkut_convert_int_to_gdk_color(prefs_common.tags_bgcolor,
+					   &tags_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.tags_color,
+					   &tags_color);
 }
 #undef CHANGE_TAG_COLOR
 

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Sat Dec 10 13:33:15 2016
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Sat, 10 Dec 2016 13:33:15 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-32-g9123296
Message-ID: <20161210123315.97AF336A4526@mx.colino.net>

The branch, master has been updated
       via  9123296406a1f61f21464ca8fd439d315b4c8367 (commit)
      from  d21adbda39220af55d316f864b4aa4c7631d09eb (commit)

Summary of changes:
 src/prefs_template.c |   10 ----------
 1 file changed, 10 deletions(-)


- Log -----------------------------------------------------------------
commit 9123296406a1f61f21464ca8fd439d315b4c8367
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Dec 10 13:32:41 2016 +0100

    Fix bug #3574: Template addressing
    
    Remove artificial limitations to values of email addresses on templates:
    these strings are already parsed and split when the template is applied
    in compose window.

diff --git a/src/prefs_template.c b/src/prefs_template.c
index c095ec4..9e2f28e 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -716,16 +716,6 @@ gboolean prefs_template_string_is_valid(gchar *string, gint *line, gboolean esca
 				*line = quote_fmt_get_line();
 			return FALSE;
 		}
-		if (email) {
-			const gchar *start = strrchr(parsed_buf, '<');
-			const gchar *end = strrchr(parsed_buf, '>');
-			const gchar *at = strrchr(parsed_buf, '@');
-			const gchar *space = strrchr(parsed_buf, ' ');
-			if (!at)
-				result = FALSE;
-			if (at && space && (!start || !end || end < start || start < space))
-				result = FALSE;
-		}
 		quote_fmt_reset_vartable();
 	}
 	return result;

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Dec 11 11:04:37 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 11 Dec 2016 11:04:37 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-33-g5f607a3
Message-ID: <20161211100438.07D2936A4556@mx.colino.net>

The branch, master has been updated
       via  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)
      from  9123296406a1f61f21464ca8fd439d315b4c8367 (commit)

Summary of changes:
 src/compose.c |   63 +++++++++------------------------------------------------
 1 file changed, 10 insertions(+), 53 deletions(-)


- Log -----------------------------------------------------------------
commit 5f607a33a7ca9a9b0311e3afd7fca2729642b838
Author: Paul <paul at claws-mail.org>
Date:   Sun Dec 11 10:04:30 2016 +0000

    fix colouring of auto-filled headers

diff --git a/src/compose.c b/src/compose.c
index da8c9a0..3e89d66 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9736,15 +9736,7 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 	gint account_id = 0;
 	GtkTreeModel *menu;
 	GtkTreeIter iter;
-	GSList *list, *saved_list = NULL;
-	HeaderEntryState *state;
-	GtkRcStyle *style = NULL;
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	static GdkColor yellow;
-	static gboolean color_set = FALSE;
-#else
-	static GdkColor yellow = { (guint32)0, (guint32)0xf5, (guint32)0xf6, (guint32)0xbe };
-#endif
+	GSList *list = NULL;
 
 	/* Get ID of active account in the combo box */
 	menu = gtk_combo_box_get_model(optmenu);
@@ -9760,33 +9752,8 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 		for (list = compose->header_list; list; list = list->next) {
 			ComposeHeaderEntry *hentry=(ComposeHeaderEntry *)list->data;
 			
-			if (hentry->type == PREF_ACCOUNT || !list->next) {
+			if (hentry->type == PREF_ACCOUNT || !list->next)
 				compose_destroy_headerentry(compose, hentry);
-				continue;
-			}
-			
-			state = g_malloc0(sizeof(HeaderEntryState));
-			state->header = gtk_editable_get_chars(GTK_EDITABLE(
-					gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
-			state->entry = gtk_editable_get_chars(
-					GTK_EDITABLE(hentry->entry), 0, -1);
-			state->type = hentry->type;
-				
-#if !GTK_CHECK_VERSION(3, 0, 0)
-			if (!color_set) {
-				gdk_color_parse("#f5f6be", &yellow);
-				color_set = gdk_colormap_alloc_color(
-							gdk_colormap_get_system(),
-							&yellow, FALSE, TRUE);
-			}
-#endif
-				
-			style = gtk_widget_get_modifier_style(hentry->entry);
-			state->entry_marked = gdk_color_equal(&yellow,
-						&style->base[GTK_STATE_NORMAL]);
-
-			saved_list = g_slist_append(saved_list, state);
-			compose_destroy_headerentry(compose, hentry);
 		}
 
 		compose->header_last = NULL;
@@ -9795,31 +9762,21 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 		compose->header_nextrow = 1;
 		compose_create_header_entry(compose);
 		
-		if (ac->set_autocc && ac->auto_cc)
+		if (ac->set_autocc && ac->auto_cc) {
 			compose_entry_append(compose, ac->auto_cc,
 						COMPOSE_CC, PREF_ACCOUNT);
-
-		if (ac->set_autobcc && ac->auto_bcc) 
+			compose_entry_mark_default_to(compose, ac->auto_cc);
+		}
+		if (ac->set_autobcc && ac->auto_bcc) {
 			compose_entry_append(compose, ac->auto_bcc,
 						COMPOSE_BCC, PREF_ACCOUNT);
-	
-		if (ac->set_autoreplyto && ac->auto_replyto)
+			compose_entry_mark_default_to(compose, ac->auto_bcc);
+		}
+		if (ac->set_autoreplyto && ac->auto_replyto) {
 			compose_entry_append(compose, ac->auto_replyto,
 						COMPOSE_REPLYTO, PREF_ACCOUNT);
-		
-		for (list = saved_list; list; list = list->next) {
-			state = (HeaderEntryState *) list->data;
-			
-			compose_add_header_entry(compose, state->header,
-						state->entry, state->type);
-			if (state->entry_marked)
-				compose_entry_mark_default_to(compose, state->entry);
-			
-			g_free(state->header);	
-			g_free(state->entry);
-			g_free(state);
+			compose_entry_mark_default_to(compose, ac->auto_replyto);
 		}
-		g_slist_free(saved_list);
 		
 		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
 					(ac->protocol == A_NNTP) ? 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Dec 11 18:44:37 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 11 Dec 2016 18:44:37 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-34-gf37bbde
Message-ID: <20161211174438.1605B36A4581@mx.colino.net>

The branch, master has been updated
       via  f37bbdecf9791f5b427e16e7951df766de1034e6 (commit)
      from  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)

Summary of changes:
 src/compose.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit f37bbdecf9791f5b427e16e7951df766de1034e6
Author: Paul <paul at claws-mail.org>
Date:   Sun Dec 11 17:44:32 2016 +0000

    some more colouring based on folder prefs override

diff --git a/src/compose.c b/src/compose.c
index 3e89d66..65c447a 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3237,15 +3237,21 @@ static void compose_set_folder_prefs(Compose *compose, FolderItem *folder,
 					COMPOSE_TO, PREF_FOLDER);
 		compose_entry_mark_default_to(compose, folder->prefs->default_to);
 	}
-	if (folder->prefs->enable_default_cc)
+	if (folder->prefs->enable_default_cc) {
 		compose_entry_append(compose, folder->prefs->default_cc,
 					COMPOSE_CC, PREF_FOLDER);
-	if (folder->prefs->enable_default_bcc)
+		compose_entry_mark_default_to(compose, folder->prefs->default_cc);
+	}
+	if (folder->prefs->enable_default_bcc) {
 		compose_entry_append(compose, folder->prefs->default_bcc,
 					COMPOSE_BCC, PREF_FOLDER);
-	if (folder->prefs->enable_default_replyto)
+		compose_entry_mark_default_to(compose, folder->prefs->default_bcc);
+	}
+	if (folder->prefs->enable_default_replyto) {
 		compose_entry_append(compose, folder->prefs->default_replyto,
 					COMPOSE_REPLYTO, PREF_FOLDER);
+		compose_entry_mark_default_to(compose, folder->prefs->default_replyto);
+	}
 }
 
 static void compose_reply_set_subject(Compose *compose, MsgInfo *msginfo)

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Mon Dec 12 08:57:01 2016
From: mones at claws-mail.org (Ricardo Mones)
Date: Mon, 12 Dec 2016 08:57:01 +0100
Subject: [Commits] [SCM] claws branch, master,
 updated. 3.14.1-33-g5f607a3
In-Reply-To: <20161211100438.07D2936A4556@mx.colino.net>
References: <20161211100438.07D2936A4556@mx.colino.net>
Message-ID: <20161212075937.67217b5e@busgosu>

On Sun, 11 Dec 2016 11:04:37 +0100 (CET)
claws at claws-mail.org wrote:

> The branch, master has been updated
>        via  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)
>       from  9123296406a1f61f21464ca8fd439d315b4c8367 (commit)
> 
> Summary of changes:
>  src/compose.c |   63
> +++++++++------------------------------------------------ 1 file changed,
> 10 insertions(+), 53 deletions(-)
> 
> 
> - Log -----------------------------------------------------------------
> commit 5f607a33a7ca9a9b0311e3afd7fca2729642b838
> Author: Paul <paul at claws-mail.org>
> Date:   Sun Dec 11 10:04:30 2016 +0000
> 
>     fix colouring of auto-filled headers
> 
> diff --git a/src/compose.c b/src/compose.c
> index da8c9a0..3e89d66 100644
> --- a/src/compose.c
> +++ b/src/compose.c
> @@ -9736,15 +9736,7 @@ static void account_activated(GtkComboBox *optmenu,
> gpointer data) gint account_id = 0;
>  	GtkTreeModel *menu;
>  	GtkTreeIter iter;
> -	GSList *list, *saved_list = NULL;
> -	HeaderEntryState *state;
> -	GtkRcStyle *style = NULL;
> -#if !GTK_CHECK_VERSION(3, 0, 0)
> -	static GdkColor yellow;
> -	static gboolean color_set = FALSE;
> -#else
> -	static GdkColor yellow = { (guint32)0, (guint32)0xf5,
> (guint32)0xf6, (guint32)0xbe }; -#endif
> +	GSList *list = NULL;
>  
>  	/* Get ID of active account in the combo box */
>  	menu = gtk_combo_box_get_model(optmenu);
> @@ -9760,33 +9752,8 @@ static void account_activated(GtkComboBox *optmenu,
> gpointer data) for (list = compose->header_list; list; list = list->next) {
>  			ComposeHeaderEntry *hentry=(ComposeHeaderEntry
> *)list->data; 
> -			if (hentry->type == PREF_ACCOUNT || !list->next) {
> +			if (hentry->type == PREF_ACCOUNT || !list->next)
>  				compose_destroy_headerentry(compose,
> hentry);
> -				continue;
> -			}
> -			
> -			state = g_malloc0(sizeof(HeaderEntryState));
> -			state->header =
> gtk_editable_get_chars(GTK_EDITABLE(
> -
> gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
> -			state->entry = gtk_editable_get_chars(
> -					GTK_EDITABLE(hentry->entry), 0,
> -1);
> -			state->type = hentry->type;
> -				
> -#if !GTK_CHECK_VERSION(3, 0, 0)
> -			if (!color_set) {
> -				gdk_color_parse("#f5f6be", &yellow);
> -				color_set = gdk_colormap_alloc_color(
> -
> gdk_colormap_get_system(),
> -							&yellow, FALSE,
> TRUE);
> -			}
> -#endif
> -				
> -			style =
> gtk_widget_get_modifier_style(hentry->entry);
> -			state->entry_marked = gdk_color_equal(&yellow,
> -
> &style->base[GTK_STATE_NORMAL]); -
> -			saved_list = g_slist_append(saved_list, state);
> -			compose_destroy_headerentry(compose, hentry);
>  		}
>  
>  		compose->header_last = NULL;
> @@ -9795,31 +9762,21 @@ static void account_activated(GtkComboBox
> *optmenu, gpointer data) compose->header_nextrow = 1;
>  		compose_create_header_entry(compose);
>  		
> -		if (ac->set_autocc && ac->auto_cc)
> +		if (ac->set_autocc && ac->auto_cc) {
>  			compose_entry_append(compose, ac->auto_cc,
>  						COMPOSE_CC, PREF_ACCOUNT);
> -
> -		if (ac->set_autobcc && ac->auto_bcc) 
> +			compose_entry_mark_default_to(compose,
> ac->auto_cc);
> +		}
> +		if (ac->set_autobcc && ac->auto_bcc) {
>  			compose_entry_append(compose, ac->auto_bcc,
>  						COMPOSE_BCC,
> PREF_ACCOUNT);
> -	
> -		if (ac->set_autoreplyto && ac->auto_replyto)
> +			compose_entry_mark_default_to(compose,
> ac->auto_bcc);
> +		}
> +		if (ac->set_autoreplyto && ac->auto_replyto) {
>  			compose_entry_append(compose, ac->auto_replyto,
>  						COMPOSE_REPLYTO,
> PREF_ACCOUNT);
> -		
> -		for (list = saved_list; list; list = list->next) {
> -			state = (HeaderEntryState *) list->data;
> -			
> -			compose_add_header_entry(compose, state->header,
> -						state->entry,
> state->type);
> -			if (state->entry_marked)
> -				compose_entry_mark_default_to(compose,
> state->entry);
> -			
> -			g_free(state->header);	
> -			g_free(state->entry);
> -			g_free(state);
> +			compose_entry_mark_default_to(compose,
> ac->auto_replyto); }
> -		g_slist_free(saved_list);
>  		
>  		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
>  					(ac->protocol == A_NNTP) ? 
> 
> -----------------------------------------------------------------------
> 
> 
> hooks/post-receive
> -- 
> Claws Mail
> _______________________________________________
> Commits mailing list
> Commits at lists.claws-mail.org
> http://lists.claws-mail.org/cgi-bin/mailman/listinfo/commits


This patch breaks account change in compose window: when replying-all to a
multiple addressed mail it opens compose with To: and 2 CC:, if From: is
changed the To: line is removed (!).

regards,
-- 
  Ricardo Mones 
  ~
  15:14 <@mones> you're overconfident today :)                         
  15:14 <@claws> i will be this way forever now        Seen on #claws


From subscript at free.fr  Mon Dec 12 09:23:36 2016
From: subscript at free.fr (wwp)
Date: Mon, 12 Dec 2016 09:23:36 +0100
Subject: [Commits] [SCM] claws branch, master,
 updated. 3.14.1-34-gf37bbde
In-Reply-To: <20161211174438.1605B36A4581@mx.colino.net>
References: <20161211174438.1605B36A4581@mx.colino.net>
Message-ID: <20161212092336.504b2248@anthra>

Hello,


On Sun, 11 Dec 2016 18:44:37 +0100 (CET) claws at claws-mail.org wrote:

> The branch, master has been updated
>        via  f37bbdecf9791f5b427e16e7951df766de1034e6 (commit)
>       from  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)
> 
> Summary of changes:
>  src/compose.c |   12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> 
> - Log -----------------------------------------------------------------
> commit f37bbdecf9791f5b427e16e7951df766de1034e6
> Author: Paul <paul at claws-mail.org>
> Date:   Sun Dec 11 17:44:32 2016 +0000
> 
>     some more colouring based on folder prefs override
> 
> diff --git a/src/compose.c b/src/compose.c
> index 3e89d66..65c447a 100644
> --- a/src/compose.c
> +++ b/src/compose.c
> @@ -3237,15 +3237,21 @@ static void compose_set_folder_prefs(Compose *compose, FolderItem *folder,
>  					COMPOSE_TO, PREF_FOLDER);
>  		compose_entry_mark_default_to(compose, folder->prefs->default_to);
>  	}
> -	if (folder->prefs->enable_default_cc)
> +	if (folder->prefs->enable_default_cc) {
>  		compose_entry_append(compose, folder->prefs->default_cc,
>  					COMPOSE_CC, PREF_FOLDER);
> -	if (folder->prefs->enable_default_bcc)
> +		compose_entry_mark_default_to(compose, folder->prefs->default_cc);
> +	}
> +	if (folder->prefs->enable_default_bcc) {
>  		compose_entry_append(compose, folder->prefs->default_bcc,
>  					COMPOSE_BCC, PREF_FOLDER);
> -	if (folder->prefs->enable_default_replyto)
> +		compose_entry_mark_default_to(compose, folder->prefs->default_bcc);
> +	}
> +	if (folder->prefs->enable_default_replyto) {
>  		compose_entry_append(compose, folder->prefs->default_replyto,
>  					COMPOSE_REPLYTO, PREF_FOLDER);
> +		compose_entry_mark_default_to(compose, folder->prefs->default_replyto);
> +	}
>  }
>  
>  static void compose_reply_set_subject(Compose *compose, MsgInfo *msginfo)
> 
> -----------------------------------------------------------------------
> 
> 
> hooks/post-receive

Note for later: works fine, unless you set a list of several recipients
in folder prefs' default To: (address1, address2, etc.).


Regards,

-- 
wwp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.claws-mail.org/pipermail/commits/attachments/20161212/c3bb4215/attachment.sig>

From subscript at free.fr  Mon Dec 12 09:24:14 2016
From: subscript at free.fr (wwp)
Date: Mon, 12 Dec 2016 09:24:14 +0100
Subject: [Commits] [SCM] claws branch, master,
 updated. 3.14.1-33-g5f607a3
In-Reply-To: <20161212075937.67217b5e@busgosu>
References: <20161211100438.07D2936A4556@mx.colino.net>
 <20161212075937.67217b5e@busgosu>
Message-ID: <20161212092414.75b83cd6@anthra>

Hello,


On Mon, 12 Dec 2016 08:57:01 +0100 Ricardo Mones <mones at claws-mail.org> wrote:

> On Sun, 11 Dec 2016 11:04:37 +0100 (CET)
> claws at claws-mail.org wrote:
> 
> > The branch, master has been updated
> >        via  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)
> >       from  9123296406a1f61f21464ca8fd439d315b4c8367 (commit)
> > 
> > Summary of changes:
> >  src/compose.c |   63
> > +++++++++------------------------------------------------ 1 file changed,
> > 10 insertions(+), 53 deletions(-)
> > 
> > 
> > - Log -----------------------------------------------------------------
> > commit 5f607a33a7ca9a9b0311e3afd7fca2729642b838
> > Author: Paul <paul at claws-mail.org>
> > Date:   Sun Dec 11 10:04:30 2016 +0000
> > 
> >     fix colouring of auto-filled headers
> > 
> > diff --git a/src/compose.c b/src/compose.c
> > index da8c9a0..3e89d66 100644
> > --- a/src/compose.c
> > +++ b/src/compose.c
> > @@ -9736,15 +9736,7 @@ static void account_activated(GtkComboBox *optmenu,
> > gpointer data) gint account_id = 0;
> >  	GtkTreeModel *menu;
> >  	GtkTreeIter iter;
> > -	GSList *list, *saved_list = NULL;
> > -	HeaderEntryState *state;
> > -	GtkRcStyle *style = NULL;
> > -#if !GTK_CHECK_VERSION(3, 0, 0)
> > -	static GdkColor yellow;
> > -	static gboolean color_set = FALSE;
> > -#else
> > -	static GdkColor yellow = { (guint32)0, (guint32)0xf5,
> > (guint32)0xf6, (guint32)0xbe }; -#endif
> > +	GSList *list = NULL;
> >  
> >  	/* Get ID of active account in the combo box */
> >  	menu = gtk_combo_box_get_model(optmenu);
> > @@ -9760,33 +9752,8 @@ static void account_activated(GtkComboBox *optmenu,
> > gpointer data) for (list = compose->header_list; list; list = list->next) {
> >  			ComposeHeaderEntry *hentry=(ComposeHeaderEntry
> > *)list->data; 
> > -			if (hentry->type == PREF_ACCOUNT || !list->next) {
> > +			if (hentry->type == PREF_ACCOUNT || !list->next)
> >  				compose_destroy_headerentry(compose,
> > hentry);
> > -				continue;
> > -			}
> > -			
> > -			state = g_malloc0(sizeof(HeaderEntryState));
> > -			state->header =
> > gtk_editable_get_chars(GTK_EDITABLE(
> > -
> > gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
> > -			state->entry = gtk_editable_get_chars(
> > -					GTK_EDITABLE(hentry->entry), 0,
> > -1);
> > -			state->type = hentry->type;
> > -				
> > -#if !GTK_CHECK_VERSION(3, 0, 0)
> > -			if (!color_set) {
> > -				gdk_color_parse("#f5f6be", &yellow);
> > -				color_set = gdk_colormap_alloc_color(
> > -
> > gdk_colormap_get_system(),
> > -							&yellow, FALSE,
> > TRUE);
> > -			}
> > -#endif
> > -				
> > -			style =
> > gtk_widget_get_modifier_style(hentry->entry);
> > -			state->entry_marked = gdk_color_equal(&yellow,
> > -
> > &style->base[GTK_STATE_NORMAL]); -
> > -			saved_list = g_slist_append(saved_list, state);
> > -			compose_destroy_headerentry(compose, hentry);
> >  		}
> >  
> >  		compose->header_last = NULL;
> > @@ -9795,31 +9762,21 @@ static void account_activated(GtkComboBox
> > *optmenu, gpointer data) compose->header_nextrow = 1;
> >  		compose_create_header_entry(compose);
> >  		
> > -		if (ac->set_autocc && ac->auto_cc)
> > +		if (ac->set_autocc && ac->auto_cc) {
> >  			compose_entry_append(compose, ac->auto_cc,
> >  						COMPOSE_CC, PREF_ACCOUNT);
> > -
> > -		if (ac->set_autobcc && ac->auto_bcc) 
> > +			compose_entry_mark_default_to(compose,
> > ac->auto_cc);
> > +		}
> > +		if (ac->set_autobcc && ac->auto_bcc) {
> >  			compose_entry_append(compose, ac->auto_bcc,
> >  						COMPOSE_BCC,
> > PREF_ACCOUNT);
> > -	
> > -		if (ac->set_autoreplyto && ac->auto_replyto)
> > +			compose_entry_mark_default_to(compose,
> > ac->auto_bcc);
> > +		}
> > +		if (ac->set_autoreplyto && ac->auto_replyto) {
> >  			compose_entry_append(compose, ac->auto_replyto,
> >  						COMPOSE_REPLYTO,
> > PREF_ACCOUNT);
> > -		
> > -		for (list = saved_list; list; list = list->next) {
> > -			state = (HeaderEntryState *) list->data;
> > -			
> > -			compose_add_header_entry(compose, state->header,
> > -						state->entry,
> > state->type);
> > -			if (state->entry_marked)
> > -				compose_entry_mark_default_to(compose,
> > state->entry);
> > -			
> > -			g_free(state->header);	
> > -			g_free(state->entry);
> > -			g_free(state);
> > +			compose_entry_mark_default_to(compose,
> > ac->auto_replyto); }
> > -		g_slist_free(saved_list);
> >  		
> >  		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
> >  					(ac->protocol == A_NNTP) ? 
> > 
> > -----------------------------------------------------------------------
> > 
> > 
> > hooks/post-receive
> > -- 
> > Claws Mail
> > _______________________________________________
> > Commits mailing list
> > Commits at lists.claws-mail.org
> > http://lists.claws-mail.org/cgi-bin/mailman/listinfo/commits  
> 
> 
> This patch breaks account change in compose window: when replying-all to a
> multiple addressed mail it opens compose with To: and 2 CC:, if From: is
> changed the To: line is removed (!).

I reproduce here, former To: get lost.


Regards,

-- 
wwp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.claws-mail.org/pipermail/commits/attachments/20161212/4ed324a9/attachment.sig>

From claws at claws-mail.org  Mon Dec 12 11:18:04 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 12 Dec 2016 11:18:04 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-35-g3f46e81
Message-ID: <20161212101804.8DD6D36A4592@mx.colino.net>

The branch, master has been updated
       via  3f46e81d2cc34000fd5de4b4a6c0f6f6b0afdd03 (commit)
      from  f37bbdecf9791f5b427e16e7951df766de1034e6 (commit)

Summary of changes:
 src/compose.c |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 3f46e81d2cc34000fd5de4b4a6c0f6f6b0afdd03
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 12 10:17:59 2016 +0000

    don't remove the To when changing account

diff --git a/src/compose.c b/src/compose.c
index 65c447a..7f44aec 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9742,7 +9742,8 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 	gint account_id = 0;
 	GtkTreeModel *menu;
 	GtkTreeIter iter;
-	GSList *list = NULL;
+	GSList *list, *saved_list = NULL;
+	HeaderEntryState *state;
 
 	/* Get ID of active account in the combo box */
 	menu = gtk_combo_box_get_model(optmenu);
@@ -9758,8 +9759,19 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 		for (list = compose->header_list; list; list = list->next) {
 			ComposeHeaderEntry *hentry=(ComposeHeaderEntry *)list->data;
 			
-			if (hentry->type == PREF_ACCOUNT || !list->next)
+			if (hentry->type == PREF_ACCOUNT || !list->next) {
 				compose_destroy_headerentry(compose, hentry);
+				continue;
+			}
+			state = g_malloc0(sizeof(HeaderEntryState));
+			state->header = gtk_editable_get_chars(GTK_EDITABLE(
+					gtk_bin_get_child(GTK_BIN(hentry->combo))), 0, -1);
+			state->entry = gtk_editable_get_chars(
+					GTK_EDITABLE(hentry->entry), 0, -1);
+			state->type = hentry->type;
+
+			saved_list = g_slist_append(saved_list, state);
+			compose_destroy_headerentry(compose, hentry);
 		}
 
 		compose->header_last = NULL;
@@ -9784,6 +9796,20 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 			compose_entry_mark_default_to(compose, ac->auto_replyto);
 		}
 		
+		for (list = saved_list; list; list = list->next) {
+			state = (HeaderEntryState *) list->data;
+
+			compose_add_header_entry(compose, state->header,
+						state->entry, state->type);
+			if (state->entry_marked)
+				compose_entry_mark_default_to(compose, state->entry);
+
+			g_free(state->header);
+			g_free(state->entry);
+			g_free(state);
+		}
+		g_slist_free(saved_list);
+
 		combobox_select_by_data(GTK_COMBO_BOX(compose->header_last->combo),
 					(ac->protocol == A_NNTP) ? 
 					COMPOSE_NEWSGROUPS : COMPOSE_TO);

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Dec 12 12:39:19 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 12 Dec 2016 12:39:19 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-36-g70795ea
Message-ID: <20161212113919.A9DB436A4591@mx.colino.net>

The branch, master has been updated
       via  70795ea5d1102c591a504e460c4fa71708eb86e5 (commit)
      from  3f46e81d2cc34000fd5de4b4a6c0f6f6b0afdd03 (commit)

Summary of changes:
 src/compose.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 70795ea5d1102c591a504e460c4fa71708eb86e5
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 12 11:39:16 2016 +0000

    more highlighted of automatically set header entries in Compose window
    
    fix highlighting of multiple addresses set in account prefs
    highlight From if not current account

diff --git a/src/compose.c b/src/compose.c
index 7f44aec..dd95cc6 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2657,6 +2657,7 @@ void compose_entry_append(Compose *compose, const gchar *address,
 			while (*tmp == ' ' || *tmp == '\t')
 				tmp++;
 			compose_add_header_entry(compose, header, tmp, pref_type);
+			compose_entry_mark_default_to(compose, tmp);
 			g_free(o_tmp);
 			continue;
 		}
@@ -2669,6 +2670,7 @@ void compose_entry_append(Compose *compose, const gchar *address,
 		while (*tmp == ' ' || *tmp == '\t')
 			tmp++;
 		compose_add_header_entry(compose, header, tmp, pref_type);
+		compose_entry_mark_default_to(compose, tmp);
 		g_free(o_tmp);		
 	}
 }
@@ -8155,6 +8157,14 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 						       ac->address);
 				gtk_entry_set_text(GTK_ENTRY(from_name), from);
 			}
+			if (cur_account != compose->account) {
+				gtk_widget_modify_base(
+					GTK_WIDGET(from_name),
+					GTK_STATE_NORMAL, &default_to_bgcolor);
+				gtk_widget_modify_text(
+					GTK_WIDGET(from_name),
+					GTK_STATE_NORMAL, &default_to_color);
+			}
 		}
 		COMBOBOX_ADD(menu, name, ac->account_id);
 		g_free(name);
@@ -9780,29 +9790,21 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 		compose->header_nextrow = 1;
 		compose_create_header_entry(compose);
 		
-		if (ac->set_autocc && ac->auto_cc) {
+		if (ac->set_autocc && ac->auto_cc)
 			compose_entry_append(compose, ac->auto_cc,
 						COMPOSE_CC, PREF_ACCOUNT);
-			compose_entry_mark_default_to(compose, ac->auto_cc);
-		}
-		if (ac->set_autobcc && ac->auto_bcc) {
+		if (ac->set_autobcc && ac->auto_bcc)
 			compose_entry_append(compose, ac->auto_bcc,
 						COMPOSE_BCC, PREF_ACCOUNT);
-			compose_entry_mark_default_to(compose, ac->auto_bcc);
-		}
-		if (ac->set_autoreplyto && ac->auto_replyto) {
+		if (ac->set_autoreplyto && ac->auto_replyto)
 			compose_entry_append(compose, ac->auto_replyto,
 						COMPOSE_REPLYTO, PREF_ACCOUNT);
-			compose_entry_mark_default_to(compose, ac->auto_replyto);
-		}
 		
 		for (list = saved_list; list; list = list->next) {
 			state = (HeaderEntryState *) list->data;
 
 			compose_add_header_entry(compose, state->header,
 						state->entry, state->type);
-			if (state->entry_marked)
-				compose_entry_mark_default_to(compose, state->entry);
 
 			g_free(state->header);
 			g_free(state->entry);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 14:10:57 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 14:10:57 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-37-gf455e02
Message-ID: <20161212131057.52B8B36A4595@mx.colino.net>

The branch, master has been updated
       via  f455e02c819d128b152bd8bbb9e9ba5721f48138 (commit)
      from  70795ea5d1102c591a504e460c4fa71708eb86e5 (commit)

Summary of changes:
 src/stock_pixmap.c |  374 +++++++++++++++++++++++++++-------------------------
 1 file changed, 192 insertions(+), 182 deletions(-)


- Log -----------------------------------------------------------------
commit f455e02c819d128b152bd8bbb9e9ba5721f48138
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 14:10:04 2016 +0100

    Fix missing initializers (last field in data struct),
    reworked table to a human readable format.

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index c0e6197..8e66eca 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -252,191 +252,201 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
 
 static StockPixmapData pixmaps[] =
 {
-	{addr_one_xpm				, NULL, NULL, "addr_one", NULL},
-	{addr_two_xpm				, NULL, NULL, "addr_two", NULL},
-	{address_xpm				, NULL, NULL, "address", NULL},
-	{address_book_xpm			, NULL, NULL, "address_book", NULL},
-	{address_search_xpm			, NULL, NULL, "address_search", NULL},
-	{anonymous_xpm				, NULL, NULL, "anonymous", NULL},
-	{book_xpm				, NULL, NULL, "book", NULL},
-	{category_xpm				, NULL, NULL, "category", NULL},
-	{checkbox_off_xpm			, NULL, NULL, "checkbox_off", NULL},
-	{checkbox_on_xpm			, NULL, NULL, "checkbox_on", NULL},
-	{check_spelling_xpm                     , NULL, NULL, "check_spelling", NULL},
-	{clip_xpm				, NULL, NULL, "clip", NULL},
-	{clipkey_xpm				, NULL, NULL, "clipkey", NULL},
-	{clip_gpg_signed_xpm			, NULL, NULL, "clip_gpg_signed", NULL},
-	{close_xpm				, NULL, NULL, "close", NULL},
-	{complete_xpm				, NULL, NULL, "complete", NULL},
-	{continue_xpm				, NULL, NULL, "continue", NULL},
-	{deleted_xpm				, NULL, NULL, "deleted", NULL},
-	{dir_close_xpm				, NULL, NULL, "dir_close", NULL},
-	{dir_close_hrm_xpm			, NULL, NULL, "dir_close_hrm", NULL},
-	{dir_open_xpm				, NULL, NULL, "dir_open", NULL},
-	{dir_open_hrm_xpm			, NULL, NULL, "dir_open_hrm", NULL},
-	{dir_close_mark_xpm			, NULL, NULL, "dir_close_mark", NULL},
-	{dir_close_hrm_mark_xpm			, NULL, NULL, "dir_close_hrm_mark", NULL},
-	{dir_open_mark_xpm			, NULL, NULL, "dir_open_mark", NULL},
-	{dir_open_hrm_mark_xpm			, NULL, NULL, "dir_open_hrm_mark", NULL},
-	{down_arrow_xpm				, NULL, NULL, "down_arrow", NULL},
-	{up_arrow_xpm				, NULL, NULL, "up_arrow", NULL},
-	{edit_extern_xpm			, NULL, NULL, "edit_extern", NULL},
-	{error_xpm				, NULL, NULL, "error", NULL},
-	{exec_xpm				, NULL, NULL, "exec", NULL},
-	{forwarded_xpm				, NULL, NULL, "forwarded", NULL},
-	{group_xpm				, NULL, NULL, "group", NULL},
-	{ignorethread_xpm			, NULL, NULL, "ignorethread", NULL},
-	{inbox_close_xpm			, NULL, NULL, "inbox_close", NULL},
-	{inbox_close_hrm_xpm			, NULL, NULL, "inbox_close_hrm", NULL},
-	{inbox_open_xpm				, NULL, NULL, "inbox_open", NULL},
-	{inbox_open_hrm_xpm			, NULL, NULL, "inbox_open_hrm", NULL},
-	{inbox_close_mark_xpm			, NULL, NULL, "inbox_close_mark", NULL},
-	{inbox_close_hrm_mark_xpm		, NULL, NULL, "inbox_close_hrm_mark", NULL},
-	{inbox_open_mark_xpm			, NULL, NULL, "inbox_open_mark", NULL},
-	{inbox_open_hrm_mark_xpm		, NULL, NULL, "inbox_open_hrm_mark", NULL},
-	{insert_file_xpm			, NULL, NULL, "insert_file", NULL},
-	{interface_xpm				, NULL, NULL, "interface", NULL},
-	{jpilot_xpm				, NULL, NULL, "jpilot", NULL},
-	{key_xpm				, NULL, NULL, "key", NULL},
-	{key_gpg_signed_xpm			, NULL, NULL, "key_gpg_signed", NULL},
-	{ldap_xpm				, NULL, NULL, "ldap", NULL},
-	{linewrapcurrent_xpm			, NULL, NULL, "linewrapcurrent", NULL},
-	{linewrap_xpm				, NULL, NULL, "linewrap", NULL},
-	{locked_xpm				, NULL, NULL, "locked", NULL},
-	{mail_xpm				, NULL, NULL, "mail", NULL},
-	{mail_attach_xpm			, NULL, NULL, "mail_attach", NULL},
-	{mail_compose_xpm			, NULL, NULL, "mail_compose", NULL},
-	{mail_forward_xpm			, NULL, NULL, "mail_forward", NULL},
-	{mail_receive_xpm			, NULL, NULL, "mail_receive", NULL},
-	{mail_receive_all_xpm			, NULL, NULL, "mail_receive_all", NULL},
-	{mail_reply_xpm				, NULL, NULL, "mail_reply", NULL},
-	{mail_reply_to_all_xpm			, NULL, NULL, "mail_reply_to_all", NULL},
-	{mail_reply_to_author_xpm		, NULL, NULL, "mail_reply_to_author", NULL},
-	{mail_reply_to_list_xpm			, NULL, NULL, "mail_reply_to_list", NULL},
-	{mail_send_xpm				, NULL, NULL, "mail_send", NULL},
-	{mail_send_queue_xpm			, NULL, NULL, "mail_send_queue", NULL},
-	{mail_sign_xpm				, NULL, NULL, "mail_sign", NULL},
-	{open_mail_xpm				, NULL, NULL, "open_mail", NULL},
-	{mark_xpm				, NULL, NULL, "mark", NULL},
-	{new_xpm				, NULL, NULL, "new", NULL},
-	{news_compose_xpm			, NULL, NULL, "news_compose", NULL},
-	{outbox_close_xpm			, NULL, NULL, "outbox_close", NULL},
-	{outbox_close_hrm_xpm			, NULL, NULL, "outbox_close_hrm", NULL},
-	{outbox_open_xpm			, NULL, NULL, "outbox_open", NULL},
-	{outbox_open_hrm_xpm			, NULL, NULL, "outbox_open_hrm", NULL},
-	{outbox_close_mark_xpm			, NULL, NULL, "outbox_close_mark", NULL},
-	{outbox_close_hrm_mark_xpm		, NULL, NULL, "outbox_close_hrm_mark", NULL},
-	{outbox_open_mark_xpm			, NULL, NULL, "outbox_open_mark", NULL},
-	{outbox_open_hrm_mark_xpm		, NULL, NULL, "outbox_open_hrm_mark", NULL},
-	{replied_xpm				, NULL, NULL, "replied", NULL},
-	{replied_and_forwarded_xpm	, NULL, NULL, "replied_and_forwarded", NULL},
-	{paste_xpm				, NULL, NULL, "paste", NULL},
-	{preferences_xpm			, NULL, NULL, "preferences", NULL},
-	{properties_xpm				, NULL, NULL, "properties", NULL},
-	{queue_close_xpm			, NULL, NULL, "queue_close", NULL},
-	{queue_close_hrm_xpm			, NULL, NULL, "queue_close_hrm", NULL},
-	{queue_open_xpm				, NULL, NULL, "queue_open", NULL},
-	{queue_open_hrm_xpm			, NULL, NULL, "queue_open_hrm", NULL},
-	{trash_open_xpm				, NULL, NULL, "trash_open", NULL},
-	{trash_open_hrm_xpm			, NULL, NULL, "trash_open_hrm", NULL},
-	{trash_close_xpm			, NULL, NULL, "trash_close", NULL},
-	{trash_close_hrm_xpm			, NULL, NULL, "trash_close_hrm", NULL},
-	{queue_close_mark_xpm			, NULL, NULL, "queue_close_mark", NULL},
-	{queue_close_hrm_mark_xpm		, NULL, NULL, "queue_close_hrm_mark", NULL},
-	{queue_open_mark_xpm			, NULL, NULL, "queue_open_mark", NULL},
-	{queue_open_hrm_mark_xpm		, NULL, NULL, "queue_open_hrm_mark", NULL},
-	{trash_open_mark_xpm			, NULL, NULL, "trash_open_mark", NULL},
-	{trash_open_hrm_mark_xpm		, NULL, NULL, "trash_open_hrm_mark", NULL},
-	{trash_close_mark_xpm			, NULL, NULL, "trash_close_mark", NULL},
-	{trash_close_hrm_mark_xpm		, NULL, NULL, "trash_close_hrm_mark", NULL},
-	{unread_xpm				, NULL, NULL, "unread", NULL},
-	{vcard_xpm				, NULL, NULL, "vcard", NULL},
-	{online_xpm				, NULL, NULL, "online", NULL},
-	{offline_xpm				, NULL, NULL, "offline", NULL},
-	{notice_warn_xpm			, NULL, NULL, "notice_warn",  NULL},
-	{notice_error_xpm			, NULL, NULL, "notice_error",  NULL},
-	{notice_note_xpm			, NULL, NULL, "notice_note",  NULL},
-	{quicksearch_xpm			, NULL, NULL, "quicksearch",  NULL},
-	{gpg_signed_xpm				, NULL, NULL, "gpg_signed", NULL},
-	{go_folders_xpm				, NULL, NULL, "go_folders", NULL},
-	{drafts_close_xpm			, NULL, NULL, "drafts_close", NULL},
-	{drafts_open_xpm			, NULL, NULL, "drafts_open", NULL},
-	{drafts_close_mark_xpm			, NULL, NULL, "drafts_close_mark", NULL},
-	{drafts_open_mark_xpm			, NULL, NULL, "drafts_open_mark", NULL},
-	{mime_text_plain_xpm			, NULL, NULL, "mime_text_plain", NULL},
-	{mime_text_html_xpm			, NULL, NULL, "mime_text_html", NULL},
-	{mime_text_patch_xpm			, NULL, NULL, "mime_text_patch", NULL},
-	{mime_application_xpm			, NULL, NULL, "mime_application", NULL},
-	{mime_image_xpm				, NULL, NULL, "mime_image", NULL},
-	{mime_audio_xpm				, NULL, NULL, "mime_audio", NULL},
-	{mime_text_enriched_xpm			, NULL, NULL, "mime_text_enriched", NULL},
-	{mime_unknown_xpm			, NULL, NULL, "mime_unknown", NULL},	
-	{mime_pdf_xpm				, NULL, NULL, "mime_pdf", NULL},	
-	{mime_ps_xpm				, NULL, NULL, "mime_ps", NULL},	
-	{mime_calendar_xpm			, NULL, NULL, "mime_calendar", NULL},	
-	{mime_pgpsig_xpm			, NULL, NULL, "mime_pgpsig", NULL},	
-	{printer_xpm				, NULL, NULL, "printer", NULL},
-	{privacy_signed_xpm			, NULL, NULL, "privacy_signed", NULL},
-	{privacy_passed_xpm			, NULL, NULL, "privacy_passed", NULL},
-	{privacy_failed_xpm			, NULL, NULL, "privacy_failed", NULL},	
-	{privacy_unknown_xpm			, NULL, NULL, "privacy_unknown", NULL},
-	{privacy_expired_xpm			, NULL, NULL, "privacy_expired", NULL},
-	{privacy_warn_xpm			, NULL, NULL, "privacy_warn", NULL},
-	{privacy_emblem_encrypted_xpm		, NULL, NULL, "privacy_emblem_encrypted", NULL},
-	{privacy_emblem_signed_xpm		, NULL, NULL, "privacy_emblem_signed", NULL},
-	{privacy_emblem_passed_xpm		, NULL, NULL, "privacy_emblem_passed", NULL},
-	{privacy_emblem_failed_xpm		, NULL, NULL, "privacy_emblem_failed", NULL},	
-	{privacy_emblem_warn_xpm		, NULL, NULL, "privacy_emblem_warn", NULL},
-	{mime_message_xpm			, NULL, NULL, "mime_message", NULL},
-	{claws_mail_icon_xpm			, NULL, NULL, "claws_mail_icon", NULL},
-	{claws_mail_icon_64_xpm			, NULL, NULL, "claws_mail_icon_64", NULL},
-	{read_xpm				, NULL, NULL, "read", NULL},
-	{delete_btn_xpm				, NULL, NULL, "delete_btn", NULL},
-	{cancel_xpm				, NULL, NULL, "cancel", NULL},
-	{trash_btn_xpm				, NULL, NULL, "trash_btn", NULL},
-	{claws_mail_compose_logo_xpm		, NULL, NULL, "claws_mail_compose_logo", NULL},
+    {addr_one_xpm            		  , NULL, NULL, "addr_one", NULL, NULL},
+    {addr_two_xpm            		  , NULL, NULL, "addr_two", NULL, NULL},
+    {address_xpm             		  , NULL, NULL, "address", NULL, NULL},
+    {address_book_xpm        		  , NULL, NULL, "address_book", NULL, NULL},
+    {address_search_xpm      		  , NULL, NULL, "address_search", NULL, NULL},
+    {anonymous_xpm           		  , NULL, NULL, "anonymous", NULL, NULL},
+    {book_xpm                		  , NULL, NULL, "book", NULL, NULL},
+    {category_xpm            		  , NULL, NULL, "category", NULL, NULL},
+    {checkbox_off_xpm        		  , NULL, NULL, "checkbox_off", NULL, NULL},
+    {checkbox_on_xpm         		  , NULL, NULL, "checkbox_on", NULL, NULL},
+    {check_spelling_xpm      		  , NULL, NULL, "check_spelling", NULL, NULL},
+    {clip_xpm                		  , NULL, NULL, "clip", NULL, NULL},
+    {clipkey_xpm             		  , NULL, NULL, "clipkey", NULL, NULL},
+    {clip_gpg_signed_xpm     		  , NULL, NULL, "clip_gpg_signed", NULL, NULL},
+    {close_xpm               		  , NULL, NULL, "close", NULL, NULL},
+    {complete_xpm            		  , NULL, NULL, "complete", NULL, NULL},
+    {continue_xpm            		  , NULL, NULL, "continue", NULL, NULL},
+    {deleted_xpm             		  , NULL, NULL, "deleted", NULL, NULL},
+    {dir_close_xpm           		  , NULL, NULL, "dir_close", NULL, NULL},
+    {dir_close_hrm_xpm       		  , NULL, NULL, "dir_close_hrm", NULL, NULL},
+    {dir_open_xpm            		  , NULL, NULL, "dir_open", NULL, NULL},
+    {dir_open_hrm_xpm        		  , NULL, NULL, "dir_open_hrm", NULL, NULL},
+    {dir_close_mark_xpm      		  , NULL, NULL, "dir_close_mark", NULL, NULL},
+    {dir_close_hrm_mark_xpm  		  , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
+    {dir_open_mark_xpm       		  , NULL, NULL, "dir_open_mark", NULL, NULL},
+    {dir_open_hrm_mark_xpm   		  , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
+    {down_arrow_xpm          		  , NULL, NULL, "down_arrow", NULL, NULL},
+    {up_arrow_xpm            		  , NULL, NULL, "up_arrow", NULL, NULL},
+    {edit_extern_xpm         		  , NULL, NULL, "edit_extern", NULL, NULL},
+    {error_xpm               		  , NULL, NULL, "error", NULL, NULL},
+    {exec_xpm                		  , NULL, NULL, "exec", NULL, NULL},
+    {forwarded_xpm           		  , NULL, NULL, "forwarded", NULL, NULL},
+    {group_xpm               		  , NULL, NULL, "group", NULL, NULL},
+    {ignorethread_xpm        		  , NULL, NULL, "ignorethread", NULL, NULL},
+    {inbox_close_xpm         		  , NULL, NULL, "inbox_close", NULL, NULL},
+    {inbox_close_hrm_xpm     		  , NULL, NULL, "inbox_close_hrm", NULL, NULL},
+    {inbox_open_xpm          		  , NULL, NULL, "inbox_open", NULL, NULL},
+    {inbox_open_hrm_xpm      		  , NULL, NULL, "inbox_open_hrm", NULL, NULL},
+    {inbox_close_mark_xpm    		  , NULL, NULL, "inbox_close_mark", NULL, NULL},
+    {inbox_close_hrm_mark_xpm		  , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
+    {inbox_open_mark_xpm     		  , NULL, NULL, "inbox_open_mark", NULL, NULL},
+    {inbox_open_hrm_mark_xpm 		  , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
+    {insert_file_xpm         		  , NULL, NULL, "insert_file", NULL, NULL},
+    {interface_xpm           		  , NULL, NULL, "interface", NULL, NULL},
+    {jpilot_xpm              		  , NULL, NULL, "jpilot", NULL, NULL},
+    {key_xpm                 		  , NULL, NULL, "key", NULL, NULL},
+    {key_gpg_signed_xpm      		  , NULL, NULL, "key_gpg_signed", NULL, NULL},
+    {ldap_xpm                		  , NULL, NULL, "ldap", NULL, NULL},
+    {linewrapcurrent_xpm     		  , NULL, NULL, "linewrapcurrent", NULL, NULL},
+    {linewrap_xpm            		  , NULL, NULL, "linewrap", NULL, NULL},
+    {locked_xpm              		  , NULL, NULL, "locked", NULL, NULL},
+    {mail_xpm                		  , NULL, NULL, "mail", NULL, NULL},
+    {mail_attach_xpm         		  , NULL, NULL, "mail_attach", NULL, NULL},
+    {mail_compose_xpm        		  , NULL, NULL, "mail_compose", NULL, NULL},
+    {mail_forward_xpm        		  , NULL, NULL, "mail_forward", NULL, NULL},
+    {mail_receive_xpm        		  , NULL, NULL, "mail_receive", NULL, NULL},
+    {mail_receive_all_xpm    		  , NULL, NULL, "mail_receive_all", NULL, NULL},
+    {mail_reply_xpm          		  , NULL, NULL, "mail_reply", NULL, NULL},
+    {mail_reply_to_all_xpm   		  , NULL, NULL, "mail_reply_to_all", NULL, NULL},
+    {mail_reply_to_author_xpm		  , NULL, NULL, "mail_reply_to_author", NULL, NULL},
+    {mail_reply_to_list_xpm  		  , NULL, NULL, "mail_reply_to_list", NULL, NULL},
+    {mail_send_xpm           		  , NULL, NULL, "mail_send", NULL, NULL},
+    {mail_send_queue_xpm     		  , NULL, NULL, "mail_send_queue", NULL, NULL},
+    {mail_sign_xpm           		  , NULL, NULL, "mail_sign", NULL, NULL},
+    {open_mail_xpm           		  , NULL, NULL, "open_mail", NULL, NULL},
+    {mark_xpm                		  , NULL, NULL, "mark", NULL, NULL},
+    {new_xpm                 		  , NULL, NULL, "new", NULL, NULL},
+    {news_compose_xpm                 , NULL, NULL, "news_compose", NULL, NULL},
+    {outbox_close_xpm                 , NULL, NULL, "outbox_close", NULL, NULL},
+    {outbox_close_hrm_xpm             , NULL, NULL, "outbox_close_hrm", NULL, NULL},
+    {outbox_open_xpm                  , NULL, NULL, "outbox_open", NULL, NULL},
+    {outbox_open_hrm_xpm              , NULL, NULL, "outbox_open_hrm", NULL, NULL},
+    {outbox_close_mark_xpm            , NULL, NULL, "outbox_close_mark", NULL, NULL},
+    {outbox_close_hrm_mark_xpm        , NULL, NULL, "outbox_close_hrm_mark", NULL, NULL},
+    {outbox_open_mark_xpm             , NULL, NULL, "outbox_open_mark", NULL, NULL},
+    {outbox_open_hrm_mark_xpm         , NULL, NULL, "outbox_open_hrm_mark", NULL, NULL},
+    {replied_xpm                      , NULL, NULL, "replied", NULL, NULL},
+    {replied_and_forwarded_xpm        , NULL, NULL, "replied_and_forwarded", NULL, NULL},
+    {paste_xpm                        , NULL, NULL, "paste", NULL, NULL},
+    {preferences_xpm                  , NULL, NULL, "preferences", NULL, NULL},
+    {properties_xpm                   , NULL, NULL, "properties", NULL, NULL},
+    {queue_close_xpm                  , NULL, NULL, "queue_close", NULL, NULL},
+    {queue_close_hrm_xpm              , NULL, NULL, "queue_close_hrm", NULL, NULL},
+    {queue_open_xpm                   , NULL, NULL, "queue_open", NULL, NULL},
+    {queue_open_hrm_xpm               , NULL, NULL, "queue_open_hrm", NULL, NULL},
+    {trash_open_xpm                   , NULL, NULL, "trash_open", NULL, NULL},
+    {trash_open_hrm_xpm               , NULL, NULL, "trash_open_hrm", NULL, NULL},
+    {trash_close_xpm                  , NULL, NULL, "trash_close", NULL, NULL},
+    {trash_close_hrm_xpm              , NULL, NULL, "trash_close_hrm", NULL, NULL},
+    {queue_close_mark_xpm             , NULL, NULL, "queue_close_mark", NULL, NULL},
+    {queue_close_hrm_mark_xpm         , NULL, NULL, "queue_close_hrm_mark", NULL, NULL},
+    {queue_open_mark_xpm              , NULL, NULL, "queue_open_mark", NULL, NULL},
+    {queue_open_hrm_mark_xpm          , NULL, NULL, "queue_open_hrm_mark", NULL, NULL},
+    {trash_open_mark_xpm              , NULL, NULL, "trash_open_mark", NULL, NULL},
+    {trash_open_hrm_mark_xpm          , NULL, NULL, "trash_open_hrm_mark", NULL, NULL},
+    {trash_close_mark_xpm             , NULL, NULL, "trash_close_mark", NULL, NULL},
+    {trash_close_hrm_mark_xpm         , NULL, NULL, "trash_close_hrm_mark", NULL, NULL},
+    {unread_xpm                       , NULL, NULL, "unread", NULL, NULL},
+    {vcard_xpm                        , NULL, NULL, "vcard", NULL, NULL},
+    {online_xpm                       , NULL, NULL, "online", NULL, NULL},
+    {offline_xpm                      , NULL, NULL, "offline", NULL, NULL},
+    {notice_warn_xpm                  , NULL, NULL, "notice_warn",  NULL, NULL},
+    {notice_error_xpm                 , NULL, NULL, "notice_error",  NULL, NULL},
+    {notice_note_xpm                  , NULL, NULL, "notice_note",  NULL, NULL},
+    {quicksearch_xpm                  , NULL, NULL, "quicksearch",  NULL, NULL},
+    {gpg_signed_xpm                   , NULL, NULL, "gpg_signed", NULL, NULL},
+    {go_folders_xpm                   , NULL, NULL, "go_folders", NULL, NULL},
+    {drafts_close_xpm                 , NULL, NULL, "drafts_close", NULL, NULL},
+    {drafts_open_xpm                  , NULL, NULL, "drafts_open", NULL, NULL},
+    {drafts_close_mark_xpm            , NULL, NULL, "drafts_close_mark", NULL, NULL},
+    {drafts_open_mark_xpm             , NULL, NULL, "drafts_open_mark", NULL, NULL},
+    {mime_text_plain_xpm              , NULL, NULL, "mime_text_plain", NULL, NULL},
+    {mime_text_html_xpm               , NULL, NULL, "mime_text_html", NULL, NULL},
+    {mime_text_patch_xpm              , NULL, NULL, "mime_text_patch", NULL, NULL},
+    {mime_application_xpm             , NULL, NULL, "mime_application", NULL, NULL},
+    {mime_image_xpm                   , NULL, NULL, "mime_image", NULL, NULL},
+    {mime_audio_xpm                   , NULL, NULL, "mime_audio", NULL, NULL},
+    {mime_text_enriched_xpm           , NULL, NULL, "mime_text_enriched", NULL, NULL},
+    {mime_unknown_xpm                 , NULL, NULL, "mime_unknown", NULL, NULL},    
+    {mime_pdf_xpm                     , NULL, NULL, "mime_pdf", NULL, NULL},    
+    {mime_ps_xpm                      , NULL, NULL, "mime_ps", NULL, NULL},    
+    {mime_calendar_xpm                , NULL, NULL, "mime_calendar", NULL, NULL},    
+    {mime_pgpsig_xpm                  , NULL, NULL, "mime_pgpsig", NULL, NULL},    
+    {printer_xpm                      , NULL, NULL, "printer", NULL, NULL},
+    {privacy_signed_xpm               , NULL, NULL, "privacy_signed", NULL, NULL},
+    {privacy_passed_xpm               , NULL, NULL, "privacy_passed", NULL, NULL},
+    {privacy_failed_xpm               , NULL, NULL, "privacy_failed", NULL, NULL},    
+    {privacy_unknown_xpm              , NULL, NULL, "privacy_unknown", NULL, NULL},
+    {privacy_expired_xpm              , NULL, NULL, "privacy_expired", NULL, NULL},
+    {privacy_warn_xpm                 , NULL, NULL, "privacy_warn", NULL, NULL},
+    {privacy_emblem_encrypted_xpm     , NULL, NULL, "privacy_emblem_encrypted", NULL, NULL},
+    {privacy_emblem_signed_xpm        , NULL, NULL, "privacy_emblem_signed", NULL, NULL},
+    {privacy_emblem_passed_xpm        , NULL, NULL, "privacy_emblem_passed", NULL, NULL},
+    {privacy_emblem_failed_xpm        , NULL, NULL, "privacy_emblem_failed", NULL, NULL},    
+    {privacy_emblem_warn_xpm          , NULL, NULL, "privacy_emblem_warn", NULL, NULL},
+    {mime_message_xpm                 , NULL, NULL, "mime_message", NULL, NULL},
+    {claws_mail_icon_xpm              , NULL, NULL, "claws_mail_icon", NULL, NULL},
+    {claws_mail_icon_64_xpm           , NULL, NULL, "claws_mail_icon_64", NULL, NULL},
+    {read_xpm                         , NULL, NULL, "read", NULL, NULL},
+    {delete_btn_xpm                   , NULL, NULL, "delete_btn", NULL, NULL},
+    {cancel_xpm                       , NULL, NULL, "cancel", NULL, NULL},
+    {trash_btn_xpm                    , NULL, NULL, "trash_btn", NULL, NULL},
+    {claws_mail_compose_logo_xpm      , NULL, NULL, "claws_mail_compose_logo", NULL, NULL},
 #ifndef GENERIC_UMPC
-	{claws_mail_logo_xpm			, NULL, NULL, "claws_mail_logo", NULL},
+    {claws_mail_logo_xpm              , NULL, NULL, "claws_mail_logo", NULL, NULL},
 #else
-	{claws_mail_logo_small_xpm		, NULL, NULL, "claws_mail_logo_small", NULL},
+    {claws_mail_logo_small_xpm        , NULL, NULL, "claws_mail_logo_small", NULL, NULL},
 #endif
-        {dir_noselect_close_xpm                 , NULL, NULL, "dir_noselect_close" , NULL},
-        {dir_noselect_close_mark_xpm            , NULL, NULL, "dir_noselect_close_mark" , NULL},
-        {dir_noselect_open_xpm                  , NULL, NULL, "dir_noselect_open" , NULL},
-        {dir_subs_close_mark_xpm                , NULL, NULL, "dir_subs_close_mark" , NULL},
-        {dir_subs_close_xpm                     , NULL, NULL, "dir_subs_close" , NULL},
-        {dir_subs_open_xpm                      , NULL, NULL, "dir_subs_open" , NULL},
-        {spam_xpm                               , NULL, NULL, "spam" , NULL},
-        {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
-        {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
-	{moved_xpm				, NULL, NULL, "moved", NULL},
-	{copied_xpm				, NULL, NULL, "copied", NULL},
-	{selection_xpm				, NULL, NULL, "selection", NULL},
-	{watchthread_xpm			, NULL, NULL, "watchthread", NULL},
-	{tray_newmail_offline_xpm		, NULL, NULL, "tray_newmail_offline", NULL},
-	{tray_newmail_xpm			, NULL, NULL, "tray_newmail", NULL},
-	{tray_newmarkedmail_offline_xpm		, NULL, NULL, "tray_newmarkedmail_offline", NULL},
-	{tray_newmarkedmail_xpm			, NULL, NULL, "tray_newmarkedmail", NULL},
-	{tray_nomail_offline_xpm		, NULL, NULL, "tray_nomail_offline", NULL},
-	{tray_nomail_xpm			, NULL, NULL, "tray_nomail", NULL},
-	{tray_unreadmail_offline_xpm		, NULL, NULL, "tray_unreadmail_offline", NULL},
-	{tray_unreadmail_xpm			, NULL, NULL, "tray_unreadmail", NULL},
-	{tray_unreadmarkedmail_offline_xpm	, NULL, NULL, "tray_unreadmarkedmail_offline", NULL},
-	{tray_unreadmarkedmail_xpm		, NULL, NULL, "tray_unreadmarkedmail", NULL},
-	{doc_index_xpm				, NULL, NULL, "doc_index", NULL},
-	{doc_index_close_xpm			, NULL, NULL, "doc_index_close", NULL},
-	{doc_info_xpm				, NULL, NULL, "doc_info", NULL},
-	{first_arrow_xpm			, NULL, NULL, "first_arrow", NULL},
-	{last_arrow_xpm				, NULL, NULL, "last_arrow", NULL},
-	{left_arrow_xpm				, NULL, NULL, "left_arrow", NULL},
-	{right_arrow_xpm			, NULL, NULL, "right_arrow", NULL},
-	{rotate_left_xpm			, NULL, NULL, "rotate_left", NULL},
-	{rotate_right_xpm			, NULL, NULL, "rotate_right", NULL},
-	{zoom_fit_xpm				, NULL, NULL, "zoom_fit", NULL},
-	{zoom_in_xpm				, NULL, NULL, "zoom_in", NULL},
-	{zoom_out_xpm				, NULL, NULL, "zoom_out", NULL},
-	{zoom_width_xpm				, NULL, NULL, "zoom_width", NULL},
-        {empty_xpm                              , NULL, NULL, "empty" , NULL}
+    {dir_noselect_close_xpm           , NULL, NULL, "dir_noselect_close", NULL, NULL},
+    {dir_noselect_close_mark_xpm      , NULL, NULL, "dir_noselect_close_mark", NULL, NULL},
+    {dir_noselect_open_xpm            , NULL, NULL, "dir_noselect_open", NULL, NULL},
+    {dir_subs_close_mark_xpm          , NULL, NULL, "dir_subs_close_mark", NULL, NULL},
+    {dir_subs_close_xpm               , NULL, NULL, "dir_subs_close", NULL, NULL},
+    {dir_subs_open_xpm                , NULL, NULL, "dir_subs_open", NULL, NULL},
+    {spam_xpm                         , NULL, NULL, "spam", NULL, NULL},
+    {spam_btn_xpm                     , NULL, NULL, "spam_btn", NULL, NULL},
+    {ham_btn_xpm                      , NULL, NULL, "ham_btn", NULL, NULL},
+    {moved_xpm                        , NULL, NULL, "moved", NULL, NULL},
+    {copied_xpm                       , NULL, NULL, "copied", NULL, NULL},
+    {selection_xpm                    , NULL, NULL, "selection", NULL, NULL},
+    {watchthread_xpm                  , NULL, NULL, "watchthread", NULL, NULL},
+    {tray_newmail_offline_xpm         , NULL, NULL, "tray_newmail_offline", NULL, NULL},
+    {tray_newmail_xpm                 , NULL, NULL, "tray_newmail", NULL, NULL},
+    {tray_newmarkedmail_offline_xpm   , NULL, NULL, "tray_newmarkedmail_offline", NULL, NULL},
+    {tray_newmarkedmail_xpm           , NULL, NULL, "tray_newmarkedmail", NULL, NULL},
+    {tray_nomail_offline_xpm          , NULL, NULL, "tray_nomail_offline", NULL, NULL},
+    {tray_nomail_xpm                  , NULL, NULL, "tray_nomail", NULL, NULL},
+    {tray_unreadmail_offline_xpm      , NULL, NULL, "tray_unreadmail_offline", NULL, NULL},
+    {tray_unreadmail_xpm              , NULL, NULL, "tray_unreadmail", NULL, NULL},
+    {tray_unreadmarkedmail_offline_xpm, NULL, NULL, "tray_unreadmarkedmail_offline", NULL, NULL},
+    {tray_unreadmarkedmail_xpm        , NULL, NULL, "tray_unreadmarkedmail", NULL, NULL},
+    {doc_index_xpm                    , NULL, NULL, "doc_index", NULL, NULL,},
+    {doc_index_close_xpm              , NULL, NULL, "doc_index_close", NULL, NULL,},
+    {doc_info_xpm                     , NULL, NULL, "doc_info", NULL, NULL,},
+    {first_arrow_xpm                  , NULL, NULL, "first_arrow", NULL, NULL},
+    {last_arrow_xpm                   , NULL, NULL, "last_arrow", NULL, NULL},
+    {left_arrow_xpm                   , NULL, NULL, "left_arrow", NULL, NULL},
+    {right_arrow_xpm                  , NULL, NULL, "right_arrow", NULL, NULL},
+    {rotate_left_xpm                  , NULL, NULL, "rotate_left", NULL, NULL},
+    {rotate_right_xpm                 , NULL, NULL, "rotate_right", NULL, NULL},
+    {zoom_fit_xpm                     , NULL, NULL, "zoom_fit", NULL, NULL},
+    {zoom_in_xpm                      , NULL, NULL, "zoom_in", NULL, NULL},
+    {zoom_out_xpm                     , NULL, NULL, "zoom_out", NULL, NULL},
+    {zoom_width_xpm                   , NULL, NULL, "zoom_width", NULL, NULL},
+	{mark_ignorethread 			      , NULL, NULL, "ignorethread", NULL},
+	{mark_watchthread 			      , NULL, NULL, "watchthread", NULL},
+	{mark_mark 					      , NULL, NULL, "mark	", NULL, NULL},
+	{mark_unmark 				      , NULL, NULL, "unmark", NULL, NULL},
+	{mark_locked 				      , NULL, NULL, "locked", NULL, NULL},
+	{mark_unlocked 				      , NULL, NULL, "unlocked", NULL, NULL},
+	{mark_allread 				      , NULL, NULL, "allread", NULL, NULL},
+	{mark_allunread 			      , NULL, NULL, "allunread", NULL, NULL},
+	{mark_read 					      , NULL, NULL, "read	", NULL, NULL},
+	{mark_unread 				      , NULL, NULL, "unread", NULL, NULL},
+    {empty_xpm                        , NULL, NULL, "empty", NULL, NULL}
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 14:15:02 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 14:15:02 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-38-g7d84a8a
Message-ID: <20161212131502.CA03636A4595@mx.colino.net>

The branch, master has been updated
       via  7d84a8a9963a48d1e0805ce06b39ac09e75d9224 (commit)
      from  f455e02c819d128b152bd8bbb9e9ba5721f48138 (commit)

Summary of changes:
 src/stock_pixmap.c |   10 ----------
 1 file changed, 10 deletions(-)


- Log -----------------------------------------------------------------
commit 7d84a8a9963a48d1e0805ce06b39ac09e75d9224
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 14:14:37 2016 +0100

    Remove extra entries, not yet in git.

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 8e66eca..b4f9d56 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -436,16 +436,6 @@ static StockPixmapData pixmaps[] =
     {zoom_in_xpm                      , NULL, NULL, "zoom_in", NULL, NULL},
     {zoom_out_xpm                     , NULL, NULL, "zoom_out", NULL, NULL},
     {zoom_width_xpm                   , NULL, NULL, "zoom_width", NULL, NULL},
-	{mark_ignorethread 			      , NULL, NULL, "ignorethread", NULL},
-	{mark_watchthread 			      , NULL, NULL, "watchthread", NULL},
-	{mark_mark 					      , NULL, NULL, "mark	", NULL, NULL},
-	{mark_unmark 				      , NULL, NULL, "unmark", NULL, NULL},
-	{mark_locked 				      , NULL, NULL, "locked", NULL, NULL},
-	{mark_unlocked 				      , NULL, NULL, "unlocked", NULL, NULL},
-	{mark_allread 				      , NULL, NULL, "allread", NULL, NULL},
-	{mark_allunread 			      , NULL, NULL, "allunread", NULL, NULL},
-	{mark_read 					      , NULL, NULL, "read	", NULL, NULL},
-	{mark_unread 				      , NULL, NULL, "unread", NULL, NULL},
     {empty_xpm                        , NULL, NULL, "empty", NULL, NULL}
 };
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 14:18:03 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 14:18:03 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-39-gc0c22eb
Message-ID: <20161212131803.3BEBF36A4597@mx.colino.net>

The branch, master has been updated
       via  c0c22eb997bc5183cf8c9a3c57cac6bd540a013e (commit)
      from  7d84a8a9963a48d1e0805ce06b39ac09e75d9224 (commit)

Summary of changes:
 src/stock_pixmap.c |  134 ++++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)


- Log -----------------------------------------------------------------
commit c0c22eb997bc5183cf8c9a3c57cac6bd540a013e
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 14:17:43 2016 +0100

    Fix format, no tabs to align everywhere (at last!).

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index b4f9d56..f40369d 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -252,73 +252,73 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
 
 static StockPixmapData pixmaps[] =
 {
-    {addr_one_xpm            		  , NULL, NULL, "addr_one", NULL, NULL},
-    {addr_two_xpm            		  , NULL, NULL, "addr_two", NULL, NULL},
-    {address_xpm             		  , NULL, NULL, "address", NULL, NULL},
-    {address_book_xpm        		  , NULL, NULL, "address_book", NULL, NULL},
-    {address_search_xpm      		  , NULL, NULL, "address_search", NULL, NULL},
-    {anonymous_xpm           		  , NULL, NULL, "anonymous", NULL, NULL},
-    {book_xpm                		  , NULL, NULL, "book", NULL, NULL},
-    {category_xpm            		  , NULL, NULL, "category", NULL, NULL},
-    {checkbox_off_xpm        		  , NULL, NULL, "checkbox_off", NULL, NULL},
-    {checkbox_on_xpm         		  , NULL, NULL, "checkbox_on", NULL, NULL},
-    {check_spelling_xpm      		  , NULL, NULL, "check_spelling", NULL, NULL},
-    {clip_xpm                		  , NULL, NULL, "clip", NULL, NULL},
-    {clipkey_xpm             		  , NULL, NULL, "clipkey", NULL, NULL},
-    {clip_gpg_signed_xpm     		  , NULL, NULL, "clip_gpg_signed", NULL, NULL},
-    {close_xpm               		  , NULL, NULL, "close", NULL, NULL},
-    {complete_xpm            		  , NULL, NULL, "complete", NULL, NULL},
-    {continue_xpm            		  , NULL, NULL, "continue", NULL, NULL},
-    {deleted_xpm             		  , NULL, NULL, "deleted", NULL, NULL},
-    {dir_close_xpm           		  , NULL, NULL, "dir_close", NULL, NULL},
-    {dir_close_hrm_xpm       		  , NULL, NULL, "dir_close_hrm", NULL, NULL},
-    {dir_open_xpm            		  , NULL, NULL, "dir_open", NULL, NULL},
-    {dir_open_hrm_xpm        		  , NULL, NULL, "dir_open_hrm", NULL, NULL},
-    {dir_close_mark_xpm      		  , NULL, NULL, "dir_close_mark", NULL, NULL},
-    {dir_close_hrm_mark_xpm  		  , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
-    {dir_open_mark_xpm       		  , NULL, NULL, "dir_open_mark", NULL, NULL},
-    {dir_open_hrm_mark_xpm   		  , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
-    {down_arrow_xpm          		  , NULL, NULL, "down_arrow", NULL, NULL},
-    {up_arrow_xpm            		  , NULL, NULL, "up_arrow", NULL, NULL},
-    {edit_extern_xpm         		  , NULL, NULL, "edit_extern", NULL, NULL},
-    {error_xpm               		  , NULL, NULL, "error", NULL, NULL},
-    {exec_xpm                		  , NULL, NULL, "exec", NULL, NULL},
-    {forwarded_xpm           		  , NULL, NULL, "forwarded", NULL, NULL},
-    {group_xpm               		  , NULL, NULL, "group", NULL, NULL},
-    {ignorethread_xpm        		  , NULL, NULL, "ignorethread", NULL, NULL},
-    {inbox_close_xpm         		  , NULL, NULL, "inbox_close", NULL, NULL},
-    {inbox_close_hrm_xpm     		  , NULL, NULL, "inbox_close_hrm", NULL, NULL},
-    {inbox_open_xpm          		  , NULL, NULL, "inbox_open", NULL, NULL},
-    {inbox_open_hrm_xpm      		  , NULL, NULL, "inbox_open_hrm", NULL, NULL},
-    {inbox_close_mark_xpm    		  , NULL, NULL, "inbox_close_mark", NULL, NULL},
-    {inbox_close_hrm_mark_xpm		  , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
-    {inbox_open_mark_xpm     		  , NULL, NULL, "inbox_open_mark", NULL, NULL},
-    {inbox_open_hrm_mark_xpm 		  , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
-    {insert_file_xpm         		  , NULL, NULL, "insert_file", NULL, NULL},
-    {interface_xpm           		  , NULL, NULL, "interface", NULL, NULL},
-    {jpilot_xpm              		  , NULL, NULL, "jpilot", NULL, NULL},
-    {key_xpm                 		  , NULL, NULL, "key", NULL, NULL},
-    {key_gpg_signed_xpm      		  , NULL, NULL, "key_gpg_signed", NULL, NULL},
-    {ldap_xpm                		  , NULL, NULL, "ldap", NULL, NULL},
-    {linewrapcurrent_xpm     		  , NULL, NULL, "linewrapcurrent", NULL, NULL},
-    {linewrap_xpm            		  , NULL, NULL, "linewrap", NULL, NULL},
-    {locked_xpm              		  , NULL, NULL, "locked", NULL, NULL},
-    {mail_xpm                		  , NULL, NULL, "mail", NULL, NULL},
-    {mail_attach_xpm         		  , NULL, NULL, "mail_attach", NULL, NULL},
-    {mail_compose_xpm        		  , NULL, NULL, "mail_compose", NULL, NULL},
-    {mail_forward_xpm        		  , NULL, NULL, "mail_forward", NULL, NULL},
-    {mail_receive_xpm        		  , NULL, NULL, "mail_receive", NULL, NULL},
-    {mail_receive_all_xpm    		  , NULL, NULL, "mail_receive_all", NULL, NULL},
-    {mail_reply_xpm          		  , NULL, NULL, "mail_reply", NULL, NULL},
-    {mail_reply_to_all_xpm   		  , NULL, NULL, "mail_reply_to_all", NULL, NULL},
-    {mail_reply_to_author_xpm		  , NULL, NULL, "mail_reply_to_author", NULL, NULL},
-    {mail_reply_to_list_xpm  		  , NULL, NULL, "mail_reply_to_list", NULL, NULL},
-    {mail_send_xpm           		  , NULL, NULL, "mail_send", NULL, NULL},
-    {mail_send_queue_xpm     		  , NULL, NULL, "mail_send_queue", NULL, NULL},
-    {mail_sign_xpm           		  , NULL, NULL, "mail_sign", NULL, NULL},
-    {open_mail_xpm           		  , NULL, NULL, "open_mail", NULL, NULL},
-    {mark_xpm                		  , NULL, NULL, "mark", NULL, NULL},
-    {new_xpm                 		  , NULL, NULL, "new", NULL, NULL},
+    {addr_one_xpm                     , NULL, NULL, "addr_one", NULL, NULL},
+    {addr_two_xpm                     , NULL, NULL, "addr_two", NULL, NULL},
+    {address_xpm                      , NULL, NULL, "address", NULL, NULL},
+    {address_book_xpm                 , NULL, NULL, "address_book", NULL, NULL},
+    {address_search_xpm               , NULL, NULL, "address_search", NULL, NULL},
+    {anonymous_xpm                    , NULL, NULL, "anonymous", NULL, NULL},
+    {book_xpm                         , NULL, NULL, "book", NULL, NULL},
+    {category_xpm                     , NULL, NULL, "category", NULL, NULL},
+    {checkbox_off_xpm                 , NULL, NULL, "checkbox_off", NULL, NULL},
+    {checkbox_on_xpm                  , NULL, NULL, "checkbox_on", NULL, NULL},
+    {check_spelling_xpm               , NULL, NULL, "check_spelling", NULL, NULL},
+    {clip_xpm                         , NULL, NULL, "clip", NULL, NULL},
+    {clipkey_xpm                      , NULL, NULL, "clipkey", NULL, NULL},
+    {clip_gpg_signed_xpm              , NULL, NULL, "clip_gpg_signed", NULL, NULL},
+    {close_xpm                        , NULL, NULL, "close", NULL, NULL},
+    {complete_xpm                     , NULL, NULL, "complete", NULL, NULL},
+    {continue_xpm                     , NULL, NULL, "continue", NULL, NULL},
+    {deleted_xpm                      , NULL, NULL, "deleted", NULL, NULL},
+    {dir_close_xpm                    , NULL, NULL, "dir_close", NULL, NULL},
+    {dir_close_hrm_xpm                , NULL, NULL, "dir_close_hrm", NULL, NULL},
+    {dir_open_xpm                     , NULL, NULL, "dir_open", NULL, NULL},
+    {dir_open_hrm_xpm                 , NULL, NULL, "dir_open_hrm", NULL, NULL},
+    {dir_close_mark_xpm               , NULL, NULL, "dir_close_mark", NULL, NULL},
+    {dir_close_hrm_mark_xpm           , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
+    {dir_open_mark_xpm                , NULL, NULL, "dir_open_mark", NULL, NULL},
+    {dir_open_hrm_mark_xpm            , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
+    {down_arrow_xpm                   , NULL, NULL, "down_arrow", NULL, NULL},
+    {up_arrow_xpm                     , NULL, NULL, "up_arrow", NULL, NULL},
+    {edit_extern_xpm                  , NULL, NULL, "edit_extern", NULL, NULL},
+    {error_xpm                        , NULL, NULL, "error", NULL, NULL},
+    {exec_xpm                         , NULL, NULL, "exec", NULL, NULL},
+    {forwarded_xpm                    , NULL, NULL, "forwarded", NULL, NULL},
+    {group_xpm                        , NULL, NULL, "group", NULL, NULL},
+    {ignorethread_xpm                 , NULL, NULL, "ignorethread", NULL, NULL},
+    {inbox_close_xpm                  , NULL, NULL, "inbox_close", NULL, NULL},
+    {inbox_close_hrm_xpm              , NULL, NULL, "inbox_close_hrm", NULL, NULL},
+    {inbox_open_xpm                   , NULL, NULL, "inbox_open", NULL, NULL},
+    {inbox_open_hrm_xpm               , NULL, NULL, "inbox_open_hrm", NULL, NULL},
+    {inbox_close_mark_xpm             , NULL, NULL, "inbox_close_mark", NULL, NULL},
+    {inbox_close_hrm_mark_xpm         , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
+    {inbox_open_mark_xpm              , NULL, NULL, "inbox_open_mark", NULL, NULL},
+    {inbox_open_hrm_mark_xpm          , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
+    {insert_file_xpm                  , NULL, NULL, "insert_file", NULL, NULL},
+    {interface_xpm                    , NULL, NULL, "interface", NULL, NULL},
+    {jpilot_xpm                       , NULL, NULL, "jpilot", NULL, NULL},
+    {key_xpm                          , NULL, NULL, "key", NULL, NULL},
+    {key_gpg_signed_xpm               , NULL, NULL, "key_gpg_signed", NULL, NULL},
+    {ldap_xpm                         , NULL, NULL, "ldap", NULL, NULL},
+    {linewrapcurrent_xpm              , NULL, NULL, "linewrapcurrent", NULL, NULL},
+    {linewrap_xpm                     , NULL, NULL, "linewrap", NULL, NULL},
+    {locked_xpm                       , NULL, NULL, "locked", NULL, NULL},
+    {mail_xpm                         , NULL, NULL, "mail", NULL, NULL},
+    {mail_attach_xpm                  , NULL, NULL, "mail_attach", NULL, NULL},
+    {mail_compose_xpm                 , NULL, NULL, "mail_compose", NULL, NULL},
+    {mail_forward_xpm                 , NULL, NULL, "mail_forward", NULL, NULL},
+    {mail_receive_xpm                 , NULL, NULL, "mail_receive", NULL, NULL},
+    {mail_receive_all_xpm             , NULL, NULL, "mail_receive_all", NULL, NULL},
+    {mail_reply_xpm                   , NULL, NULL, "mail_reply", NULL, NULL},
+    {mail_reply_to_all_xpm            , NULL, NULL, "mail_reply_to_all", NULL, NULL},
+    {mail_reply_to_author_xpm         , NULL, NULL, "mail_reply_to_author", NULL, NULL},
+    {mail_reply_to_list_xpm           , NULL, NULL, "mail_reply_to_list", NULL, NULL},
+    {mail_send_xpm                    , NULL, NULL, "mail_send", NULL, NULL},
+    {mail_send_queue_xpm              , NULL, NULL, "mail_send_queue", NULL, NULL},
+    {mail_sign_xpm                    , NULL, NULL, "mail_sign", NULL, NULL},
+    {open_mail_xpm                    , NULL, NULL, "open_mail", NULL, NULL},
+    {mark_xpm                         , NULL, NULL, "mark", NULL, NULL},
+    {new_xpm                          , NULL, NULL, "new", NULL, NULL},
     {news_compose_xpm                 , NULL, NULL, "news_compose", NULL, NULL},
     {outbox_close_xpm                 , NULL, NULL, "outbox_close", NULL, NULL},
     {outbox_close_hrm_xpm             , NULL, NULL, "outbox_close_hrm", NULL, NULL},

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 14:24:46 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 14:24:46 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-40-gb3d90c5
Message-ID: <20161212132446.A702236A4595@mx.colino.net>

The branch, master has been updated
       via  b3d90c51d0d06b22cef9f65e25e77ee9b133ab7b (commit)
      from  c0c22eb997bc5183cf8c9a3c57cac6bd540a013e (commit)

Summary of changes:
 src/compose.c      |   20 ++++++++++----------
 src/prefs_common.c |    4 ++--
 src/prefs_common.h |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit b3d90c51d0d06b22cef9f65e25e77ee9b133ab7b
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 14:24:14 2016 +0100

    Rename default_to_(bg)color hiddeng pref and variable to default_header_(bg)color.

diff --git a/src/compose.c b/src/compose.c
index dd95cc6..8b99b76 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -183,14 +183,14 @@ typedef enum {
 #define COMPOSE_DRAFT_TIMEOUT_UNSET -1
 #define COMPOSE_DRAFT_TIMEOUT_FORBIDDEN -2
 
-static GdkColor default_to_bgcolor = {
+static GdkColor default_header_bgcolor = {
 	(gulong)0,
 	(gushort)0,
 	(gushort)0,
 	(gushort)0
 };
 
-static GdkColor default_to_color = {
+static GdkColor default_header_color = {
 	(gulong)0,
 	(gushort)0,
 	(gushort)0,
@@ -2686,10 +2686,10 @@ static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
 				gtk_widget_modify_base(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &default_to_bgcolor);
+					GTK_STATE_NORMAL, &default_header_bgcolor);
 				gtk_widget_modify_text(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &default_to_color);
+					GTK_STATE_NORMAL, &default_header_color);
 		}
 	}
 }
@@ -8100,10 +8100,10 @@ static Compose *compose_create(PrefsAccount *account,
 		gtk_widget_show(window);
 	}
 	
-	gtkut_convert_int_to_gdk_color(prefs_common.default_to_bgcolor,
-					   &default_to_bgcolor);
-	gtkut_convert_int_to_gdk_color(prefs_common.default_to_color,
-					   &default_to_color);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_bgcolor,
+					   &default_header_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_color,
+					   &default_header_color);
 
 	return compose;
 }
@@ -8160,10 +8160,10 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 			if (cur_account != compose->account) {
 				gtk_widget_modify_base(
 					GTK_WIDGET(from_name),
-					GTK_STATE_NORMAL, &default_to_bgcolor);
+					GTK_STATE_NORMAL, &default_header_bgcolor);
 				gtk_widget_modify_text(
 					GTK_WIDGET(from_name),
-					GTK_STATE_NORMAL, &default_to_color);
+					GTK_STATE_NORMAL, &default_header_color);
 			}
 		}
 		COMBOBOX_ADD(menu, name, ac->account_id);
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 63e1816..ea276b0 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -726,9 +726,9 @@ static PrefParam param[] = {
 	{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
 	 P_BOOL, NULL, NULL, NULL},
 
-	{"default_to_color", "#000000", &prefs_common.default_to_color, P_COLOR,
+	{"default_header_color", "#000000", &prefs_common.default_header_color, P_COLOR,
 	 NULL, NULL, NULL},
-	{"default_to_bgcolor", "#f5f6be", &prefs_common.default_to_bgcolor, P_COLOR,
+	{"default_header_bgcolor", "#f5f6be", &prefs_common.default_header_bgcolor, P_COLOR,
 	 NULL, NULL, NULL},
 	{"tags_color", "#000000", &prefs_common.tags_color, P_COLOR,
 	 NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 58df319..45db9c6 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -328,8 +328,8 @@ struct _PrefsCommon
 	gulong signature_col;
 	gulong emphasis_col;
 	gboolean recycle_quote_colors;
-	gulong default_to_bgcolor;
-	gulong default_to_color;
+	gulong default_header_bgcolor;
+	gulong default_header_color;
 	gulong tags_bgcolor;
 	gulong tags_color;
 	gulong qs_active_bgcolor;

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Dec 12 14:58:20 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 12 Dec 2016 14:58:20 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-41-g3bbea86
Message-ID: <20161212135820.C144E36A4595@mx.colino.net>

The branch, master has been updated
       via  3bbea866fa43faceb84e9c10f24cbc8949905bd2 (commit)
      from  b3d90c51d0d06b22cef9f65e25e77ee9b133ab7b (commit)

Summary of changes:
 src/compose.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 3bbea866fa43faceb84e9c10f24cbc8949905bd2
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 12 13:58:16 2016 +0000

    rename compose_entry_mark_default_to() to compose_entry_indicate()

diff --git a/src/compose.c b/src/compose.c
index 8b99b76..93669d3 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -211,7 +211,7 @@ static Compose *compose_create			(PrefsAccount	*account,
 						 ComposeMode	 mode,
 						 gboolean batch);
 
-static void compose_entry_mark_default_to	(Compose	  *compose,
+static void compose_entry_indicate	(Compose	  *compose,
 					 const gchar	  *address);
 static Compose *compose_followup_and_reply_to	(MsgInfo	*msginfo,
 					 ComposeQuoteMode	 quote_mode,
@@ -2657,7 +2657,7 @@ void compose_entry_append(Compose *compose, const gchar *address,
 			while (*tmp == ' ' || *tmp == '\t')
 				tmp++;
 			compose_add_header_entry(compose, header, tmp, pref_type);
-			compose_entry_mark_default_to(compose, tmp);
+			compose_entry_indicate(compose, tmp);
 			g_free(o_tmp);
 			continue;
 		}
@@ -2670,12 +2670,12 @@ void compose_entry_append(Compose *compose, const gchar *address,
 		while (*tmp == ' ' || *tmp == '\t')
 			tmp++;
 		compose_add_header_entry(compose, header, tmp, pref_type);
-		compose_entry_mark_default_to(compose, tmp);
+		compose_entry_indicate(compose, tmp);
 		g_free(o_tmp);		
 	}
 }
 
-static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
+static void compose_entry_indicate(Compose *compose, const gchar *mailto)
 {
 	GSList *h_list;
 	GtkEntry *entry;
@@ -3237,22 +3237,22 @@ static void compose_set_folder_prefs(Compose *compose, FolderItem *folder,
 	if (respect_default_to && folder->prefs->enable_default_to) {
 		compose_entry_append(compose, folder->prefs->default_to,
 					COMPOSE_TO, PREF_FOLDER);
-		compose_entry_mark_default_to(compose, folder->prefs->default_to);
+		compose_entry_indicate(compose, folder->prefs->default_to);
 	}
 	if (folder->prefs->enable_default_cc) {
 		compose_entry_append(compose, folder->prefs->default_cc,
 					COMPOSE_CC, PREF_FOLDER);
-		compose_entry_mark_default_to(compose, folder->prefs->default_cc);
+		compose_entry_indicate(compose, folder->prefs->default_cc);
 	}
 	if (folder->prefs->enable_default_bcc) {
 		compose_entry_append(compose, folder->prefs->default_bcc,
 					COMPOSE_BCC, PREF_FOLDER);
-		compose_entry_mark_default_to(compose, folder->prefs->default_bcc);
+		compose_entry_indicate(compose, folder->prefs->default_bcc);
 	}
 	if (folder->prefs->enable_default_replyto) {
 		compose_entry_append(compose, folder->prefs->default_replyto,
 					COMPOSE_REPLYTO, PREF_FOLDER);
-		compose_entry_mark_default_to(compose, folder->prefs->default_replyto);
+		compose_entry_indicate(compose, folder->prefs->default_replyto);
 	}
 }
 
@@ -3332,7 +3332,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 			compose_entry_append(compose,
 			    msginfo->folder->prefs->default_reply_to,
 			    COMPOSE_TO, PREF_FOLDER);
-			compose_entry_mark_default_to(compose,
+			compose_entry_indicate(compose,
 				msginfo->folder->prefs->default_reply_to);
 		} else {
 			gchar *tmp1 = NULL;

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Dec 12 15:02:32 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 12 Dec 2016 15:02:32 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-42-g773ddbb
Message-ID: <20161212140232.7A7E336A4593@mx.colino.net>

The branch, master has been updated
       via  773ddbbae8fb70c2e715c95d819ec8810cc2641b (commit)
      from  3bbea866fa43faceb84e9c10f24cbc8949905bd2 (commit)

Summary of changes:
 src/compose.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 773ddbbae8fb70c2e715c95d819ec8810cc2641b
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 12 14:02:28 2016 +0000

    rename compose_guess_forward_account_from_msginfo() to compose_find_account()

diff --git a/src/compose.c b/src/compose.c
index 93669d3..10ecdc2 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -569,7 +569,7 @@ static void compose_check_backwards	   (GtkAction *action, gpointer data);
 static void compose_check_forwards_go	   (GtkAction *action, gpointer data);
 #endif
 
-static PrefsAccount *compose_guess_forward_account_from_msginfo	(MsgInfo *msginfo);
+static PrefsAccount *compose_find_account	(MsgInfo *msginfo);
 
 static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
 
@@ -1770,9 +1770,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 	cm_return_val_if_fail(msginfo != NULL, NULL);
 	cm_return_val_if_fail(msginfo->folder != NULL, NULL);
 
-	if (!account && 
-	    !(account = compose_guess_forward_account_from_msginfo
-				(msginfo)))
+	if (!account && !(account = compose_find_account(msginfo)))
 		account = cur_account;
 
 	if (!prefs_common.forward_as_attachment)
@@ -1976,8 +1974,7 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
 
 	/* guess account from first selected message */
 	if (!account && 
-	    !(account = compose_guess_forward_account_from_msginfo
-				(msginfo_list->data)))
+	    !(account = compose_find_account(msginfo_list->data)))
 		account = cur_account;
 
 	cm_return_val_if_fail(account != NULL, NULL);
@@ -11722,7 +11719,7 @@ static void compose_check_forwards_go(GtkAction *action, gpointer data)
  *\brief	Guess originating forward account from MsgInfo and several 
  *		"common preference" settings. Return NULL if no guess. 
  */
-static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo)
+static PrefsAccount *compose_find_account(MsgInfo *msginfo)
 {
 	PrefsAccount *account = NULL;
 	

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 15:19:43 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 15:19:43 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-43-gb7df74e
Message-ID: <20161212141943.4F10F36A4595@mx.colino.net>

The branch, master has been updated
       via  b7df74e8f5a7e6f948c63da3a7a3808fcc108935 (commit)
      from  773ddbbae8fb70c2e715c95d819ec8810cc2641b (commit)

Summary of changes:
 src/folderutils.c |   66 ++++++++++++++++++++++++++++-
 src/folderutils.h |    2 +
 src/folderview.c  |  121 +++++++++++++++++++++++++++++++++++++++++++++--------
 src/mainwindow.c  |   20 ++++++---
 src/summaryview.c |   72 ++++++++++++++++++-------------
 src/summaryview.h |    5 +--
 6 files changed, 230 insertions(+), 56 deletions(-)


- Log -----------------------------------------------------------------
commit b7df74e8f5a7e6f948c63da3a7a3808fcc108935
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 15:17:15 2016 +0100

    Add new mark-all-unread (and recursively when relevant) action to folder
    context menu, message list and main window menu.

diff --git a/src/folderutils.c b/src/folderutils.c
index 0a27229..939b019 100644
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -132,7 +132,7 @@ void folderutils_mark_all_read(FolderItem *item)
 	if (mainwin && mainwin->summaryview &&
 	    mainwin->summaryview->folder_item == item) {
 		debug_print("folder opened, using summary\n");
-		summary_mark_all_read(mainwin->summaryview);
+		summary_mark_all_read(mainwin->summaryview, TRUE);
 	} else {
 		msglist = folder_item_get_msg_list(item);
 		debug_print("got msglist %p\n", msglist);
@@ -159,6 +159,46 @@ void folderutils_mark_all_read(FolderItem *item)
 	folder_item_update_thaw();
 }
 
+void folderutils_mark_all_unread(FolderItem *item)
+{
+	MsgInfoList *msglist, *cur;
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+	int i = 0, m = 0;
+	debug_print("marking all unread in item %s\n", (item==NULL)?"NULL":item->name);
+	cm_return_if_fail(item != NULL);
+
+
+	folder_item_update_freeze();
+	if (mainwin && mainwin->summaryview &&
+	    mainwin->summaryview->folder_item == item) {
+		debug_print("folder opened, using summary\n");
+		summary_mark_all_read(mainwin->summaryview, FALSE);
+	} else {
+		msglist = folder_item_get_msg_list(item);
+		debug_print("got msglist %p\n", msglist);
+		if (msglist == NULL) {
+			folder_item_update_thaw();
+			return;
+		}
+		folder_item_set_batch(item, TRUE);
+		for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+			MsgInfo *msginfo = cur->data;
+
+			if (!(msginfo->flags.perm_flags & MSG_UNREAD)) {
+				procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+				m++;
+			}
+			i++;
+			procmsg_msginfo_free(&msginfo);
+		}
+		folder_item_set_batch(item, FALSE);
+		folder_item_close(item);
+		debug_print("marked %d messages out of %d as unread\n", m, i);
+		g_slist_free(msglist);
+	}
+	folder_item_update_thaw();
+}
+
 void folderutils_mark_all_read_recursive(FolderItem *item)
 {
 	GNode *node;
@@ -182,3 +222,27 @@ void folderutils_mark_all_read_recursive(FolderItem *item)
 		}
 	}
 }
+
+void folderutils_mark_all_unread_recursive(FolderItem *item)
+{
+	GNode *node;
+
+	cm_return_if_fail(item != NULL);
+
+	folderutils_mark_all_unread(item);
+
+	cm_return_if_fail(item->folder != NULL);
+	cm_return_if_fail(item->folder->node != NULL);
+
+	node = item->folder->node;
+	node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+	node = node->children;
+
+	while (node != NULL) {
+		if (node->data != NULL) {
+			FolderItem *sub_item = (FolderItem *) node->data;
+			node = node->next;
+			folderutils_mark_all_unread_recursive(sub_item);
+		}
+	}
+}
diff --git a/src/folderutils.h b/src/folderutils.h
index ca404c5..64a5c2e 100644
--- a/src/folderutils.h
+++ b/src/folderutils.h
@@ -30,6 +30,8 @@ typedef enum {
 gint folderutils_delete_duplicates(FolderItem *item,
 				   DeleteDuplicatesMode mode);
 void folderutils_mark_all_read	  (FolderItem *item);
+void folderutils_mark_all_unread	  (FolderItem *item);
 void folderutils_mark_all_read_recursive	  (FolderItem *item);
+void folderutils_mark_all_unread_recursive	  (FolderItem *item);
 
 #endif /* FOLDERUTILS_H */
diff --git a/src/folderview.c b/src/folderview.c
index 8469ee9..3fe8ccc 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -169,14 +169,19 @@ static void folderview_col_resized	(GtkCMCList	*clist,
 					 gint		 width,
 					 FolderView	*folderview);
 
-static void mark_all_read_handler	(GtkAction	*action,
+static void mark_all_read_unread_handler	(GtkAction	*action,
 					 gpointer	 data,
-					 gboolean	 recursive);
+					 gboolean	 recursive,
+					 gboolean	 read);
 
 static void mark_all_read_cb            (GtkAction 	*action,
 					 gpointer	 data);
+static void mark_all_unread_cb            (GtkAction 	*action,
+					 gpointer	 data);
 static void mark_all_read_recursive_cb  (GtkAction 	*action,
 					 gpointer	 data);
+static void mark_all_unread_recursive_cb  (GtkAction 	*action,
+					 gpointer	 data);
 
 static void folderview_empty_trash_cb	(GtkAction 	*action,
 					 gpointer	 data);
@@ -240,7 +245,9 @@ static GtkActionEntry folderview_common_popup_entries[] =
 {
 	{"FolderViewPopup",			NULL, "FolderViewPopup" },
 	{"FolderViewPopup/MarkAllRead",		NULL, N_("Mark all re_ad"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
+	{"FolderViewPopup/MarkAllUnread",		NULL, N_("Mark all u_nread"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
 	{"FolderViewPopup/MarkAllReadRec",	NULL, N_("Mark all read recursi_vely"), NULL, NULL, G_CALLBACK(mark_all_read_recursive_cb) },
+	{"FolderViewPopup/MarkAllUnreadRec",	NULL, N_("Mark all unread recursi_vely"), NULL, NULL, G_CALLBACK(mark_all_unread_recursive_cb) },
 	{"FolderViewPopup/---",			NULL, "---" },
 	{"FolderViewPopup/RunProcessing",	NULL, N_("R_un processing rules"), NULL, NULL, G_CALLBACK(folderview_run_processing_cb) },
 	{"FolderViewPopup/SearchFolder",	NULL, N_("_Search folder..."), NULL, NULL, G_CALLBACK(folderview_search_cb) },
@@ -825,33 +832,54 @@ void folderview_select(FolderView *folderview, FolderItem *item)
 
 static void mark_all_read_cb(GtkAction *action, gpointer data)
 {
-	mark_all_read_handler(action, data, FALSE);
+	mark_all_read_unread_handler(action, data, FALSE, TRUE);
+}
+
+static void mark_all_unread_cb(GtkAction *action, gpointer data)
+{
+	mark_all_read_unread_handler(action, data, FALSE, FALSE);
 }
 
 static void mark_all_read_recursive_cb(GtkAction *action, gpointer data)
 {
-	mark_all_read_handler(action, data, TRUE);
+	mark_all_read_unread_handler(action, data, TRUE, TRUE);
 }
 
-static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean recursive)
+static void mark_all_unread_recursive_cb(GtkAction *action, gpointer data)
+{
+	mark_all_read_unread_handler(action, data, TRUE, FALSE);
+}
+
+static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
+						gboolean recursive, gboolean read)
 {
 	FolderView *folderview = (FolderView *)data;
 	FolderItem *item;
 	AlertValue val;
 	gchar *message;
+	gchar *title;
 	
 	item = folderview_get_selected_item(folderview);
 	if (item == NULL)
 		return;
 
-	message = recursive? _("Do you really want to mark all mails in this "
-			       "folder and its sub-folders as read?") :
-			     _("Do you really want to mark all mails in this "
-			       "folder as read?");
+	if (read) {
+		title = _("Mark all as read");
+		message = recursive? _("Do you really want to mark all mails in this "
+							"folder and its sub-folders as read?") :
+							_("Do you really want to mark all mails in this "
+							"folder as read?");
+	} else {
+		title = _("Mark all as unread");
+		message = recursive? _("Do you really want to mark all mails in this "
+							"folder and its sub-folders as unread?") :
+							_("Do you really want to mark all mails in this "
+							"folder as unread?");
+	}
 	if (folderview->summaryview->folder_item != item &&
 	    prefs_common.ask_mark_all_read) {
-		val = alertpanel_full(_("Mark all as read"),
-			  message, GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+		val = alertpanel_full(title, message,
+			  GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -866,11 +894,17 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 	else
 		summary_freeze(folderview->summaryview);
 		
-	if (recursive)
-		folderutils_mark_all_read_recursive(item);
-	else
-		folderutils_mark_all_read(item);
-	
+	if (read) {
+		if (recursive)
+			folderutils_mark_all_read_recursive(item);
+		else
+			folderutils_mark_all_read(item);
+	} else {
+		if (recursive)
+			folderutils_mark_all_unread_recursive(item);
+		else
+			folderutils_mark_all_unread(item);
+	}
 	if (folderview->summaryview->folder_item != item && !recursive)
 		summary_unlock(folderview->summaryview);
 	else
@@ -1355,6 +1389,52 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
 	return folderview_have_unread_children_sub(folderview, item, FALSE);
 }
 
+static gboolean folderview_have_read_children_sub(FolderView *folderview,
+						    FolderItem *item, 
+						    gboolean in_sub)
+{
+	GNode *node = NULL;
+	
+	if (!item || !item->folder || !item->folder->node) {
+		return FALSE;
+	}			
+
+	node = item->folder->node;
+	
+	node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+	node = node->children;
+
+	if (in_sub &&
+	    (((item->total_msgs > 0) &&
+		(item->unread_msgs != (item->total_msgs - item->ignored_msgs))))) {
+		return TRUE;
+	}
+
+	while (node != NULL) {
+		if (node && node->data) {
+			FolderItem *next_item = (FolderItem*) node->data;
+			node = node->next;
+			if (folderview_have_read_children_sub(folderview, 
+							        next_item, 
+								TRUE)) {
+				return TRUE;
+			}
+		}
+	}
+
+debug_print("-> false 2 %s\n", item->name);
+	return FALSE;
+}
+
+static gboolean folderview_have_read_children(FolderView *folderview,
+						FolderItem *item)
+{
+gboolean ret;
+	 ret = folderview_have_read_children_sub(folderview, item, FALSE);
+debug_print("-> %s 0 (%d)\n", ret?"true":"false", ret);
+	return ret;
+}
+
 static gboolean folderview_have_matching_children_sub(FolderView *folderview,
 						      FolderItem *item,
 						      gboolean in_sub)
@@ -1874,7 +1954,9 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 		fpopup->add_menuitems(ui_manager, item);
 
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MarkAllRead", "FolderViewPopup/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MarkAllUnread", "FolderViewPopup/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MarkAllReadRec", "FolderViewPopup/MarkAllReadRec", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MarkAllUnreadRec", "FolderViewPopup/MarkAllUnreadRec", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "Separator1", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "RunProcessing", "FolderViewPopup/RunProcessing", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SearchFolder", "FolderViewPopup/SearchFolder", GTK_UI_MANAGER_MENUITEM)
@@ -1904,9 +1986,12 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 #define SET_SENS(name, sens) \
 	cm_menu_set_sensitive_full(ui_manager, "Popup/"name, sens)
 
-	SET_SENS("FolderViewPopup/MarkAllRead", item->unread_msgs >= 1);
+	SET_SENS("FolderViewPopup/MarkAllRead", item->unread_msgs > 0);
+	SET_SENS("FolderViewPopup/MarkAllUnread", (item->total_msgs > 0) &&
+		(item->unread_msgs != (item->total_msgs - item->ignored_msgs)));
 	SET_SENS("FolderViewPopup/MarkAllReadRec", folderview_have_unread_children(folderview,item));
-	SET_SENS("FolderViewPopup/SearchFolder", item->total_msgs >= 1 && 
+	SET_SENS("FolderViewPopup/MarkAllUnreadRec", folderview_have_read_children(folderview,item));
+	SET_SENS("FolderViewPopup/SearchFolder", item->total_msgs > 0 && 
 		 folderview->selected == folderview->opened);
 	SET_SENS("FolderViewPopup/Properties", TRUE);
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index e03c55e..1500488 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -231,6 +231,8 @@ static void mark_as_read_cb		(GtkAction	*action,
 				  gpointer	 data);
 static void mark_all_read_cb		(GtkAction	*action,
 				  gpointer	 data);
+static void mark_all_unread_cb		(GtkAction	*action,
+				  gpointer	 data);
 static void mark_as_spam_cb		(GtkAction	*action,
 				  gpointer	 data);
 static void mark_as_ham_cb		(GtkAction	*action,
@@ -704,6 +706,7 @@ static GtkActionEntry mainwin_entries[] =
 	{"Message/Mark/MarkRead",		NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) },
 	/* separation */
 	{"Message/Mark/MarkAllRead",		NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
+	{"Message/Mark/MarkAllUnread",		NULL, N_("Mark all unread"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
 	/* separation */
 	{"Message/Mark/IgnoreThread",		NULL, N_("Ignore thread"), NULL, NULL, G_CALLBACK(ignore_thread_cb) },
 	{"Message/Mark/UnignoreThread",		NULL, N_("Unignore thread"), NULL, NULL, G_CALLBACK(unignore_thread_cb) },
@@ -1788,6 +1791,7 @@ MainWindow *main_window_create()
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
@@ -4461,22 +4465,28 @@ static void unmark_cb(GtkAction *action, gpointer data)
 	summary_unmark(mainwin->summaryview);
 }
 
-static void mark_as_unread_cb(GtkAction *action, gpointer data)
+static void mark_as_read_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_as_unread(mainwin->summaryview);
+	summary_mark_as_read(mainwin->summaryview, TRUE);
 }
 
-static void mark_as_read_cb(GtkAction *action, gpointer data)
+static void mark_as_unread_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_as_read(mainwin->summaryview);
+	summary_mark_as_read(mainwin->summaryview, FALSE);
 }
 
 static void mark_all_read_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_all_read(mainwin->summaryview);
+	summary_mark_all_read(mainwin->summaryview, TRUE);
+}
+
+static void mark_all_unread_cb(GtkAction *action, gpointer data)
+{
+	MainWindow *mainwin = (MainWindow *)data;
+	summary_mark_all_read(mainwin->summaryview, FALSE);
 }
 
 static void mark_as_spam_cb(GtkAction *action, gpointer data)
diff --git a/src/summaryview.c b/src/summaryview.c
index f135324..4739b66 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4025,7 +4025,25 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
 		msginfo->msgnum);
 }
 
-void summary_mark_as_read(SummaryView *summaryview)
+static void summary_mark_row_as_unread(SummaryView *summaryview,
+				     GtkCMCTreeNode *row)
+{
+	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+	MsgInfo *msginfo;
+
+	msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+	cm_return_if_fail(msginfo);
+
+	if(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags))
+		return;
+
+	summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+	summary_set_row_marks(summaryview, row);
+	debug_print("Message %d is marked as unread\n",
+		msginfo->msgnum);
+}
+
+void summary_mark_as_read(SummaryView *summaryview, gboolean read)
 {
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	GList *cur;
@@ -4036,8 +4054,12 @@ void summary_mark_as_read(SummaryView *summaryview)
 	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)
-		summary_mark_row_as_read(summaryview,
-					 GTK_CMCTREE_NODE(cur->data));
+		if (read)
+			summary_mark_row_as_read(summaryview,
+						 GTK_CMCTREE_NODE(cur->data));
+		else
+			summary_mark_row_as_unread(summaryview,
+						 GTK_CMCTREE_NODE(cur->data));
 	folder_item_set_batch(summaryview->folder_item, FALSE);
 	END_LONG_OPERATION(summaryview);
 	
@@ -4078,17 +4100,26 @@ void summary_msgs_unlock(SummaryView *summaryview)
 	summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview)
+void summary_mark_all_read(SummaryView *summaryview, gboolean read)
 {
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	GtkCMCTreeNode *node;
 	AlertValue val;
 	gboolean froze = FALSE;
+	gchar *message;
+	gchar *title;
+
+	if (read) {
+		title = _("Mark all as read");
+		message = _("Do you really want to mark all mails in this folder as read?");
+	} else {
+		title = _("Mark all as unread");
+		message = _("Do you really want to mark all mails in this folder as unread?");
+	}
 
 	if (prefs_common.ask_mark_all_read) {
-		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,
+		val = alertpanel_full(title, message,
+			  GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4103,7 +4134,10 @@ void summary_mark_all_read(SummaryView *summaryview)
 	folder_item_set_batch(summaryview->folder_item, TRUE);
 	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
 	     node = gtkut_ctree_node_next(ctree, node))
-		summary_mark_row_as_read(summaryview, node);
+		if (read)
+			summary_mark_row_as_read(summaryview, node);
+		else
+			summary_mark_row_as_unread(summaryview, node);
 	folder_item_set_batch(summaryview->folder_item, FALSE);
 	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
 	     node = gtkut_ctree_node_next(ctree, node)) {
@@ -4183,27 +4217,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 }
 
 
-static void summary_mark_row_as_unread(SummaryView *summaryview,
-				       GtkCMCTreeNode *row)
-{
-	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-	MsgInfo *msginfo;
-
-	msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-	cm_return_if_fail(msginfo);
-	if (MSG_IS_DELETED(msginfo->flags)) {
-		procmsg_msginfo_set_to_folder(msginfo, NULL);
-		summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
-		summaryview->deleted--;
-	}
-
-	summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
-	debug_print("Message %d is marked as unread\n",
-		msginfo->msgnum);
-
-	summary_set_row_marks(summaryview, row);
-}
-
 void summary_mark_as_unread(SummaryView *summaryview)
 {
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
@@ -7750,6 +7763,7 @@ void summary_toggle_watch_thread(SummaryView *summaryview)
 		summary_watch_thread(summaryview);
 }
 
+
 void summary_toggle_show_read_messages(SummaryView *summaryview)
 {
 	FolderItemUpdateData source;
diff --git a/src/summaryview.h b/src/summaryview.h
index ba24099..dee8068 100644
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -272,11 +272,10 @@ void summary_save_as		  (SummaryView		*summaryview);
 void summary_print		  (SummaryView		*summaryview);
 void summary_mark		  (SummaryView		*summaryview);
 void summary_unmark		  (SummaryView		*summaryview);
-void summary_mark_as_unread	  (SummaryView		*summaryview);
-void summary_mark_as_read	  (SummaryView		*summaryview);
+void summary_mark_as_read	  (SummaryView		*summaryview, gboolean);
 void summary_msgs_lock		  (SummaryView		*summaryview);
 void summary_msgs_unlock	  (SummaryView		*summaryview);
-void summary_mark_all_read	  (SummaryView		*summaryview);
+void summary_mark_all_read	  (SummaryView		*summaryview, gboolean);
 void summary_mark_as_spam	  (SummaryView 		*summaryview, 
 				   guint 		 action, 
 				   GtkWidget 		*widget);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 15:32:36 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 15:32:36 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-44-g382a3fe
Message-ID: <20161212143236.8CC1236A4596@mx.colino.net>

The branch, master has been updated
       via  382a3fed9dd3209321b639774e3e46f5d5294388 (commit)
      from  b7df74e8f5a7e6f948c63da3a7a3808fcc108935 (commit)

Summary of changes:
 src/compose.c                     |    2 +-
 src/pixmaps/mark_allread.xpm      |   90 ++++++++++++
 src/pixmaps/mark_allunread.xpm    |   37 +++++
 src/pixmaps/mark_ignorethread.xpm |   98 +++++++++++++
 src/pixmaps/mark_locked.xpm       |  101 +++++++++++++
 src/pixmaps/mark_mark.xpm         |   69 +++++++++
 src/pixmaps/mark_read.xpm         |   69 +++++++++
 src/pixmaps/mark_unlocked.xpm     |   95 +++++++++++++
 src/pixmaps/mark_unmark.xpm       |   77 ++++++++++
 src/pixmaps/mark_unread.xpm       |   36 +++++
 src/pixmaps/mark_watchthread.xpm  |   92 ++++++++++++
 src/prefs_toolbar.c               |   10 ++
 src/stock_pixmap.c                |   20 +++
 src/stock_pixmap.h                |   10 ++
 src/toolbar.c                     |  285 ++++++++++++++++++++++++++++++++++---
 src/toolbar.h                     |   14 +-
 16 files changed, 1078 insertions(+), 27 deletions(-)
 create mode 100644 src/pixmaps/mark_allread.xpm
 create mode 100644 src/pixmaps/mark_allunread.xpm
 create mode 100644 src/pixmaps/mark_ignorethread.xpm
 create mode 100644 src/pixmaps/mark_locked.xpm
 create mode 100644 src/pixmaps/mark_mark.xpm
 create mode 100644 src/pixmaps/mark_read.xpm
 create mode 100644 src/pixmaps/mark_unlocked.xpm
 create mode 100644 src/pixmaps/mark_unmark.xpm
 create mode 100644 src/pixmaps/mark_unread.xpm
 create mode 100644 src/pixmaps/mark_watchthread.xpm


- Log -----------------------------------------------------------------
commit 382a3fed9dd3209321b639774e3e46f5d5294388
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 15:30:24 2016 +0100

    Add new actions to main window's toolbar: mark, unmark, lock, unlock,
    mark (all) read, mark (all) unread.
    Add new xpm icons for these actions (existing ones are small and made
    for the message list) as well as for ignorethread and watchthread
    actions.
    Rename A_SENDL to A_SEND_LATER, we're not that lazy.

diff --git a/src/compose.c b/src/compose.c
index 10ecdc2..ae84883 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2702,7 +2702,7 @@ void compose_toolbar_cb(gint action, gpointer data)
 	case A_SEND:
 		compose_send_cb(NULL, compose);
 		break;
-	case A_SENDL:
+	case A_SEND_LATER:
 		compose_send_later_cb(NULL, compose);
 		break;
 	case A_DRAFT:
diff --git a/src/pixmaps/mark_allread.xpm b/src/pixmaps/mark_allread.xpm
new file mode 100644
index 0000000..b63d25f
--- /dev/null
+++ b/src/pixmaps/mark_allread.xpm
@@ -0,0 +1,90 @@
+/* XPM */
+static char * mark_allread_xpm[] = {
+"24 24 63 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F4F4F4",
+"*	c #E3E3E3",
+"=	c #EEEEEE",
+"-	c #4F4F4F",
+";	c #F5F5F5",
+">	c #F3F3F3",
+",	c #F2F2F2",
+"'	c #F1F1F1",
+")	c #EDEDED",
+"!	c #AEAEAE",
+"~	c #E4E4E4",
+"{	c #434343",
+"]	c #FDFDFD",
+"^	c #F0F0F0",
+"/	c #ACACAC",
+"(	c #C8C8C8",
+"_	c #898989",
+":	c #FBFBFB",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #D3D3D3",
+"1	c #525252",
+"2	c #F8F8F8",
+"3	c #ECECEC",
+"4	c #959595",
+"5	c #BABABA",
+"6	c #494949",
+"7	c #3E3E3E",
+"8	c #4D4D4D",
+"9	c #818181",
+"0	c #C6C6C6",
+"a	c #414141",
+"b	c #6A6A6A",
+"c	c #838383",
+"d	c #C5C5C5",
+"e	c #636363",
+"f	c #B9B9B9",
+"g	c #737373",
+"h	c #7C7C7C",
+"i	c #BBBBBB",
+"j	c #C9C9C9",
+"k	c #BCBCBC",
+"l	c #6B6B6B",
+"m	c #686868",
+"n	c #D6D6D6",
+"o	c #D2D2D2",
+"p	c #666666",
+"q	c #C0C0C0",
+"r	c #CDCDCD",
+"s	c #787878",
+"t	c #C7C7C7",
+"u	c #AFAFAF",
+"v	c #B1B1B1",
+"w	c #B6B6B6",
+"x	c #919191",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+".+++++++++++++++++@     ",
+"+#$$$$%%%%%%%%%&*#+     ",
+"+=-$;&>,,''''')*-!+     ",
+"+$~{]>,,'^''''*-/(++++_ ",
+"+$;~-:'^^<=''*{[}(+(|1+ ",
+"+$:;~{2^<=)3*-4}~(+56/+ ",
+"+$;;;~7;=)3*890~~(+a[0+ ",
+"+$:;;~b{>3*-b00;~(+cd0+ ",
+"+$;;~e$f-^-40g0;~(+!}0+ ",
+"+$:~e$;~}-/0~~h~~(+i}0+ ",
+"+$~g$;;;;~~;;;~h~(+j}0+ ",
+"+$h$~~~~~~~~~~~~h(+j}0+ ",
+"+gkkkkkkkkkkkkkkke+i}0+ ",
+"@+++++++++++++++++lmn0+ ",
+"    +opoiiiiiiiiiiqrst+ ",
+"    +luuuuuuuuuuuuvw5e+ ",
+"    x+++++++++++++++++s ",
+"                        "};
diff --git a/src/pixmaps/mark_allunread.xpm b/src/pixmaps/mark_allunread.xpm
new file mode 100644
index 0000000..503367c
--- /dev/null
+++ b/src/pixmaps/mark_allunread.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * mark_allunread_xpm[] = {
+"24 24 10 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #030057",
+"$	c #DDDCF2",
+"%	c #CAC8EB",
+"&	c #B0AEE1",
+"*	c #26219A",
+"=	c #787878",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+".+++++++++++++++++@     ",
+"+#$$$$$$$$$$$%%%$#+     ",
+"+%#$%%%%%%&%&&&$#*+     ",
+"+$%#$%&&&&&&&&$#*&++++@ ",
+"+$&%#$%&&&&&&$#*%&+&&#+ ",
+"+$&&%#$&&&&&$#*&%&+&#*+ ",
+"+$&&&&#$&&&$#*&&%&+#*&+ ",
+"+$&&&&*#$&$#*&&&&&+*%&+ ",
+"+$&&&*$%#$#*%*&&&&+&%&+ ",
+"+$&&*$&&%#*&&%*&&&+&%&+ ",
+"+$&*$&&&&&&&&&%*&&+&&&+ ",
+"+%*$&&&&&&&&&&&%*&+&&&+ ",
+"+*%&&&&&&&&&&&&&&*+&&&+ ",
+"@+++++++++++++++++#*&&+ ",
+"    +&*%&&&&&&&&&&&%*&+ ",
+"    +*%&&&&&&&&&&&&&&*+ ",
+"    @+++++++++++++++++= ",
+"                        "};
diff --git a/src/pixmaps/mark_ignorethread.xpm b/src/pixmaps/mark_ignorethread.xpm
new file mode 100644
index 0000000..d26b19d
--- /dev/null
+++ b/src/pixmaps/mark_ignorethread.xpm
@@ -0,0 +1,98 @@
+/* XPM */
+static char * mark_ignorethread_xpm[] = {
+"24 24 71 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #1B2B3C",
+"5	c #6A6A6A",
+"6	c #B6B6B6",
+"7	c #264057",
+"8	c #233B51",
+"9	c #253F56",
+"0	c #374E63",
+"a	c #606B76",
+"b	c #2B2B2B",
+"c	c #636363",
+"d	c #B9B9B9",
+"e	c #CACACA",
+"f	c #334F68",
+"g	c #E7E7E7",
+"h	c #314E6C",
+"i	c #597187",
+"j	c #262626",
+"k	c #DFDFDF",
+"l	c #3B5673",
+"m	c #506881",
+"n	c #E1E1E1",
+"o	c #737373",
+"p	c #8091A3",
+"q	c #EC8E79",
+"r	c #DF421E",
+"s	c #7C7C7C",
+"t	c #EBEBEB",
+"u	c #7D8EA0",
+"v	c #3A5572",
+"w	c #FCF1EF",
+"x	c #FDFBFA",
+"y	c #FDF6F4",
+"z	c #F9DFDA",
+"A	c #BCBCBC",
+"B	c #303030",
+"C	c #1F262D",
+"D	c #FBECE9",
+"E	c #FBEAE7",
+"F	c #FDF9F8",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'14+++++/+   ",
+"  +$(**!5~,1467890ab+   ",
+"  +$**!c$d>+efg$+hi6j   ",
+"  +$(!c$*!+k*l$$+hmn[+  ",
+"  +$!o$****+:phhhqrrrrrq",
+"  +$s$!!!!!!+tuvvrwxryzr",
+"  +oAAAAAAAAAB++Crx$D$yr",
+"  @++++++++++++++rrw$Drr",
+"                 ry$E$Fr",
+"                 rwFryzr",
+"                 qrrrrrq"};
diff --git a/src/pixmaps/mark_locked.xpm b/src/pixmaps/mark_locked.xpm
new file mode 100644
index 0000000..83e7b6e
--- /dev/null
+++ b/src/pixmaps/mark_locked.xpm
@@ -0,0 +1,101 @@
+/* XPM */
+static char * mark_locked_xpm[] = {
+"24 24 74 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #4D4D4D",
+"5	c #818181",
+"6	c #C6C6C6",
+"7	c #6A6A6A",
+"8	c #F3EFE0",
+"9	c #F4E5B3",
+"0	c #CDB86D",
+"a	c #636363",
+"b	c #B9B9B9",
+"c	c #F4F0E4",
+"d	c #F2E1A5",
+"e	c #EED680",
+"f	c #737373",
+"g	c #7C7C7C",
+"h	c #F9F9F9",
+"i	c #E5EAF1",
+"j	c #DCE3EB",
+"k	c #DAE1E8",
+"l	c #D7DEE6",
+"m	c #D1D9E1",
+"n	c #8F99A2",
+"o	c #BCBCBC",
+"p	c #E3EAF1",
+"q	c #B7C8DA",
+"r	c #8CA7C3",
+"s	c #87A2BE",
+"t	c #829DBA",
+"u	c #7D98B6",
+"v	c #465766",
+"w	c #E7EDF3",
+"x	c #B6C7D9",
+"y	c #8AA5C1",
+"z	c #85A0BC",
+"A	c #809BB8",
+"B	c #7B96B4",
+"C	c #445462",
+"D	c #ECF1F5",
+"E	c #AEC0D4",
+"F	c #88A3BF",
+"G	c #839EBB",
+"H	c #7E99B6",
+"I	c #7994B2",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'1-456++++   ",
+"  +$(**!7~,1->76+890+   ",
+"  +$**!a$b>:>26+c++/0+  ",
+"  +$(!a$*!}>^6!+d+!+e+  ",
+"  +$!f$****!!*++0+++0++ ",
+"  +$g$!!!!!!!!+hijklmn+ ",
+"  +foooooooooo+pqrstuv+ ",
+"  @++++++++++++wxyzABC+ ",
+"              +DEFGHIC+ ",
+"              +++++++++ ",
+"                        "};
diff --git a/src/pixmaps/mark_mark.xpm b/src/pixmaps/mark_mark.xpm
new file mode 100644
index 0000000..84cf69d
--- /dev/null
+++ b/src/pixmaps/mark_mark.xpm
@@ -0,0 +1,69 @@
+/* XPM */
+static char * mark_mark_xpm[] = {
+"24 24 42 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #4D4D4D",
+"5	c #818181",
+"6	c #C6C6C6",
+"7	c #6A6A6A",
+"8	c #636363",
+"9	c #B9B9B9",
+"0	c #737373",
+"a	c #7C7C7C",
+"b	c #BCBCBC",
+"c	c #787878",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'1-456!!/+$$ ",
+"  +$(**!7~,1->766*!/$+$ ",
+"  +$**!8$9>:>2606*!$++$ ",
+"  +$(!8$*!}>^$$!a!$+++$ ",
+"  +$!0$****!!$+$!$+++$  ",
+"  +$a$!!!!!!!$++$+++$   ",
+"  +0bbbbbbbbb$+++++$+   ",
+"  @+++++++++++$+++$+c   ",
+"               $+$      ",
+"                $       ",
+"                        "};
diff --git a/src/pixmaps/mark_read.xpm b/src/pixmaps/mark_read.xpm
new file mode 100644
index 0000000..ab9e107
--- /dev/null
+++ b/src/pixmaps/mark_read.xpm
@@ -0,0 +1,69 @@
+/* XPM */
+static char * mark_read_xpm[] = {
+"24 24 42 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #4D4D4D",
+"5	c #818181",
+"6	c #C6C6C6",
+"7	c #6A6A6A",
+"8	c #636363",
+"9	c #B9B9B9",
+"0	c #737373",
+"a	c #7C7C7C",
+"b	c #BCBCBC",
+"c	c #787878",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'1-456!!/+   ",
+"  +$(**!7~,1->766*!/+   ",
+"  +$**!8$9>:>2606*!/+   ",
+"  +$(!8$*!}>^6!!a!!/+   ",
+"  +$!0$****!!***!a!/+   ",
+"  +$a$!!!!!!!!!!!!a/+   ",
+"  +0bbbbbbbbbbbbbbb8+   ",
+"  @+++++++++++++++++c   ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/src/pixmaps/mark_unlocked.xpm b/src/pixmaps/mark_unlocked.xpm
new file mode 100644
index 0000000..d5f00a2
--- /dev/null
+++ b/src/pixmaps/mark_unlocked.xpm
@@ -0,0 +1,95 @@
+/* XPM */
+static char * mark_unlocked_xpm[] = {
+"24 24 68 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #959595",
+"2	c #3E3E3E",
+"3	c #F4E5B3",
+"4	c #EED680",
+"5	c #CDB86D",
+"6	c #6A6A6A",
+"7	c #636363",
+"8	c #B9B9B9",
+"9	c #C6C6C6",
+"0	c #737373",
+"a	c #7C7C7C",
+"b	c #F9F9F9",
+"c	c #E5EAF1",
+"d	c #DCE3EB",
+"e	c #DAE1E8",
+"f	c #D7DEE6",
+"g	c #D1D9E1",
+"h	c #8F99A2",
+"i	c #BCBCBC",
+"j	c #E3EAF1",
+"k	c #B7C8DA",
+"l	c #8CA7C3",
+"m	c #87A2BE",
+"n	c #829DBA",
+"o	c #7D98B6",
+"p	c #465766",
+"q	c #E7EDF3",
+"r	c #B6C7D9",
+"s	c #8AA5C1",
+"t	c #85A0BC",
+"u	c #809BB8",
+"v	c #7B96B4",
+"w	c #445462",
+"x	c #ECF1F5",
+"y	c #AEC0D4",
+"z	c #88A3BF",
+"A	c #839EBB",
+"B	c #7E99B6",
+"C	c #7994B2",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;!+++1}!/+   ",
+"  +$***!2*;!+345+1!/+   ",
+"  +$(**!6~,+3+++5+!/+   ",
+"  +$**!7$8>+4+9+4+!/+   ",
+"  +$(!7$*!}+5+9+4+!/+   ",
+"  +$!0$****!99++5++++++ ",
+"  +$a$!!!!!!!!+bcdefgh+ ",
+"  +0iiiiiiiiii+jklmnop+ ",
+"  @++++++++++++qrstuvw+ ",
+"              +xyzABCw+ ",
+"              +++++++++ ",
+"                        "};
diff --git a/src/pixmaps/mark_unmark.xpm b/src/pixmaps/mark_unmark.xpm
new file mode 100644
index 0000000..f1f2695
--- /dev/null
+++ b/src/pixmaps/mark_unmark.xpm
@@ -0,0 +1,77 @@
+/* XPM */
+static char * mark_unmark_xpm[] = {
+"24 24 50 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #4D4D4D",
+"5	c #818181",
+"6	c #C6C6C6",
+"7	c #6A6A6A",
+"8	c #636363",
+"9	c #B9B9B9",
+"0	c #737373",
+"a	c #7C7C7C",
+"b	c #EC8E79",
+"c	c #DF421E",
+"d	c #FCF1EF",
+"e	c #FDFBFA",
+"f	c #FDF6F4",
+"g	c #F9DFDA",
+"h	c #BCBCBC",
+"i	c #FBECE9",
+"j	c #FBEAE7",
+"k	c #FDF9F8",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'1-456!!/+$$ ",
+"  +$(**!7~,1->766*!/$+$ ",
+"  +$**!8$9>:>2606*!$++$ ",
+"  +$(!8$*!}>^$$!a!$+++$ ",
+"  +$!0$****!!$+$!bcccccb",
+"  +$a$!!!!!!!$++$cdecfgc",
+"  +0hhhhhhhhh$+++ce$i$fc",
+"  @+++++++++++$++ccd$icc",
+"               $+cf$j$kc",
+"                $cdkcfgc",
+"                 bcccccb"};
diff --git a/src/pixmaps/mark_unread.xpm b/src/pixmaps/mark_unread.xpm
new file mode 100644
index 0000000..910464b
--- /dev/null
+++ b/src/pixmaps/mark_unread.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * mark_unread_xpm[] = {
+"24 24 9 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #030057",
+"$	c #DDDCF2",
+"%	c #CAC8EB",
+"&	c #B0AEE1",
+"*	c #26219A",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$$$$$$$$%%%$#+   ",
+"  +%#$%%%%%%&%&&&$#*+   ",
+"  +$%#$%&&&&&&&&$#*&+   ",
+"  +$&%#$%&&&&&&$#*%&+   ",
+"  +$&&%#$&&&&&$#*&%&+   ",
+"  +$&&&&#$&&&$#*&&%&+   ",
+"  +$&&&&*#$&$#*&&&&&+   ",
+"  +$&&&*$%#$#*%*&&&&+   ",
+"  +$&&*$&&%#*&&%*&&&+   ",
+"  +$&*$&&&&&&&&&%*&&+   ",
+"  +%*$&&&&&&&&&&&%*&+   ",
+"  +*%&&&&&&&&&&&&&&*+   ",
+"  @+++++++++++++++++#   ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/src/pixmaps/mark_watchthread.xpm b/src/pixmaps/mark_watchthread.xpm
new file mode 100644
index 0000000..08cb6fb
--- /dev/null
+++ b/src/pixmaps/mark_watchthread.xpm
@@ -0,0 +1,92 @@
+/* XPM */
+static char * mark_watchthread_xpm[] = {
+"24 24 65 1",
+" 	c None",
+".	c #999999",
+"+	c #000000",
+"@	c #929292",
+"#	c #535353",
+"$	c #FFFFFF",
+"%	c #FEFEFE",
+"&	c #F6F6F6",
+"*	c #F5F5F5",
+"=	c #F4F4F4",
+"-	c #E3E3E3",
+";	c #EEEEEE",
+">	c #4F4F4F",
+",	c #F3F3F3",
+"'	c #EDEDED",
+")	c #AEAEAE",
+"!	c #E4E4E4",
+"~	c #434343",
+"{	c #FDFDFD",
+"]	c #F2F2F2",
+"^	c #ACACAC",
+"/	c #C8C8C8",
+"(	c #FBFBFB",
+"_	c #F1F1F1",
+":	c #F0F0F0",
+"<	c #EFEFEF",
+"[	c #A0A0A0",
+"}	c #D4D4D4",
+"|	c #F8F8F8",
+"1	c #ECECEC",
+"2	c #959595",
+"3	c #3E3E3E",
+"4	c #4D4D4D",
+"5	c #818181",
+"6	c #C6C6C6",
+"7	c #6A6A6A",
+"8	c #636363",
+"9	c #B9B9B9",
+"0	c #737373",
+"a	c #1B2B3C",
+"b	c #B6B6B6",
+"c	c #264057",
+"d	c #233B51",
+"e	c #253F56",
+"f	c #374E63",
+"g	c #606B76",
+"h	c #2B2B2B",
+"i	c #7C7C7C",
+"j	c #CACACA",
+"k	c #334F68",
+"l	c #E7E7E7",
+"m	c #314E6C",
+"n	c #597187",
+"o	c #262626",
+"p	c #BCBCBC",
+"q	c #DFDFDF",
+"r	c #3B5673",
+"s	c #506881",
+"t	c #E1E1E1",
+"u	c #8091A3",
+"v	c #3A5572",
+"w	c #EBEBEB",
+"x	c #7D8EA0",
+"y	c #303030",
+"z	c #1F262D",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  .+++++++++++++++++@   ",
+"  +#$$$$%$%$%$%&*=-#+   ",
+"  +;>$*=,=,=,=,;'->)+   ",
+"  +$!~{,],],],]'->^/+   ",
+"  +$*!>(_::<;''-~[}/+   ",
+"  +$(*!~|:<;'1->2}!/+   ",
+"  +$***!3*;'1-456!!/+   ",
+"  +$(**!7~,1->766*!/+   ",
+"  +$**!8$9>:>2606*!/+   ",
+"  +$(!8$*!}>^6a++++++   ",
+"  +$!0$****!!abcdefgh   ",
+"  +$i$!!!!!!+jkl$+mnbo  ",
+"  +0ppppppp+q*r$$+mst[+ ",
+"  @++++++++++:ummmvvq+  ",
+"             +wxvvxw+   ",
+"              y++z++    ",
+"                        "};
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index fc9a17b..24efd93 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -146,6 +146,16 @@ static const gint ToolbarIcons[] =
 	STOCK_PIXMAP_TRASH,
 	STOCK_PIXMAP_DELETE,
 	STOCK_PIXMAP_CANCEL,
+	STOCK_PIXMAP_MARK_IGNORETHREAD,
+	STOCK_PIXMAP_MARK_WATCHTHREAD,
+	STOCK_PIXMAP_MARK_MARK,
+	STOCK_PIXMAP_MARK_UNMARK,
+	STOCK_PIXMAP_MARK_LOCKED,
+	STOCK_PIXMAP_MARK_UNLOCKED,
+	STOCK_PIXMAP_MARK_ALLREAD,
+	STOCK_PIXMAP_MARK_ALLUNREAD,
+	STOCK_PIXMAP_MARK_READ,
+	STOCK_PIXMAP_MARK_UNREAD,
 	STOCK_PIXMAP_EMPTY,              /* last entry */
 };
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index f40369d..4d968d3 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -214,6 +214,16 @@
 #include "pixmaps/zoom_in.xpm"
 #include "pixmaps/zoom_out.xpm"
 #include "pixmaps/zoom_width.xpm"
+#include "pixmaps/mark_ignorethread.xpm"
+#include "pixmaps/mark_watchthread.xpm"
+#include "pixmaps/mark_mark.xpm"
+#include "pixmaps/mark_unmark.xpm"
+#include "pixmaps/mark_locked.xpm"
+#include "pixmaps/mark_unlocked.xpm"
+#include "pixmaps/mark_allread.xpm" 
+#include "pixmaps/mark_allunread.xpm"  
+#include "pixmaps/mark_read.xpm"     
+#include "pixmaps/mark_unread.xpm"
 
 typedef struct _StockPixmapData	StockPixmapData;
 
@@ -436,6 +446,16 @@ static StockPixmapData pixmaps[] =
     {zoom_in_xpm                      , NULL, NULL, "zoom_in", NULL, NULL},
     {zoom_out_xpm                     , NULL, NULL, "zoom_out", NULL, NULL},
     {zoom_width_xpm                   , NULL, NULL, "zoom_width", NULL, NULL},
+    {mark_ignorethread_xpm            , NULL, NULL, "mark_ignorethread", NULL},
+    {mark_watchthread_xpm             , NULL, NULL, "mark_watchthread", NULL},
+    {mark_mark_xpm                    , NULL, NULL, "mark_mark", NULL, NULL},
+    {mark_unmark_xpm                  , NULL, NULL, "mark_unmark", NULL, NULL},
+    {mark_locked_xpm                  , NULL, NULL, "mark_locked", NULL, NULL},
+    {mark_unlocked_xpm                , NULL, NULL, "mark_unlocked", NULL, NULL},
+    {mark_allread_xpm                 , NULL, NULL, "mark_allread", NULL, NULL},
+    {mark_allunread_xpm               , NULL, NULL, "mark_allunread", NULL, NULL},
+    {mark_read_xpm                    , NULL, NULL, "mark_read", NULL, NULL},
+    {mark_unread_xpm                  , NULL, NULL, "mark_unread", NULL, NULL},
     {empty_xpm                        , NULL, NULL, "empty", NULL, NULL}
 };
 
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 1a11623..9995cfe 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -204,6 +204,16 @@ typedef enum
 	STOCK_PIXMAP_ZOOM_IN,
 	STOCK_PIXMAP_ZOOM_OUT,
 	STOCK_PIXMAP_ZOOM_WIDTH,
+	STOCK_PIXMAP_MARK_IGNORETHREAD,
+	STOCK_PIXMAP_MARK_WATCHTHREAD,
+	STOCK_PIXMAP_MARK_MARK,
+	STOCK_PIXMAP_MARK_UNMARK,
+	STOCK_PIXMAP_MARK_LOCKED,
+	STOCK_PIXMAP_MARK_UNLOCKED,
+	STOCK_PIXMAP_MARK_ALLREAD,
+	STOCK_PIXMAP_MARK_ALLUNREAD,
+	STOCK_PIXMAP_MARK_READ,
+	STOCK_PIXMAP_MARK_UNREAD,
 	STOCK_PIXMAP_EMPTY,              /* last entry */
 	N_STOCK_PIXMAPS
 } StockPixmap;
diff --git a/src/toolbar.c b/src/toolbar.c
index ee98c9e..edf28e9 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -139,6 +139,30 @@ static void toolbar_ignore_thread_cb	   	(GtkWidget	*widget,
 static void toolbar_watch_thread_cb	   	(GtkWidget	*widget,
 					    	 gpointer 	 data);
 
+static void toolbar_mark_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_unmark_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_lock_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_ulock_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_all_read_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_all_unread_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_read_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
+static void toolbar_unread_cb	   	(GtkWidget	*widget,
+					    	 gpointer 	 data);
+
 static void toolbar_print_cb			(GtkWidget	*widget,
 					    	 gpointer 	 data);
 
@@ -205,15 +229,25 @@ struct {
 	{ "A_EXECUTE",       	N_("Execute")                              },
 	{ "A_GOTO_PREV",     	N_("Go to Previous Unread Message")        },
 	{ "A_GOTO_NEXT",     	N_("Go to Next Unread Message")            },
+
 	{ "A_IGNORE_THREAD", 	N_("Ignore thread")                        },
 	{ "A_WATCH_THREAD", 	N_("Watch thread")                         },
+	{ "A_MARK", 			N_("Mark Message")                         },
+	{ "A_UNMARK", 			N_("Unmark Message")                         },
+	{ "A_LOCK", 			N_("Lock Message")                         },
+	{ "A_UNLOCK", 			N_("Unlock Message")                         },
+	{ "A_ALL_READ",			N_("Mark all Messages as read")            },
+	{ "A_ALL_UNREAD",		N_("Mark all Messages as unread")          },
+	{ "A_READ", 			N_("Mark Message as read")                 },
+	{ "A_UNREAD", 			N_("Mark Message as unread")               },
+
 	{ "A_PRINT",	     	N_("Print")                                },
 	{ "A_LEARN_SPAM",       N_("Learn Spam or Ham")                    },
 	{ "A_GO_FOLDERS",   	N_("Open folder/Go to folder list")        },
 	{ "A_PREFERENCES",      N_("Preferences")                          },
 
 	{ "A_SEND",          	N_("Send Message")                         },
-	{ "A_SENDL",         	N_("Put into queue folder and send later") },
+	{ "A_SEND_LATER",     	N_("Put into queue folder and send later") },
 	{ "A_DRAFT",         	N_("Save to draft folder")                 },
 	{ "A_INSERT",        	N_("Insert file")                          },   
 	{ "A_ATTACH",        	N_("Attach file")                          },
@@ -313,11 +347,14 @@ GList *toolbar_get_action_items(ToolbarType source)
 	gint i = 0;
 	
 	if (source == TOOLBAR_MAIN) {
-		gint main_items[] = { A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
-					A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, 
-					A_REPLY_ALL,     A_REPLY_ML,      A_OPEN_MAIL,     A_FORWARD, 
-					A_TRASH,         A_DELETE_REAL,   A_EXECUTE,       A_GOTO_PREV, 
-					A_GOTO_NEXT,     A_IGNORE_THREAD, A_WATCH_THREAD,  A_PRINT,
+		gint main_items[] = {
+					A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
+					A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+					A_REPLY_ALL,     A_REPLY_ML,      A_OPEN_MAIL,     A_FORWARD,
+					A_TRASH,         A_DELETE_REAL,   A_EXECUTE,       A_GOTO_PREV,
+					A_GOTO_NEXT,     A_IGNORE_THREAD, A_WATCH_THREAD,  A_MARK,
+					A_UNMARK,        A_LOCK,          A_UNLOCK,        A_ALL_READ,
+					A_ALL_UNREAD,    A_READ,          A_UNREAD,          A_PRINT,
 					A_ADDRBOOK,      A_LEARN_SPAM,    A_GO_FOLDERS, 
 					A_CANCEL_INC,    A_CANCEL_SEND,   A_CANCEL_ALL,    A_PREFERENCES };
 
@@ -326,23 +363,25 @@ GList *toolbar_get_action_items(ToolbarType source)
 		}	
 	}
 	else if (source == TOOLBAR_COMPOSE) {
-		gint comp_items[] =   {	A_SEND,          A_SENDL,        A_DRAFT,
+		gint comp_items[] =   {
+					A_SEND,          A_SEND_LATER,   A_DRAFT,
 					A_INSERT,        A_ATTACH,       A_SIG,
-					A_REP_SIG,	 A_EXTEDITOR,    A_LINEWRAP_CURRENT,     
+					A_REP_SIG,       A_EXTEDITOR,    A_LINEWRAP_CURRENT,
 					A_LINEWRAP_ALL,  A_ADDRBOOK,
 #ifdef USE_ENCHANT
-					A_CHECK_SPELLING, 
+					A_CHECK_SPELLING,
 #endif
-					A_CLOSE };	
+					A_CLOSE };
 
 		for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) 
 			items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr));
 	}
 	else if (source == TOOLBAR_MSGVIEW) {
-		gint msgv_items[] =   { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
-				        A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,
-				        A_TRASH, A_DELETE_REAL,       A_GOTO_PREV,	  A_GOTO_NEXT,
-					A_ADDRBOOK,	 A_LEARN_SPAM, A_CLOSE };	
+		gint msgv_items[] =   {
+					A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+					A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,
+					A_TRASH,         A_DELETE_REAL,   A_GOTO_PREV,      A_GOTO_NEXT,
+					A_ADDRBOOK,      A_LEARN_SPAM,    A_CLOSE };
 
 		for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++) 
 			items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
@@ -418,11 +457,19 @@ const gchar *toolbar_get_short_text(int action) {
 	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_CLOSE: 		return _("Close");
 	case A_PREFERENCES:	return _("Preferences");
 	case A_SEND: 		return _("Send");
-	case A_SENDL: 		return _("Send later");
+	case A_SEND_LATER:	return _("Send later");
 	case A_DRAFT: 		return _("Draft");
 	case A_INSERT: 		return _("Insert");
 	case A_ATTACH: 		return _("Attach");
@@ -462,13 +509,21 @@ gint toolbar_get_icon(int action) {
 	case A_LEARN_SPAM: 	return STOCK_PIXMAP_SPAM_BTN;
 	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_IGNORETHREAD;
-	case A_WATCH_THREAD: 	return STOCK_PIXMAP_WATCHTHREAD;
+	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;
 	case A_CLOSE: 		return STOCK_PIXMAP_CLOSE;
 	case A_PREFERENCES:	return STOCK_PIXMAP_PREFERENCES;
 	case A_SEND: 		return STOCK_PIXMAP_MAIL_SEND;
-	case A_SENDL: 		return STOCK_PIXMAP_MAIL_SEND_QUEUE;
+	case A_SEND_LATER:	return STOCK_PIXMAP_MAIL_SEND_QUEUE;
 	case A_DRAFT: 		return STOCK_PIXMAP_MAIL;
 	case A_INSERT: 		return STOCK_PIXMAP_INSERT_FILE;
 	case A_ATTACH: 		return STOCK_PIXMAP_MAIL_ATTACH;
@@ -559,7 +614,7 @@ static void toolbar_set_default_compose(void)
 		{ A_SEPARATOR}, 
 #endif
 		{ A_SEND},
-		{ A_SENDL},
+		{ A_SEND_LATER},
 		{ A_DRAFT},
 		{ A_SEPARATOR}, 
 #ifndef GENERIC_UMPC
@@ -1471,6 +1526,182 @@ static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
 	}
 }
 
+static void toolbar_mark_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_mark(mainwin->summaryview);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_unmark_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_unmark(mainwin->summaryview);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_lock_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_msgs_lock(mainwin->summaryview);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_unlock_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_msgs_unlock(mainwin->summaryview);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_all_read_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_mark_all_read(mainwin->summaryview, TRUE);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_all_unread_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_mark_all_read(mainwin->summaryview, FALSE);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_read_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_mark_as_read(mainwin->summaryview, TRUE);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
+static void toolbar_unread_cb(GtkWidget *widget, gpointer data)
+{
+	ToolbarItem *toolbar_item = (ToolbarItem*)data;
+	MainWindow *mainwin;
+
+	cm_return_if_fail(toolbar_item != NULL);
+
+	switch (toolbar_item->type) {
+	case TOOLBAR_MAIN:
+		mainwin = (MainWindow *) toolbar_item->parent;
+		summary_mark_as_unread(mainwin->summaryview, FALSE);
+		break;
+	case TOOLBAR_MSGVIEW:
+		/* TODO: see toolbar_next_unread_cb() if you need
+		 * this in the message view */
+		break;
+	default:
+		debug_print("toolbar event not supported\n");
+		break;
+	}
+}
+
 static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
 {
 	ToolbarItem *toolbar_item = (ToolbarItem*)data;
@@ -1523,7 +1754,7 @@ static void toolbar_send_cb(GtkWidget *widget, gpointer data)
 
 static void toolbar_send_later_cb(GtkWidget *widget, gpointer data)
 {
-	compose_toolbar_cb(A_SENDL, data);
+	compose_toolbar_cb(A_SEND_LATER, data);
 }
 
 static void toolbar_draft_cb(GtkWidget *widget, gpointer data)
@@ -1736,12 +1967,20 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 		{ A_GOTO_NEXT,      	toolbar_next_unread_cb		},
 		{ A_IGNORE_THREAD,	toolbar_ignore_thread_cb	},
 		{ A_WATCH_THREAD,	toolbar_watch_thread_cb		},
-		{ A_PRINT,		toolbar_print_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_GO_FOLDERS,		toolbar_go_folders_cb		},
 
 		{ A_SEND,		toolbar_send_cb       		},
-		{ A_SENDL,		toolbar_send_later_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		},
@@ -2102,7 +2341,7 @@ Toolbar *toolbar_create(ToolbarType 	 type,
 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Message"));
 			toolbar_data->send_btn = item;
 			break;
-		case A_SENDL:
+		case A_SEND_LATER:
 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Put into queue folder and send later"));
 			toolbar_data->sendl_btn = item;
 			break;
diff --git a/src/toolbar.h b/src/toolbar.h
index f8b1f21..1a11b9a 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -150,8 +150,8 @@ struct _ToolbarItem {
 
 
 
-/* enum holds available actions for both 
-   Compose Toolbar and Main Toolbar 
+/* enum holds available actions for both
+   Compose Toolbar and Main Toolbar
 */
 enum {
 	/* main toolbar */
@@ -173,6 +173,14 @@ enum {
 	A_GOTO_NEXT,
 	A_IGNORE_THREAD,
 	A_WATCH_THREAD,
+	A_MARK,
+	A_UNMARK,
+	A_LOCK,
+	A_UNLOCK,
+	A_ALL_READ,
+	A_ALL_UNREAD,
+	A_READ,
+	A_UNREAD,
 	A_PRINT,
 	A_LEARN_SPAM,
 	A_GO_FOLDERS,
@@ -180,7 +188,7 @@ enum {
 
 	/* compose toolbar */
 	A_SEND,
-	A_SENDL,
+	A_SEND_LATER,
 	A_DRAFT,
 	A_INSERT,
 	A_ATTACH,

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 17:37:05 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 17:37:05 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-45-ga8aa3fc
Message-ID: <20161212163705.E060236A4598@mx.colino.net>

The branch, master has been updated
       via  a8aa3fc2205e274faa91de830a599ac88c00d3f6 (commit)
      from  382a3fed9dd3209321b639774e3e46f5d5294388 (commit)

Summary of changes:
 src/Makefile.am |   11 +++++++++++
 src/toolbar.c   |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit a8aa3fc2205e274faa91de830a599ac88c00d3f6
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 17:36:05 2016 +0100

    Fix wrong call to missing *_unread func (we use the *_read() func
    w/ FALSE as parameter for that).
    Add missing new xpm files to Makefile.am.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3932e48..6aee1cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -557,6 +557,17 @@ EXTRA_DIST = \
 	pixmaps/zoom_in.xpm \
 	pixmaps/zoom_out.xpm \
 	pixmaps/zoom_width.xpm \
+	pixmaps/mark_allread.xpm \
+	pixmaps/mark_allunread.xpm \
+	pixmaps/mark_ignorethread.xpm \
+	pixmaps/mark_locked.xpm \
+	pixmaps/mark_mark.xpm \
+	pixmaps/mark_read.xpm \
+	pixmaps/mark_unlocked.xpm \
+	pixmaps/mark_unmark.xpm \
+	pixmaps/mark_unread.xpm \
+	pixmaps/mark_watchthread.xpm \
+	pixmaps/mark.xpm \
 	claws-contacts.xml \
 	$(abook_extra)
 
diff --git a/src/toolbar.c b/src/toolbar.c
index edf28e9..13d58ed 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1690,7 +1690,7 @@ static void toolbar_unread_cb(GtkWidget *widget, gpointer data)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow *) toolbar_item->parent;
-		summary_mark_as_unread(mainwin->summaryview, FALSE);
+		summary_mark_as_read(mainwin->summaryview, FALSE);
 		break;
 	case TOOLBAR_MSGVIEW:
 		/* TODO: see toolbar_next_unread_cb() if you need

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Dec 12 18:03:27 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 12 Dec 2016 18:03:27 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-46-g1340b93
Message-ID: <20161212170327.A1F6836A4596@mx.colino.net>

The branch, master has been updated
       via  1340b93c5b95148d5522fd74cb91008074c2be66 (commit)
      from  a8aa3fc2205e274faa91de830a599ac88c00d3f6 (commit)

Summary of changes:
 src/Makefile.am |   97 +++++++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 50 deletions(-)


- Log -----------------------------------------------------------------
commit 1340b93c5b95148d5522fd74cb91008074c2be66
Author: Paul <paul at claws-mail.org>
Date:   Mon Dec 12 17:03:23 2016 +0000

    make list a bit more manageable and remove duplicated items

diff --git a/src/Makefile.am b/src/Makefile.am
index 6aee1cc..5c0de96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -372,6 +372,7 @@ CLEANFILES = \
 endif
 
 EXTRA_DIST = \
+	claws-contacts.xml \
 	w32-logo.ico w32-resource.rc \
 	pixmaps/addr_one.xpm \
 	pixmaps/addr_two.xpm \
@@ -396,42 +397,58 @@ EXTRA_DIST = \
 	pixmaps/close.xpm \
 	pixmaps/complete.xpm \
 	pixmaps/continue.xpm \
+	pixmaps/copied.xpm \
 	pixmaps/delete_btn.xpm \
 	pixmaps/deleted.xpm \
 	pixmaps/dir_close.xpm \
 	pixmaps/dir_close_hrm.xpm \
-	pixmaps/dir_open_hrm.xpm \
+	pixmaps/dir_close_hrm_mark.xpm \
+	pixmaps/dir_close_mark.xpm \
 	pixmaps/dir_open.xpm \
+	pixmaps/dir_open_hrm.xpm \
+	pixmaps/dir_open_hrm_mark.xpm \
+	pixmaps/dir_open_mark.xpm \
 	pixmaps/dir_noselect_close.xpm \
 	pixmaps/dir_noselect_close_mark.xpm \
 	pixmaps/dir_noselect_open.xpm \
 	pixmaps/dir_subs_close_mark.xpm \
 	pixmaps/dir_subs_close.xpm \
 	pixmaps/dir_subs_open.xpm \
+	pixmaps/doc_index.xpm \
+	pixmaps/doc_index_close.xpm \
+	pixmaps/doc_info.xpm \
 	pixmaps/down_arrow.xpm \
 	pixmaps/drafts_close.xpm \
+	pixmaps/drafts_close_mark.xpm \
 	pixmaps/drafts_open.xpm \
-	pixmaps/drafts_close.xpm \
-	pixmaps/drafts_open.xpm \
+	pixmaps/drafts_open_mark.xpm \
 	pixmaps/edit_extern.xpm \
+	pixmaps/empty.xpm \
 	pixmaps/error.xpm \
 	pixmaps/exec.xpm \
+	pixmaps/first_arrow.xpm \
 	pixmaps/forwarded.xpm \
 	pixmaps/gpg_signed.xpm \
 	pixmaps/go_folders.xpm \
 	pixmaps/group.xpm \
 	pixmaps/ham_btn.xpm \
 	pixmaps/ignorethread.xpm \
-	pixmaps/inbox_open_hrm.xpm \
 	pixmaps/inbox_open.xpm \
-	pixmaps/inbox_close_hrm.xpm \
+	pixmaps/inbox_open_hrm.xpm \
+	pixmaps/inbox_open_hrm_mark.xpm \
+	pixmaps/inbox_open_mark.xpm \
 	pixmaps/inbox_close.xpm \
+	pixmaps/inbox_close_hrm.xpm \
+	pixmaps/inbox_close_hrm_mark.xpm \
+	pixmaps/inbox_close_mark.xpm \
 	pixmaps/interface.xpm \
 	pixmaps/insert_file.xpm \
 	pixmaps/jpilot.xpm \
 	pixmaps/key.xpm \
 	pixmaps/key_gpg_signed.xpm \
+	pixmaps/last_arrow.xpm \
 	pixmaps/ldap.xpm \
+	pixmaps/left_arrow.xpm \
 	pixmaps/linewrap.xpm \
 	pixmaps/linewrapcurrent.xpm \
 	pixmaps/locked.xpm \
@@ -449,6 +466,16 @@ EXTRA_DIST = \
 	pixmaps/mail_sign.xpm \
 	pixmaps/mail.xpm \
 	pixmaps/mark.xpm \
+	pixmaps/mark_allread.xpm \
+	pixmaps/mark_allunread.xpm \
+	pixmaps/mark_ignorethread.xpm \
+	pixmaps/mark_locked.xpm \
+	pixmaps/mark_mark.xpm \
+	pixmaps/mark_read.xpm \
+	pixmaps/mark_unlocked.xpm \
+	pixmaps/mark_unmark.xpm \
+	pixmaps/mark_unread.xpm \
+	pixmaps/mark_watchthread.xpm \
 	pixmaps/mime_application.xpm \
 	pixmaps/mime_audio.xpm \
 	pixmaps/mime_image.xpm \
@@ -462,6 +489,7 @@ EXTRA_DIST = \
 	pixmaps/mime_text_patch.xpm \
 	pixmaps/mime_text_plain.xpm \
 	pixmaps/mime_unknown.xpm \
+	pixmaps/moved.xpm \
 	pixmaps/news_compose.xpm \
 	pixmaps/new.xpm \
 	pixmaps/notice_error.xpm \
@@ -503,35 +531,22 @@ EXTRA_DIST = \
 	pixmaps/queue_open_mark.xpm \
 	pixmaps/quicksearch.xpm \
 	pixmaps/replied.xpm \
+	pixmaps/replied_and_forwarded.xpm \
+	pixmaps/right_arrow.xpm \
+	pixmaps/rotate_left.xpm \
+	pixmaps/rotate_right.xpm \
 	pixmaps/selection.xpm \
 	pixmaps/spam.xpm \
 	pixmaps/spam_btn.xpm \
-	pixmaps/trash_open_hrm.xpm \
+	pixmaps/trash_btn.xpm \
+	pixmaps/trash_close.xpm \
 	pixmaps/trash_close_hrm.xpm \
+	pixmaps/trash_close_hrm_mark.xpm \
+	pixmaps/trash_close_mark.xpm \
 	pixmaps/trash_open.xpm \
-	pixmaps/trash_close.xpm \
-	pixmaps/trash_btn.xpm \
-	pixmaps/unread.xpm \
-	pixmaps/read.xpm \
-	pixmaps/up_arrow.xpm \
-	pixmaps/vcard.xpm \
-	pixmaps/dir_close_mark.xpm \
-	pixmaps/dir_close_hrm_mark.xpm \
-	pixmaps/dir_open_hrm_mark.xpm \
-	pixmaps/dir_open_mark.xpm \
-	pixmaps/drafts_close_mark.xpm \
-	pixmaps/drafts_open_mark.xpm \
-	pixmaps/inbox_open_hrm_mark.xpm \
-	pixmaps/inbox_open_mark.xpm \
-	pixmaps/inbox_close_hrm_mark.xpm \
-	pixmaps/inbox_close_mark.xpm \
+	pixmaps/trash_open_hrm.xpm \
 	pixmaps/trash_open_hrm_mark.xpm \
-	pixmaps/trash_close_hrm_mark.xpm \
 	pixmaps/trash_open_mark.xpm \
-	pixmaps/trash_close_mark.xpm \
-	pixmaps/moved.xpm \
-	pixmaps/copied.xpm \
-	pixmaps/watchthread.xpm \
 	pixmaps/tray_newmail_offline.xpm \
 	pixmaps/tray_newmail.xpm \
 	pixmaps/tray_newmarkedmail_offline.xpm \
@@ -542,33 +557,15 @@ EXTRA_DIST = \
 	pixmaps/tray_unreadmail.xpm \
 	pixmaps/tray_unreadmarkedmail_offline.xpm \
 	pixmaps/tray_unreadmarkedmail.xpm \
-	pixmaps/empty.xpm \
-	pixmaps/replied_and_forwarded.xpm \
-	pixmaps/doc_index.xpm \
-	pixmaps/doc_index_close.xpm \
-	pixmaps/doc_info.xpm \
-	pixmaps/first_arrow.xpm \
-	pixmaps/last_arrow.xpm \
-	pixmaps/left_arrow.xpm \
-	pixmaps/right_arrow.xpm \
-	pixmaps/rotate_left.xpm \
-	pixmaps/rotate_right.xpm \
+	pixmaps/unread.xpm \
+	pixmaps/read.xpm \
+	pixmaps/up_arrow.xpm \
+	pixmaps/vcard.xpm \
+	pixmaps/watchthread.xpm \
 	pixmaps/zoom_fit.xpm \
 	pixmaps/zoom_in.xpm \
 	pixmaps/zoom_out.xpm \
 	pixmaps/zoom_width.xpm \
-	pixmaps/mark_allread.xpm \
-	pixmaps/mark_allunread.xpm \
-	pixmaps/mark_ignorethread.xpm \
-	pixmaps/mark_locked.xpm \
-	pixmaps/mark_mark.xpm \
-	pixmaps/mark_read.xpm \
-	pixmaps/mark_unlocked.xpm \
-	pixmaps/mark_unmark.xpm \
-	pixmaps/mark_unread.xpm \
-	pixmaps/mark_watchthread.xpm \
-	pixmaps/mark.xpm \
-	claws-contacts.xml \
 	$(abook_extra)
 
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Mon Dec 12 19:42:05 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Mon, 12 Dec 2016 19:42:05 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-48-g4b9f6e2
Message-ID: <20161212184205.5475636A4599@mx.colino.net>

The branch, master has been updated
       via  4b9f6e2b6316a1efff97dc3f41836cfeeb04e220 (commit)
       via  9c47b608f786d30faedb3d7984d27f2020f9d858 (commit)
      from  1340b93c5b95148d5522fd74cb91008074c2be66 (commit)

Summary of changes:
 src/mainwindow.c  |    4 ++--
 src/summaryview.c |   10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 4b9f6e2b6316a1efff97dc3f41836cfeeb04e220
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 19:41:56 2016 +0100

    Fix table order.

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 1500488..19b98bd 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -702,8 +702,8 @@ static GtkActionEntry mainwin_entries[] =
 	{"Message/Mark/Unmark",			NULL, N_("_Unmark"), "U", NULL, G_CALLBACK(unmark_cb) },
 	{"Message/Mark/---",			NULL, "---", NULL, NULL, NULL },
 
-	{"Message/Mark/MarkUnread",		NULL, N_("Mark as unr_ead"), "<shift>exclam", NULL, G_CALLBACK(mark_as_unread_cb) },
 	{"Message/Mark/MarkRead",		NULL, N_("Mark as rea_d"), NULL, NULL, G_CALLBACK(mark_as_read_cb) },
+	{"Message/Mark/MarkUnread",		NULL, N_("Mark as unr_ead"), "<shift>exclam", NULL, G_CALLBACK(mark_as_unread_cb) },
 	/* separation */
 	{"Message/Mark/MarkAllRead",		NULL, N_("Mark all read"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
 	{"Message/Mark/MarkAllUnread",		NULL, N_("Mark all unread"), NULL, NULL, G_CALLBACK(mark_all_unread_cb) },
@@ -1787,8 +1787,8 @@ MainWindow *main_window_create()
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)

commit 9c47b608f786d30faedb3d7984d27f2020f9d858
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 19:28:06 2016 +0100

    Fix missing items in summaryview's menu declarations.

diff --git a/src/summaryview.c b/src/summaryview.c
index 4739b66..4757b10 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -706,10 +706,11 @@ SummaryView *summary_create(MainWindow *mainwin)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
@@ -1714,7 +1715,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 	gboolean sensitive;
 	gint i;
 
-#define N_ENTRIES 38
+#define N_ENTRIES 39
 	static struct {
 		const gchar *entry;
 		SensitiveCondMask cond;
@@ -1750,15 +1751,16 @@ do { \
 	FILL_TABLE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
-	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
+	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
+	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllUnread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST);
-	FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST);
+	FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
 	FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
 	FILL_TABLE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Dec 13 00:56:21 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue, 13 Dec 2016 00:56:21 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-49-gea40116
Message-ID: <20161212235621.9080A36A4592@mx.colino.net>

The branch, master has been updated
       via  ea4011632f33c8ccc5929ffc157e3f6255fe9d95 (commit)
      from  4b9f6e2b6316a1efff97dc3f41836cfeeb04e220 (commit)

Summary of changes:
 src/compose.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit ea4011632f33c8ccc5929ffc157e3f6255fe9d95
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Dec 13 00:55:24 2016 +0100

    Honor autosave_encrypted preference when using external editor.
    
    Patch by Ashish Gupta <ashmew2 at gmail.com>.

diff --git a/src/compose.c b/src/compose.c
index ae84883..a4e4881 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9493,6 +9493,14 @@ static gboolean compose_ext_editor_kill(Compose *compose)
 	return TRUE;
 }
 
+static gboolean compose_can_autosave(Compose *compose)
+{
+	if (compose->privacy_system && compose->use_encryption)
+		return prefs_common.autosave && prefs_common.autosave_encrypted;
+	else
+		return prefs_common.autosave;
+}
+
 static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
 				 gpointer data)
 {
@@ -9521,7 +9529,10 @@ static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
 		gtk_text_buffer_set_text(buffer, "", -1);
 		compose_insert_file(compose, compose->exteditor_file);
 		compose_changed_cb(NULL, compose);
-		compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
+
+		/* Check if we should save the draft or not */
+		if (compose_can_autosave(compose))
+		  compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
 
 		if (claws_unlink(compose->exteditor_file) < 0)
 			FILE_OP_ERROR(compose->exteditor_file, "unlink");
@@ -10382,14 +10393,6 @@ void compose_close_toolbar(Compose *compose)
 	compose_close_cb(NULL, compose);
 }
 
-static gboolean compose_can_autosave(Compose *compose)
-{
-	if (compose->privacy_system && compose->use_encryption)
-		return prefs_common.autosave && prefs_common.autosave_encrypted;
-	else
-		return prefs_common.autosave;
-}
-
 static void compose_close_cb(GtkAction *action, gpointer data)
 {
 	Compose *compose = (Compose *)data;

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Dec 13 00:57:55 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue, 13 Dec 2016 00:57:55 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-50-gc939c07
Message-ID: <20161212235756.06AA236A4592@mx.colino.net>

The branch, master has been updated
       via  c939c0702b9a61c84939d671d2a462812337bee5 (commit)
      from  ea4011632f33c8ccc5929ffc157e3f6255fe9d95 (commit)

Summary of changes:
 AUTHORS |    1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit c939c0702b9a61c84939d671d2a462812337bee5
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Dec 13 00:57:31 2016 +0100

    Update AUTHORS file for the previous commit ea40116.

diff --git a/AUTHORS b/AUTHORS
index 7eda15f..73b8c1b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -310,3 +310,4 @@ contributors (in addition to the above; based on Changelog)
 	Ben Hutchings
 	Ralf Bormann
 	Darac Marjal
+	Ashish Gupta

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Dec 13 01:01:50 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue, 13 Dec 2016 01:01:50 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-51-g1a50532
Message-ID: <20161213000150.6E6DD36A4593@mx.colino.net>

The branch, master has been updated
       via  1a505326d080b3711388595f5d630a757791005a (commit)
      from  c939c0702b9a61c84939d671d2a462812337bee5 (commit)

Summary of changes:
 src/gtk/authors.h |    1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit 1a505326d080b3711388595f5d630a757791005a
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Dec 13 01:01:23 2016 +0100

    Also update authors.h for commit ea40116.

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index cc5bffa..452c58a 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -149,6 +149,7 @@ static char *CONTRIBS_LIST[] = {
 "Micha? G?rny",
 "Bodo Graumann",
 "Yang Guilong",
+"Ashish Gupta",
 "Daniel Gustafson",
 "HIROSHIMA",
 "Oliver Haertel",

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 13 08:57:55 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 13 Dec 2016 08:57:55 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-53-ga34523c
Message-ID: <20161213075755.7307236A45A7@mx.colino.net>

The branch, master has been updated
       via  a34523c61866032b23efd90390990c5e114db1df (commit)
       via  884055d3bd0e34da2ea6d74705ed5c2a0e9ef0a2 (commit)
      from  1a505326d080b3711388595f5d630a757791005a (commit)

Summary of changes:
 src/folderutils.c |    4 +--
 src/mainwindow.c  |    8 ++---
 src/summaryview.c |  103 +++++++++++++++++++++++++++++++----------------------
 src/summaryview.h |    6 ++--
 src/toolbar.c     |    8 ++---
 5 files changed, 75 insertions(+), 54 deletions(-)


- Log -----------------------------------------------------------------
commit a34523c61866032b23efd90390990c5e114db1df
Merge: 884055d 1a50532
Author: wwp <wwp at free.fr>
Date:   Tue Dec 13 08:57:52 2016 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 884055d3bd0e34da2ea6d74705ed5c2a0e9ef0a2
Author: wwp <wwp at free.fr>
Date:   Tue Dec 13 08:56:27 2016 +0100

    Internal API change: split read/unread marking features from functions used
    to mark as read/all read using a parameter.

diff --git a/src/folderutils.c b/src/folderutils.c
index 939b019..0a4c95c 100644
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -132,7 +132,7 @@ void folderutils_mark_all_read(FolderItem *item)
 	if (mainwin && mainwin->summaryview &&
 	    mainwin->summaryview->folder_item == item) {
 		debug_print("folder opened, using summary\n");
-		summary_mark_all_read(mainwin->summaryview, TRUE);
+		summary_mark_all_read(mainwin->summaryview);
 	} else {
 		msglist = folder_item_get_msg_list(item);
 		debug_print("got msglist %p\n", msglist);
@@ -172,7 +172,7 @@ void folderutils_mark_all_unread(FolderItem *item)
 	if (mainwin && mainwin->summaryview &&
 	    mainwin->summaryview->folder_item == item) {
 		debug_print("folder opened, using summary\n");
-		summary_mark_all_read(mainwin->summaryview, FALSE);
+		summary_mark_all_unread(mainwin->summaryview);
 	} else {
 		msglist = folder_item_get_msg_list(item);
 		debug_print("got msglist %p\n", msglist);
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 19b98bd..64b2583 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4468,25 +4468,25 @@ static void unmark_cb(GtkAction *action, gpointer data)
 static void mark_as_read_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_as_read(mainwin->summaryview, TRUE);
+	summary_mark_as_read(mainwin->summaryview);
 }
 
 static void mark_as_unread_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_as_read(mainwin->summaryview, FALSE);
+	summary_mark_as_unread(mainwin->summaryview);
 }
 
 static void mark_all_read_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_all_read(mainwin->summaryview, TRUE);
+	summary_mark_all_read(mainwin->summaryview);
 }
 
 static void mark_all_unread_cb(GtkAction *action, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-	summary_mark_all_read(mainwin->summaryview, FALSE);
+	summary_mark_all_unread(mainwin->summaryview);
 }
 
 static void mark_as_spam_cb(GtkAction *action, gpointer data)
diff --git a/src/summaryview.c b/src/summaryview.c
index 4757b10..c2a9362 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4045,7 +4045,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
 		msginfo->msgnum);
 }
 
-void summary_mark_as_read(SummaryView *summaryview, gboolean read)
+void summary_mark_as_read(SummaryView *summaryview)
 {
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	GList *cur;
@@ -4056,12 +4056,27 @@ void summary_mark_as_read(SummaryView *summaryview, gboolean read)
 	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)
-		if (read)
-			summary_mark_row_as_read(summaryview,
-						 GTK_CMCTREE_NODE(cur->data));
-		else
-			summary_mark_row_as_unread(summaryview,
-						 GTK_CMCTREE_NODE(cur->data));
+		summary_mark_row_as_read(summaryview,
+					 GTK_CMCTREE_NODE(cur->data));
+	folder_item_set_batch(summaryview->folder_item, FALSE);
+	END_LONG_OPERATION(summaryview);
+	
+	summary_status_show(summaryview);
+}
+
+void summary_mark_as_unread(SummaryView *summaryview)
+{
+	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+	GList *cur;
+	gboolean froze = FALSE;
+
+	if (summary_is_locked(summaryview))
+		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)
+		summary_mark_row_as_unread(summaryview,
+					 GTK_CMCTREE_NODE(cur->data));
 	folder_item_set_batch(summaryview->folder_item, FALSE);
 	END_LONG_OPERATION(summaryview);
 	
@@ -4102,25 +4117,53 @@ void summary_msgs_unlock(SummaryView *summaryview)
 	summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview, gboolean read)
+void summary_mark_all_read(SummaryView *summaryview)
 {
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	GtkCMCTreeNode *node;
 	AlertValue val;
 	gboolean froze = FALSE;
-	gchar *message;
-	gchar *title;
 
-	if (read) {
-		title = _("Mark all as read");
-		message = _("Do you really want to mark all mails in this folder as read?");
-	} else {
-		title = _("Mark all as unread");
-		message = _("Do you really want to mark all mails in this folder as unread?");
+	if (prefs_common.ask_mark_all_read) {
+		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,
+			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+
+		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
+			return;
+		else if (val & G_ALERTDISABLE)
+			prefs_common.ask_mark_all_read = FALSE;
 	}
+	
+	if (summary_is_locked(summaryview))
+		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;
+	     node = gtkut_ctree_node_next(ctree, node))
+		summary_mark_row_as_read(summaryview, node);
+	folder_item_set_batch(summaryview->folder_item, FALSE);
+	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
+	     node = gtkut_ctree_node_next(ctree, node)) {
+		if (!GTK_CMCTREE_ROW(node)->expanded)
+			summary_set_row_marks(summaryview, node);
+	}
+	END_LONG_OPERATION(summaryview);
+	
+	summary_status_show(summaryview);
+}
+
+void summary_mark_all_unread(SummaryView *summaryview)
+{
+	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+	GtkCMCTreeNode *node;
+	AlertValue val;
+	gboolean froze = FALSE;
 
 	if (prefs_common.ask_mark_all_read) {
-		val = alertpanel_full(title, message,
+		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,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
@@ -4136,10 +4179,7 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean read)
 	folder_item_set_batch(summaryview->folder_item, TRUE);
 	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
 	     node = gtkut_ctree_node_next(ctree, node))
-		if (read)
-			summary_mark_row_as_read(summaryview, node);
-		else
-			summary_mark_row_as_unread(summaryview, node);
+		summary_mark_row_as_unread(summaryview, node);
 	folder_item_set_batch(summaryview->folder_item, FALSE);
 	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
 	     node = gtkut_ctree_node_next(ctree, node)) {
@@ -4218,27 +4258,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 	summary_status_show(summaryview);	
 }
 
-
-void summary_mark_as_unread(SummaryView *summaryview)
-{
-	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-	GList *cur;
-	gboolean froze = FALSE;
-
-	if (summary_is_locked(summaryview))
-		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)
-		summary_mark_row_as_unread(summaryview,
-					   GTK_CMCTREE_NODE(cur->data));
-	folder_item_set_batch(summaryview->folder_item, FALSE);
-	END_LONG_OPERATION(summaryview);
-	
-	summary_status_show(summaryview);
-}
-
 static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
 {
 	GList * cur;
diff --git a/src/summaryview.h b/src/summaryview.h
index dee8068..66c0c4d 100644
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -272,10 +272,12 @@ void summary_save_as		  (SummaryView		*summaryview);
 void summary_print		  (SummaryView		*summaryview);
 void summary_mark		  (SummaryView		*summaryview);
 void summary_unmark		  (SummaryView		*summaryview);
-void summary_mark_as_read	  (SummaryView		*summaryview, gboolean);
+void summary_mark_as_read	  (SummaryView		*summaryview);
+void summary_mark_as_unread	  (SummaryView		*summaryview);
 void summary_msgs_lock		  (SummaryView		*summaryview);
 void summary_msgs_unlock	  (SummaryView		*summaryview);
-void summary_mark_all_read	  (SummaryView		*summaryview, gboolean);
+void summary_mark_all_read	  (SummaryView		*summaryview);
+void summary_mark_all_unread	  (SummaryView		*summaryview);
 void summary_mark_as_spam	  (SummaryView 		*summaryview, 
 				   guint 		 action, 
 				   GtkWidget 		*widget);
diff --git a/src/toolbar.c b/src/toolbar.c
index 13d58ed..b48b804 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1624,7 +1624,7 @@ static void toolbar_all_read_cb(GtkWidget *widget, gpointer data)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow *) toolbar_item->parent;
-		summary_mark_all_read(mainwin->summaryview, TRUE);
+		summary_mark_all_read(mainwin->summaryview);
 		break;
 	case TOOLBAR_MSGVIEW:
 		/* TODO: see toolbar_next_unread_cb() if you need
@@ -1646,7 +1646,7 @@ static void toolbar_all_unread_cb(GtkWidget *widget, gpointer data)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow *) toolbar_item->parent;
-		summary_mark_all_read(mainwin->summaryview, FALSE);
+		summary_mark_all_unread(mainwin->summaryview);
 		break;
 	case TOOLBAR_MSGVIEW:
 		/* TODO: see toolbar_next_unread_cb() if you need
@@ -1668,7 +1668,7 @@ static void toolbar_read_cb(GtkWidget *widget, gpointer data)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow *) toolbar_item->parent;
-		summary_mark_as_read(mainwin->summaryview, TRUE);
+		summary_mark_as_read(mainwin->summaryview);
 		break;
 	case TOOLBAR_MSGVIEW:
 		/* TODO: see toolbar_next_unread_cb() if you need
@@ -1690,7 +1690,7 @@ static void toolbar_unread_cb(GtkWidget *widget, gpointer data)
 	switch (toolbar_item->type) {
 	case TOOLBAR_MAIN:
 		mainwin = (MainWindow *) toolbar_item->parent;
-		summary_mark_as_read(mainwin->summaryview, FALSE);
+		summary_mark_as_unread(mainwin->summaryview);
 		break;
 	case TOOLBAR_MSGVIEW:
 		/* TODO: see toolbar_next_unread_cb() if you need

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 13 08:58:43 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 13 Dec 2016 08:58:43 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-54-g06f63cb
Message-ID: <20161213075843.32E5736A44B6@mx.colino.net>

The branch, master has been updated
       via  06f63cb892ca160d54fb28ca4a185c89b7b901fb (commit)
      from  a34523c61866032b23efd90390990c5e114db1df (commit)

Summary of changes:
 po/fr.po | 1904 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 972 insertions(+), 932 deletions(-)


- Log -----------------------------------------------------------------
commit 06f63cb892ca160d54fb28ca4a185c89b7b901fb
Author: wwp <wwp at free.fr>
Date:   Tue Dec 13 08:58:23 2016 +0100

    Updates and hotkey fixes.

diff --git a/po/fr.po b/po/fr.po
index deebc9d..449fa7b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -643,14 +643,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-11-06 10:47+0000\n"
-"PO-Revision-Date: 2016-10-30 22:58+0100\n"
+"POT-Creation-Date: 2016-12-12 15:14+0100\n"
+"PO-Revision-Date: 2016-12-12 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -713,11 +713,10 @@ msgstr "R"
 
 #: src/account.c:1568
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr ""
-"La fonctionnalit? ? Relever ? r?cup?rera le courrier des comptes coch?s"
+msgstr "La fonctionnalit? ? Relever ? r?cup?rera le courrier des comptes coch?s"
 
 #: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7205 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7203 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
@@ -738,22 +737,22 @@ msgstr "Protocole"
 msgid "Server"
 msgstr "Serveur"
 
-#: src/action.c:382
+#: src/action.c:380
 #, c-format
 msgid "Could not get message file %d"
 msgstr "?chec lors de la r?cup?ration du fichier correspondant au message %d"
 
-#: src/action.c:419
+#: src/action.c:418
 msgid "Could not get message part."
 msgstr "?chec lors de la r?cup?ration de la partie du message."
 
-#: src/action.c:436
+#: src/action.c:435
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr ""
 "?chec lors de la r?cup?ration d'une partie d'un message multi-parties : %s"
 
-#: src/action.c:608
+#: src/action.c:607
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -762,11 +761,11 @@ msgstr ""
 "L'action choisie ne peut ?tre utilis?e pour un message en cours\n"
 "de composition car elle contient %%f, %%F, %%as ou %%p."
 
-#: src/action.c:720
+#: src/action.c:719
 msgid "There is no filtering action set"
 msgstr "Il n'y a pas d'action de filtrage d?finie."
 
-#: src/action.c:722
+#: src/action.c:721
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -775,7 +774,7 @@ msgstr ""
 "Action(s) de filtrage non valide(s) :\n"
 "%s"
 
-#: src/action.c:987
+#: src/action.c:986
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -786,7 +785,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
+#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
 #: src/plugins/tnef_parse/tnef_parse.c:67
 #: src/plugins/vcalendar/vcal_folder.c:1821
 #: src/plugins/vcalendar/vcal_folder.c:1825
@@ -795,25 +794,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1206 src/action.c:1371
 msgid "Completed"
 msgstr "Termin?"
 
-#: src/action.c:1243
+#: src/action.c:1242
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
-#: src/action.c:1247
+#: src/action.c:1246
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Termin? : %s\n"
 
-#: src/action.c:1280
+#: src/action.c:1279
 msgid "Action's input/output"
 msgstr "Entr?es/Sorties d'Actions"
 
-#: src/action.c:1608
+#: src/action.c:1607
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -824,11 +823,11 @@ msgstr ""
 "(L'argument remplacera ? %%h ?)\n"
 "  %s"
 
-#: src/action.c:1613
+#: src/action.c:1612
 msgid "Action's hidden user argument"
 msgstr "Argument cach? de l'action"
 
-#: src/action.c:1617
+#: src/action.c:1616
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -839,7 +838,7 @@ msgstr ""
 "(L'argument remplacera ? %%u ?)\n"
 "  %s"
 
-#: src/action.c:1622
+#: src/action.c:1621
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
@@ -935,12 +934,12 @@ msgstr ""
 #: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
 #: src/addressbook.c:483 src/edittags.c:272
 #: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/prefs_filtering.c:1693 src/prefs_template.c:1109
 msgid "_Delete"
 msgstr "_Supprimer"
 
 #: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/prefs_filtering.c:1694 src/prefs_template.c:1110
 msgid "Delete _all"
 msgstr "_Tout supprimer.."
 
@@ -1060,17 +1059,17 @@ msgid "_Book"
 msgstr "_Carnet"
 
 #: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
+#: src/addressbook.c:482 src/compose.c:600 src/mainwindow.c:514
 #: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_?dition"
 
-#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
+#: src/addressbook.c:407 src/compose.c:605 src/mainwindow.c:517
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "Ou_tils"
 
-#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
+#: src/addressbook.c:408 src/compose.c:606 src/mainwindow.c:519
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "_Aide"
@@ -1103,14 +1102,14 @@ msgstr "_?diter"
 msgid "_Delete book"
 msgstr "Supp_rimer le carnet"
 
-#: src/addressbook.c:427 src/compose.c:603
+#: src/addressbook.c:427 src/compose.c:617
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:433
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Save"
 msgstr "Enregi_strer"
 
-#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:621 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:629
 msgid "_Close"
@@ -1125,13 +1124,13 @@ msgid "C_ut"
 msgstr "Co_uper"
 
 #: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/compose.c:629 src/mainwindow.c:548 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:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Co_ller"
 
@@ -1175,7 +1174,7 @@ msgstr "_Chercher les contacts en double.."
 msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
-#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
+#: src/addressbook.c:458 src/compose.c:709 src/mainwindow.c:816
 #: src/messageview.c:338
 msgid "_About"
 msgstr "? _propos"
@@ -1460,8 +1459,8 @@ msgstr "Carnets d'adresses"
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:348
-#: src/folderview.c:436 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:355
+#: src/folderview.c:443 src/prefs_account.c:2799 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1604,18 +1603,19 @@ msgstr ""
 "La mise ? jour a ?chou?. Les modifications ne seront pas appliqu?es au "
 "r?pertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9454
+#: src/alertpanel.c:146 src/compose.c:9465
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5689 src/compose.c:6212
-#: src/compose.c:11905 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4851
+#: src/alertpanel.c:159 src/compose.c:5687 src/compose.c:6210
+#: src/compose.c:11891 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:867
+#: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
+#: src/summaryview.c:4850
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5630 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Erreur"
@@ -1884,650 +1884,650 @@ msgstr "<non sp?cifi? dans le certificat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprim? par RegExp)"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:256
 #, c-format
 msgid "%dB"
 msgstr "%do"
 
-#: src/common/utils.c:260
+#: src/common/utils.c:257
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 
-#: src/common/utils.c:261
+#: src/common/utils.c:258
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 
-#: src/common/utils.c:262
+#: src/common/utils.c:259
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
-#: src/common/utils.c:4764
+#: src/common/utils.c:4761
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/common/utils.c:4765
+#: src/common/utils.c:4762
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Lundi"
 
-#: src/common/utils.c:4766
+#: src/common/utils.c:4763
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/common/utils.c:4767
+#: src/common/utils.c:4764
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/common/utils.c:4768
+#: src/common/utils.c:4765
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/common/utils.c:4769
+#: src/common/utils.c:4766
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/common/utils.c:4770
+#: src/common/utils.c:4767
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/common/utils.c:4772
+#: src/common/utils.c:4769
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janvier"
 
-#: src/common/utils.c:4773
+#: src/common/utils.c:4770
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "F?vrier"
 
-#: src/common/utils.c:4774
+#: src/common/utils.c:4771
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mars"
 
-#: src/common/utils.c:4775
+#: src/common/utils.c:4772
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Avril"
 
-#: src/common/utils.c:4776
+#: src/common/utils.c:4773
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4777
+#: src/common/utils.c:4774
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juin"
 
-#: src/common/utils.c:4778
+#: src/common/utils.c:4775
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juillet"
 
-#: src/common/utils.c:4779
+#: src/common/utils.c:4776
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Ao?t"
 
-#: src/common/utils.c:4780
+#: src/common/utils.c:4777
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Septembre"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4778
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octobre"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4779
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4780
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "D?cembre"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4782
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dim"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4783
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Lun"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4784
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Mar"
 
-#: src/common/utils.c:4788
+#: src/common/utils.c:4785
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Mer"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4786
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4787
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Ven"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4788
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sam"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4790
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4791
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "F?v"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4792
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4793
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Avr"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4794
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4795
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4796
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jui"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4797
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ao?"
 
-#: src/common/utils.c:4801
+#: src/common/utils.c:4798
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4799
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Oct"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4800
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4801
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "D?c"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4812
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4813
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4814
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4815
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:575
+#: src/compose.c:589
 msgid "_Add..."
 msgstr "_Ajouter.."
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:590 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:578 src/folderview.c:247
+#: src/compose.c:592 src/folderview.c:254
 msgid "_Properties..."
 msgstr "_Propri?t?s.."
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:599 src/mainwindow.c:516 src/messageview.c:211
 msgid "_Message"
 msgstr "_Message"
 
-#: src/compose.c:588
+#: src/compose.c:602
 msgid "_Spelling"
 msgstr "O_rthographe"
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:604 src/compose.c:671
 msgid "_Options"
 msgstr "_Options"
 
-#: src/compose.c:594
+#: src/compose.c:608
 msgid "S_end"
 msgstr "_Envoyer"
 
-#: src/compose.c:595
+#: src/compose.c:609
 msgid "Send _later"
 msgstr "Envoyer _ult?rieurement"
 
-#: src/compose.c:598
+#: src/compose.c:612
 msgid "_Attach file"
 msgstr "_Joindre un fichier"
 
-#: src/compose.c:599
+#: src/compose.c:613
 msgid "_Insert file"
 msgstr "_Ins?rer un fichier"
 
-#: src/compose.c:600
+#: src/compose.c:614
 msgid "Insert si_gnature"
 msgstr "Ins?rer la si_gnature"
 
-#: src/compose.c:601
+#: src/compose.c:615
 msgid "_Replace signature"
 msgstr "_Remplacer la signature"
 
-#: src/compose.c:605
+#: src/compose.c:619
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:624 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "Ann_uler"
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:625 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: src/compose.c:618
+#: src/compose.c:632
 msgid "_Special paste"
 msgstr "Coller c_omme"
 
-#: src/compose.c:619
+#: src/compose.c:633
 msgid "As _quotation"
 msgstr "_Citation"
 
-#: src/compose.c:620
+#: src/compose.c:634
 msgid "_Wrapped"
 msgstr "Texte _justifi?"
 
-#: src/compose.c:621
+#: src/compose.c:635
 msgid "_Unwrapped"
 msgstr "Texte _non justifi?"
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:637 src/mainwindow.c:549
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_S?lectionner tout"
 
-#: src/compose.c:625
+#: src/compose.c:639
 msgid "A_dvanced"
 msgstr "A_vanc?"
 
-#: src/compose.c:626
+#: src/compose.c:640
 msgid "Move a character backward"
 msgstr "Reculer d'un _caract?re"
 
-#: src/compose.c:627
+#: src/compose.c:641
 msgid "Move a character forward"
 msgstr "Avancer d'un c_aract?re"
 
-#: src/compose.c:628
+#: src/compose.c:642
 msgid "Move a word backward"
 msgstr "Reculer d'un _mot"
 
-#: src/compose.c:629
+#: src/compose.c:643
 msgid "Move a word forward"
 msgstr "Avancer d'un m_ot"
 
-#: src/compose.c:630
+#: src/compose.c:644
 msgid "Move to beginning of line"
 msgstr "Aller en _d?but de ligne"
 
-#: src/compose.c:631
+#: src/compose.c:645
 msgid "Move to end of line"
 msgstr "Aller en _fin de ligne"
 
-#: src/compose.c:632
+#: src/compose.c:646
 msgid "Move to previous line"
 msgstr "Aller ? la _ligne pr?c?dente"
 
-#: src/compose.c:633
+#: src/compose.c:647
 msgid "Move to next line"
 msgstr "Aller ? la l_igne suivante"
 
-#: src/compose.c:634
+#: src/compose.c:648
 msgid "Delete a character backward"
 msgstr "Supprimer le caract?re _pr?c?dent"
 
-#: src/compose.c:635
+#: src/compose.c:649
 msgid "Delete a character forward"
 msgstr "Supprimer le caract?re _suivant"
 
-#: src/compose.c:636
+#: src/compose.c:650
 msgid "Delete a word backward"
 msgstr "Supprimer le mot p_r?c?dent"
 
-#: src/compose.c:637
+#: src/compose.c:651
 msgid "Delete a word forward"
 msgstr "Supprimer le mot s_uivant"
 
-#: src/compose.c:638
+#: src/compose.c:652
 msgid "Delete line"
 msgstr "_Effacer la ligne"
 
-#: src/compose.c:639
+#: src/compose.c:653
 msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'? la fin de la ligne"
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:656 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Chercher dans le _message.."
 
-#: src/compose.c:645
+#: src/compose.c:659
 msgid "_Wrap current paragraph"
 msgstr "Justifier le _paragraphe actuel"
 
-#: src/compose.c:646
+#: src/compose.c:660
 msgid "Wrap all long _lines"
 msgstr "_Justifier tout le message"
 
-#: src/compose.c:648
+#: src/compose.c:662
 msgid "Edit with e_xternal editor"
 msgstr "?diter avec un ?diteur au_xiliaire"
 
-#: src/compose.c:651
+#: src/compose.c:665
 msgid "_Check all or check selection"
 msgstr "_V?rifier la s?lection ou tout le texte"
 
-#: src/compose.c:652
+#: src/compose.c:666
 msgid "_Highlight all misspelled words"
 msgstr "Montrer les mots _inconnus"
 
-#: src/compose.c:653
+#: src/compose.c:667
 msgid "Check _backwards misspelled word"
 msgstr "V?rifier les mots _pr?c?dents"
 
-#: src/compose.c:654
+#: src/compose.c:668
 msgid "_Forward to next misspelled word"
 msgstr "V?rifier les mots _suivants et avancer"
 
-#: src/compose.c:662
+#: src/compose.c:676
 msgid "Reply _mode"
 msgstr "_Mode de r?ponse"
 
-#: src/compose.c:664
+#: src/compose.c:678
 msgid "Privacy _System"
 msgstr "S_yst?me de confidentialit?"
 
-#: src/compose.c:669
+#: src/compose.c:683
 msgid "_Priority"
 msgstr "_Priorit?"
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:685 src/mainwindow.c:612 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Jeux de caract?res"
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:690 src/mainwindow.c:617 src/messageview.c:269
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:691 src/mainwindow.c:618 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:692 src/mainwindow.c:619 src/messageview.c:271
 msgid "Hebrew"
 msgstr "H?breu"
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:693 src/mainwindow.c:620 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:694 src/mainwindow.c:621 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:695 src/mainwindow.c:622 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:696 src/mainwindow.c:623 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:697 src/mainwindow.c:624 src/messageview.c:276
 msgid "Korean"
 msgstr "Cor?en"
 
-#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:698 src/mainwindow.c:625 src/messageview.c:277
 msgid "Thai"
 msgstr "Tha?landais"
 
-#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:701 src/mainwindow.c:735 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
-#: src/compose.c:689
+#: src/compose.c:703
 msgid "_Template"
 msgstr "_Mod?les"
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:705 src/mainwindow.c:763 src/messageview.c:334
 msgid "Actio_ns"
 msgstr "_Actions"
 
-#: src/compose.c:700
+#: src/compose.c:714
 msgid "Aut_o wrapping"
 msgstr "Justifier aut_omatiquement pendant la saisie"
 
-#: src/compose.c:701
+#: src/compose.c:715
 msgid "Auto _indent"
 msgstr "_Indentation automatique"
 
-#: src/compose.c:702
+#: src/compose.c:716
 msgid "Si_gn"
 msgstr "_signer"
 
-#: src/compose.c:703
+#: src/compose.c:717
 msgid "_Encrypt"
 msgstr "_Chiffrer"
 
-#: src/compose.c:704
+#: src/compose.c:718
 msgid "_Request Return Receipt"
 msgstr "Demander un _accus? de r?ception"
 
-#: src/compose.c:705
+#: src/compose.c:719
 msgid "Remo_ve references"
 msgstr "Supprimer les _r?f?rences"
 
-#: src/compose.c:706
+#: src/compose.c:720
 msgid "Show _ruler"
 msgstr "Afficher la _r?gle"
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:725 src/compose.c:735
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:726 src/mainwindow.c:666 src/messageview.c:302
 msgid "_All"
 msgstr "? _tous"
 
-#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:727 src/mainwindow.c:667 src/messageview.c:303
 msgid "_Sender"
 msgstr "? l'_exp?diteur"
 
-#: src/compose.c:714
+#: src/compose.c:728
 msgid "_Mailing-list"
 msgstr "La _liste"
 
-#: src/compose.c:719
+#: src/compose.c:733
 msgid "_Highest"
 msgstr "La plus _haute"
 
-#: src/compose.c:720
+#: src/compose.c:734
 msgid "Hi_gh"
 msgstr "Haute"
 
-#: src/compose.c:722
+#: src/compose.c:736
 msgid "Lo_w"
 msgstr "Ba_sse"
 
-#: src/compose.c:723
+#: src/compose.c:737
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:742 src/mainwindow.c:881 src/messageview.c:351
 msgid "_Automatic"
 msgstr "_D?tection automatique"
 
-#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:743 src/mainwindow.c:882 src/messageview.c:352
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:744 src/mainwindow.c:883 src/messageview.c:353
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:748 src/mainwindow.c:887 src/messageview.c:357
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:751 src/mainwindow.c:890 src/messageview.c:360
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:756 src/mainwindow.c:895 src/messageview.c:365
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1071
+#: src/compose.c:1085
 msgid "New message From format error."
 msgstr "Erreur de formatage du mod?le d'exp?diteur des nouveaux messages."
 
-#: src/compose.c:1163
+#: src/compose.c:1177
 msgid "New message subject format error."
 msgstr "Erreur de formatage du mod?le de sujet des nouveaux messages."
 
-#: src/compose.c:1194 src/quote_fmt.c:570
+#: src/compose.c:1208 src/quote_fmt.c:570
 #, 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:1455
+#: src/compose.c:1469
 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:1638 src/quote_fmt.c:587
+#: src/compose.c:1652 src/quote_fmt.c:587
 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:1686 src/quote_fmt.c:590
+#: src/compose.c:1700 src/quote_fmt.c:590
 #, 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:1822 src/compose.c:2014 src/quote_fmt.c:607
+#: src/compose.c:1834 src/compose.c:2025 src/quote_fmt.c:607
 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:1882 src/quote_fmt.c:610
+#: src/compose.c:1894 src/quote_fmt.c:610
 #, 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:2056
+#: src/compose.c:2067
 msgid "Fw: multiple emails"
 msgstr "Fw: emails multiples"
 
-#: src/compose.c:2539
+#: src/compose.c:2550
 #, 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:2606 src/gtk/headers.h:14
+#: src/compose.c:2617 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2620 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cci:"
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2623 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "R?pondre ?:"
 
-#: src/compose.c:2615 src/compose.c:4948 src/compose.c:4950
+#: src/compose.c:2626 src/compose.c:4942 src/compose.c:4944
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Groupe de discussion:"
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2629 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Donnant suite ?:"
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2632 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En r?ponse ?:"
 
-#: src/compose.c:2625 src/compose.c:4945 src/compose.c:4953
+#: src/compose.c:2636 src/compose.c:4939 src/compose.c:4947
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
 msgstr "?:"
 
-#: src/compose.c:2834
+#: src/compose.c:2822
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible de joindre le fichier au message (?chec de conversion de jeu de "
 "caract?res)."
 
-#: src/compose.c:2840
+#: src/compose.c:2828
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2542,16 +2542,16 @@ msgstr[1] ""
 "Les fichiers suivants ont ?t? joints au message :\n"
 "%s"
 
-#: src/compose.c:3115
+#: src/compose.c:3103
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Le ? pr?fixe de citation ? du mod?le est invalide."
 
-#: src/compose.c:3615
+#: src/compose.c:3609
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossible de r?cup?rer la taille du fichier '%s'."
 
-#: src/compose.c:3626
+#: src/compose.c:3620
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2560,57 +2560,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:3629
+#: src/compose.c:3623
 msgid "Are you sure?"
 msgstr "?tes-vous s?r ?"
 
-#: src/compose.c:3630 src/compose.c:10510 src/compose.c:11386
+#: src/compose.c:3624 src/compose.c:10496 src/compose.c:11372
 msgid "_Insert"
 msgstr "_Ins?rer"
 
-#: src/compose.c:3754
+#: src/compose.c:3748
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:3755
+#: src/compose.c:3749
 msgid "Empty file"
 msgstr "Fichier vide"
 
-#: src/compose.c:3756
+#: src/compose.c:3750
 msgid "_Attach anyway"
 msgstr "_Attacher quand m?me"
 
-#: src/compose.c:3765
+#: src/compose.c:3759
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:3792
+#: src/compose.c:3786
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4785 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4779 src/plugins/managesieve/sieve_editor.c:694
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [modifi?]"
 
-#: src/compose.c:4792 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4786 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4789 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:4797 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4791 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4824 src/messageview.c:889
+#: src/compose.c:4818 src/messageview.c:889
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2618,55 +2618,55 @@ 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:5044 src/compose.c:5076 src/compose.c:5118
+#: src/compose.c:5038 src/compose.c:5070 src/compose.c:5112
 #: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:5045
+#: src/compose.c:5039
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
-"Le seul destinataire est l'adresse ? Cc: ? par d?faut. Voulez-vous quand "
-"m?me envoyer le message ?"
+"Le seul destinataire est l'adresse ? Cc: ? par d?faut. Voulez-vous quand m?me "
+"envoyer le message ?"
 
-#: src/compose.c:5046 src/compose.c:5078 src/compose.c:5111 src/compose.c:5631
-#: src/folderview.c:2462 src/messageview.c:855 src/messageview.c:872
+#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5105 src/compose.c:5625
+#: src/folderview.c:2548 src/messageview.c:855 src/messageview.c:872
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5077
+#: src/compose.c:5071
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse ? Cci: ? par d?faut. Voulez-vous quand "
 "m?me envoyer le message ?"
 
-#: src/compose.c:5094
+#: src/compose.c:5088
 msgid "Recipient is not specified."
 msgstr "Destinataire non sp?cifi?."
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5107 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:5114
+#: src/compose.c:5108
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand m?me l'envoyer ?"
 
-#: src/compose.c:5116 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5110 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand m?me le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5118 src/toolbar.c:425
+#: src/compose.c:5112 src/toolbar.c:425
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5171 src/compose.c:9974
+#: src/compose.c:5165 src/compose.c:9960
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2676,7 +2676,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caract?res a ?chou?."
 
-#: src/compose.c:5174 src/compose.c:9977
+#: src/compose.c:5168 src/compose.c:9963
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2686,7 +2686,7 @@ msgstr ""
 "\n"
 "La cl? de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5180 src/compose.c:9971
+#: src/compose.c:5174 src/compose.c:9957
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2697,7 +2697,7 @@ msgstr ""
 "\n"
 "Sa signature a ?chou? : %s"
 
-#: src/compose.c:5183
+#: src/compose.c:5177
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2708,11 +2708,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5200 src/compose.c:5260
+#: src/compose.c:5194 src/compose.c:5254
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2720,7 +2720,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:5256
+#: src/compose.c:5250
 #, c-format
 msgid ""
 "%s\n"
@@ -2729,7 +2729,7 @@ msgstr ""
 "%s\n"
 "Utilisez ? Message / Envoyer les messages en file d'attente ? pour r?essayer."
 
-#: src/compose.c:5627
+#: src/compose.c:5621
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2740,7 +2740,7 @@ msgstr ""
 "message vers le jeu de caract?res sp?cifi? (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5685
+#: src/compose.c:5683
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2754,75 +2754,76 @@ msgstr ""
 "\n"
 "Voulez-vous quand m?me l'envoyer ?"
 
-#: src/compose.c:5796
+#: src/compose.c:5794
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossible de chiffrer le message : %s"
 
-#: src/compose.c:5917
+#: src/compose.c:5915
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:5918
+#: src/compose.c:5916
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:5967
+#: src/compose.c:5965
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5976
+#: src/compose.c:5974
 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:6211
+#: src/compose.c:6209
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pi?ce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6212 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6210 src/mainwindow.c:657 src/toolbar.c:231
+#: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6212
+#: src/compose.c:6210
 msgid "Ignore attachment"
 msgstr "Ignorer cette pi?ce jointe"
 
-#: src/compose.c:6252
+#: src/compose.c:6250
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6813
+#: src/compose.c:6811
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6974
+#: src/compose.c:6972
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6978 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6976 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour proc?der ? la compl?tion depuis le carnet "
 "d'adresse"
 
-#: src/compose.c:7193
+#: src/compose.c:7191
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7199 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7197 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:446
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7262
+#: src/compose.c:7260
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7299 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7297 src/editjpilot.c:276 src/editldap.c:519
 #: 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2833,23 +2834,23 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7772
+#: src/compose.c:7770
 msgid "Hea_der"
 msgstr "E_n-t?te"
 
-#: src/compose.c:7777
+#: src/compose.c:7775
 msgid "_Attachments"
 msgstr "Pi?ces _jointes"
 
-#: src/compose.c:7791
+#: src/compose.c:7789
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7806
+#: src/compose.c:7804
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8030
+#: src/compose.c:8028
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2858,19 +2859,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu ?tre lanc?.\n"
 "%s"
 
-#: src/compose.c:8169
+#: src/compose.c:8180
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8186
+#: src/compose.c:8197
 msgid "Account to use for this email"
 msgstr "Compte ? utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8188
+#: src/compose.c:8199
 msgid "Sender address to be used"
 msgstr "Adresse email ? utiliser en tant qu'exp?diteur"
 
-#: src/compose.c:8354
+#: src/compose.c:8365
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2879,68 +2880,68 @@ msgstr ""
 "Le syst?me de confidentialit? '%s' ne peut ?tre charg?. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8455 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8556 src/prefs_template.c:760
+#: src/compose.c:8567 src/prefs_template.c:750
 #, 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:8672
+#: src/compose.c:8683
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-t?te ? De: ? du mod?le."
 
-#: src/compose.c:8690
+#: src/compose.c:8701
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-t?te ? ?: ? du mod?le."
 
-#: src/compose.c:8708
+#: src/compose.c:8719
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cc: ? du mod?le."
 
-#: src/compose.c:8726
+#: src/compose.c:8737
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cci: ? du mod?le."
 
-#: src/compose.c:8744
+#: src/compose.c:8755
 msgid "Template Reply-To format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Reply-To: ? du mod?le."
 
-#: src/compose.c:8763
+#: src/compose.c:8774
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du mod?le."
 
-#: src/compose.c:9032
+#: src/compose.c:9043
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9047
+#: src/compose.c:9058
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9121
+#: src/compose.c:9132
 msgid "Properties"
 msgstr "Propri?t?s"
 
-#: src/compose.c:9138
+#: src/compose.c:9149
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9179
+#: src/compose.c:9190
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9199
+#: src/compose.c:9210
 msgid "Path"
 msgstr "Chemin d'acc?s"
 
-#: src/compose.c:9200
+#: src/compose.c:9211
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9451
+#: src/compose.c:9462
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2951,15 +2952,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9940 src/messageview.c:1083
+#: src/compose.c:9926 src/messageview.c:1083
 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:9966
+#: src/compose.c:9952
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9968
+#: src/compose.c:9954
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2970,15 +2971,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10146
+#: src/compose.c:10132
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10150
+#: src/compose.c:10136
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10151
+#: src/compose.c:10137
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2987,24 +2988,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'?dition de ce message ?"
 
-#: src/compose.c:10153
+#: src/compose.c:10139
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10153
+#: src/compose.c:10139
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10313 src/compose.c:10327
+#: src/compose.c:10299 src/compose.c:10313
 msgid "Select file"
 msgstr "Veuillez s?lectionner un fichier"
 
-#: src/compose.c:10341
+#: src/compose.c:10327
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "?chec lors de la lecture de ? %s ?."
 
-#: src/compose.c:10343
+#: src/compose.c:10329
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3013,54 +3014,54 @@ msgstr ""
 "Le fichier ? %s ? contient des caract?res n'appartenant pas\n"
 "? l'encodage courant : l'insertion peut ?tre incorrecte."
 
-#: src/compose.c:10430
+#: src/compose.c:10416
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10431
+#: src/compose.c:10417
 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:10432 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10418 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10432 src/compose.c:10436
+#: src/compose.c:10418 src/compose.c:10422
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10434 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10420 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10435
+#: src/compose.c:10421
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
 "modifications ?"
 
-#: src/compose.c:10436
+#: src/compose.c:10422
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10507
+#: src/compose.c:10493
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le mod?le ? %s ? ?"
 
-#: src/compose.c:10509
+#: src/compose.c:10495
 msgid "Apply template"
 msgstr "Utiliser le mod?le"
 
-#: src/compose.c:10510 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10496 src/prefs_actions.c:329
+#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11379
+#: src/compose.c:11365
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -3075,20 +3076,20 @@ msgstr[1] ""
 "Voulez-vous ins?rer le contenu des %d fichiers directement dans le corps du "
 "message ou les joindre en tant que pi?ces jointes ?"
 
-#: src/compose.c:11385
+#: src/compose.c:11371
 msgid "Insert or attach?"
 msgstr "Ins?rer ou joindre ?"
 
-#: src/compose.c:11386
+#: src/compose.c:11372
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11604
+#: src/compose.c:11590
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation ? la ligne %d."
 
-#: src/compose.c:11899
+#: src/compose.c:11885
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3448,9 +3449,9 @@ msgid ""
 "computer as Claws Mail."
 msgstr ""
 "Nom du serveur LDAP. Par exemple, ? ldap.exemple.org ? peut ?tre appropri? "
-"pour l'organisation ? exemple.org ?. Une adresse IP peut aussi ?tre "
-"utilis?e. Si le serveur se trouve sur la m?me machine ex?cutant Claws Mail, "
-"? localhost ? peut ?tre utilis?."
+"pour l'organisation ? exemple.org ?. Une adresse IP peut aussi ?tre utilis?e. "
+"Si le serveur se trouve sur la m?me machine ex?cutant Claws Mail, ? localhost "
+"? peut ?tre utilis?."
 
 #: src/editldap.c:470
 msgid "STARTTLS"
@@ -3591,10 +3592,10 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 "La recherche des noms et adresses utilise les crit?res ? begins-with "
-"? (commen?ant par) ou ? contains ? (contenant). Veuillez activer cette "
-"option pour utiliser le crit?re ? contains ? (contenant). Celui-ci est "
-"g?n?ralement plus lent. Pour des raisons de performances, le crit?re ? "
-"begins with ? est n?anmoins toujours utilis? pour la compl?tion d'adresse."
+"? (commen?ant par) ou ? contains ? (contenant). Veuillez activer cette option "
+"pour utiliser le crit?re ? contains ? (contenant). Celui-ci est g?n?ralement "
+"plus 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:702
 msgid "Bind DN"
@@ -3641,7 +3642,7 @@ msgstr "Le nombre maximal d'entr?es ? retourner lors d'une recherche."
 msgid "Basic"
 msgstr "G?n?ral"
 
-#: src/editldap.c:782 src/gtk/quicksearch.c:680
+#: src/editldap.c:782 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Avanc?"
 
@@ -3773,10 +3774,10 @@ msgid "Stylesheet"
 msgstr "Feuille de style"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1191
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5977
+#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5974
 msgid "None"
 msgstr "Aucun"
 
@@ -3974,10 +3975,10 @@ msgid ""
 msgstr ""
 "Le fichier LDIF contient diff?rents enregistrements qui sont habituellement "
 "envoy?s vers un serveur LDAP. Chaque enregistrement est identifi? de mani?re "
-"unique par un ? nom absolu ? (Distinguished Name, DN). Un suffixe est "
-"rajout? au ? nom relatif ? (Relative Distinguished Name, RDN) pour cr?er le "
-"DN. Veuillez s?lectionner une des options RDN propos?es qui sera utilis?e "
-"pour la cr?ation du DN."
+"unique par un ? nom absolu ? (Distinguished Name, DN). Un suffixe est rajout? "
+"au ? nom relatif ? (Relative Distinguished Name, RDN) pour cr?er le DN. "
+"Veuillez s?lectionner une des options RDN propos?es qui sera utilis?e pour "
+"la cr?ation du DN."
 
 #: src/expldifdlg.c:543
 msgid "Use DN attribute if present in data"
@@ -4016,7 +4017,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:8124
+#: src/export.c:113 src/summaryview.c:8118
 msgid "Export to mbox file"
 msgstr "Exporter la s?lection en fichier mbox"
 
@@ -4093,8 +4094,8 @@ msgstr "Impossible de copier %s vers %s"
 #: src/file_checker.c:98
 #, c-format
 msgid ""
-"The file %s is empty or corrupted! Do you want to use the backup file from "
-"%s?"
+"The file %s is empty or corrupted! Do you want to use the backup file from %"
+"s?"
 msgstr ""
 "Le fichier %s est vide ou corrompu ! Voulez-vous utiliser le fichier de "
 "sauvegarde du %s ?"
@@ -4165,8 +4166,8 @@ msgstr "r?gle bas?e sur un compte, saut?e ? la demande de l'utilisateur\n"
 #: src/filtering.c:694
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account [id=%"
+"d, name='%s']\n"
 msgstr ""
 "r?gle bas?e sur un compte [id=%d, nom='%s'], sans correspondance avec le "
 "compte courant [id=%d, nom='%s']\n"
@@ -4179,11 +4180,11 @@ msgstr ""
 #: src/filtering.c:712
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], current account [id=%d, "
-"name='%s']\n"
+"rule is account-based [id=%d, name='%s'], current account [id=%d, name='%"
+"s']\n"
 msgstr ""
-"r?gle bas?e sur un compte [id=%d, nom='%s'], compte courant [id=%d, "
-"nom='%s']\n"
+"r?gle bas?e sur un compte [id=%d, nom='%s'], compte courant [id=%d, nom='%"
+"s']\n"
 
 #: src/filtering.c:752
 #, c-format
@@ -4339,10 +4340,10 @@ msgstr "S?lection d'un dossier"
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:596 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:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
+#: src/foldersel.c:596 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:422 src/plugins/rssyl/rssyl_cb_menu.c:204
 #: src/plugins/vcalendar/vcal_folder.c:2052
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -4363,61 +4364,73 @@ msgstr "Le dossier '%s' existe d?j?."
 msgid "Can't create the folder '%s'."
 msgstr "Impossible de cr?er le dossier '%s'."
 
-#: src/folderview.c:242
+#: src/folderview.c:247
 msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
-#: src/folderview.c:243
+#: src/folderview.c:248
+msgid "Mark all u_nread"
+msgstr "Marquer tou_s comme non lus"
+
+#: src/folderview.c:249
 msgid "Mark all read recursi_vely"
 msgstr "Marquer comme lu r?cursivement"
 
-#: src/folderview.c:245
+#: src/folderview.c:250
+msgid "Mark all unread recursi_vely"
+msgstr "Marquer tous comme non lus r?cursi_vement"
+
+#: src/folderview.c:252
 msgid "R_un processing rules"
 msgstr "Ex?c_uter les r?gles de traitement"
 
-#: src/folderview.c:246 src/mainwindow.c:551
+#: src/folderview.c:253 src/mainwindow.c:553
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
-#: src/folderview.c:248
+#: src/folderview.c:255
 msgid "Process_ing..."
 msgstr "_Traitement.."
 
-#: src/folderview.c:249
+#: src/folderview.c:256
 msgid "Empty _trash..."
 msgstr "_Vider la corbeille.."
 
-#: src/folderview.c:250
+#: src/folderview.c:257
 msgid "Send _queue..."
 msgstr "_Envoyer les messages.."
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6251
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6248
 msgid "New"
 msgstr "Nouveau"
 
-#: src/folderview.c:391 src/folderview.c:438
+#: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6253
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6250
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:392 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:81
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:440 src/summaryview.c:447
+#: src/folderview.c:447 src/summaryview.c:447
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:775
+#: src/folderview.c:782
 msgid "Setting folder info..."
 msgstr "Initialisation des donn?es des dossiers.."
 
-#: src/folderview.c:847
+#: src/folderview.c:867 src/summaryview.c:4113
+msgid "Mark all as read"
+msgstr "Marquer tous comme lus"
+
+#: src/folderview.c:868
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
@@ -4425,102 +4438,115 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme lus ?"
 
-#: src/folderview.c:849 src/summaryview.c:4104
+#: src/folderview.c:870 src/summaryview.c:4114
 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:853 src/summaryview.c:4103
-msgid "Mark all as read"
-msgstr "Marquer tous les messages comme lus"
+#: src/folderview.c:873 src/summaryview.c:4116
+msgid "Mark all as unread"
+msgstr "Marquer tous comme non l_us"
+
+#: src/folderview.c:874
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"unread?"
+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:4117
+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:1032 src/imap.c:4636
+#: src/folderview.c:1067 src/imap.c:4636
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %s/%s.."
 
-#: src/folderview.c:1035 src/imap.c:4640 src/mainwindow.c:5197 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4640 src/mainwindow.c:5210 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1066
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1067
+#: src/folderview.c:1102
 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:1077
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1079
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1170
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1224
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2148
+#: src/folderview.c:2234
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2243
+#: src/folderview.c:2329
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2261
+#: src/folderview.c:2347
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu ?tre ouvert."
 
-#: src/folderview.c:2403 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2489 src/mainwindow.c:2907 src/mainwindow.c:2911
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2404
+#: src/folderview.c:2490
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2405
+#: src/folderview.c:2491
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2448 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2534 src/inc.c:1533 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2449 src/toolbar.c:2608
+#: src/folderview.c:2535 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/folderview.c:2460 src/toolbar.c:2627
+#: src/folderview.c:2546 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2461 src/toolbar.c:2628
+#: src/folderview.c:2547 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2470 src/toolbar.c:2647
+#: src/folderview.c:2556 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2473 src/main.c:2744 src/toolbar.c:2650
+#: src/folderview.c:2559 src/main.c:2748 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4529,67 +4555,67 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2634
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 
-#: src/folderview.c:2549
+#: src/folderview.c:2635
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2637
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2551
+#: src/folderview.c:2637
 msgid "Move folder"
 msgstr "D?placement du dossier"
 
-#: src/folderview.c:2562
+#: src/folderview.c:2648
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2562
+#: src/folderview.c:2648
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "D?placement de %s vers %s.."
 
-#: src/folderview.c:2596
+#: src/folderview.c:2682
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2599
+#: src/folderview.c:2685
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2600
+#: src/folderview.c:2686
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de d?placer un dossier vers un de ses SOUS-DOSSIERS."
 
-#: src/folderview.c:2603
+#: src/folderview.c:2689
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 "Un dossier ne peut ?tre d?plac? ? travers diff?rentes bo?tes aux lettres."
 
-#: src/folderview.c:2606
+#: src/folderview.c:2692
 msgid "Copy failed!"
 msgstr "La copie a ?chou?."
 
-#: src/folderview.c:2606
+#: src/folderview.c:2692
 msgid "Move failed!"
 msgstr "Le d?placement a ?chou?."
 
-#: src/folderview.c:2656
+#: src/folderview.c:2742
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3096 src/summaryview.c:4542 src/summaryview.c:4643
+#: src/folderview.c:3182 src/summaryview.c:4541 src/summaryview.c:4642
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut ?tre utilis? seulement pour stocker des "
@@ -4641,7 +4667,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:1922 src/summaryview.c:1564
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1572
 msgid "Done."
 msgstr "Termin?."
 
@@ -4861,44 +4887,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:698 src/main.c:2568
+#: src/gtk/about.c:698 src/main.c:2572
 msgid "Session statistics\n"
 msgstr "Statistiques de la session\n"
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2578 src/main.c:2581
+#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2582 src/main.c:2585
 #, c-format
 msgid "Started: %s\n"
 msgstr "D?marr?e le : %s\n"
 
-#: src/gtk/about.c:718 src/main.c:2587
+#: src/gtk/about.c:718 src/main.c:2591
 msgid "Incoming traffic\n"
 msgstr "Trafic entrant\n"
 
-#: src/gtk/about.c:721 src/main.c:2590
+#: src/gtk/about.c:721 src/main.c:2594
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Messages re?us: %d\n"
 
-#: src/gtk/about.c:728 src/main.c:2596
+#: src/gtk/about.c:728 src/main.c:2600
 msgid "Outgoing traffic\n"
 msgstr "Trafic sortant\n"
 
-#: src/gtk/about.c:731 src/main.c:2599
+#: src/gtk/about.c:731 src/main.c:2603
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nouveaux messages et redirections: %d\n"
 
-#: src/gtk/about.c:736 src/main.c:2603
+#: src/gtk/about.c:736 src/main.c:2607
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "R?ponses: %d\n"
 
-#: src/gtk/about.c:741 src/main.c:2607
+#: src/gtk/about.c:741 src/main.c:2611
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Messages transf?r?s: %d\n"
 
-#: src/gtk/about.c:746 src/main.c:2611
+#: src/gtk/about.c:746 src/main.c:2615
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total des messages sortants: %d\n"
@@ -5338,7 +5364,7 @@ msgstr "Consult? :"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
 #: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2812
+#: src/prefs_summary_column.c:79 src/summaryview.c:2798
 msgid "Status"
 msgstr "?tat"
 
@@ -5781,7 +5807,7 @@ 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:844
 msgid "_Hide"
 msgstr "_Cacher"
 
@@ -5794,208 +5820,208 @@ msgstr "_Cacher"
 msgid "Account"
 msgstr "Compte"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:479
 msgid "all messages"
 msgstr "tous les messages"
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:480
 msgid "messages whose age is greater than # days"
 msgstr "messages ?g?s de plus de # jours"
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:481
 msgid "messages whose age is less than # days"
 msgstr "messages ag?s de moins de # jours"
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:482
 msgid "messages whose age is greater than # hours"
 msgstr "messages ?g?s de plus de # heures"
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:483
 msgid "messages whose age is less than # hours"
 msgstr "messages ag?s de moins de # heures"
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:484
 msgid "messages which contain S in the message body"
 msgstr "messages contenant S dans leur corps"
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:485
 msgid "messages which contain S in the whole message"
 msgstr "message contenant S"
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:486
 msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-t?te ? Cc: ?"
 
-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:487
 msgid "message is either to: or cc: to S"
 msgstr "messages contenant S dans les en-t?tes ? ?: ? ou ? Cc: ?"
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:488
 msgid "deleted messages"
 msgstr "messages supprim?s"
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:489
 msgid "messages which contain S in the Sender field"
 msgstr "messages contenant S dans l'en-t?te d'exp?diteur (en-t?te ? Sender: ?)"
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:490
 msgid "true if execute \"S\" succeeds"
 msgstr "vrai si l'ex?cution de ? S ? r?ussit"
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:491
 msgid "messages originating from user S"
 msgstr "messages venant de l'exp?diteur S"
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:492
 msgid "forwarded messages"
 msgstr "messages transf?r?s"
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:493
 msgid "messages which have attachments"
 msgstr "messages avec pi?ces jointes"
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in any header name or value"
 msgstr "messages contenant S dans un nom d'en-t?te ou sa valeur"
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:495
 msgid "messages which contain S in the value of any header"
 msgstr "messages contenant S dans la valeur d'un en-t?te"
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:496
 msgid "messages which contain S in Message-ID header"
 msgstr "messages contenant S dans l'en-t?te ? Message-Id: ?"
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:497
 msgid "messages which contain S in In-Reply-To header"
 msgstr "messages contenant S dans l'en-t?te ? In-Reply-To: ?"
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:498
 msgid "messages which are marked with color #"
 msgstr "messages marqu?s de la couleur n?#"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:499
 msgid "locked messages"
 msgstr "messages verrouill?s"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:500
 msgid "messages which are in newsgroup S"
 msgstr "messages appartenant au groupe de discussion S"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:501
 msgid "new messages"
 msgstr "nouveaux messages"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:502
 msgid "old messages"
 msgstr "messages anciens"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:503
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messages incomplets (partiellement t?l?charg?s)"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:504
 msgid "messages which you have replied to"
 msgstr "messages auxquels vous avez r?pondu"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:505
 msgid "read messages"
 msgstr "messages lus"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:506
 msgid "messages which contain S in subject"
 msgstr "messages contenant S dans le sujet"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:507
 msgid "messages whose score is equal to # points"
 msgstr "messages dont le score est ?gal ? # points"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:508
 msgid "messages whose score is greater than # points"
 msgstr "messages dont le score est plus grand que # points"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:509
 msgid "messages whose score is lower than # points"
 msgstr "messages dont le score est plus petit que # points"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:510
 msgid "messages whose size is equal to # bytes"
 msgstr "messages dont la taille est ?gale ? # octets"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:511
 msgid "messages whose size is greater than # bytes"
 msgstr "messages dont la taille est plus grande que # octets"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:512
 msgid "messages whose size is smaller than # bytes"
 msgstr "messages dont la taille est plus petite que # octets"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:513
 msgid "messages which have been sent to S"
 msgstr "messages qui ont ?t? envoy?s ? S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:514
 msgid "messages which tags contain S"
 msgstr "messages dont les labels contiennent S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:515
 msgid "messages which have tag(s)"
 msgstr "messages labellis?s"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:516
 msgid "marked messages"
 msgstr "messages marqu?s"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:517
 msgid "unread messages"
 msgstr "messages non lus"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:518
 msgid "messages which contain S in References header"
 msgstr "messages contenant S dans l'en-t?te ? References: ?"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:519
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messages qui, pass?s ? la commande ? cmd ?, lui font faire\n"
 "retourner 0 (%F ?tant le fichier correspondant au message)"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:520
 msgid "messages which contain S in X-Label header"
 msgstr "messages contenant S dans l'en-t?te ? X-Label: ?"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:522
 msgid "logical AND operator"
 msgstr "op?rateur logique ET"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:523
 msgid "logical OR operator"
 msgstr "op?rateur logique OU"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:524
 msgid "logical NOT operator"
 msgstr "op?rateur logique NON"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:525
 msgid "case sensitive search"
 msgstr "recherche sensible ? la casse"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:526
 msgid "match using regular expressions instead of substring search"
 msgstr ""
 "correspondance ? l'aide d'expressions r?guli?res au lieu de recherche de "
 "sous-cha?nes"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:528
 msgid "all filtering expressions are allowed"
 msgstr "L'ensemble des conditions de filtrage est utilisable."
 
-#: src/gtk/quicksearch.c:509 src/summary_search.c:471
+#: src/gtk/quicksearch.c:537 src/summary_search.c:471
 msgid "Extended Search"
 msgstr "Recherche avanc?e"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:538
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -6006,51 +6032,51 @@ msgstr ""
 "r?pondant ? ces crit?res.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/gtk/quicksearch.c:610
+#: src/gtk/quicksearch.c:638
 msgid "Something went wrong during search. Please check your logs."
 msgstr "La recherche a ?chou?. Consultez les traces d'activit?s."
 
-#: src/gtk/quicksearch.c:676
+#: src/gtk/quicksearch.c:704
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/?/Cc/Sujet/Label"
 
-#: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
+#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
 msgstr "R?cursif"
 
-#: src/gtk/quicksearch.c:696
+#: src/gtk/quicksearch.c:724
 msgid "Sticky"
 msgstr "Permanent"
 
-#: src/gtk/quicksearch.c:706
+#: src/gtk/quicksearch.c:734
 msgid "Type-ahead"
 msgstr "Dynamique"
 
-#: src/gtk/quicksearch.c:718
+#: src/gtk/quicksearch.c:746
 msgid "Run on select"
 msgstr "S?lection validante"
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:788
 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 
-#: src/gtk/quicksearch.c:770 src/summary_search.c:424
+#: src/gtk/quicksearch.c:798 src/summary_search.c:424
 msgid "Edit search criteria"
 msgstr "?dition des crit?res de recherche"
 
-#: src/gtk/quicksearch.c:779
+#: src/gtk/quicksearch.c:807
 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avanc?e"
 
-#: src/gtk/quicksearch.c:817 src/gtk/quicksearch.c:832
+#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
+#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
 msgid "E_dit"
 msgstr "E_dition"
 
-#: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
+#: 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
 msgid "C_lear"
 msgstr "_Effacer"
@@ -6202,15 +6228,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:884 src/summaryview.c:3383
-#: src/summaryview.c:3401 src/summaryview.c:3422
+#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3369
+#: src/summaryview.c:3387 src/summaryview.c:3408
 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:887 src/summaryview.c:3434
-#: src/summaryview.c:3437
+#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3420
+#: src/summaryview.c:3423
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -6801,7 +6827,7 @@ msgstr "_Rechercher"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Choisir un sous-dossier de '%s' auquel vous souhaitez vous inscrire : "
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:528 src/mainwindow.c:681
 msgid "Subscribe"
 msgstr "S'inscrire"
 
@@ -6819,8 +6845,8 @@ msgstr ""
 "Vous ?tes d?j? inscrit ? ce dossier et il ne contient aucun sous-dossier "
 "auquel vous n'?tes pas inscrit.S'il y a des nouveaux dossiers, cr??s et "
 "auxquels vous vous ?tes d?j? inscrit depuis un autre client, vous pouvez "
-"utiliser ?  Examiner pour de nouveaux dossiers ? depuis le menu contextuel "
-"du dossier racine de chaque bo?te aux lettres."
+"utiliser ?  Examiner pour de nouveaux dossiers ? depuis le menu contextuel du "
+"dossier racine de chaque bo?te aux lettres."
 
 #: src/imap_gtk.c:557
 #, c-format
@@ -6835,8 +6861,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "d?sinscrire du"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432 src/prefs_folder_item.c:1460
-#: src/prefs_folder_item.c:1488
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432
+#: src/prefs_folder_item.c:1460 src/prefs_folder_item.c:1488
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -6967,12 +6993,12 @@ msgid ""
 msgstr ""
 "Veuillez choisir, dans la liste ci-dessous, le champ LDIF devant ?tre "
 "renomm? ou s?lectionn? pour l'import. Les champs reserv?s (marqu?s dans la "
-"colonne ? R ?), sont automatiquement import?s et ne peuvent ?tre renomm?s. "
-"Un clique dans la colonne de s?lection (? S ?) permet de s?lectionner le "
-"champ pour l'import. Un clique en dehors de cette colonne s?lectionne le "
-"champ pour le renommer dans le champ de saisie au-dessous de la liste. Un "
-"double-clique ?galement en dehors de cette colonne permet de s?lectionner le "
-"champ pour l'import."
+"colonne ? R ?), sont automatiquement import?s et ne peuvent ?tre renomm?s. Un "
+"clique dans la colonne de s?lection (? S ?) permet de s?lectionner le champ "
+"pour l'import. Un clique en dehors de cette colonne s?lectionne le champ "
+"pour le renommer dans le champ de saisie au-dessous de la liste. Un double-"
+"clique ?galement en dehors de cette colonne permet de s?lectionner le champ "
+"pour l'import."
 
 #: src/importldif.c:822
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -7081,7 +7107,7 @@ msgid "Auth failed"
 msgstr "L'authentification a ?chou?"
 
 #: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2808 src/summaryview.c:6277
+#: src/prefs_summary_column.c:88 src/summaryview.c:2794 src/summaryview.c:6274
 msgid "Locked"
 msgstr "Verrouill?"
 
@@ -7337,15 +7363,15 @@ msgstr "La migration a ?chou? !"
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration.."
 
-#: src/main.c:1120
+#: src/main.c:1124
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non support? par glib.\n"
 
-#: src/main.c:1140 src/main.c:1144 src/main.c:1148
+#: src/main.c:1144 src/main.c:1148 src/main.c:1152
 msgid "(or older)"
 msgstr "(ou ant?rieure)"
 
-#: src/main.c:1449
+#: src/main.c:1453
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7364,7 +7390,7 @@ msgstr[1] ""
 "configuration des modules pour de plus amples informations :\n"
 "%s"
 
-#: src/main.c:1500
+#: src/main.c:1504
 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 "
@@ -7375,7 +7401,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:1506
+#: src/main.c:1510
 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 "
@@ -7385,36 +7411,36 @@ msgstr ""
 "est probablement d? ? la caducit? d'un module externe. Veuillez r?-installer "
 "le module et essayer ? nouveau."
 
-#: src/main.c:1751
+#: src/main.c:1755
 msgid "Missing filename\n"
 msgstr "Nom de fichier manquant\n"
 
-#: src/main.c:1758
+#: src/main.c:1762
 msgid "Cannot open filename for reading\n"
 msgstr "Impossible d'ouvrir le fichier en lecture\n"
 
-#: src/main.c:1769
+#: src/main.c:1773
 msgid "Malformed header\n"
 msgstr "En-t?te non conforme\n"
 
-#: src/main.c:1776
+#: src/main.c:1780
 msgid "Duplicated 'To:' header\n"
 msgstr "En-t?te '?:' en plusieurs exemplaires\n"
 
-#: src/main.c:1787
+#: src/main.c:1791
 msgid "Missing required 'To:' header\n"
 msgstr "L'en-t?te 'To:' est manquant\n"
 
-#: src/main.c:1930
+#: src/main.c:1934
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]..\n"
 
-#: src/main.c:1932
+#: src/main.c:1936
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fen?tre de composition de message"
 
-#: src/main.c:1933
+#: src/main.c:1937
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7434,7 +7460,7 @@ msgstr ""
 "                         jusqu'? une ligne vide, puis le corps de message "
 "jusqu'? la fin de fichier"
 
-#: src/main.c:1938
+#: src/main.c:1942
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donn? (requiert\n"
@@ -7442,7 +7468,7 @@ msgstr ""
 "                         de nouvelles, ou ? vCalendar ? , gestionnaire de\n"
 "                         rendez-vous et calendriers en ligne)"
 
-#: src/main.c:1939
+#: src/main.c:1943
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7452,25 +7478,25 @@ msgstr ""
 "                         ouvrir une fen?tre de composition avec les\n"
 "                         fichiers sp?cifi?s attach?s"
 
-#: src/main.c:1942
+#: src/main.c:1946
 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              r?cup?rer les nouveaux messages (du compte courant)"
 
-#: src/main.c:1943
+#: src/main.c:1947
 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:1944
+#: src/main.c:1948
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuler la r?cup?ration des messages"
 
-#: src/main.c:1945
+#: src/main.c:1949
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuler l'envoi des messages"
 
-#: src/main.c:1946
+#: src/main.c:1950
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7482,25 +7508,24 @@ msgid ""
 msgstr ""
 "  --search dossier type texte [r?cursif]\n"
 "                         rechercher des messages\n"
-"                         dossier, par ex. : ? #mh/Mailbox/inbox ? ou ? Mail "
-"?\n"
+"                         dossier, par ex. : ? #mh/Mailbox/inbox ? ou ? Mail ?\n"
 "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] ou "
 "g: tag\n"
 "                         texte: cha?ne de texte ? chercher\n"
 "                         r?cursif: aucune si l'argument commence par 0, n, "
 "N, f ou F"
 
-#: src/main.c:1953
+#: src/main.c:1957
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:1954
+#: src/main.c:1958
 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:1955
+#: src/main.c:1959
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7508,15 +7533,15 @@ msgstr ""
 "  --status-full [dossier]..\n"
 "                         afficher le nombre de messages de chaque dossier"
 
-#: src/main.c:1957
+#: src/main.c:1961
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           affiche les statistiques de la session"
 
-#: src/main.c:1958
+#: src/main.c:1962
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     r?initialise les statistiques de la session"
 
-#: src/main.c:1959
+#: src/main.c:1963
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -7527,35 +7552,35 @@ msgstr ""
 "voici\n"
 "                         un exemple de syntaxe : 'dossier/sous_dossier'"
 
-#: src/main.c:1961
+#: src/main.c:1965
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
-#: src/main.c:1962
+#: src/main.c:1966
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
-#: src/main.c:1963
+#: src/main.c:1967
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
-#: src/main.c:1964
+#: src/main.c:1968
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de d?boguage"
 
-#: src/main.c:1965
+#: src/main.c:1969
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         changer le mode debug"
 
-#: src/main.c:1966
+#: src/main.c:1970
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
-#: src/main.c:1967
+#: src/main.c:1971
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
-#: src/main.c:1968
+#: src/main.c:1972
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -7563,12 +7588,12 @@ msgstr ""
 "  --version-full -V      afficher la version et les informations concernant\n"
 "                         les options int?gr?es et terminer"
 
-#: src/main.c:1969
+#: src/main.c:1973
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 
-#: src/main.c:1970
+#: src/main.c:1974
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -7576,7 +7601,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         utiliser le dossier de configuration sp?cifi?"
 
-#: src/main.c:1972
+#: src/main.c:1976
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -7584,850 +7609,854 @@ msgstr ""
 "  --geometry -geometry LxH+X+Y\n"
 "                         d?finir la g?om?trie de la fen?tre principale"
 
-#: src/main.c:2025
+#: src/main.c:2029
 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: ? claws-mail --help ?.\n"
 
-#: src/main.c:2043
+#: src/main.c:2047
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s).."
 
-#: src/main.c:2046
+#: src/main.c:2050
 msgid "top level folder"
 msgstr "dossier racine"
 
-#: src/main.c:2129
+#: src/main.c:2133
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:2130
+#: src/main.c:2134
 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:2872
+#: src/main.c:2876
 msgid "NetworkManager: network is online.\n"
 msgstr "Gestionnaire r?seau : le r?seau est activ?.\n"
 
-#: src/main.c:2878
+#: src/main.c:2882
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire r?seau : le r?seau est d?sactiv?.\n"
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:513 src/messageview.c:208
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:435
+#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:435
 msgid "_View"
 msgstr "_Vue"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "_Configuration"
 msgstr "_Configuration"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "_Add mailbox"
 msgstr "_Ajouter une bo?te aux lettres"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "MH..."
 msgstr "_MH.."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "Change mailbox order..."
 msgstr "Changer l'ordre des bo?tes aux lettres.."
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:529
 msgid "_Import mbox file..."
 msgstr "I_mporter un fichier mbox.."
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "_Export to mbox file..."
 msgstr "E_xporter vers un fichier mbox.."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:531
 msgid "_Export selected to mbox file..."
 msgstr "_Exporter la s?lection en fichier mbox.."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:536 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:537 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:540 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:541 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Imprimer.."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:543
 msgid "Synchronise folders"
 msgstr "S_ynchroniser les dossiers distants"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:545
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:550
 msgid "Select _thread"
 msgstr "S?lectionner la discussi_on"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:552
 msgid "_Find in current message..."
 msgstr "Chercher dans le _message.."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:554
 msgid "_Quick search"
 msgstr "_Recherche rapide"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:557
 msgid "Show or hi_de"
 msgstr "Afficher _ou cacher"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:558
 msgid "_Toolbar"
 msgstr "Barre d'_outils"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "Set displayed _columns"
 msgstr "S?lect_ion des ?l?ments affich?s"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:561
 msgid "In _folder list..."
 msgstr "Dans la liste des _dossiers.."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:562
 msgid "In _message list..."
 msgstr "Dans la liste des _messages.."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:567
 msgid "La_yout"
 msgstr "_Disposition"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "_Attract by subject"
 msgstr "Attirer par s_ujet"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "E_xpand all threads"
 msgstr "D?plo_yer les fils de discussion"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:575
 msgid "Co_llapse all threads"
 msgstr "Com_pacter les fils de discussion"
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:577 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Aller ?"
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:578 src/messageview.c:232
 msgid "_Previous message"
 msgstr "Message _pr?c?dent"
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:579 src/messageview.c:233
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
-#: src/mainwindow.c:579 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:580 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
-#: src/mainwindow.c:582 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:583 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:585 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:586 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "_Marqu? suivant"
 
-#: src/mainwindow.c:588 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:589 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "_Colori? suivant"
 
-#: src/mainwindow.c:591 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:592 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:596 src/messageview.c:250
 msgid "Parent message"
 msgstr "Message paren_t"
 
-#: src/mainwindow.c:596 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:597 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:253
 msgid "F_older..."
 msgstr "Dossier..."
 
-#: src/mainwindow.c:599 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:600 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:603 src/messageview.c:257
+#: src/mainwindow.c:605 src/messageview.c:257
 msgid "Message scroll"
 msgstr "D?filement du message"
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:606 src/messageview.c:258
 msgid "Previous line"
 msgstr "Ligne pr?c?dente"
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:607 src/messageview.c:259
 msgid "Next line"
 msgstr "Ligne suivante"
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:608 src/messageview.c:260 src/printing.c:481
 msgid "Previous page"
 msgstr "Page pr?c?dente"
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:609 src/messageview.c:261 src/printing.c:488
 msgid "Next page"
 msgstr "Page suivante"
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:627 src/messageview.c:279
 msgid "Decode"
 msgstr "D?coda_ge"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:634
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fen?tre"
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:635 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:637 src/messageview.c:287
 msgid "Message part"
 msgstr "Message"
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:638 src/messageview.c:288
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:639 src/messageview.c:289 src/toolbar.c:403
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:291
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:645 src/messageview.c:294
 msgid "Quotes"
 msgstr "_Citations"
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:647
 msgid "_Update summary"
 msgstr "Mettre ? jo_ur"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:650
 msgid "Recei_ve"
 msgstr "R?ce_ption"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:651
 msgid "Get from _current account"
 msgstr "Relever le courrier du compte _courant"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:652
 msgid "Get from _all accounts"
 msgstr "Relever le courrier de _tous les comptes"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:653
 msgid "Cancel receivin_g"
 msgstr "_Interrompre la rel?ve du courrier"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:656
 msgid "_Send queued messages"
 msgstr "En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "Compose a_n email message"
 msgstr "Composer un _nouveau message"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:662
 msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
-#: src/mainwindow.c:662 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:663 src/messageview.c:301 src/summaryview.c:427
+#: src/mainwindow.c:665 src/messageview.c:301 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr "R?p_ondre ?"
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:668 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:669
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et r?pondre ?"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:672 src/messageview.c:307 src/toolbar.c:2069
 msgid "_Forward"
 msgstr "_Transf?rer"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:673 src/messageview.c:308 src/toolbar.c:2070
 msgid "For_ward as attachment"
 msgstr "Transf?rer en _pi?ce jointe"
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:674 src/messageview.c:309 src/toolbar.c:2071
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:676
 msgid "Mailing-_List"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:677
 msgid "Post"
 msgstr "?crire ? la liste"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:679
 msgid "Help"
 msgstr "_Aide"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:683
 msgid "Unsubscribe"
 msgstr "Se _d?sinscrire"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "View archive"
 msgstr "Voir l'archive"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:687
 msgid "Contact owner"
 msgstr "Contacter le _propri?taire"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "M_ove..."
 msgstr "_D?placer.."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "_Copy..."
 msgstr "_Copier.."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "Move to _trash"
 msgstr "D?placer ver_s la corbeille"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:694
 msgid "_Delete..."
 msgstr "S_upprimer d?finitivement.."
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "Move thread to tr_ash"
 msgstr "D?placer ver_s la corbeille"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:696
 msgid "Delete t_hread"
 msgstr "S_upprimer la discussion"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:697
 msgid "Cancel a news message"
 msgstr "E_ffacer un article du serveur"
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:428
+#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:428
 msgid "_Mark"
 msgstr "_Marquer"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:702
 msgid "_Unmark"
 msgstr "_D?marquer"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:705
 msgid "Mark as unr_ead"
 msgstr "Marquer comme _non lu"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Marquer comme _lu"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:708
 msgid "Mark all read"
 msgstr "Marquer _tous comme lus"
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
+#: src/mainwindow.c:709
+msgid "Mark all unread"
+msgstr "Marquer _tous comme non lus"
+
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:208
 #: src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Ignorer du f_il de discussion"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:712
 msgid "Unignore thread"
-msgstr "Inclure dans _fil de discussion"
+msgstr "Inclure dans f_il de discussion"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:209
 #: src/toolbar.c:420
 msgid "Watch thread"
 msgstr "_Suivre le fil de discussion"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:714
 msgid "Unwatch thread"
-msgstr "Ne _plus suivre le fil"
+msgstr "Ne plus sui_vre le fil"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:717
 msgid "Mark as _spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:718
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _l?gitime"
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:181
 msgid "Lock"
 msgstr "_Bloquer"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:182
 msgid "Unlock"
-msgstr "D?bloquer"
+msgstr "D?blo_quer"
 
-#: src/mainwindow.c:721 src/summaryview.c:429
+#: src/mainwindow.c:724 src/summaryview.c:429
 msgid "Color la_bel"
 msgstr "C_olorier"
 
-#: src/mainwindow.c:722 src/summaryview.c:430
+#: src/mainwindow.c:725 src/summaryview.c:430
 msgid "Ta_gs"
 msgstr "La_bels"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:728
 msgid "Re-_edit"
 msgstr "R??d_iter"
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:731 src/messageview.c:310 src/mimeview.c:1021
 msgid "Check signature"
 msgstr "V?rifier la signature"
 
-#: src/mainwindow.c:733 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:735
+#: src/mainwindow.c:738
 msgid "C_ollect addresses"
 msgstr "R?cup?ration des adresses"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "From current _folder..."
 msgstr "? partir du dossier actuel.."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:740
 msgid "From selected _messages..."
 msgstr "? partir des _messages s?lectionn?s.."
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:743
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer tous les messages du dossier"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:744
 msgid "Filter _selected messages"
 msgstr "Filtrer les messages _s?lectionn?s"
 
-#: src/mainwindow.c:742
+#: 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:744 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:745 src/mainwindow.c:751 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:746 src/mainwindow.c:752 src/mainwindow.c:858
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Par _De"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:862
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "A_vec ? ?: ?"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 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:750 src/messageview.c:323 src/summaryview.c:433
+#: src/mainwindow.c:753 src/messageview.c:323 src/summaryview.c:433
 msgid "Create processing rule"
 msgstr "Cr?er une r?gle de traite_ment"
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:760 src/messageview.c:331
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "Ch_eck for new messages in all folders"
 msgstr "Examen de tous les dossiers pour _nouveaux messages"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:768
 msgid "Delete du_plicated messages"
 msgstr "Supprimer les messages en _double"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:769
 msgid "In selected folder"
 msgstr "Dans le dossier s?lectionn?"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:770
 msgid "In all folders"
 msgstr "Dans tous les dossiers"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "E_xecute"
 msgstr "E_x?cuter"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "Exp_unge"
 msgstr "P_urger"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "SSL/TLS cer_tificates"
 msgstr "C_ertificats SSL/TLS"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:781
 msgid "Filtering Lo_g"
 msgstr "Traces de _filtrage"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:783
 msgid "Network _Log"
 msgstr "Traces _r?seaux"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:785
 msgid "_Forget all session passwords"
 msgstr "Oublier tous mots de passe des sessions"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:787
 msgid "Forget _master passphrase"
 msgstr "Oublier la phrase secr?te principale"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:791
 msgid "C_hange current account"
 msgstr "_S?lectionner un autre compte"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:793
 msgid "_Preferences for current account..."
 msgstr "_Configuration du compte courant.."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:794
 msgid "Create _new account..."
 msgstr "Cr?ation d'un _nouveau compte.."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:795
 msgid "_Edit accounts..."
 msgstr "?dition des _comptes.."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:798
 msgid "P_references..."
 msgstr "_Pr?f?rences.."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:799
 msgid "Pre-pr_ocessing..."
 msgstr "P_r?-traitement.."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:800
 msgid "Post-pro_cessing..."
 msgstr "P_ost-traitement.."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:801
 msgid "_Filtering..."
 msgstr "_Filtrage des messages.."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:802
 msgid "_Templates..."
 msgstr "_Mod?les.."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:803
 msgid "_Actions..."
 msgstr "_Actions.."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:804
 msgid "Tag_s..."
 msgstr "_Labels.."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:806
 msgid "Plu_gins..."
 msgstr "Mo_dules.."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:809
 msgid "_Manual"
 msgstr "_Manuel"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:810
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ en ligne autog?r?e"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:811
 msgid "Icon _Legend"
 msgstr "_L?gende des ic?nes"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:813
 msgid "Set as default client"
 msgstr "D?finir comme client par d?faut"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:820
 msgid "Offline _mode"
 msgstr "_Travailler hors-ligne"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:821
 msgid "Men_ubar"
 msgstr "Barre de Men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "_Message view"
 msgstr "Vue du _message"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:824
 msgid "Status _bar"
 msgstr "_Barre d'?tat"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:826
 msgid "Column headers"
 msgstr "_En-t?te de colonnes"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:827
 msgid "Th_read view"
 msgstr "Vue par _fil de discussion"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:828
 msgid "Hide read threads"
 msgstr "Cacher les fils lus"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:829
 msgid "_Hide read messages"
 msgstr "Cacher les messages _lus"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:830
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprim?s"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:831
 msgid "_Fullscreen"
 msgstr "Plei_n ?cran"
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:832 src/messageview.c:343
 msgid "Show all _headers"
 msgstr "Tous les _en-t?tes"
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:833 src/messageview.c:344
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:834 src/messageview.c:345
 msgid "Collapse from level _2"
 msgstr "Replier ? partir du niveau _2"
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:835 src/messageview.c:346
 msgid "Collapse from level _3"
 msgstr "Replier ? partir du niveau _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:839
 msgid "Text _below icons"
 msgstr "Texte _sous les ic?nes"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:840
 msgid "Text be_side icons"
 msgstr "Texte _contre les ic?nes"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:841
 msgid "_Icons only"
 msgstr "_Ic?nes seules"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:842
 msgid "_Text only"
 msgstr "_Texte seul"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:849
 msgid "_Standard"
 msgstr "_Classique"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:850
 msgid "_Three columns"
 msgstr "_Trois colonnes"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:851
 msgid "_Wide message"
 msgstr "Vue des _messages ?tendue"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:852
 msgid "W_ide message list"
 msgstr "_Liste des messages ?tendue"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:853
 msgid "S_mall screen"
 msgstr "_Petit ?cran"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:857
 msgid "By _number"
 msgstr "Par _num?ro"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:858
 msgid "By s_ize"
 msgstr "Par taille"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:859
 msgid "By _date"
 msgstr "Par da_te"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:860
 msgid "By thread date"
 msgstr "Par date du _fil"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:863
 msgid "By s_ubject"
 msgstr "Par s_ujet"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:864
 msgid "By _color label"
 msgstr "Par _couleur"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:865
 msgid "By tag"
 msgstr "Par _label"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:866
 msgid "By _mark"
 msgstr "Par _marque"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:867
 msgid "By _status"
 msgstr "Par ?t_at"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:868
 msgid "By a_ttachment"
 msgstr "Par _pi?ce jointe"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:869
 msgid "By score"
 msgstr "Par sc_ore"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:870
 msgid "By locked"
 msgstr "Par _verrouill?s"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:871
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:875 src/prefs_summaries.c:455
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:876 src/prefs_summaries.c:456
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:918 src/messageview.c:388
 msgid "_Auto detect"
 msgstr "D?tection _automatique"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6203
+#: src/mainwindow.c:1315 src/summaryview.c:6200
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1963
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Une ou plusieurs erreurs sont survenues. Cliquez-ici pour voir les traces."
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1978
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Vous ?tes en ligne. Veuillez cliquer sur l'ic?ne pour aller hors-ligne."
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1981
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Vous ?tes hors-ligne. Veuillez cliquer sur l'ic?ne pour aller en ligne."
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1995
 msgid "Select account"
 msgstr "S?lectionner un compte"
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2022 src/prefs_logging.c:140
 msgid "Network log"
 msgstr "Traces r?seaux"
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2026
 msgid "Filtering/Processing debug log"
 msgstr "Traces de d?bogage du filtrage/traitement"
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2045 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
 msgstr "Le tra?age du filtrage est activ?.\n"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2047 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
 msgstr "Le tra?age du filtrage est d?sactiv?.\n"
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2490 src/mainwindow.c:2497 src/mainwindow.c:2540
+#: src/mainwindow.c:2573 src/mainwindow.c:2605 src/mainwindow.c:2650
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2651 src/prefs_summary_open.c:116
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2908 src/mainwindow.c:2912
 msgid "Delete all messages in trash folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2909
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle bo?te aux lettres"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2939
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -8436,18 +8465,18 @@ msgstr ""
 "Veuillez saisir le chemin vers la bo?te aux lettres :\n"
 "(Si elle existe d?j?, elle sera automatiquement analys?e.)"
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2945 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:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:740
 msgid "Mailbox"
 msgstr "Bo?te aux lettres"
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2955 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 "
@@ -8457,84 +8486,84 @@ msgstr ""
 "Il se peut que les fichiers existent d?j?, ou que vous n'ayez pas les droits "
 "en ?criture."
 
-#: src/mainwindow.c:3417
+#: src/mainwindow.c:3424
 msgid "No posting allowed"
 msgstr "Envoi de message non autoris?"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4007
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a ?chou?."
 
-#: src/mainwindow.c:4009 src/mainwindow.c:4018
+#: src/mainwindow.c:4016 src/mainwindow.c:4025
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a ?chou?."
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4066 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4066 src/plugins/notification/notification_trayicon.c:548
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4250
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4251
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "_Synchroniser"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4706
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4730
+#: src/mainwindow.c:4743
 #, 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:4986 src/summaryview.c:5694
+#: src/mainwindow.c:4999 src/summaryview.c:5691
 msgid "Processing rules to apply before folder rules"
 msgstr "R?gles de traitement ? appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:4994
+#: src/mainwindow.c:5007
 msgid "Processing rules to apply after folder rules"
 msgstr "R?gles de traitement ? appliquer apr?s le filtrage des dossiers"
 
-#: src/mainwindow.c:5002 src/summaryview.c:5705
+#: src/mainwindow.c:5015 src/summaryview.c:5702
 msgid "Filtering configuration"
 msgstr "R?gles de filtrage"
 
-#: src/mainwindow.c:5117
+#: src/mainwindow.c:5130
 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:5176
+#: src/mainwindow.c:5189
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par d?faut."
 
-#: src/mainwindow.c:5178
+#: src/mainwindow.c:5191
 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:5192 src/setup.c:91
+#: src/mainwindow.c:5205 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/mainwindow.c:5336
+#: src/mainwindow.c:5349
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8615,7 +8644,7 @@ 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:1842 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3076
+#: src/prefs_themes.c:533 src/textview.c:3085
 msgid "Overwrite"
 msgstr "?craser"
 
@@ -8660,7 +8689,7 @@ msgstr "Fin de message atteint, reprendre depuis le d?but ?"
 msgid "Search finished"
 msgstr "Recherche termin?e"
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:297 src/textview.c:252
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
@@ -8673,13 +8702,13 @@ msgid "<No Return-Path found>"
 msgstr "< ? Return-Path: ? introuvable>"
 
 #: src/messageview.c:848
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
 "Notification address: %s\n"
 "Return path: %s\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "L'adresse ? laquelle l'accus? de r?ception est ? envoyer\n"
 "ne correspond pas ? l'en-t?te ? Return-Path: ?\n"
@@ -8692,11 +8721,12 @@ msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
 #: src/messageview.c:868
+#, fuzzy
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 "officially addressed to you.\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 "Ce message demande un accus? de r?ception, or d'apr?s\n"
 "les en-t?tes ? ?: ? et ? Cc: ?, vous n'en ?tes pas le\n"
@@ -8719,8 +8749,8 @@ msgstr ""
 "Le message n'est pas conforme au standard MIME. Il pourrait ?tre mal affich?."
 
 #: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4796
-#: src/summaryview.c:4799 src/textview.c:3064
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4795
+#: src/summaryview.c:4798 src/textview.c:3073
 msgid "Save as"
 msgstr "Enregistrer sous"
 
@@ -8728,8 +8758,8 @@ msgstr "Enregistrer sous"
 msgid "Overwrite existing file?"
 msgstr "?craser le fichier existant ?"
 
-#: src/messageview.c:1851 src/summaryview.c:4816 src/summaryview.c:4819
-#: src/summaryview.c:4834
+#: src/messageview.c:1851 src/summaryview.c:4815 src/summaryview.c:4818
+#: src/summaryview.c:4833
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier ? %s ?."
@@ -8864,8 +8894,8 @@ msgstr ""
 "\n"
 " Le message a ?t? supprim? ou d?plac? vers un autre dossier"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4177
-#: src/summaryview.c:6972
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4197
+#: src/summaryview.c:6967
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'op?ration d'apprentissage du module SpamAssassin.\n"
 
@@ -8977,13 +9007,14 @@ msgid "Go back to email"
 msgstr "Revenir ? l'email"
 
 #: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:2078 src/mimeview.c:2190
+#: src/plugins/fancy/fancy_viewer.c:416
 #, 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:1839 src/textview.c:3074
+#: src/mimeview.c:1839 src/textview.c:3083
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "?craser le fichier existant ? %s ? ?"
@@ -8997,11 +9028,11 @@ msgstr "S?lection du dossier de destination"
 msgid "'%s' is not a directory."
 msgstr "? %s ? n'est pas un dossier."
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2991
+#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:3000
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2992
+#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:3001
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -9047,7 +9078,7 @@ msgid "Type:"
 msgstr "Type :"
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2702
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2688
 msgid "Size:"
 msgstr "Taille :"
 
@@ -9565,6 +9596,7 @@ msgstr "Taux de compression"
 #: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
 #: src/plugins/pdf_viewer/poppler_viewer.c:716 src/prefs_folder_item.c:522
+#: src/prefs_summaries.c:505
 msgid "Yes"
 msgstr "Oui"
 
@@ -9572,7 +9604,7 @@ msgstr "Oui"
 #: src/plugins/archive/archiver_gtk.c:807
 #: src/plugins/archive/archiver_gtk.c:815
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:372 src/prefs_summaries.c:504
 msgid "No"
 msgstr "Aucun"
 
@@ -9839,7 +9871,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2796
+#: src/prefs_summary_column.c:80 src/summaryview.c:2782
 msgid "Attachment"
 msgstr "Pi?ces jointes"
 
@@ -9962,7 +9994,8 @@ 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:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135
+#: src/prefs_msg_colors.c:362
 msgid "Signatures"
 msgstr "Signature"
 
@@ -10078,12 +10111,14 @@ msgstr ""
 "Ce module est param?trable via les options situ?es sous Configuration/"
 "Pr?f?rences/Modules/Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
+#: src/plugins/bogofilter/bogofilter.c:1043
+#: src/plugins/bsfilter/bsfilter.c:676
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
+#: src/plugins/bogofilter/bogofilter.c:1044
+#: src/plugins/bsfilter/bsfilter.c:677
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
@@ -10250,8 +10285,8 @@ msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"Erreur lors du traitement d'un message par le module Bsfilter. La commande `"
-"%s` n'a pu ?tre ex?cut?e."
+"Erreur lors du traitement d'un message par le module Bsfilter. La commande `%"
+"s` n'a pu ?tre ex?cut?e."
 
 #: src/plugins/bsfilter/bsfilter.c:502
 msgid "Bsfilter: learning from message..."
@@ -11397,7 +11432,7 @@ msgstr "Sieve: nouvel essai d'authentification\n"
 msgid "Auth method not available"
 msgstr "M?thode d'authentification non disponible"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5592
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5589
 msgid "_Filter"
 msgstr "_Filtrer"
 
@@ -11922,12 +11957,12 @@ msgstr "Montrer la banni?re"
 
 #: src/plugins/notification/notification_prefs.c:766
 #: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Jamais"
 
 #: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
+#: src/prefs_summaries.c:486
 msgid "Always"
 msgstr "Toujours"
 
@@ -12372,8 +12407,7 @@ msgstr "?diter les r?gles des filtres Perl (ext).."
 
 #: src/plugins/pgpcore/autocompletion.c:133
 msgid "Failed to register PGP address autocompletion hook"
-msgstr ""
-"Impossible d'enregistrer le connecteur 'PGP address completion'"
+msgstr "Impossible d'enregistrer le connecteur 'PGP address completion'"
 
 #: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
 msgid "Passphrase"
@@ -12538,7 +12572,8 @@ msgstr "Expirer apr?s"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la m?moriser pendant toute la session"
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
+#: src/plugins/pgpcore/prefs_gpg.c:163
+#: src/plugins/rssyl/rssyl_feed_props.c:476
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
 #: src/prefs_receive.c:187
 msgid "minutes"
@@ -13083,8 +13118,8 @@ msgstr ""
 "messages, la v?rification des signatures ou la signature et le chiffrement "
 "de votre propre courrier.\n"
 "\n"
-"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu "
-"? Configuration/Configuration du compte courant.. ? dans l'onglet ? "
+"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu ? "
+"Configuration/Configuration du compte courant.. ? dans l'onglet ? "
 "Confidentialit? ? et par le menu ? Options/Syst?me de confidentialit? ? lors "
 "d'une composition de message.\n"
 "\n"
@@ -13146,8 +13181,8 @@ msgstr ""
 "d?chiffrer les messages, v?rifier les signatures ou signer et chiffrer vos "
 "propres mails.\n"
 "\n"
-"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu "
-"? Configuration/Configuration du compte courant.. ? dans l'onglet ? "
+"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu ? "
+"Configuration/Configuration du compte courant.. ? dans l'onglet ? "
 "Confidentialit? ? et par le menu ? Options/Syst?me de confidentialit? ? lors "
 "d'une composition de message.\n"
 "\n"
@@ -13250,8 +13285,7 @@ msgstr ""
 "\n"
 "Le dossier ~/.claws-mail/python-scripts/auto/ est l'endroit o? enregistrer "
 "des scripts ? ex?cuter automatiquement lors de certains ?v?nements. "
-"Actuellement, les fichiers suivants dans le r?pertoire ? auto ? sont "
-"g?r?s :\n"
+"Actuellement, les fichiers suivants dans le r?pertoire ? auto ? sont g?r?s :\n"
 "\n"
 "compose_any\n"
 "Ex?cut? lorsqu'une fen?tre de composition de message est ouverte (nouveau "
@@ -13504,7 +13538,8 @@ msgstr "R?cup?rer les commentaires des articles de moins de"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:426
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/prefs_account.c:1480 src/prefs_folder_item.c:568
+#: src/prefs_matcher.c:337
 msgid "days"
 msgstr "jour(s)"
 
@@ -13761,8 +13796,8 @@ msgstr ""
 "syst?me S/MIME. Vous pouvez d?chiffrer les messages, v?rifier les signatures "
 "ou signer et chiffrer vos propres mails.\n"
 "\n"
-"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu "
-"? Configuration/Configuration du compte courant.. ? dans l'onglet ? "
+"Il peut ?tre activ? comme Syst?me de confidentialit? par d?faut via le menu ? "
+"Configuration/Configuration du compte courant.. ? dans l'onglet ? "
 "Confidentialit? ? et par le menu ? Options/Syst?me de confidentialit? ? lors "
 "d'une composition de message.\n"
 "\n"
@@ -14140,6 +14175,7 @@ msgid "vCalendar"
 msgstr "Calendrier"
 
 #: src/plugins/vcalendar/plugin.c:73
+#, fuzzy
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
 "Evolution or Outlook.\n"
@@ -14151,7 +14187,7 @@ msgid ""
 "To create a meeting right-click on the vCalendar or Meetings folder and "
 "choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote Webcal feeds,export your "
+"You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
@@ -15655,20 +15691,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114
+#: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "R?gle non ajout?e"
 
 #: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1520 src/prefs_template.c:573
+#: src/prefs_template.c:598
 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:900 src/prefs_actions.c:905 src/prefs_actions.c:931
 #: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117
+#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Poursuivre l'?dition"
 
@@ -15794,7 +15831,7 @@ msgstr ""
 "composition) les messages ou une de leurs parties."
 
 #: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_template.c:1111
 msgid "D_uplicate"
 msgstr "_Dupliquer"
 
@@ -16081,7 +16118,7 @@ msgid "Message flags"
 msgstr "?tats de message"
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2802
+#: src/prefs_summary_column.c:78 src/summaryview.c:2788
 msgid "Mark"
 msgstr "Marque"
 
@@ -16237,9 +16274,8 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"L'action de filtrage ? Ex?cuter ? permet ? l'utilisateur d'envoyer un "
-"message ou ?l?ment d'en-t?te de message ? un programme ou un script "
-"auxiliaire.\n"
+"L'action de filtrage ? Ex?cuter ? permet ? l'utilisateur d'envoyer un message "
+"ou ?l?ment d'en-t?te de message ? un programme ou un script auxiliaire.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 #: src/prefs_filtering_action.c:1422
@@ -16818,11 +16854,11 @@ msgstr "Corps du message"
 msgid "whole message"
 msgstr "Tout le message"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6267
+#: src/prefs_matcher.c:394 src/summaryview.c:6264
 msgid "Marked"
 msgstr "Marqu?"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6265
+#: src/prefs_matcher.c:395 src/summaryview.c:6262
 msgid "Deleted"
 msgstr "Supprim?"
 
@@ -16830,11 +16866,11 @@ msgstr "Supprim?"
 msgid "Replied"
 msgstr "R?pondu"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6259
+#: src/prefs_matcher.c:397 src/summaryview.c:6256
 msgid "Forwarded"
 msgstr "Transf?r?"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6249 src/toolbar.c:416
+#: src/prefs_matcher.c:399 src/summaryview.c:6246 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
 msgstr "Pourriel"
@@ -16843,7 +16879,7 @@ msgstr "Pourriel"
 msgid "Has attachment"
 msgstr "Contient une ou plusieurs pi?ces jointes"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6285
+#: src/prefs_matcher.c:401 src/summaryview.c:6282
 msgid "Signed"
 msgstr "Sign?"
 
@@ -16995,8 +17031,8 @@ msgstr "l'(les) adresse(s) de l'en-t?te '%s'"
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
-"If you want to match %s against the whole address book, you have to select "
-"'%s' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select '%"
+"s' from the book/folder drop-down list."
 msgstr ""
 "Le chemin vers un carnet d'adresses/dossier n'est pas renseign?.\n"
 "\n"
@@ -17097,9 +17133,9 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"La condition de filtrage ? Test ? permet ? l'utilisateur de faire un test "
-"sur un message ou ?l?ment d'en-t?te de message en utilisant un programme ou "
-"un script auxiliaire. Le programme doit retourner 0 ou 1 (0 ?tant la valeur "
+"La condition de filtrage ? Test ? permet ? l'utilisateur de faire un test sur "
+"un message ou ?l?ment d'en-t?te de message en utilisant un programme ou un "
+"script auxiliaire. Le programme doit retourner 0 ou 1 (0 ?tant la valeur "
 "validant la condition de filtrage).\n"
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
@@ -18015,8 +18051,8 @@ msgid "Open message when selected"
 msgstr "Ouvrir les messages lorsqu'ils sont s?lectionn?s"
 
 #: src/prefs_summaries.c:506
-msgid "When message view is visible"
-msgstr "Quand la vue du message est visible"
+msgid "Only when message view is visible"
+msgstr "Seulement quand la vue du message est visible"
 
 #: src/prefs_summaries.c:512
 msgid "Thread using subject in addition to standard headers"
@@ -18072,8 +18108,8 @@ msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
-"L'affichage des en-t?tes courants (comme ? From: ?, ? Subject: ?) sera "
-"traduit dans le language pr?sentement utilis?."
+"L'affichage des en-t?tes courants (comme ? From: ?, ? Subject: ?) sera traduit "
+"dans le language pr?sentement utilis?."
 
 #: src/prefs_summaries.c:732
 msgid "Summaries"
@@ -18093,42 +18129,46 @@ msgstr ""
 "pouvez utiliser les boutons ? Monter ? et ? Descendre ? ou simplement les "
 "faire glisser."
 
-#: src/prefs_summary_open.c:109
+#: src/prefs_summary_open.c:111
 msgid "first marked email"
 msgstr "1er message marqu?"
 
-#: src/prefs_summary_open.c:110
+#: src/prefs_summary_open.c:112
 msgid "first new email"
 msgstr "1er nouveau message"
 
-#: src/prefs_summary_open.c:111
+#: src/prefs_summary_open.c:113
 msgid "first unread email"
 msgstr "1er message non lu"
 
-#: src/prefs_summary_open.c:112
+#: src/prefs_summary_open.c:114
 msgid "last opened email"
 msgstr "dernier message ouvert"
 
-#: src/prefs_summary_open.c:113
+#: src/prefs_summary_open.c:115
 msgid "last email in the list"
 msgstr "dernier message dans la liste"
 
-#: src/prefs_summary_open.c:115
+#: src/prefs_summary_open.c:117
 msgid "first email in the list"
 msgstr "1er message dans la liste"
 
-#: src/prefs_summary_open.c:184
+#: src/prefs_summary_open.c:187
 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:269
 msgid "Selection on folder opening"
 msgstr "S?lection ? l'ouverture d'un dossier"
 
+#: src/prefs_summary_open.c:303
+msgid "Open the selected message"
+msgstr "Ouvrir les message _s?lectionn?"
+
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
 msgstr "Ce nom est utilis? en tant que nom de menu."
@@ -18187,56 +18227,56 @@ msgstr ""
 "La liste de mod?les a ?t? modifi?e mais non enregistr?e. Voulez-vous quand "
 "m?me fermer ?"
 
-#: src/prefs_template.c:768
+#: src/prefs_template.c:758
 msgid "The template's name is not set."
 msgstr "Le nom du mod?le n'est pas d?fini."
 
-#: src/prefs_template.c:811
+#: src/prefs_template.c:801
 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:817
+#: src/prefs_template.c:807
 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:823
+#: src/prefs_template.c:813
 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:829
+#: src/prefs_template.c:819
 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:835
+#: src/prefs_template.c:825
 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:841
+#: src/prefs_template.c:831
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Le champ ? Sujet ? du mod?le est invalide."
 
-#: src/prefs_template.c:912
+#: src/prefs_template.c:902
 msgid "Delete template"
 msgstr "Supprimer le mod?le"
 
-#: src/prefs_template.c:913
+#: src/prefs_template.c:903
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment supprimer le mod?le s?lectionn? ?"
 
-#: src/prefs_template.c:925
+#: src/prefs_template.c:915
 msgid "Delete all templates"
 msgstr "Suppression de tous les mod?les"
 
-#: src/prefs_template.c:926
+#: src/prefs_template.c:916
 msgid "Do you really want to delete all the templates?"
 msgstr "Voulez-vous vraiment supprimer tous les mod?les ?"
 
-#: src/prefs_template.c:1241
+#: src/prefs_template.c:1231
 msgid "Current templates"
 msgstr "Mod?les enregistr?s"
 
-#: src/prefs_template.c:1269
+#: src/prefs_template.c:1259
 msgid "Template"
 msgstr "Mod?le"
 
@@ -18916,12 +18956,12 @@ msgstr "Veuillez saisir le texte pour remplacer '%s'"
 msgid "Enter variable"
 msgstr "Remplacement de variable"
 
-#: src/send_message.c:153
+#: src/send_message.c:152
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Envoi du message par la commande : %s\n"
 
-#: src/send_message.c:167
+#: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Impossible de lancer la commande : %s"
@@ -19107,34 +19147,34 @@ msgstr "Il reste des messages marqu?s, voulez-vous les traiter ?"
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s).."
 
-#: src/summaryview.c:1843 src/summaryview.c:1894
+#: src/summaryview.c:1848 src/summaryview.c:1896
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1849
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1856 src/summaryview.c:1907 src/summaryview.c:1950
-#: src/summaryview.c:2001 src/summaryview.c:2079
+#: src/summaryview.c:1861 src/summaryview.c:1909 src/summaryview.c:1946
+#: src/summaryview.c:1994 src/summaryview.c:2061
 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:1864
+#: src/summaryview.c:1873
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1895
+#: src/summaryview.c:1897
 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1937 src/summaryview.c:1988
+#: src/summaryview.c:1933 src/summaryview.c:1981
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1934
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
@@ -19142,190 +19182,190 @@ msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1989
+#: src/summaryview.c:1982
 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2026 src/summaryview.c:2066
+#: src/summaryview.c:2015 src/summaryview.c:2048
 msgid "No more marked messages"
 msgstr "Plus de messages marqu?s"
 
-#: src/summaryview.c:2027
+#: src/summaryview.c:2016
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqu?s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2025
 msgid "No marked messages."
 msgstr "Pas de message marqu?."
 
-#: src/summaryview.c:2067
+#: src/summaryview.c:2049
 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqu?s. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2129
+#: src/summaryview.c:2082 src/summaryview.c:2111
 msgid "No more labeled messages"
 msgstr "Plus de messages colori?s"
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2083
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages colori?s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2114 src/summaryview.c:2139
+#: src/summaryview.c:2092 src/summaryview.c:2125
 msgid "No labeled messages."
 msgstr "Plus de messages colori?s."
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2112
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages colori?s. Rechercher depuis le d?but ?"
 
-#: src/summaryview.c:2453
+#: src/summaryview.c:2439
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet.."
 
-#: src/summaryview.c:2638
+#: src/summaryview.c:2624
 #, c-format
 msgid "%d deleted"
 msgstr "%d d?truit(s)"
 
-#: src/summaryview.c:2642
+#: src/summaryview.c:2628
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d d?plac?(s)"
 
-#: src/summaryview.c:2643 src/summaryview.c:2650
+#: src/summaryview.c:2629 src/summaryview.c:2636
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2648
+#: src/summaryview.c:2634
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copi?(s)"
 
-#: src/summaryview.c:2662
+#: src/summaryview.c:2648
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " objet s?lectionn?"
 msgstr[1] " s?lection"
 
-#: src/summaryview.c:2680 src/summaryview.c:2723
+#: src/summaryview.c:2666 src/summaryview.c:2709
 #, 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:2698
+#: src/summaryview.c:2684
 msgid "Message summary"
 msgstr "Liste des messages"
 
-#: src/summaryview.c:2699
+#: src/summaryview.c:2685
 msgid "New:"
 msgstr "Nouveaux :"
 
-#: src/summaryview.c:2700
+#: src/summaryview.c:2686
 msgid "Unread:"
 msgstr "Non lus :"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2687
 msgid "Total:"
 msgstr "Total :"
 
-#: src/summaryview.c:2703
+#: src/summaryview.c:2689
 msgid "Marked:"
 msgstr "Marqu?s :"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2690
 msgid "Replied:"
 msgstr "R?pondus :"
 
-#: src/summaryview.c:2705
+#: src/summaryview.c:2691
 msgid "Forwarded:"
 msgstr "Transf?r?s :"
 
-#: src/summaryview.c:2706
+#: src/summaryview.c:2692
 msgid "Locked:"
 msgstr "Verrouill?s :"
 
-#: src/summaryview.c:2707
+#: src/summaryview.c:2693
 msgid "Ignored:"
 msgstr "Ignor?s :"
 
-#: src/summaryview.c:2708
+#: src/summaryview.c:2694
 msgid "Watched:"
 msgstr "Suivis :"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2704
 #, 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:3011
+#: src/summaryview.c:2997
 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages.."
 
-#: src/summaryview.c:3150
+#: src/summaryview.c:3136
 msgid "Setting summary from message data..."
 msgstr "D?finition de la liste des messages ? partir des donn?es du message.."
 
-#: src/summaryview.c:3355
+#: src/summaryview.c:3341
 msgid "(No Date)"
 msgstr "(Pas de date)"
 
-#: src/summaryview.c:3407
+#: src/summaryview.c:3393
 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 
-#: src/summaryview.c:3442
+#: src/summaryview.c:3428
 #, c-format
 msgid "From: %s, on %s"
 msgstr "De : %s, le %s"
 
-#: src/summaryview.c:3451
+#: src/summaryview.c:3437
 #, c-format
 msgid "To: %s, on %s"
 msgstr "? : %s, le %s"
 
-#: src/summaryview.c:4280
+#: src/summaryview.c:4279
 msgid "You're not the author of the article.\n"
 msgstr "Vous n'?tes pas l'auteur de cet article.\n"
 
-#: src/summaryview.c:4370
+#: src/summaryview.c:4369
 #, 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:4373
+#: src/summaryview.c:4372
 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:4537
+#: src/summaryview.c:4536
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:4638
+#: src/summaryview.c:4637
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
-#: src/summaryview.c:4803
+#: src/summaryview.c:4802
 msgid "Append or Overwrite"
 msgstr "Ajouter ou ?craser"
 
-#: src/summaryview.c:4804
+#: src/summaryview.c:4803
 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe d?j?. Ajouter au fichier existant ou bien l'?craser ?"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4804
 msgid "_Append"
 msgstr "_Ajouter"
 
-#: src/summaryview.c:4805
+#: src/summaryview.c:4804
 msgid "_Overwrite"
 msgstr "_?craser"
 
-#: src/summaryview.c:4846
+#: src/summaryview.c:4845
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -19333,29 +19373,29 @@ msgstr ""
 "Vous ?tes sur le point d'imprimer %d messages un par un. Voulez-vous "
 "continuer ?"
 
-#: src/summaryview.c:5306
+#: src/summaryview.c:5303
 msgid "Building threads..."
 msgstr "Construction des threads.."
 
-#: src/summaryview.c:5554
+#: src/summaryview.c:5551
 msgid "Skip these rules"
 msgstr "Ignorer ces r?gles"
 
-#: src/summaryview.c:5557
+#: src/summaryview.c:5554
 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:5560
+#: src/summaryview.c:5557
 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:5589
+#: src/summaryview.c:5586
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/summaryview.c:5590
+#: src/summaryview.c:5587
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19363,55 +19403,55 @@ msgstr ""
 "Il y a des r?gles de filtrage rattach?es ? des comptes.\n"
 "Veuillez s?lectionner ce que vous souhaitez faire avec ces r?gles :"
 
-#: src/summaryview.c:5620
+#: src/summaryview.c:5617
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
 
-#: src/summaryview.c:5699
+#: src/summaryview.c:5696
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
-#: src/summaryview.c:6245
+#: src/summaryview.c:6242
 msgid "Ignored thread"
 msgstr "Fil de discussion ignor?"
 
-#: src/summaryview.c:6247
+#: src/summaryview.c:6244
 msgid "Watched thread"
 msgstr "Fil de discussion suivi"
 
-#: src/summaryview.c:6255
+#: src/summaryview.c:6252
 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:6257
+#: src/summaryview.c:6254
 msgid "Replied - click to see reply"
 msgstr "R?pondu - cliquer pour voir la r?ponse"
 
-#: src/summaryview.c:6269
+#: src/summaryview.c:6266
 msgid "To be moved"
 msgstr "? deplacer"
 
-#: src/summaryview.c:6271
+#: src/summaryview.c:6268
 msgid "To be copied"
 msgstr "? copier"
 
-#: src/summaryview.c:6283
+#: src/summaryview.c:6280
 msgid "Signed, has attachment(s)"
 msgstr "Sign? et contenant une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:6287
+#: src/summaryview.c:6284
 msgid "Encrypted, has attachment(s)"
 msgstr "Chiffr? et contenant une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:6289
+#: src/summaryview.c:6286
 msgid "Encrypted"
 msgstr "Chiffr?"
 
-#: src/summaryview.c:6291
+#: src/summaryview.c:6288
 msgid "Has attachment(s)"
 msgstr "Contient une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:7938
+#: src/summaryview.c:7932
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19420,53 +19460,53 @@ msgstr ""
 "Erreur dans l'expression r?guli?re (regexp) :\n"
 "%s"
 
-#: src/summaryview.c:8041
+#: src/summaryview.c:8035
 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:8046
+#: src/summaryview.c:8040
 msgid "Go back to the folder list"
 msgstr "Revenir ? la liste des dossiers"
 
-#: src/textview.c:231
+#: src/textview.c:245
 msgid "_Open in web browser"
 msgstr "_Ouvrir avec le navigateur web"
 
-#: src/textview.c:232
+#: src/textview.c:246
 msgid "Copy this _link"
 msgstr "Copier l'adresse du _lien"
 
-#: src/textview.c:239
+#: src/textview.c:253
 msgid "_Reply to this address"
 msgstr "R?pondre ? cette ad_resse"
 
-#: src/textview.c:240
+#: src/textview.c:254
 msgid "Add to _Address book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/textview.c:241
+#: src/textview.c:255
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:247
+#: src/textview.c:261
 msgid "_Open image"
 msgstr "_Ouvrir l'image"
 
-#: src/textview.c:248
+#: src/textview.c:262
 msgid "_Save image..."
 msgstr "Enregi_strer l'image sous.."
 
-#: src/textview.c:722
+#: src/textview.c:724
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d octets)]"
 
-#: src/textview.c:725
+#: src/textview.c:727
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d octets)]"
 
-#: src/textview.c:915
+#: src/textview.c:917
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19480,75 +19520,75 @@ msgstr ""
 "\n"
 "  Pour plus d'informations, veuillez s?lectionner le menu ? "
 
-#: src/textview.c:920
+#: src/textview.c:922
 msgid "'Network Log'"
 msgstr "'Traces r?seaux'"
 
-#: src/textview.c:921
+#: src/textview.c:923
 msgid " in the Tools menu for more information."
 msgstr " ?."
 
-#: src/textview.c:984
+#: src/textview.c:986
 msgid "  The following can be performed on this part\n"
 msgstr ""
 "  Les actions suivantes peuvent ?tre effectu?es sur l'?l?ment actuellement "
 "s?lectionn?\n"
 
-#: src/textview.c:986
+#: src/textview.c:988
 msgid "  by right-clicking the icon or list item:"
 msgstr ""
 "  en cliquant avec le bouton droit sur l'ic?ne ou l'?l?ment de la liste :"
 
-#: src/textview.c:990
+#: src/textview.c:992
 msgid "     - To save, select "
 msgstr "     - Pour l'enregistrer, veuillez s?lectionner ? "
 
-#: src/textview.c:991
+#: src/textview.c:993
 msgid "'Save as...'"
 msgstr "Enregistrer sous.."
 
-#: src/textview.c:993 src/textview.c:1005 src/textview.c:1017
-#: src/textview.c:1027
+#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
+#: src/textview.c:1029
 msgid " (Shortcut key: '"
 msgstr " (raccourci : '"
 
-#: src/textview.c:1001
+#: src/textview.c:1003
 msgid "     - To display as text, select "
 msgstr "     - Pour l'afficher en tant que texte, veuillez s?lectionner ? "
 
-#: src/textview.c:1002
+#: src/textview.c:1004
 msgid "'Display as text'"
 msgstr "Afficher comme du texte"
 
-#: src/textview.c:1013
+#: src/textview.c:1015
 msgid "     - To open with an external program, select "
 msgstr ""
 "     - Pour l'ouvrir avec le programme auxiliaire correspondant, veuillez "
 "s?lectionner ? "
 
-#: src/textview.c:1014
+#: src/textview.c:1016
 msgid "'Open'"
 msgstr "Ouvrir"
 
-#: src/textview.c:1022
+#: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (un double-clique ou un clique avec le bouton "
 
-#: src/textview.c:1023
+#: src/textview.c:1025
 msgid "mouse button)\n"
 msgstr "du milieu sont ?galement possibles.);\n"
 
-#: src/textview.c:1025
+#: src/textview.c:1027
 msgid "     - Or use "
 msgstr ""
 "     - Pour l'ouvrir avec un programme auxiliaire de votre choix, veuillez "
 "s?lectionner ? "
 
-#: src/textview.c:1026
+#: src/textview.c:1028
 msgid "'Open with...'"
 msgstr "Ouvrir avec.."
 
-#: src/textview.c:1140
+#: src/textview.c:1145
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19559,31 +19599,31 @@ msgstr ""
 "    %s\n"
 "Code de retour %d\n"
 
-#: src/textview.c:2189
+#: src/textview.c:2196
 msgid "Tags: "
 msgstr "Labels: "
 
-#: src/textview.c:2895
+#: src/textview.c:2904
 msgid "The real URL is different from the displayed URL."
 msgstr "L'URL r?el est diff?rent de l'URL affich?"
 
-#: src/textview.c:2896
+#: src/textview.c:2905
 msgid "Displayed URL:"
 msgstr "URL affich? :"
 
-#: src/textview.c:2897
+#: src/textview.c:2906
 msgid "Real URL:"
 msgstr "URL r?el :"
 
-#: src/textview.c:2898
+#: src/textview.c:2907
 msgid "Open it anyway?"
 msgstr "Voulez-vous quand m?me l'ouvrir ?"
 
-#: src/textview.c:2899
+#: src/textview.c:2908
 msgid "Phishing attempt warning"
 msgstr "Attention : Tentative d'hame?onnage (phishing)"
 
-#: src/textview.c:2900
+#: src/textview.c:2909
 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 
@@ -20335,11 +20375,11 @@ msgstr ""
 #~ "span>"
 
 #~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
+#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and %"
+#~ "d errors</span>"
 #~ msgstr ""
-#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d r?pertoires, "
-#~ "%d autres et %d erreurs</span>"
+#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d r?pertoires, %"
+#~ "d autres et %d erreurs</span>"
 
 #~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
 #~ msgstr ""
@@ -20378,8 +20418,8 @@ msgstr ""
 #~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 #~ msgstr ""
 #~ "<b>Intervalle de mise ? jour, en minutes :</b>\n"
-#~ "<small>(Saisissez 0 pour d?sactiver la mise ? jour automatique de ce "
-#~ "flux)</small>"
+#~ "<small>(Saisissez 0 pour d?sactiver la mise ? jour automatique de ce flux)"
+#~ "</small>"
 
 #~ msgid "<b>If an item changes, do not mark it as new:</b>"
 #~ msgstr "<b>Si un article change, ne pas le marquer comme non lu :</b>"

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Wed Dec 14 11:09:34 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Wed, 14 Dec 2016 11:09:34 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-55-gb4d895b
Message-ID: <20161214100934.EF91536A45CC@mx.colino.net>

The branch, master has been updated
       via  b4d895b8b87dcb0850a6f628d95a45c8dcf13d56 (commit)
      from  06f63cb892ca160d54fb28ca4a185c89b7b901fb (commit)

Summary of changes:
 src/toolbar.c |  109 ++++++++++++++++++++++++++++++++++++++-------------------
 src/toolbar.h |    2 ++
 2 files changed, 75 insertions(+), 36 deletions(-)


- Log -----------------------------------------------------------------
commit b4d895b8b87dcb0850a6f628d95a45c8dcf13d56
Author: wwp <wwp at free.fr>
Date:   Wed Dec 14 11:06:18 2016 +0100

    Fix possibly broken toolbar_compose.xml by migrating A_SENDL actions names
    to A_SEND_LATER. An attempt to rewrite the whole toolbar .xml file was done
    when only a part of it was read, leading to toolbar elements loss; the
    rewrite of migrated toolbar configs is now done a posteriori.
    Also, the renaming/migration magics swallowed the existing one
    for A_SYL_ACTIONS.

diff --git a/src/toolbar.c b/src/toolbar.c
index b48b804..1f36f71 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -79,7 +79,7 @@ static void toolbar_init(Toolbar * toolbar);
 static gboolean      toolbar_is_duplicate		(gint           action,
 					      	 ToolbarType	source);
 static void   toolbar_parse_item		(XMLFile        *file,
-					      	 ToolbarType	source);
+					      	 ToolbarType	source, gboolean *rewrite);
 
 static gint   toolbar_ret_val_from_text		(const gchar	*text);
 static gchar *toolbar_ret_text_from_val		(gint           val);
@@ -233,9 +233,9 @@ struct {
 	{ "A_IGNORE_THREAD", 	N_("Ignore thread")                        },
 	{ "A_WATCH_THREAD", 	N_("Watch thread")                         },
 	{ "A_MARK", 			N_("Mark Message")                         },
-	{ "A_UNMARK", 			N_("Unmark Message")                         },
+	{ "A_UNMARK", 			N_("Unmark Message")                       },
 	{ "A_LOCK", 			N_("Lock Message")                         },
-	{ "A_UNLOCK", 			N_("Unlock Message")                         },
+	{ "A_UNLOCK", 			N_("Unlock Message")                       },
 	{ "A_ALL_READ",			N_("Mark all Messages as read")            },
 	{ "A_ALL_UNREAD",		N_("Mark all Messages as unread")          },
 	{ "A_READ", 			N_("Mark Message as read")                 },
@@ -252,7 +252,7 @@ struct {
 	{ "A_INSERT",        	N_("Insert file")                          },   
 	{ "A_ATTACH",        	N_("Attach file")                          },
 	{ "A_SIG",           	N_("Insert signature")                     },
-	{ "A_REP_SIG",          N_("Replace signature")                     },
+	{ "A_REP_SIG",          N_("Replace signature")                    },
 	{ "A_EXTEDITOR",     	N_("Edit with external editor")            },
 	{ "A_LINEWRAP_CURRENT",	N_("Wrap long lines of current paragraph") }, 
 	{ "A_LINEWRAP_ALL",     N_("Wrap all long lines")                  }, 
@@ -266,9 +266,22 @@ struct {
 	{ "A_CANCEL_ALL",       N_("Cancel receiving/sending")             },
 	{ "A_CLOSE",            N_("Close window")                         },
 	{ "A_SEPARATOR",     	N_("Separator")                            },
-	{ "A_CLAWS_PLUGINS",    N_("Claws Mail Plugins")                   },
+	{ "A_CLAWS_PLUGINS",    N_("Claws Mail Plugins")                   }
 };
 
+/* migration table: support reading toolbar configuration files with
+   old action names and converting them to current action names,
+   see toolbar_parse_item(), which makes uses of this alias table.
+*/
+struct {
+	const gchar *old_name;
+	const gchar *current_name;
+} toolbar_migration [] = {
+	{ "A_SYL_ACTIONS",   "A_CLAWS_ACTIONS" },
+	{ "A_SENDL",         "A_SEND_LATER" },
+	{ NULL,              NULL }
+};
+	
 /* struct holds configuration files and a list of
  * currently active toolbar items 
  * TOOLBAR_MAIN, TOOLBAR_COMPOSE and TOOLBAR_MSGVIEW
@@ -390,12 +403,11 @@ GList *toolbar_get_action_items(ToolbarType source)
 	return items;
 }
 
-static void toolbar_parse_item(XMLFile *file, ToolbarType source)
+static void toolbar_parse_item(XMLFile *file, ToolbarType source, gboolean *rewrite)
 {
 	GList *attr;
 	gchar *name, *value;
 	ToolbarItem *item = NULL;
-	gboolean rewrite = FALSE;
 
 	attr = xml_get_current_tag_attr(file);
 	item = g_new0(ToolbarItem, 1);
@@ -409,52 +421,64 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source)
 			item->text = g_strdup (*value ? gettext(value):"");
 		else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
 			item->index = toolbar_ret_val_from_text(value);
-		if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+
+		if ((item->index == -1) && !strcmp(value, "A_DELETE")) {
 			/* switch button */
 			item->index = A_TRASH;
 			g_free(item->file);
 			item->file = g_strdup("trash_btn");
 			g_free(item->text);
 			item->text = g_strdup(C_("Toolbar", "Trash"));
-			rewrite = TRUE;
+			*rewrite = TRUE;
 		}
-		if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
-			/* switch button */
-			item->index = A_CLAWS_ACTIONS;
-			rewrite = TRUE;
+		if (item->index == -1) {
+			/* item not found in table: try migrating old action names to current ones */
+			gint i;
+
+			/* replace action name */
+			for (i = 0; toolbar_migration[i].old_name != NULL; i++) {
+				if (g_utf8_collate(value, toolbar_migration[i].old_name) == 0) {
+					item->index = toolbar_ret_val_from_text(toolbar_migration[i].current_name);
+					if (item->index != -1) {
+						*rewrite = TRUE;
+						debug_print("toolbar_parse_item: migrating action label from '%s' to '%s'\n",
+							value, toolbar_migration[i].current_name);
+						break;
+					}
+				}
+			}
 		}
+		if ((item->index == -1) && !rewrite)
+			g_warning("toolbar_parse_item: unrecognized action name '%s'\n", value);
+
 		attr = g_list_next(attr);
 	}
 	if (item->index != -1) {
-		
 		if (!toolbar_is_duplicate(item->index, source)) 
 			toolbar_config[source].item_list = g_slist_append(toolbar_config[source].item_list,
 									 item);
 	}
-	if (rewrite) {
-		toolbar_save_config_file(source);
-	}
 }
 
 const gchar *toolbar_get_short_text(int action) {
 	switch(action) {
-	case A_GO_FOLDERS: 	return _("Folders");
-	case A_OPEN_MAIL: 	return _("Open");
 	case A_RECEIVE_ALL: 	return _("Get Mail");
 	case A_RECEIVE_CUR: 	return _("Get");
 	case A_SEND_QUEUED: 	return _("Send");
 	case A_COMPOSE_EMAIL: 	return C_("Toolbar", "Compose");
 	case A_COMPOSE_NEWS: 	return C_("Toolbar", "Compose");
 	case A_REPLY_MESSAGE: 	return _("Reply");
-	case A_REPLY_ALL: 	return _("All");
 	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_LEARN_SPAM: 	return _("Spam");
+	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");
@@ -465,9 +489,12 @@ const gchar *toolbar_get_short_text(int action) {
 	case A_ALL_UNREAD: 	return _("All unread");
 	case A_READ: 		return _("Read");
 	case A_UNREAD: 		return _("Unread");
+
 	case A_PRINT:	 	return _("Print");
-	case A_CLOSE: 		return _("Close");
+	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");
@@ -479,36 +506,37 @@ const gchar *toolbar_get_short_text(int action) {
 	case A_LINEWRAP_CURRENT:return _("Wrap para.");
 	case A_LINEWRAP_ALL:	return _("Wrap all");
 	case A_ADDRBOOK: 	return _("Address");
-	case A_CANCEL_INC:	return _("Stop");
-	case A_CANCEL_SEND:	return _("Stop");
-	case A_CANCEL_ALL:	return _("Stop all");
-	case A_EXECUTE:		return _("Execute");
 	#ifdef USE_ENCHANT
 	case A_CHECK_SPELLING:	return _("Check spelling");
 	#endif
+
+	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 "";
 	}
 }
 
 gint toolbar_get_icon(int action) {
 	switch(action) {
-	case A_GO_FOLDERS: 	return STOCK_PIXMAP_GO_FOLDERS;
-	case A_OPEN_MAIL: 	return STOCK_PIXMAP_OPEN_MAIL;
 	case A_RECEIVE_ALL: 	return STOCK_PIXMAP_MAIL_RECEIVE_ALL;
 	case A_RECEIVE_CUR: 	return STOCK_PIXMAP_MAIL_RECEIVE;
 	case A_SEND_QUEUED: 	return STOCK_PIXMAP_MAIL_SEND_QUEUE;
 	case A_COMPOSE_EMAIL: 	return STOCK_PIXMAP_MAIL_COMPOSE;
 	case A_COMPOSE_NEWS: 	return STOCK_PIXMAP_NEWS_COMPOSE;
 	case A_REPLY_MESSAGE: 	return STOCK_PIXMAP_MAIL_REPLY;
-	case A_REPLY_ALL: 	return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
 	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_LEARN_SPAM: 	return STOCK_PIXMAP_SPAM_BTN;
+	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;
@@ -519,9 +547,12 @@ gint toolbar_get_icon(int action) {
 	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;
-	case A_CLOSE: 		return STOCK_PIXMAP_CLOSE;
+	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;
@@ -533,13 +564,14 @@ gint toolbar_get_icon(int action) {
 	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_CANCEL_INC:	return STOCK_PIXMAP_CANCEL;
-	case A_CANCEL_SEND:	return STOCK_PIXMAP_CANCEL;
-	case A_CANCEL_ALL:	return STOCK_PIXMAP_CANCEL;
-	case A_EXECUTE:		return STOCK_PIXMAP_EXEC;
 	#ifdef USE_ENCHANT
 	case A_CHECK_SPELLING:	return STOCK_PIXMAP_CHECK_SPELLING;
 	#endif
+
+	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;
 	}
 }
@@ -775,6 +807,7 @@ void toolbar_read_config_file(ToolbarType source)
 	XMLFile *file   = NULL;
 	gchar *fileSpec = NULL;
 	jmp_buf    jumper;
+	gboolean rewrite = FALSE;
 
 	debug_print("read Toolbar Configuration from %s\n", toolbar_config[source].conf_file);
 
@@ -802,7 +835,7 @@ void toolbar_read_config_file(ToolbarType source)
 
 			/* Get next tag (icon, icon_text or icon_action) */
 			if (xml_compare_tag(file, TOOLBAR_TAG_ITEM)) {
-				toolbar_parse_item(file, source);
+				toolbar_parse_item(file, source, &rewrite);
 			} else if (xml_compare_tag(file, TOOLBAR_TAG_SEPARATOR)) {
 				ToolbarItem *item = g_new0(ToolbarItem, 1);
 			
@@ -814,6 +847,10 @@ void toolbar_read_config_file(ToolbarType source)
 
 		}
 		xml_close_file(file);
+		if (rewrite) {
+			debug_print("toolbar_read_config_file: rewriting toolbar\n");
+			toolbar_save_config_file(source);
+		}
 	}
 
 	if ((!file) || (g_slist_length(toolbar_config[source].item_list) == 0)) {
diff --git a/src/toolbar.h b/src/toolbar.h
index 1a11b9a..4b84bb6 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -171,6 +171,7 @@ enum {
 	A_EXECUTE,
 	A_GOTO_PREV,
 	A_GOTO_NEXT,
+
 	A_IGNORE_THREAD,
 	A_WATCH_THREAD,
 	A_MARK,
@@ -181,6 +182,7 @@ enum {
 	A_ALL_UNREAD,
 	A_READ,
 	A_UNREAD,
+
 	A_PRINT,
 	A_LEARN_SPAM,
 	A_GO_FOLDERS,

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Thu Dec 15 19:57:43 2016
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Thu, 15 Dec 2016 19:57:43 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-56-gabc9d9c
Message-ID: <20161215185743.D6ACE36A453F@mx.colino.net>

The branch, master has been updated
       via  abc9d9cd4034d793869129298cc635245fd2108e (commit)
      from  b4d895b8b87dcb0850a6f628d95a45c8dcf13d56 (commit)

Summary of changes:
 src/stock_pixmap.c |   92 ++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)


- Log -----------------------------------------------------------------
commit abc9d9cd4034d793869129298cc635245fd2108e
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Dec 15 19:57:27 2016 +0100

    Fix initialization of two pixmaps

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 4d968d3..9db0648 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -220,9 +220,9 @@
 #include "pixmaps/mark_unmark.xpm"
 #include "pixmaps/mark_locked.xpm"
 #include "pixmaps/mark_unlocked.xpm"
-#include "pixmaps/mark_allread.xpm" 
-#include "pixmaps/mark_allunread.xpm"  
-#include "pixmaps/mark_read.xpm"     
+#include "pixmaps/mark_allread.xpm"
+#include "pixmaps/mark_allunread.xpm"
+#include "pixmaps/mark_read.xpm"
 #include "pixmaps/mark_unread.xpm"
 
 typedef struct _StockPixmapData	StockPixmapData;
@@ -244,10 +244,10 @@ struct _OverlayData
 	gboolean is_pixmap;
 	cairo_surface_t *base_pixmap;
 	cairo_surface_t *overlay_pixmap;
-	
+
 	GdkPixbuf *base_pixbuf;
 	GdkPixbuf *overlay_pixbuf;
-	
+
 	guint base_height;
 	guint base_width;
 	guint overlay_height;
@@ -380,22 +380,22 @@ static StockPixmapData pixmaps[] =
     {mime_image_xpm                   , NULL, NULL, "mime_image", NULL, NULL},
     {mime_audio_xpm                   , NULL, NULL, "mime_audio", NULL, NULL},
     {mime_text_enriched_xpm           , NULL, NULL, "mime_text_enriched", NULL, NULL},
-    {mime_unknown_xpm                 , NULL, NULL, "mime_unknown", NULL, NULL},    
-    {mime_pdf_xpm                     , NULL, NULL, "mime_pdf", NULL, NULL},    
-    {mime_ps_xpm                      , NULL, NULL, "mime_ps", NULL, NULL},    
-    {mime_calendar_xpm                , NULL, NULL, "mime_calendar", NULL, NULL},    
-    {mime_pgpsig_xpm                  , NULL, NULL, "mime_pgpsig", NULL, NULL},    
+    {mime_unknown_xpm                 , NULL, NULL, "mime_unknown", NULL, NULL},
+    {mime_pdf_xpm                     , NULL, NULL, "mime_pdf", NULL, NULL},
+    {mime_ps_xpm                      , NULL, NULL, "mime_ps", NULL, NULL},
+    {mime_calendar_xpm                , NULL, NULL, "mime_calendar", NULL, NULL},
+    {mime_pgpsig_xpm                  , NULL, NULL, "mime_pgpsig", NULL, NULL},
     {printer_xpm                      , NULL, NULL, "printer", NULL, NULL},
     {privacy_signed_xpm               , NULL, NULL, "privacy_signed", NULL, NULL},
     {privacy_passed_xpm               , NULL, NULL, "privacy_passed", NULL, NULL},
-    {privacy_failed_xpm               , NULL, NULL, "privacy_failed", NULL, NULL},    
+    {privacy_failed_xpm               , NULL, NULL, "privacy_failed", NULL, NULL},
     {privacy_unknown_xpm              , NULL, NULL, "privacy_unknown", NULL, NULL},
     {privacy_expired_xpm              , NULL, NULL, "privacy_expired", NULL, NULL},
     {privacy_warn_xpm                 , NULL, NULL, "privacy_warn", NULL, NULL},
     {privacy_emblem_encrypted_xpm     , NULL, NULL, "privacy_emblem_encrypted", NULL, NULL},
     {privacy_emblem_signed_xpm        , NULL, NULL, "privacy_emblem_signed", NULL, NULL},
     {privacy_emblem_passed_xpm        , NULL, NULL, "privacy_emblem_passed", NULL, NULL},
-    {privacy_emblem_failed_xpm        , NULL, NULL, "privacy_emblem_failed", NULL, NULL},    
+    {privacy_emblem_failed_xpm        , NULL, NULL, "privacy_emblem_failed", NULL, NULL},
     {privacy_emblem_warn_xpm          , NULL, NULL, "privacy_emblem_warn", NULL, NULL},
     {mime_message_xpm                 , NULL, NULL, "mime_message", NULL, NULL},
     {claws_mail_icon_xpm              , NULL, NULL, "claws_mail_icon", NULL, NULL},
@@ -446,8 +446,8 @@ static StockPixmapData pixmaps[] =
     {zoom_in_xpm                      , NULL, NULL, "zoom_in", NULL, NULL},
     {zoom_out_xpm                     , NULL, NULL, "zoom_out", NULL, NULL},
     {zoom_width_xpm                   , NULL, NULL, "zoom_width", NULL, NULL},
-    {mark_ignorethread_xpm            , NULL, NULL, "mark_ignorethread", NULL},
-    {mark_watchthread_xpm             , NULL, NULL, "mark_watchthread", NULL},
+    {mark_ignorethread_xpm            , NULL, NULL, "mark_ignorethread", NULL, NULL},
+    {mark_watchthread_xpm             , NULL, NULL, "mark_watchthread", NULL, NULL},
     {mark_mark_xpm                    , NULL, NULL, "mark_mark", NULL, NULL},
     {mark_unmark_xpm                  , NULL, NULL, "mark_unmark", NULL, NULL},
     {mark_locked_xpm                  , NULL, NULL, "mark_locked", NULL, NULL},
@@ -468,12 +468,12 @@ GtkWidget *stock_pixmap_widget(StockPixmap icon)
 
 	if (stock_pixbuf_gdk(icon, &pixbuf) != -1)
 		return gtk_image_new_from_pixbuf(pixbuf);
-	
+
 	return NULL;
 }
 
 /*!
- *\brief	
+ *\brief
  */
 gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 {
@@ -484,7 +484,7 @@ gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 
 	if (pixbuf)
 		*pixbuf = NULL;
-		
+
 	cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
 
 	pix_d = &pixmaps[icon];
@@ -492,7 +492,7 @@ gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 	theme_changed = (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0);
 	if (!pix_d->pixbuf || theme_changed) {
 		GdkPixbuf *pix = NULL;
-		
+
 		if (theme_changed && pix_d->pixmap) {
 			g_object_unref(pix_d->pixmap);
 			pix_d->pixmap = NULL;
@@ -500,8 +500,8 @@ gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 
 		if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
 			if (is_dir_exist(prefs_common.pixmap_theme_path)) {
-				char *icon_file_name; 
-try_next_extension:				
+				char *icon_file_name;
+try_next_extension:
 				icon_file_name = g_strconcat(prefs_common.pixmap_theme_path,
 							     G_DIR_SEPARATOR_S,
 							     pix_d->file,
@@ -509,9 +509,9 @@ try_next_extension:
 							     NULL);
 				if (is_file_exist(icon_file_name)) {
 					GError *err = NULL;
-					pix = gdk_pixbuf_new_from_file(icon_file_name, &err);	
+					pix = gdk_pixbuf_new_from_file(icon_file_name, &err);
 					if (err) g_error_free(err);
-				}					
+				}
 				if (pix) {
 					g_free(pix_d->icon_path);
 					pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
@@ -535,7 +535,7 @@ try_next_extension:
 		pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) pix_d->data);
 		if (pix_d->pixbuf) {
 			g_free(pix_d->icon_path);
-			pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);	
+			pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
 		}
 	}
 
@@ -544,7 +544,7 @@ try_next_extension:
 	if (pixbuf)
 		*pixbuf = pix_d->pixbuf;
 
-	/* pixbuf should have one ref outstanding */		
+	/* pixbuf should have one ref outstanding */
 
 	return 0;
 }
@@ -556,17 +556,17 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 	GDir *dp;
 	GError *error = NULL;
 	static const char *extension[]={".png", ".xpm", NULL};
-	
+
 	if ((dp = g_dir_open(dirname, 0, &error)) == NULL) {
 		debug_print("skipping theme scan, dir %s could not be opened: %s (%d)\n",
 				dirname ? dirname : "(null)", error->message, error->code);
 		g_error_free(error);
 		return;
 	}
-	
+
 	while ((entry = g_dir_read_name(dp)) != NULL) {
 		fullentry = g_strconcat(dirname, G_DIR_SEPARATOR_S, entry, NULL);
-		
+
 		if (strcmp(entry, ".") != 0 && strcmp(entry, "..") != 0 && is_dir_exist(fullentry)) {
 			gchar *filetoexist;
 			gboolean found = FALSE;
@@ -582,9 +582,9 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 					g_free(filetoexist);
 				}
 			}
-			if (i == N_STOCK_PIXMAPS) 
+			if (i == N_STOCK_PIXMAPS)
 				g_free(fullentry);
-		} else 
+		} else
 			g_free(fullentry);
 	}
 	g_dir_close(dp);
@@ -609,9 +609,9 @@ GList *stock_pixmap_themes_list_new(void)
 	gchar *userthemes;
 	gchar *systemthemes;
 	GList *list = NULL;
-	
+
 	defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
-	userthemes   = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, 
+	userthemes   = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
 				   PIXMAP_THEME_DIR, NULL);
 	systemthemes = stock_pixmap_get_system_theme_dir_for_theme(NULL);
 
@@ -628,16 +628,16 @@ void stock_pixmap_themes_list_free(GList *list)
 {
 	GList *ptr;
 
-	for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr)) 
+	for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr))
 		g_free(ptr->data);
-	g_list_free(list);		
+	g_list_free(list);
 }
 
 gchar *stock_pixmap_get_name (StockPixmap icon)
 {
 	if (icon < 0 || icon >= N_STOCK_PIXMAPS)
 		return NULL;
-	
+
 	return pixmaps[icon].file;
 
 }
@@ -645,7 +645,7 @@ gchar *stock_pixmap_get_name (StockPixmap icon)
 StockPixmap stock_pixmap_get_icon (gchar *file)
 {
 	gint i;
-	
+
 	for (i = 0; i < N_STOCK_PIXMAPS; i++) {
 		if (strcmp (pixmaps[i].file, file) == 0)
 			return i;
@@ -654,9 +654,9 @@ StockPixmap stock_pixmap_get_icon (gchar *file)
 }
 
 static gboolean do_pix_draw(GtkWidget *widget, cairo_t *cr,
-			    OverlayData *data) 
+			    OverlayData *data)
 {
-	GdkWindow *drawable = gtk_widget_get_window(widget);	
+	GdkWindow *drawable = gtk_widget_get_window(widget);
 	gint left = 0;
 	gint top = 0;
 
@@ -733,7 +733,7 @@ static gboolean do_pix_draw(GtkWidget *widget, cairo_t *cr,
 			case OVERLAY_MID_RIGHT:
 				top = (data->base_height + data->border_y * 2 - data->overlay_height)/2;
 				break;
-					
+
 			case OVERLAY_BOTTOM_LEFT:
 			case OVERLAY_BOTTOM_CENTER:
 			case OVERLAY_BOTTOM_RIGHT:
@@ -764,15 +764,15 @@ static gboolean do_pix_draw(GtkWidget *widget, cairo_t *cr,
 
 #if !GTK_CHECK_VERSION(3,0,0)
 static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventExpose *expose,
-                                                   OverlayData *data) 
+                                                   OverlayData *data)
 #else
 static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, cairo_t *cr,
-						    OverlayData *data) 
+						    OverlayData *data)
 #endif
 {
 #if !GTK_CHECK_VERSION(3,0,0)
 	cairo_t *cr;
-	GdkWindow *drawable = gtk_widget_get_window(widget);	
+	GdkWindow *drawable = gtk_widget_get_window(widget);
 	gboolean result;
 
 	cr = gdk_cairo_create(drawable);
@@ -787,7 +787,7 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, cairo_t *
 #endif
 }
 
-static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data) 
+static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
 {
 	if (data->is_pixmap) {
 		cairo_surface_destroy(data->base_pixmap);
@@ -826,7 +826,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
 	GtkWidget *stock_wid = NULL;
 	GtkRequisition requisition;
 	OverlayData *data = NULL;
-	
+
 	data = g_new0(OverlayData, 1);
 
 	stock_wid = stock_pixmap_widget(icon);
@@ -890,13 +890,13 @@ GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
 	data->highlight = FALSE;
 
 	widget = gtk_drawing_area_new();
-	gtk_widget_set_size_request(widget, data->base_width + border_x * 2, 
+	gtk_widget_set_size_request(widget, data->base_width + border_x * 2,
 			      data->base_height + border_y * 2);
 #if !GTK_CHECK_VERSION(3, 0, 0)
-	g_signal_connect(G_OBJECT(widget), "expose_event", 
+	g_signal_connect(G_OBJECT(widget), "expose_event",
 			 G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
 #else
-	g_signal_connect(G_OBJECT(widget), "draw", 
+	g_signal_connect(G_OBJECT(widget), "draw",
 			 G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
 #endif
 	g_signal_connect(G_OBJECT(widget), "destroy",

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Dec 16 09:16:17 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri, 16 Dec 2016 09:16:17 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-58-g77a2981
Message-ID: <20161216081617.DA45636A4521@mx.colino.net>

The branch, master has been updated
       via  77a2981141aa9d2653fb0092db0e44a3d9bee8e6 (commit)
       via  19430d77d5b7873488fb458534215231356ec1c0 (commit)
      from  abc9d9cd4034d793869129298cc635245fd2108e (commit)

Summary of changes:
 src/toolbar.c |    2 ++
 1 file changed, 2 insertions(+)


- Log -----------------------------------------------------------------
commit 77a2981141aa9d2653fb0092db0e44a3d9bee8e6
Merge: 19430d7 abc9d9c
Author: wwp <wwp at free.fr>
Date:   Fri Dec 16 09:16:15 2016 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 19430d77d5b7873488fb458534215231356ec1c0
Author: wwp <wwp at free.fr>
Date:   Fri Dec 16 09:15:45 2016 +0100

    Silent up coverity scan.

diff --git a/src/toolbar.c b/src/toolbar.c
index 1f36f71..7b7aaae 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -409,6 +409,8 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source, gboolean *rewr
 	gchar *name, *value;
 	ToolbarItem *item = NULL;
 
+	g_return_if_fail(rewrite != NULL);
+
 	attr = xml_get_current_tag_attr(file);
 	item = g_new0(ToolbarItem, 1);
 	while( attr ) {

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Fri Dec 16 11:21:36 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Fri, 16 Dec 2016 11:21:36 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-59-ge3bb5c6
Message-ID: <20161216102136.2AFCB36A4527@mx.colino.net>

The branch, master has been updated
       via  e3bb5c6ac8a605bdeb836f4efeb5af02a8bbc00e (commit)
      from  77a2981141aa9d2653fb0092db0e44a3d9bee8e6 (commit)

Summary of changes:
 src/compose.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit e3bb5c6ac8a605bdeb836f4efeb5af02a8bbc00e
Author: Paul <paul at claws-mail.org>
Date:   Fri Dec 16 10:21:31 2016 +0000

    fix black on black in From header

diff --git a/src/compose.c b/src/compose.c
index a4e4881..26fd9ec 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7503,6 +7503,11 @@ static Compose *compose_create(PrefsAccount *account,
 
 	cm_return_val_if_fail(account != NULL, NULL);
 
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_bgcolor,
+					   &default_header_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_color,
+					   &default_header_color);
+
 	debug_print("Creating compose window...\n");
 	compose = g_new0(Compose, 1);
 
@@ -8097,11 +8102,6 @@ static Compose *compose_create(PrefsAccount *account,
 		gtk_widget_show(window);
 	}
 	
-	gtkut_convert_int_to_gdk_color(prefs_common.default_header_bgcolor,
-					   &default_header_bgcolor);
-	gtkut_convert_int_to_gdk_color(prefs_common.default_header_color,
-					   &default_header_color);
-
 	return compose;
 }
 

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Sun Dec 18 22:35:22 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Sun, 18 Dec 2016 22:35:22 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-60-g22d94ce
Message-ID: <20161218213522.E992536A4544@mx.colino.net>

The branch, master has been updated
       via  22d94ce01f95c50998c3dd8b60a368862a1d3e62 (commit)
      from  e3bb5c6ac8a605bdeb836f4efeb5af02a8bbc00e (commit)

Summary of changes:
 src/common/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 22d94ce01f95c50998c3dd8b60a368862a1d3e62
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Dec 18 22:34:44 2016 +0100

    Do not strip plus sign when drag&drop attaching files.
    
    Closes bug #3742.

diff --git a/src/common/utils.c b/src/common/utils.c
index 875bbe1..1a66212 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1374,7 +1374,7 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
 					*file = '\0';
 					strncpy(escaped_utf8uri, p, q - p + 1);
 					escaped_utf8uri[q - p + 1] = '\0';
-					decode_uri(file, escaped_utf8uri);
+					decode_uri_with_plus(file, escaped_utf8uri, FALSE);
 		    /*
 		     * g_filename_from_uri() rejects escaped/locale encoded uri
 		     * string which come from Nautilus.

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Mon Dec 19 20:51:50 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Mon, 19 Dec 2016 20:51:50 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-61-g5a66116
Message-ID: <20161219195150.F041536A457B@mx.colino.net>

The branch, master has been updated
       via  5a66116ee95c1ceae362074be6cc286a6c70ecc3 (commit)
      from  22d94ce01f95c50998c3dd8b60a368862a1d3e62 (commit)

Summary of changes:
 src/folder.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 5a66116ee95c1ceae362074be6cc286a6c70ecc3
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Dec 19 20:51:21 2016 +0100

    Allow toplevel folders to be copied.
    
    They are created as regular folders in target mailbox.

diff --git a/src/folder.c b/src/folder.c
index ad75045..458026a 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -3344,14 +3344,18 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
 		}
 		tmp = folder_item_parent(tmp);
 	}
-	
+
+	/* both dst and src can be root folders */
 	src_identifier = folder_item_get_identifier(src);
+	if (src_identifier == NULL && src->folder && folder_item_parent(src) == NULL) {
+		src_identifier = folder_get_identifier(src->folder);
+	}
+
 	dst_identifier = folder_item_get_identifier(dest);
-	
 	if(dst_identifier == NULL && dest->folder && folder_item_parent(dest) == NULL) {
-		/* dest can be a root folder */
 		dst_identifier = folder_get_identifier(dest->folder);
 	}
+
 	if (src_identifier == NULL || dst_identifier == NULL) {
 		debug_print("Can't get identifiers\n");
 		return F_MOVE_FAILED;

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Mon Dec 19 21:31:39 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Mon, 19 Dec 2016 21:31:39 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-62-g5305715
Message-ID: <20161219203139.38EFD36A457F@mx.colino.net>

The branch, master has been updated
       via  53057151deb0b63df65fa570df40407effc814c0 (commit)
      from  5a66116ee95c1ceae362074be6cc286a6c70ecc3 (commit)

Summary of changes:
 src/foldersel.c |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 53057151deb0b63df65fa570df40407effc814c0
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Dec 19 21:30:45 2016 +0100

    Use left/right keys to collapse/expand rows in foldersel dialog.
    
    Further keypress will move the cursor to parent
    or first child, respectively.

diff --git a/src/foldersel.c b/src/foldersel.c
index 8d8295b..5470906 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -655,8 +655,38 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-	if (event && event->keyval == GDK_KEY_Escape)
+	if (!event)
+		return FALSE;
+
+	if (event->keyval == GDK_KEY_Escape)
 		foldersel_cancel(NULL, NULL);
+
+	GtkTreePath *path = NULL;
+	gtk_tree_view_get_cursor(GTK_TREE_VIEW(treeview), &path, NULL);
+	if (path == NULL)
+		return FALSE;
+
+	switch (event->keyval) {
+		case GDK_KEY_Left:
+			if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path)) {
+				gtk_tree_view_collapse_row(GTK_TREE_VIEW(treeview), path);
+			} else {
+				gtk_tree_path_up(path);
+				gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
+			}
+			break;
+		case GDK_KEY_Right:
+			if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path)) {
+				gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE);
+			} else {
+				gtk_tree_path_down(path);
+				gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
+			}
+			break;
+	}
+
+	gtk_tree_path_free(path);
+
 	return FALSE;
 }
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 20 11:52:21 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 20 Dec 2016 11:52:21 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-63-ga389716
Message-ID: <20161220105221.3B42D36A456A@mx.colino.net>

The branch, master has been updated
       via  a38971609f56d457f68591d7384490aec06b5638 (commit)
      from  53057151deb0b63df65fa570df40407effc814c0 (commit)

Summary of changes:
 src/compose.c           |    2 +-
 src/messageview.c       |    2 +-
 src/prefs_account.c     |    6 +++---
 src/prefs_folder_item.c |   10 +++++-----
 src/quote_fmt.c         |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit a38971609f56d457f68591d7384490aec06b5638
Author: wwp <wwp at free.fr>
Date:   Tue Dec 20 11:50:46 2016 +0100

    Fix untranslatable concatenated strings (i.e. "Default "+"To:"),
    normalize few uses of header names in UI.

diff --git a/src/compose.c b/src/compose.c
index 26fd9ec..fc02ba7 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5036,7 +5036,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 				gtk_widget_show_all(compose->window);
 			}
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default CC address. Send anyway?"),
+					  _("The only recipient is the default Cc address. Send anyway?"),
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
diff --git a/src/messageview.c b/src/messageview.c
index 1476fe1..05bf956 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,7 +866,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		AlertValue val = 
 		alertpanel_full(_("Warning"),
 		  _("This message is asking for a return receipt notification\n"
-		    "but according to its 'To:' and 'CC:' headers it was not\n"
+		    "but according to its 'To' and 'Cc' headers it was not\n"
 		    "officially addressed to you.\n"
 		    "It is advised to not send the return receipt."),
 		  _("_Don't Send"), _("_Send"), NULL, FALSE,
diff --git a/src/prefs_account.c b/src/prefs_account.c
index c54afcf..9fc9616 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2027,7 +2027,7 @@ static void compose_create_widget_func(PrefsPage * _page,
 	gtk_table_set_col_spacings (GTK_TABLE (table), 8);
 
 	autocc_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Cc"));
+				prefs_common_translated_header_name("Cc:"));
 	gtk_widget_show (autocc_checkbtn);
 	gtk_table_attach (GTK_TABLE (table), autocc_checkbtn, 0, 1, 0, 1,
 			  GTK_FILL, 0, 0, 0);
@@ -2041,7 +2041,7 @@ static void compose_create_widget_func(PrefsPage * _page,
 	SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
 
 	autobcc_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Bcc"));
+				prefs_common_translated_header_name("Bcc:"));
 	gtk_widget_show (autobcc_checkbtn);
 	gtk_table_attach (GTK_TABLE (table), autobcc_checkbtn, 0, 1, 1, 2,
 			  GTK_FILL, 0, 0, 0);
@@ -2055,7 +2055,7 @@ static void compose_create_widget_func(PrefsPage * _page,
 	SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
 
 	autoreplyto_checkbtn = gtk_check_button_new_with_label (
-				prefs_common_translated_header_name("Reply-To"));
+				prefs_common_translated_header_name("Reply-To:"));
 	gtk_widget_show (autoreplyto_checkbtn);
 	gtk_table_attach (GTK_TABLE (table), autoreplyto_checkbtn, 0, 1, 2, 3,
 			  GTK_FILL, 0, 0, 0);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 404aba9..b52187b 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"), NULL);
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -942,7 +942,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strconcat(_("Default "), prefs_common_translated_header_name("To:"),
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"),
 				 _(" for replies"), NULL);
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
@@ -966,7 +966,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strconcat(_("Default "), prefs_common_translated_header_name("Cc:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"), NULL);
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -989,7 +989,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Bcc */
-		text = g_strconcat(_("Default "), prefs_common_translated_header_name("Bcc:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1012,7 +1012,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strconcat(_("Default "), prefs_common_translated_header_name("Reply-To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"), NULL);
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index 9059290..673be38 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -309,7 +309,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
 		gtk_widget_show (hbox3);
 		gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-		label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+		label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
 		gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
 		gtk_widget_show (label_from);
 		gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -439,7 +439,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
 		gtk_widget_show (hbox3);
 		gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-		label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+		label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
 		gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
 		gtk_widget_show (label_from);
 		gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 20 23:02:33 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 20 Dec 2016 23:02:33 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-64-g4a92e36
Message-ID: <20161220220234.1338136A452A@mx.colino.net>

The branch, master has been updated
       via  4a92e36b32bf29d913acf1fed9d81261aa7b4063 (commit)
      from  a38971609f56d457f68591d7384490aec06b5638 (commit)

Summary of changes:
 src/compose.c           |    4 ++--
 src/prefs_folder_item.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 4a92e36b32bf29d913acf1fed9d81261aa7b4063
Author: wwp <wwp at free.fr>
Date:   Tue Dec 20 23:01:29 2016 +0100

    Fix extra arguments to g_strdup_printf (thanks to coverity scan),
    add quotes around header names in few dialogs.

diff --git a/src/compose.c b/src/compose.c
index fc02ba7..0147385 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5036,7 +5036,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 				gtk_widget_show_all(compose->window);
 			}
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default Cc address. Send anyway?"),
+					  _("The only recipient is the default 'Cc' address. Send anyway?"),
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
@@ -5068,7 +5068,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 				gtk_widget_show_all(compose->window);
 			}
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default BCC address. Send anyway?"),
+					  _("The only recipient is the default 'Bcc' address. Send anyway?"),
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index b52187b..f407efb 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -943,7 +943,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
 		/* Default address to reply to */
 		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"),
-				 _(" for replies"), NULL);
+				 _(" for replies"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -966,7 +966,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1012,7 +1012,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"), NULL);
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Dec 20 23:31:39 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue, 20 Dec 2016 23:31:39 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-65-gcf9cab5
Message-ID: <20161220223139.7313436A457F@mx.colino.net>

The branch, master has been updated
       via  cf9cab50cbf40ac76f6db206573c0bf03624a2d0 (commit)
      from  4a92e36b32bf29d913acf1fed9d81261aa7b4063 (commit)

Summary of changes:
 src/common/timing.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit cf9cab50cbf40ac76f6db206573c0bf03624a2d0
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Dec 20 23:31:16 2016 +0100

    Removed an unneeded trailing '\' from Windows' START_TIMING.
    
    Well spotted by Pierre Fortin.

diff --git a/src/common/timing.h b/src/common/timing.h
index 61ffa48..f97bfb1 100644
--- a/src/common/timing.h
+++ b/src/common/timing.h
@@ -63,7 +63,7 @@
 	LARGE_INTEGER diff; \
 	const char *timing_name=str; \
 	QueryPerformanceFrequency (&frequency); \
-	QueryPerformanceCounter (&start); \
+	QueryPerformanceCounter (&start);
 
 #define END_TIMING() \
 	QueryPerformanceCounter (&end); \

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Wed Dec 21 10:08:28 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Wed, 21 Dec 2016 10:08:28 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-66-g596d44c
Message-ID: <20161221090828.2739636A459A@mx.colino.net>

The branch, master has been updated
       via  596d44ce3ca6eaa3c74ec943f43103e8d25bb441 (commit)
      from  cf9cab50cbf40ac76f6db206573c0bf03624a2d0 (commit)

Summary of changes:
 src/prefs_folder_item.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 596d44ce3ca6eaa3c74ec943f43103e8d25bb441
Author: wwp <wwp at free.fr>
Date:   Wed Dec 21 10:08:13 2016 +0100

    Fix wrong string split and list of arguments.

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index f407efb..dab8eb3 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -942,8 +942,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"),
-				 _(" for replies"));
+		text = g_strdup_printf(_("Default %s for replies"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Dec 21 12:58:11 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed, 21 Dec 2016 12:58:11 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-67-g123563c
Message-ID: <20161221115811.754DF36A45A5@mx.colino.net>

The branch, master has been updated
       via  123563ca47cc6225791d5cff84792d9de6c312a6 (commit)
      from  596d44ce3ca6eaa3c74ec943f43103e8d25bb441 (commit)

Summary of changes:
 src/compose.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 123563ca47cc6225791d5cff84792d9de6c312a6
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Dec 21 12:57:47 2016 +0100

    Moved compose_can_autosave() outside of #ifdef G_OS_UNIX.

diff --git a/src/compose.c b/src/compose.c
index 0147385..4ed8e21 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9371,6 +9371,14 @@ static void compose_exec_ext_editor(Compose *compose)
 #endif /* G_OS_UNIX */
 }
 
+static gboolean compose_can_autosave(Compose *compose)
+{
+	if (compose->privacy_system && compose->use_encryption)
+		return prefs_common.autosave && prefs_common.autosave_encrypted;
+	else
+		return prefs_common.autosave;
+}
+
 #ifdef G_OS_UNIX
 static gboolean compose_get_ext_editor_cmd_valid()
 {
@@ -9493,14 +9501,6 @@ static gboolean compose_ext_editor_kill(Compose *compose)
 	return TRUE;
 }
 
-static gboolean compose_can_autosave(Compose *compose)
-{
-	if (compose->privacy_system && compose->use_encryption)
-		return prefs_common.autosave && prefs_common.autosave_encrypted;
-	else
-		return prefs_common.autosave;
-}
-
 static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
 				 gpointer data)
 {

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Dec 21 13:21:58 2016
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed, 21 Dec 2016 13:21:58 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-68-ge31ee60
Message-ID: <20161221122158.85FDB36A45A7@mx.colino.net>

The branch, master has been updated
       via  e31ee60178f6d6a1daf673bea143d1446d4378db (commit)
      from  123563ca47cc6225791d5cff84792d9de6c312a6 (commit)

Summary of changes:
 src/foldersel.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit e31ee60178f6d6a1daf673bea143d1446d4378db
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Dec 21 13:21:03 2016 +0100

    Stop left/right keypresses from propagating further in foldersel.
    
    This amends commit 5305715.

diff --git a/src/foldersel.c b/src/foldersel.c
index 5470906..faf8293 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -658,8 +658,10 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
 	if (!event)
 		return FALSE;
 
-	if (event->keyval == GDK_KEY_Escape)
+	if (event->keyval == GDK_KEY_Escape) {
 		foldersel_cancel(NULL, NULL);
+		return TRUE;
+	}
 
 	GtkTreePath *path = NULL;
 	gtk_tree_view_get_cursor(GTK_TREE_VIEW(treeview), &path, NULL);
@@ -674,6 +676,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
 				gtk_tree_path_up(path);
 				gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
 			}
+			return TRUE;
 			break;
 		case GDK_KEY_Right:
 			if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path)) {
@@ -682,6 +685,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
 				gtk_tree_path_down(path);
 				gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
 			}
+			return TRUE;
 			break;
 	}
 

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Wed Dec 21 15:17:43 2016
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Wed, 21 Dec 2016 15:17:43 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-69-gb281fca
Message-ID: <20161221141744.0711E36A45B9@mx.colino.net>

The branch, master has been updated
       via  b281fcac6759f48d15eaa646e12735a8924e9005 (commit)
      from  e31ee60178f6d6a1daf673bea143d1446d4378db (commit)

Summary of changes:
 src/stock_pixmap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit b281fcac6759f48d15eaa646e12735a8924e9005
Author: Ricardo Mones <ricardo at mones.org>
Date:   Wed Dec 21 15:12:16 2016 +0100

    Remove unnecessary commas
    
    They were added by mistake in f455e02c.

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 9db0648..702b45c 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -433,9 +433,9 @@ static StockPixmapData pixmaps[] =
     {tray_unreadmail_xpm              , NULL, NULL, "tray_unreadmail", NULL, NULL},
     {tray_unreadmarkedmail_offline_xpm, NULL, NULL, "tray_unreadmarkedmail_offline", NULL, NULL},
     {tray_unreadmarkedmail_xpm        , NULL, NULL, "tray_unreadmarkedmail", NULL, NULL},
-    {doc_index_xpm                    , NULL, NULL, "doc_index", NULL, NULL,},
-    {doc_index_close_xpm              , NULL, NULL, "doc_index_close", NULL, NULL,},
-    {doc_info_xpm                     , NULL, NULL, "doc_info", NULL, NULL,},
+    {doc_index_xpm                    , NULL, NULL, "doc_index", NULL, NULL},
+    {doc_index_close_xpm              , NULL, NULL, "doc_index_close", NULL, NULL},
+    {doc_info_xpm                     , NULL, NULL, "doc_info", NULL, NULL},
     {first_arrow_xpm                  , NULL, NULL, "first_arrow", NULL, NULL},
     {last_arrow_xpm                   , NULL, NULL, "last_arrow", NULL, NULL},
     {left_arrow_xpm                   , NULL, NULL, "left_arrow", NULL, NULL},

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Wed Dec 21 15:53:01 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Wed, 21 Dec 2016 15:53:01 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-70-g69eaf52
Message-ID: <20161221145302.2067736A45B9@mx.colino.net>

The branch, master has been updated
       via  69eaf525fa8425ce3a993f5300ffd970ab730d7b (commit)
      from  b281fcac6759f48d15eaa646e12735a8924e9005 (commit)

Summary of changes:
 src/compose.c                                     |   12 +++++++++--
 src/messageview.c                                 |   11 ++++++++---
 src/plugins/address_keeper/address_keeper_prefs.c |   22 +++++++++++++++------
 src/prefs_compose_writing.c                       |    7 +++++--
 4 files changed, 39 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 69eaf525fa8425ce3a993f5300ffd970ab730d7b
Author: wwp <wwp at free.fr>
Date:   Wed Dec 21 15:52:41 2016 +0100

    More translatable header names in UI strings.

diff --git a/src/compose.c b/src/compose.c
index 4ed8e21..0be7a59 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5032,12 +5032,16 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 		}
 		if (!found_other) {
 			AlertValue aval;
+			gchar *text;
 			if (compose->batch) {
 				gtk_widget_show_all(compose->window);
 			}
+			text = g_strdup_printf(_("The only recipient is the default '%s' address. Send anyway?"),
+					   prefs_common_translated_header_name("Cc"));
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default 'Cc' address. Send anyway?"),
+					  text,
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
+			g_free(text);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
 		}
@@ -5064,12 +5068,16 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
 		}
 		if (!found_other) {
 			AlertValue aval;
+			gchar *text;
 			if (compose->batch) {
 				gtk_widget_show_all(compose->window);
 			}
+			text = g_strdup_printf(_("The only recipient is the default '%s' address. Send anyway?"),
+					   prefs_common_translated_header_name("Bcc"));
 			aval = alertpanel(_("Send"),
-					  _("The only recipient is the default 'Bcc' address. Send anyway?"),
+					  text,
 					  GTK_STOCK_CANCEL, g_strconcat("+", _("_Send"), NULL), NULL);
+			g_free(text);
 			if (aval != G_ALERTALTERNATE)
 				return FALSE;
 		}
diff --git a/src/messageview.c b/src/messageview.c
index 05bf956..b07813e 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -863,12 +863,17 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 	ac_list = account_find_all_from_address(ac_list, msginfo->cc);
 
 	if (ac_list == NULL) {
-		AlertValue val = 
-		alertpanel_full(_("Warning"),
+		AlertValue val;
+		gchar *text;
+		text = g_strdup_printf(
 		  _("This message is asking for a return receipt notification\n"
-		    "but according to its 'To' and 'Cc' headers it was not\n"
+		    "but according to its '%s' and '%s' headers it was not\n"
 		    "officially addressed to you.\n"
 		    "It is advised to not send the return receipt."),
+		  prefs_common_translated_header_name("To"),
+		  prefs_common_translated_header_name("Cc"));
+		val = alertpanel_full(_("Warning"),
+		  text,
 		  _("_Don't Send"), _("_Send"), NULL, FALSE,
 		  NULL, ALERT_WARNING, G_ALERTDEFAULT);
 		if (val != G_ALERTALTERNATE)
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 5291b51..93a39f1 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -99,6 +99,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	GtkWidget *blocked_scrolledwin;
 	GtkWidget *vbox;
 	GtkTextBuffer *buffer;
+	gchar *text;
 
 	vbox = gtk_vbox_new(FALSE, 6);
 
@@ -137,29 +138,38 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 		_("Fields to keep addresses from"));
 	gtk_container_set_border_width(GTK_CONTAINER(keep_frame), 6);
 
-	keep_to_checkbox = gtk_check_button_new_with_label(_("To"));
+	keep_to_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("To"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_to_checkbox);
-	CLAWS_SET_TIP(keep_to_checkbox, _("Keep addresses which appear in 'To' headers"));
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+			prefs_common_translated_header_name("To"));
+	CLAWS_SET_TIP(keep_to_checkbox, text);
+	g_free(text);
 	gtk_widget_show(keep_to_checkbox);
 
 	page->keep_to_addrs_check = keep_to_checkbox;
 
-	keep_cc_checkbox = gtk_check_button_new_with_label(_("Cc"));
+	keep_cc_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("Cc"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_cc_checkbox);
-	CLAWS_SET_TIP(keep_cc_checkbox, _("Keep addresses which appear in 'Cc' headers"));
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+			prefs_common_translated_header_name("Cc"));
+	CLAWS_SET_TIP(keep_cc_checkbox, text);
+	g_free(text);
 	gtk_widget_show(keep_cc_checkbox);
 
 	page->keep_cc_addrs_check = keep_cc_checkbox;
 
-	keep_bcc_checkbox = gtk_check_button_new_with_label(_("Bcc"));
+	keep_bcc_checkbox = gtk_check_button_new_with_label(prefs_common_translated_header_name("Bcc"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_bcc_checkbox);
-	CLAWS_SET_TIP(keep_bcc_checkbox, _("Keep addresses which appear in 'Bcc' headers"));
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+			prefs_common_translated_header_name("Bcc"));
+	CLAWS_SET_TIP(keep_bcc_checkbox, text);
+	g_free(text);
 	gtk_widget_show(keep_bcc_checkbox);
 
 	page->keep_bcc_addrs_check = keep_bcc_checkbox;
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 46dd621..2f5aff2 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -116,6 +116,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	GtkWidget *optmenu_dnd_insert_or_attach;
 	GtkListStore *menu;
 	GtkTreeIter iter;
+	gchar *text;
 
 	vbox1 = gtk_vbox_new (FALSE, VSPACING);
 	gtk_widget_show (vbox1);
@@ -226,8 +227,10 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
 	PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment,
 			   _("Forward as attachment"));
 
-	PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
-			   _("Keep the original 'From' header when redirecting"));
+	text = g_strdup_printf(_("Keep the original '%s' header when redirecting"),
+			prefs_common_translated_header_name("From"));
+	PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from, text);
+	g_free(text);
 
 	/* dnd insert or attach */
 	label_dnd_insert_or_attach = gtk_label_new (_("When dropping files into the Compose window"));

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Wed Dec 21 16:01:48 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Wed, 21 Dec 2016 16:01:48 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-71-gdbdfae6
Message-ID: <20161221150148.B597336A45BC@mx.colino.net>

The branch, master has been updated
       via  dbdfae69691fb64e37347cb4bec9bb41619e6dbb (commit)
      from  69eaf525fa8425ce3a993f5300ffd970ab730d7b (commit)

Summary of changes:
 src/gtk/quicksearch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit dbdfae69691fb64e37347cb4bec9bb41619e6dbb
Author: wwp <wwp at free.fr>
Date:   Wed Dec 21 16:01:36 2016 +0100

    Capitalize header names (as everywhere else).

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 4efbaf0..7e1d372 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -484,7 +484,7 @@ static gchar *search_descr_strings[] = {
 	"b S",	 N_("messages which contain S in the message body"),
 	"B S",	 N_("messages which contain S in the whole message"),
 	"c S",	 N_("messages carbon-copied to S"),
-	"C S",	 N_("message is either to: or cc: to S"),
+	"C S",	 N_("message is either To: or Cc: to S"),
 	"D",	 N_("deleted messages"), /** how I can filter deleted messages **/
 	"e S",	 N_("messages which contain S in the Sender field"),
 	"E S",	 N_("true if execute \"S\" succeeds"),

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Wed Dec 21 16:03:36 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Wed, 21 Dec 2016 16:03:36 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-72-gbb71788
Message-ID: <20161221150336.B81B336A45BC@mx.colino.net>

The branch, master has been updated
       via  bb7178864f2ff7f07ba9b8a632eeb005887e3820 (commit)
      from  dbdfae69691fb64e37347cb4bec9bb41619e6dbb (commit)

Summary of changes:
 po/fr.po |  988 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 517 insertions(+), 471 deletions(-)


- Log -----------------------------------------------------------------
commit bb7178864f2ff7f07ba9b8a632eeb005887e3820
Author: wwp <wwp at free.fr>
Date:   Wed Dec 21 16:03:15 2016 +0100

    Update French translation.

diff --git a/po/fr.po b/po/fr.po
index 449fa7b..00d55ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -643,8 +643,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: 2016-12-12 15:14+0100\n"
-"PO-Revision-Date: 2016-12-12 19:02+0100\n"
+"POT-Creation-Date: 2016-12-21 16:02+0100\n"
+"PO-Revision-Date: 2016-12-21 16:00+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
 "MIME-Version: 1.0\n"
@@ -716,7 +716,7 @@ 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:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7203 src/editaddress.c:1264
+#: src/addressbook.c:125 src/compose.c:7211 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
@@ -996,7 +996,7 @@ msgid "Duplicate email addresses"
 msgstr "Adresses email en double"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:510
 msgid "Address"
 msgstr "Adresse"
 
@@ -1293,7 +1293,7 @@ msgid "Sources"
 msgstr "Sources"
 
 #: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/toolbar.c:259 src/toolbar.c:2420
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1332,7 +1332,7 @@ msgstr ""
 
 #: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/toolbar.c:479
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1603,19 +1603,19 @@ msgstr ""
 "La mise ? jour a ?chou?. Les modifications ne seront pas appliqu?es au "
 "r?pertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9465
+#: src/alertpanel.c:146 src/compose.c:9481
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5687 src/compose.c:6210
-#: src/compose.c:11891 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867
+#: src/alertpanel.c:159 src/compose.c:5695 src/compose.c:6218
+#: src/compose.c:11902 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:875
 #: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4850
+#: src/summaryview.c:4871
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5624 src/inc.c:663
+#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5632 src/inc.c:663
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
 msgid "Error"
 msgstr "Erreur"
@@ -2564,7 +2564,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?tes-vous s?r ?"
 
-#: src/compose.c:3624 src/compose.c:10496 src/compose.c:11372
+#: src/compose.c:3624 src/compose.c:10507 src/compose.c:11383
 msgid "_Insert"
 msgstr "_Ins?rer"
 
@@ -2610,7 +2610,7 @@ msgstr "[Pas de sujet] - Composition d'un message%s"
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4818 src/messageview.c:889
+#: src/compose.c:4818 src/messageview.c:894
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2618,55 +2618,50 @@ 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:5038 src/compose.c:5070 src/compose.c:5112
-#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
-msgid "Send"
-msgstr "Envoyer"
-
-#: src/compose.c:5039
-msgid "The only recipient is the default CC address. Send anyway?"
+#: src/compose.c:5039 src/compose.c:5075
+#, c-format
+msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
-"Le seul destinataire est l'adresse ? Cc: ? par d?faut. Voulez-vous quand m?me "
+"Le seul destinataire est l'adresse ? %s ? par d?faut. Voulez-vous quand m?me "
 "envoyer le message ?"
 
-#: src/compose.c:5040 src/compose.c:5072 src/compose.c:5105 src/compose.c:5625
-#: src/folderview.c:2548 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+#: src/compose.c:5041 src/compose.c:5077 src/compose.c:5120
+#: src/prefs_account.c:3323 src/toolbar.c:469 src/toolbar.c:500
+msgid "Send"
+msgstr "Envoyer"
+
+#: src/compose.c:5043 src/compose.c:5079 src/compose.c:5113 src/compose.c:5633
+#: src/folderview.c:2548 src/messageview.c:855 src/messageview.c:877
+#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2907
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5071
-msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr ""
-"Le seul destinataire est l'adresse ? Cci: ? par d?faut. Voulez-vous quand "
-"m?me envoyer le message ?"
-
-#: src/compose.c:5088
+#: src/compose.c:5096
 msgid "Recipient is not specified."
 msgstr "Destinataire non sp?cifi?."
 
-#: src/compose.c:5107 src/plugins/attachwarner/attachwarner.c:212
+#: src/compose.c:5115 src/plugins/attachwarner/attachwarner.c:212
 msgid "_Queue"
 msgstr "_Mettre en file d'attente"
 
-#: src/compose.c:5108
+#: src/compose.c:5116
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5109 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5117 src/plugins/attachwarner/attachwarner.c:222
 msgid "Send it anyway?"
 msgstr "Voulez-vous quand m?me l'envoyer ?"
 
-#: src/compose.c:5110 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5118 src/plugins/attachwarner/attachwarner.c:222
 msgid "Queue it anyway?"
 msgstr "Voulez-vous quand m?me le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5112 src/toolbar.c:425
+#: src/compose.c:5120 src/toolbar.c:501
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5165 src/compose.c:9960
+#: src/compose.c:5173 src/compose.c:9979
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2676,7 +2671,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caract?res a ?chou?."
 
-#: src/compose.c:5168 src/compose.c:9963
+#: src/compose.c:5176 src/compose.c:9982
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2686,7 +2681,7 @@ msgstr ""
 "\n"
 "La cl? de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5174 src/compose.c:9957
+#: src/compose.c:5182 src/compose.c:9976
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2697,7 +2692,7 @@ msgstr ""
 "\n"
 "Sa signature a ?chou? : %s"
 
-#: src/compose.c:5177
+#: src/compose.c:5185
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2708,11 +2703,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5179
+#: src/compose.c:5187
 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:5194 src/compose.c:5254
+#: src/compose.c:5202 src/compose.c:5262
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2720,7 +2715,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:5250
+#: src/compose.c:5258
 #, c-format
 msgid ""
 "%s\n"
@@ -2729,7 +2724,7 @@ msgstr ""
 "%s\n"
 "Utilisez ? Message / Envoyer les messages en file d'attente ? pour r?essayer."
 
-#: src/compose.c:5621
+#: src/compose.c:5629
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2740,7 +2735,7 @@ msgstr ""
 "message vers le jeu de caract?res sp?cifi? (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5683
+#: src/compose.c:5691
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2754,76 +2749,76 @@ msgstr ""
 "\n"
 "Voulez-vous quand m?me l'envoyer ?"
 
-#: src/compose.c:5794
+#: src/compose.c:5802
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossible de chiffrer le message : %s"
 
-#: src/compose.c:5915
+#: src/compose.c:5923
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:5916
+#: src/compose.c:5924
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:5965
+#: src/compose.c:5973
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5974
+#: src/compose.c:5982
 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:6209
+#: src/compose.c:6217
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pi?ce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6210 src/mainwindow.c:657 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6218 src/mainwindow.c:657 src/toolbar.c:265
+#: src/toolbar.c:2445
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6210
+#: src/compose.c:6218
 msgid "Ignore attachment"
 msgstr "Ignorer cette pi?ce jointe"
 
-#: src/compose.c:6250
+#: src/compose.c:6258
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6811
+#: src/compose.c:6819
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6972
+#: src/compose.c:6980
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6976 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6984 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour proc?der ? la compl?tion depuis le carnet "
 "d'adresse"
 
-#: src/compose.c:7191
+#: src/compose.c:7199
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7197 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
+#: src/compose.c:7205 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
 #: src/prefs_matcher.c:630 src/prefs_summaries.c:434
 #: src/prefs_summary_column.c:85 src/summaryview.c:446
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7260
+#: src/compose.c:7268
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7297 src/editjpilot.c:276 src/editldap.c:519
+#: src/compose.c:7305 src/editjpilot.c:276 src/editldap.c:519
 #: 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:1025
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2834,23 +2829,23 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7770
+#: src/compose.c:7783
 msgid "Hea_der"
 msgstr "E_n-t?te"
 
-#: src/compose.c:7775
+#: src/compose.c:7788
 msgid "_Attachments"
 msgstr "Pi?ces _jointes"
 
-#: src/compose.c:7789
+#: src/compose.c:7802
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7804
+#: src/compose.c:7817
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8028
+#: src/compose.c:8041
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2859,19 +2854,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu ?tre lanc?.\n"
 "%s"
 
-#: src/compose.c:8180
+#: src/compose.c:8188
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8197
+#: src/compose.c:8205
 msgid "Account to use for this email"
 msgstr "Compte ? utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8199
+#: src/compose.c:8207
 msgid "Sender address to be used"
 msgstr "Adresse email ? utiliser en tant qu'exp?diteur"
 
-#: src/compose.c:8365
+#: src/compose.c:8373
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2880,68 +2875,68 @@ msgstr ""
 "Le syst?me de confidentialit? '%s' ne peut ?tre charg?. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8466 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8474 src/plugins/archive/archiver_gtk.c:1077
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8567 src/prefs_template.c:750
+#: src/compose.c:8575 src/prefs_template.c:750
 #, 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:8683
+#: src/compose.c:8691
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-t?te ? De: ? du mod?le."
 
-#: src/compose.c:8701
+#: src/compose.c:8709
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-t?te ? ?: ? du mod?le."
 
-#: src/compose.c:8719
+#: src/compose.c:8727
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cc: ? du mod?le."
 
-#: src/compose.c:8737
+#: src/compose.c:8745
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cci: ? du mod?le."
 
-#: src/compose.c:8755
+#: src/compose.c:8763
 msgid "Template Reply-To format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Reply-To: ? du mod?le."
 
-#: src/compose.c:8774
+#: src/compose.c:8782
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du mod?le."
 
-#: src/compose.c:9043
+#: src/compose.c:9051
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9058
+#: src/compose.c:9066
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9132
+#: src/compose.c:9140
 msgid "Properties"
 msgstr "Propri?t?s"
 
-#: src/compose.c:9149
+#: src/compose.c:9157
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9190
+#: src/compose.c:9198
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9210
+#: src/compose.c:9218
 msgid "Path"
 msgstr "Chemin d'acc?s"
 
-#: src/compose.c:9211
+#: src/compose.c:9219
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9462
+#: src/compose.c:9478
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2952,15 +2947,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9926 src/messageview.c:1083
+#: src/compose.c:9945 src/messageview.c:1088
 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:9952
+#: src/compose.c:9971
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9954
+#: src/compose.c:9973
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2971,15 +2966,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10132
+#: src/compose.c:10151
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10136
+#: src/compose.c:10155
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10137
+#: src/compose.c:10156
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2988,24 +2983,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'?dition de ce message ?"
 
-#: src/compose.c:10139
+#: src/compose.c:10158
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10139
+#: src/compose.c:10158
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10299 src/compose.c:10313
+#: src/compose.c:10318 src/compose.c:10332
 msgid "Select file"
 msgstr "Veuillez s?lectionner un fichier"
 
-#: src/compose.c:10327
+#: src/compose.c:10346
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "?chec lors de la lecture de ? %s ?."
 
-#: src/compose.c:10329
+#: src/compose.c:10348
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3014,54 +3009,54 @@ msgstr ""
 "Le fichier ? %s ? contient des caract?res n'appartenant pas\n"
 "? l'encodage courant : l'insertion peut ?tre incorrecte."
 
-#: src/compose.c:10416
+#: src/compose.c:10427
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10417
+#: src/compose.c:10428
 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:10418 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10429 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10418 src/compose.c:10422
+#: src/compose.c:10429 src/compose.c:10433
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10420 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10431 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10421
+#: src/compose.c:10432
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
 "modifications ?"
 
-#: src/compose.c:10422
+#: src/compose.c:10433
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10493
+#: src/compose.c:10504
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le mod?le ? %s ? ?"
 
-#: src/compose.c:10495
+#: src/compose.c:10506
 msgid "Apply template"
 msgstr "Utiliser le mod?le"
 
-#: src/compose.c:10496 src/prefs_actions.c:329
+#: src/compose.c:10507 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1060
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11365
+#: src/compose.c:11376
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -3076,20 +3071,20 @@ msgstr[1] ""
 "Voulez-vous ins?rer le contenu des %d fichiers directement dans le corps du "
 "message ou les joindre en tant que pi?ces jointes ?"
 
-#: src/compose.c:11371
+#: src/compose.c:11382
 msgid "Insert or attach?"
 msgstr "Ins?rer ou joindre ?"
 
-#: src/compose.c:11372
+#: src/compose.c:11383
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11590
+#: src/compose.c:11601
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation ? la ligne %d."
 
-#: src/compose.c:11885
+#: src/compose.c:11896
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3121,7 +3116,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Traces de d?bogage"
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:518
 msgid "Close"
 msgstr "Fermer"
 
@@ -3201,7 +3196,7 @@ msgstr "L'adresse email est requise."
 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:1679
+#: src/editaddress.c:675 src/prefs_folder_item.c:1678
 msgid "Discard"
 msgstr "Annuler"
 
@@ -3777,7 +3772,7 @@ msgstr "Feuille de style"
 #: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1191
 #: src/plugins/archive/archiver_prefs.c:235
 #: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5974
+#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1476 src/summaryview.c:5995
 msgid "None"
 msgstr "Aucun"
 
@@ -4017,7 +4012,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:8118
+#: src/export.c:113 src/summaryview.c:8139
 msgid "Export to mbox file"
 msgstr "Exporter la s?lection en fichier mbox"
 
@@ -4309,25 +4304,25 @@ msgstr "Copie de %s vers %s..\n"
 msgid "Moving %s to %s...\n"
 msgstr "D?placement de %s vers %s..\n"
 
-#: src/folder.c:3568
+#: src/folder.c:3572
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise ? jour du cache pour %s.."
 
-#: src/folder.c:4430
+#: src/folder.c:4434
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
-#: src/folder.c:4565
+#: src/folder.c:4569
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
 
-#: src/folder.c:4822
+#: src/folder.c:4826
 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:4826
+#: src/folder.c:4830
 msgid "A folder name can not end with a space."
 msgstr "Un nom de dossier ne peut pas finir par un espace."
 
@@ -4402,13 +4397,14 @@ msgstr "_Envoyer les messages.."
 
 #: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6248
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6269
 msgid "New"
 msgstr "Nouveau"
 
 #: src/folderview.c:398 src/folderview.c:445
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6250
+#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6271
+#: src/toolbar.c:493
 msgid "Unread"
 msgstr "Non lu"
 
@@ -4426,7 +4422,7 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Initialisation des donn?es des dossiers.."
 
-#: src/folderview.c:867 src/summaryview.c:4113
+#: src/folderview.c:867 src/summaryview.c:4128
 msgid "Mark all as read"
 msgstr "Marquer tous comme lus"
 
@@ -4438,12 +4434,12 @@ 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:4114
+#: src/folderview.c:870 src/summaryview.c:4129
 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:4116
+#: src/folderview.c:873 src/summaryview.c:4165
 msgid "Mark all as unread"
 msgstr "Marquer tous comme non l_us"
 
@@ -4455,7 +4451,7 @@ 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:4117
+#: src/folderview.c:876 src/summaryview.c:4166
 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 ?"
@@ -4524,29 +4520,29 @@ msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2534 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2534 src/inc.c:1533 src/toolbar.c:2885
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2535 src/toolbar.c:2608
+#: src/folderview.c:2535 src/toolbar.c:2886
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
-#: src/folderview.c:2546 src/toolbar.c:2627
+#: src/folderview.c:2546 src/toolbar.c:2905
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2547 src/toolbar.c:2628
+#: src/folderview.c:2547 src/toolbar.c:2906
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2556 src/toolbar.c:2647
+#: src/folderview.c:2556 src/toolbar.c:2925
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
-#: src/folderview.c:2559 src/main.c:2748 src/toolbar.c:2650
+#: src/folderview.c:2559 src/main.c:2748 src/toolbar.c:2928
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4615,7 +4611,7 @@ msgstr "Le d?placement a ?chou?."
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3182 src/summaryview.c:4541 src/summaryview.c:4642
+#: src/folderview.c:3182 src/summaryview.c:4562 src/summaryview.c:4663
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut ?tre utilis? seulement pour stocker des "
@@ -4667,7 +4663,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:1922 src/summaryview.c:1572
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1922 src/summaryview.c:1573
 msgid "Done."
 msgstr "Termin?."
 
@@ -5199,20 +5195,18 @@ msgstr "? l'exp?diteur :"
 msgid "Reply-To"
 msgstr "R?pondre ?"
 
-#: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:444
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1257
+#: src/prefs_matcher.c:2163 src/prefs_summaries.c:438
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:444
 msgid "To"
 msgstr "?"
 
-#: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1258
+#: src/prefs_matcher.c:2164 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
-#: src/gtk/headers.h:15 src/plugins/address_keeper/address_keeper_prefs.c:158
+#: src/gtk/headers.h:15
 msgid "Bcc"
 msgstr "Cci"
 
@@ -5364,7 +5358,7 @@ msgstr "Consult? :"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
 #: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2798
+#: src/prefs_summary_column.c:79 src/summaryview.c:2800
 msgid "Status"
 msgstr "?tat"
 
@@ -5554,7 +5548,7 @@ msgstr "? ou Cc"
 
 #: src/gtk/headers.h:64
 msgid "To or Cc:"
-msgstr "? ou Cc :"
+msgstr "? ou Cc:"
 
 #: src/gtk/headers.h:65
 msgid "From, To or Subject"
@@ -5562,7 +5556,7 @@ msgstr "De, ? ou Sujet"
 
 #: src/gtk/headers.h:65
 msgid "From, To or Subject:"
-msgstr "De, ? ou Sujet :"
+msgstr "De, ? ou Sujet:"
 
 #: src/gtk/icon_legend.c:67
 msgid "New message"
@@ -5746,7 +5740,7 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
+#: src/plugins/address_keeper/address_keeper_prefs.c:266
 #: src/plugins/archive/archiver_prefs.c:90
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
@@ -5768,7 +5762,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:944
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:954
 msgid "Plugins"
 msgstr "Modules"
 
@@ -5853,7 +5847,8 @@ msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-t?te ? Cc: ?"
 
 #: src/gtk/quicksearch.c:487
-msgid "message is either to: or cc: to S"
+#, fuzzy
+msgid "message is either To: or Cc: to S"
 msgstr "messages contenant S dans les en-t?tes ? ?: ? ou ? Cc: ?"
 
 #: src/gtk/quicksearch.c:488
@@ -6228,15 +6223,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:884 src/summaryview.c:3369
-#: src/summaryview.c:3387 src/summaryview.c:3408
+#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3371
+#: src/summaryview.c:3389 src/summaryview.c:3410
 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:887 src/summaryview.c:3420
-#: src/summaryview.c:3423
+#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3422
+#: src/summaryview.c:3425
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -6861,8 +6856,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "d?sinscrire du"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1432
-#: src/prefs_folder_item.c:1460 src/prefs_folder_item.c:1488
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1431
+#: src/prefs_folder_item.c:1459 src/prefs_folder_item.c:1487
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -7107,7 +7102,7 @@ msgid "Auth failed"
 msgstr "L'authentification a ?chou?"
 
 #: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2794 src/summaryview.c:6274
+#: src/prefs_summary_column.c:88 src/summaryview.c:2796 src/summaryview.c:6295
 msgid "Locked"
 msgstr "Verrouill?"
 
@@ -7425,7 +7420,7 @@ msgstr "En-t?te non conforme\n"
 
 #: src/main.c:1780
 msgid "Duplicated 'To:' header\n"
-msgstr "En-t?te '?:' en plusieurs exemplaires\n"
+msgstr "En-t?te ? ?: ? en plusieurs exemplaires\n"
 
 #: src/main.c:1791
 msgid "Missing required 'To:' header\n"
@@ -7870,7 +7865,7 @@ msgstr "Message"
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:639 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:639 src/messageview.c:289 src/toolbar.c:476
 msgid "Open"
 msgstr "Ouvrir"
 
@@ -7931,15 +7926,15 @@ msgstr "_Liste de diffusion"
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et r?pondre ?"
 
-#: src/mainwindow.c:672 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:672 src/messageview.c:307 src/toolbar.c:2347
 msgid "_Forward"
 msgstr "_Transf?rer"
 
-#: src/mainwindow.c:673 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:673 src/messageview.c:308 src/toolbar.c:2348
 msgid "For_ward as attachment"
 msgstr "Transf?rer en _pi?ce jointe"
 
-#: src/mainwindow.c:674 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:674 src/messageview.c:309 src/toolbar.c:2349
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
@@ -8004,13 +7999,13 @@ msgid "_Unmark"
 msgstr "_D?marquer"
 
 #: src/mainwindow.c:705
-msgid "Mark as unr_ead"
-msgstr "Marquer comme _non lu"
-
-#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Marquer comme _lu"
 
+#: src/mainwindow.c:706
+msgid "Mark as unr_ead"
+msgstr "Marquer comme _non lu"
+
 #: src/mainwindow.c:708
 msgid "Mark all read"
 msgstr "Marquer _tous comme lus"
@@ -8019,8 +8014,8 @@ msgstr "Marquer _tous comme lus"
 msgid "Mark all unread"
 msgstr "Marquer _tous comme non lus"
 
-#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:233
+#: src/toolbar.c:484
 msgid "Ignore thread"
 msgstr "Ignorer du f_il de discussion"
 
@@ -8028,8 +8023,8 @@ msgstr "Ignorer du f_il de discussion"
 msgid "Unignore thread"
 msgstr "Inclure dans f_il de discussion"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:234
+#: src/toolbar.c:485
 msgid "Watch thread"
 msgstr "_Suivre le fil de discussion"
 
@@ -8045,11 +8040,11 @@ msgstr "Marquer comme _pourriel"
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _l?gitime"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:181 src/toolbar.c:488
 msgid "Lock"
 msgstr "_Bloquer"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:182 src/toolbar.c:489
 msgid "Unlock"
 msgstr "D?blo_quer"
 
@@ -8393,7 +8388,7 @@ msgstr "Descendant"
 msgid "_Auto detect"
 msgstr "D?tection _automatique"
 
-#: src/mainwindow.c:1315 src/summaryview.c:6200
+#: src/mainwindow.c:1315 src/summaryview.c:6221
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
@@ -8435,7 +8430,7 @@ msgstr "Le tra?age du filtrage est d?sactiv?.\n"
 #: src/mainwindow.c:2490 src/mainwindow.c:2497 src/mainwindow.c:2540
 #: src/mainwindow.c:2573 src/mainwindow.c:2605 src/mainwindow.c:2650
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1062
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1061
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -8529,7 +8524,7 @@ 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:4999 src/summaryview.c:5691
+#: src/mainwindow.c:4999 src/summaryview.c:5712
 msgid "Processing rules to apply before folder rules"
 msgstr "R?gles de traitement ? appliquer avant le filtrage des dossiers"
 
@@ -8537,7 +8532,7 @@ msgstr "R?gles de traitement ? appliquer avant le filtrage des dossiers"
 msgid "Processing rules to apply after folder rules"
 msgstr "R?gles de traitement ? appliquer apr?s le filtrage des dossiers"
 
-#: src/mainwindow.c:5015 src/summaryview.c:5702
+#: src/mainwindow.c:5015 src/summaryview.c:5723
 msgid "Filtering configuration"
 msgstr "R?gles de filtrage"
 
@@ -8643,7 +8638,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:1842 src/mimeview.c:1842
+#: src/mbox.c:551 src/messageview.c:1847 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3085
 msgid "Overwrite"
 msgstr "?craser"
@@ -8693,7 +8688,7 @@ msgstr "Recherche termin?e"
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:713 src/messageview.c:1438 src/messageview.c:1589
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
@@ -8702,7 +8697,7 @@ msgid "<No Return-Path found>"
 msgstr "< ? Return-Path: ? introuvable>"
 
 #: src/messageview.c:848
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
@@ -8713,67 +8708,67 @@ msgstr ""
 "L'adresse ? laquelle l'accus? de r?ception est ? envoyer\n"
 "ne correspond pas ? l'en-t?te ? Return-Path: ?\n"
 "Adresse pour l'accus? de r?ception : %s\n"
-"Return-Path: %s\n"
+"Return-Path : %s\n"
 "Il est conseill? de ne pas envoyer cet accus? de r?ception."
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:855 src/messageview.c:877
 msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
-#: src/messageview.c:868
-#, fuzzy
+#: src/messageview.c:869
+#, c-format
 msgid ""
 "This message is asking for a return receipt notification\n"
-"but according to its 'To:' and 'CC:' headers it was not\n"
+"but according to its '%s' and '%s' headers it was not\n"
 "officially addressed to you.\n"
 "It is advised to not send the return receipt."
 msgstr ""
 "Ce message demande un accus? de r?ception, or d'apr?s\n"
-"les en-t?tes ? ?: ? et ? Cc: ?, vous n'en ?tes pas le\n"
+"les en-t?tes ? %s ? et ? %s ?, vous n'en ?tes pas le\n"
 "destinataire officiel.\n"
 "Il est conseill? de ne pas envoyer cet accus? de r?ception."
 
-#: src/messageview.c:1363
+#: src/messageview.c:1368
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1399 src/procmime.c:1008
+#: src/messageview.c:1404 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "D?chiffrement impossible : %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1485 src/messageview.c:1493
 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:1834 src/messageview.c:1837 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4795
-#: src/summaryview.c:4798 src/textview.c:3073
+#: src/messageview.c:1839 src/messageview.c:1842 src/mimeview.c:1995
+#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4816
+#: src/summaryview.c:4819 src/textview.c:3073
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1843
+#: src/messageview.c:1848
 msgid "Overwrite existing file?"
 msgstr "?craser le fichier existant ?"
 
-#: src/messageview.c:1851 src/summaryview.c:4815 src/summaryview.c:4818
-#: src/summaryview.c:4833
+#: src/messageview.c:1856 src/summaryview.c:4836 src/summaryview.c:4839
+#: src/summaryview.c:4854
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier ? %s ?."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1909
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1906
+#: src/messageview.c:1911
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier m?ga-octet de texte est affich?."
 
-#: src/messageview.c:1937
+#: src/messageview.c:1942
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8781,19 +8776,19 @@ msgstr ""
 "Vous avez demand? un accus? de r?ception pour ce message : cela a ?t? mis en "
 "?vidence pour le destinataire."
 
-#: src/messageview.c:1940
+#: src/messageview.c:1945
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demand? un accus? de r?ception pour ce message."
 
-#: src/messageview.c:1946
+#: src/messageview.c:1951
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accus? de r?ception."
 
-#: src/messageview.c:1947
+#: src/messageview.c:1952
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:1990
+#: src/messageview.c:1995
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8801,7 +8796,7 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r?,\n"
 "et a ?t? supprim? du serveur."
 
-#: src/messageview.c:1996
+#: src/messageview.c:2001
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8810,16 +8805,16 @@ msgstr "Ce message a ?t? partiellement r?cup?r? ; il fait %s au total."
 
 # NDT : probl?me de longueur de la cha?ne "Marquer pour t?l?chargement" :
 # la cha?ne est coup?e des 2 c?t?s (bouton trop petit) -> id?e : tooltips
-#: src/messageview.c:2000 src/messageview.c:2022
+#: src/messageview.c:2005 src/messageview.c:2027
 msgid "Mark for download"
 msgstr "T?l?charger"
 
 # NDT : m?me pb qu'avec "Mark for download" pr cha?ne "Marquer pour suppression"
-#: src/messageview.c:2001 src/messageview.c:2013
+#: src/messageview.c:2006 src/messageview.c:2018
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2006
+#: src/messageview.c:2011
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8828,12 +8823,12 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r? ;\n"
 "il fait %s au total et est marqu? pour ?tre t?l?charg? ult?rieurement."
 
-#: src/messageview.c:2011 src/messageview.c:2024
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2016 src/messageview.c:2029
+#: src/prefs_filtering_action.c:180 src/toolbar.c:487
 msgid "Unmark"
 msgstr "D?marquer"
 
-#: src/messageview.c:2017
+#: src/messageview.c:2022
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8842,11 +8837,11 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r? ;\n"
 "il fait %s au total et est marqu? pour ?tre supprim? ult?rieurement."
 
-#: src/messageview.c:2090
+#: src/messageview.c:2095
 msgid "Return Receipt Notification"
 msgstr "Accus? de r?ception."
 
-#: src/messageview.c:2091
+#: src/messageview.c:2096
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8858,19 +8853,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accus? "
 "de r?ception :"
 
-#: src/messageview.c:2095 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2100 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2095
+#: src/messageview.c:2100
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2184
+#: src/messageview.c:2189
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2949
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8878,7 +8873,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2957
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8886,7 +8881,7 @@ msgstr ""
 "\n"
 " Le message a ?t? supprim?"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8894,8 +8889,8 @@ msgstr ""
 "\n"
 " Le message a ?t? supprim? ou d?plac? vers un autre dossier"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4197
-#: src/summaryview.c:6967
+#: src/messageview.c:2991 src/messageview.c:2997 src/summaryview.c:4239
+#: src/summaryview.c:6988
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'op?ration d'apprentissage du module SpamAssassin.\n"
 
@@ -9078,7 +9073,7 @@ msgid "Type:"
 msgstr "Type :"
 
 #: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2688
+#: src/plugins/pdf_viewer/poppler_viewer.c:697 src/summaryview.c:2690
 msgid "Size:"
 msgstr "Taille :"
 
@@ -9367,23 +9362,23 @@ msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:257
+#: src/plugins/address_keeper/address_keeper_prefs.c:267
 msgid "Address Keeper"
 msgstr "Collecteur d'adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:106
+#: src/plugins/address_keeper/address_keeper_prefs.c:107
 msgid "Address book location"
 msgstr "Chemin du carnet d'adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:111
+#: src/plugins/address_keeper/address_keeper_prefs.c:112
 msgid "Keep to folder"
 msgstr "Dossier o? conserver les adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:119
+#: src/plugins/address_keeper/address_keeper_prefs.c:120
 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:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:122
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:446
@@ -9392,23 +9387,18 @@ msgstr "Dossier du carnet d'adresses o? conserver les adresses"
 msgid "Select..."
 msgstr "S?lectionner.."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:137
+#: src/plugins/address_keeper/address_keeper_prefs.c:138
 msgid "Fields to keep addresses from"
 msgstr "En-t?te ? partir desquels r?cup?rer les adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:144
-msgid "Keep addresses which appear in 'To' headers"
-msgstr "Collecter les adresses pr?sentes dans les en-t?tes 'De' ('To')"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:153
-msgid "Keep addresses which appear in 'Cc' headers"
-msgstr "Collecter les adresses pr?sentes dans les en-t?tes 'Cc'"
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:162
-msgid "Keep addresses which appear in 'Bcc' headers"
-msgstr "Collecter les adresses pr?sentes dans les en-t?tes 'Cci' ('Bcc')"
+#: src/plugins/address_keeper/address_keeper_prefs.c:145
+#: src/plugins/address_keeper/address_keeper_prefs.c:157
+#: src/plugins/address_keeper/address_keeper_prefs.c:169
+#, c-format
+msgid "Keep addresses which appear in '%s' headers"
+msgstr "Collecter les adresses pr?sentes dans les en-t?tes ? %s ?"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:168
+#: src/plugins/address_keeper/address_keeper_prefs.c:178
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
@@ -9871,7 +9861,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2782
+#: src/prefs_summary_column.c:80 src/summaryview.c:2784
 msgid "Attachment"
 msgstr "Pi?ces jointes"
 
@@ -11432,7 +11422,7 @@ msgstr "Sieve: nouvel essai d'authentification\n"
 msgid "Auth method not available"
 msgstr "M?thode d'authentification non disponible"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5589
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5610
 msgid "_Filter"
 msgstr "_Filtrer"
 
@@ -14175,7 +14165,6 @@ msgid "vCalendar"
 msgstr "Calendrier"
 
 #: src/plugins/vcalendar/plugin.c:73
-#, fuzzy
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
 "Evolution or Outlook.\n"
@@ -15329,30 +15318,30 @@ msgstr "D?finition automatique des adresses suivantes"
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1089
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1088
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dictionnaire par d?faut"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1123
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1122
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par d?faut"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1434
-#: src/prefs_folder_item.c:1824 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1433
+#: src/prefs_folder_item.c:1823 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1462 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1461 src/prefs_quote.c:134
+#: src/toolbar.c:472
 msgid "Reply"
 msgstr "R?pondre"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1490 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_folder_item.c:1489 src/prefs_quote.c:149 src/toolbar.c:477
 msgid "Forward"
 msgstr "Transf?rer"
 
@@ -15532,7 +15521,7 @@ msgstr "La commande externe d'envoi est non sp?cifi?e."
 msgid "Receive"
 msgstr "R?ception"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1840 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1839 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mod?les"
 
@@ -15604,7 +15593,7 @@ 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:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
+#: src/prefs_toolbar.c:1066
 msgid "D_elete"
 msgstr "Supprim_er"
 
@@ -15864,98 +15853,99 @@ msgstr ""
 msgid "%x(%a) %H:%M"
 msgstr "%a %x %H:%M"
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:126
 msgid "Automatic account selection"
 msgstr "S?lectionner automatiquement le compte"
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:134
 msgid "when replying"
 msgstr "en r?pondant"
 
-#: src/prefs_compose_writing.c:135
+#: src/prefs_compose_writing.c:136
 msgid "when forwarding"
 msgstr "en transf?rant"
 
-#: src/prefs_compose_writing.c:137
+#: src/prefs_compose_writing.c:138
 msgid "when re-editing"
 msgstr "en r??ditant"
 
-#: src/prefs_compose_writing.c:140
+#: src/prefs_compose_writing.c:141
 msgid "Editing"
 msgstr "Edition"
 
-#: src/prefs_compose_writing.c:144
+#: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'?diteur auxiliaire"
 
-#: src/prefs_compose_writing.c:152
+#: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
 msgstr "Enregistrer automatiquement le texte en brouillon tous les"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:163 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "caract?res"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:174
 msgid "Even if message is to be encrypted"
 msgstr "M?me si le message doit ?tre chiffr?"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:181
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199
 msgid "Warn when inserting a file larger than"
 msgstr ""
 "Pr?venir lors de l'insertion dans le corps du message d'un fichier plus "
 "grand que"
 
-#: src/prefs_compose_writing.c:210
+#: src/prefs_compose_writing.c:211
 msgid "KB into message body "
 msgstr "Ko dans le corps du message"
 
-#: src/prefs_compose_writing.c:216
+#: src/prefs_compose_writing.c:217
 msgid "Replying"
 msgstr "R?ponse"
 
-#: src/prefs_compose_writing.c:219
+#: src/prefs_compose_writing.c:220
 msgid "Reply will quote by default"
 msgstr "Par d?faut, r?pondre en citant"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:223
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton ? R?pondre ? prend en compte les listes"
 
-#: src/prefs_compose_writing.c:224
+#: src/prefs_compose_writing.c:225
 msgid "Forwarding"
 msgstr "Transfert"
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:228 src/prefs_filtering_action.c:192
 msgid "Forward as attachment"
 msgstr "Transf?rer en pi?ce jointe"
 
 #: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Garder l'en-t?te original ? De: ? (? From: ?) pour les redirections"
+#, c-format
+msgid "Keep the original '%s' header when redirecting"
+msgstr "Garder l'en-t?te original ? %s ? pour les redirections"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:236
 msgid "When dropping files into the Compose window"
 msgstr ""
 "Lors d'un glisser-d?placer de fichier(s) sur la fen?tre de composition,"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:245
 msgid "Ask"
 msgstr "Demander"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+#: src/prefs_compose_writing.c:246 src/toolbar.c:503
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+#: src/prefs_compose_writing.c:247 src/toolbar.c:504
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:374
 msgid "Writing"
 msgstr "Composer"
 
@@ -16118,7 +16108,7 @@ msgid "Message flags"
 msgstr "?tats de message"
 
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2788
+#: src/prefs_summary_column.c:78 src/summaryview.c:2790 src/toolbar.c:486
 msgid "Mark"
 msgstr "Marque"
 
@@ -16139,7 +16129,7 @@ msgid "Mark as ham"
 msgstr "Marquer comme courrier l?gitime"
 
 #: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+#: src/toolbar.c:229 src/toolbar.c:480 src/toolbar.c:2366
 msgid "Execute"
 msgstr "Ex?cuter"
 
@@ -16438,7 +16428,7 @@ msgid "Displayed columns"
 msgstr "?l?ments affich?s"
 
 #: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
+#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1074
 msgid " Use default "
 msgstr " Remise ? z?ro "
 
@@ -16493,7 +16483,7 @@ msgstr "Permissions chmod du dossier"
 msgid "Folder color"
 msgstr "Couleur du dossier"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1663
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1662
 msgid "Pick color for folder"
 msgstr "S?lection de la couleur pour le(s) dossier(s)"
 
@@ -16559,35 +16549,36 @@ msgstr ""
 "Enregistrer la copie des messages envoy?s dans ce dossier plut?t que dans ? "
 "Envoy?s ?"
 
-#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:945
-#: src/prefs_folder_item.c:969 src/prefs_folder_item.c:992
-#: src/prefs_folder_item.c:1015
-msgid "Default "
-msgstr "D?faut"
+#: src/prefs_folder_item.c:922 src/prefs_folder_item.c:968
+#: src/prefs_folder_item.c:991 src/prefs_folder_item.c:1014
+#, c-format
+msgid "Default %s"
+msgstr "%s par d?faut"
 
-#: src/prefs_folder_item.c:946
-msgid " for replies"
-msgstr " pour les r?ponses"
+#: src/prefs_folder_item.c:945
+#, c-format
+msgid "Default %s for replies"
+msgstr "%s par d?faut pour les r?ponses"
 
-#: src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:1037
 msgid "Default account"
 msgstr "Compte par d?faut"
 
-#: src/prefs_folder_item.c:1676
+#: src/prefs_folder_item.c:1675
 msgid "Discard cache"
 msgstr "Suppression du cache"
 
-#: src/prefs_folder_item.c:1677
+#: src/prefs_folder_item.c:1676
 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:1807
+#: src/prefs_folder_item.c:1806
 msgid "General"
 msgstr "G?n?ral"
 
-#: src/prefs_folder_item.c:1886
+#: src/prefs_folder_item.c:1885
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"
@@ -16631,7 +16622,7 @@ msgstr "Affichage"
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:911 src/toolbar.c:247 src/toolbar.c:498
 msgid "Preferences"
 msgstr "Pr?f?rences"
 
@@ -16854,11 +16845,11 @@ msgstr "Corps du message"
 msgid "whole message"
 msgstr "Tout le message"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6264
+#: src/prefs_matcher.c:394 src/summaryview.c:6285
 msgid "Marked"
 msgstr "Marqu?"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6262
+#: src/prefs_matcher.c:395 src/summaryview.c:6283
 msgid "Deleted"
 msgstr "Supprim?"
 
@@ -16866,12 +16857,12 @@ msgstr "Supprim?"
 msgid "Replied"
 msgstr "R?pondu"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6256
+#: src/prefs_matcher.c:397 src/summaryview.c:6277
 msgid "Forwarded"
 msgstr "Transf?r?"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6246 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:399 src/summaryview.c:6267 src/toolbar.c:496
+#: src/toolbar.c:1028 src/toolbar.c:2256
 msgid "Spam"
 msgstr "Pourriel"
 
@@ -16879,7 +16870,7 @@ msgstr "Pourriel"
 msgid "Has attachment"
 msgstr "Contient une ou plusieurs pi?ces jointes"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6282
+#: src/prefs_matcher.c:401 src/summaryview.c:6303
 msgid "Signed"
 msgstr "Sign?"
 
@@ -18438,7 +18429,7 @@ msgstr "URL :"
 msgid "Preview"
 msgstr "Pr?visualisation"
 
-#: src/prefs_toolbar.c:176
+#: src/prefs_toolbar.c:186
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -18446,75 +18437,75 @@ msgstr ""
 "L'action s?lectionn?e est d?j? pr?sente.\n"
 "Veuillez choisir une autre action."
 
-#: src/prefs_toolbar.c:177
+#: src/prefs_toolbar.c:187
 msgid "Item has no icon defined."
 msgstr "L'?l?ment n'a pas d'ic?ne d?finie."
 
-#: src/prefs_toolbar.c:178
+#: src/prefs_toolbar.c:188
 msgid "Item has no text defined."
 msgstr "L'?l?ment n'a pas de texte d?fini."
 
-#: src/prefs_toolbar.c:916
+#: src/prefs_toolbar.c:926
 msgid "Toolbar item"
 msgstr "?l?ment de barre d'outils"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:942
 msgid "Item type"
 msgstr "Type d'?l?ment"
 
-#: src/prefs_toolbar.c:942
+#: src/prefs_toolbar.c:952
 msgid "Internal Function"
 msgstr "Fonction interne"
 
-#: src/prefs_toolbar.c:943
+#: src/prefs_toolbar.c:953
 msgid "User Action"
 msgstr "Action"
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
+#: src/prefs_toolbar.c:955 src/toolbar.c:268
 msgid "Separator"
 msgstr "S?parateur"
 
-#: src/prefs_toolbar.c:952
+#: src/prefs_toolbar.c:962
 msgid "Event executed on click"
 msgstr "Fonction ? ex?cuter"
 
-#: src/prefs_toolbar.c:991
+#: src/prefs_toolbar.c:1001
 msgid "Toolbar text"
 msgstr "Texte de la barre d'outils"
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:1016 src/prefs_toolbar.c:1392
 msgid "Icon"
 msgstr "Ic?ne"
 
-#: src/prefs_toolbar.c:1042
+#: src/prefs_toolbar.c:1052
 msgid "A_dd"
 msgstr "A_jouter"
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1272 src/prefs_toolbar.c:1286 src/prefs_toolbar.c:1300
 msgid "Toolbars"
 msgstr "Barre d'outils"
 
-#: src/prefs_toolbar.c:1263
+#: src/prefs_toolbar.c:1273
 msgid "Main Window"
 msgstr "Vue principale"
 
-#: src/prefs_toolbar.c:1277
+#: src/prefs_toolbar.c:1287
 msgid "Message Window"
 msgstr "Vue de messages"
 
-#: src/prefs_toolbar.c:1291
+#: src/prefs_toolbar.c:1301
 msgid "Compose Window"
 msgstr "Fen?tre de composition"
 
-#: src/prefs_toolbar.c:1405
+#: src/prefs_toolbar.c:1415
 msgid "Icon text"
 msgstr "Texte"
 
-#: src/prefs_toolbar.c:1414
+#: src/prefs_toolbar.c:1424
 msgid "Mapped event"
 msgstr "Fonction"
 
-#: src/prefs_toolbar.c:1711
+#: src/prefs_toolbar.c:1721
 msgid "Toolbar item icon"
 msgstr "Ic?ne de l'?l?ment de barre d'outils"
 
@@ -19109,7 +19100,7 @@ msgstr "Condition :"
 msgid "Find _all"
 msgstr "Chercher _tous"
 
-#: src/summary_search.c:690 src/summaryview.c:1088 src/summaryview.c:1350
+#: src/summary_search.c:690 src/summaryview.c:1089 src/summaryview.c:1351
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Recherche en cours dans le dossier %s.. \n"
@@ -19134,238 +19125,238 @@ msgstr "Affiche/cache la barre de recherche rapide"
 msgid "Toggle multiple selection"
 msgstr "Activer la s?lection multiple"
 
-#: src/summaryview.c:1278
+#: src/summaryview.c:1279
 msgid "Process mark"
 msgstr "Traitement des messages marqu?s"
 
-#: src/summaryview.c:1279
+#: src/summaryview.c:1280
 msgid "Some marks are left. Process them?"
 msgstr "Il reste des messages marqu?s, voulez-vous les traiter ?"
 
-#: src/summaryview.c:1329
+#: src/summaryview.c:1330
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s).."
 
-#: src/summaryview.c:1848 src/summaryview.c:1896
+#: src/summaryview.c:1850 src/summaryview.c:1898
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1849
+#: src/summaryview.c:1851
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1861 src/summaryview.c:1909 src/summaryview.c:1946
-#: src/summaryview.c:1994 src/summaryview.c:2061
+#: src/summaryview.c:1863 src/summaryview.c:1911 src/summaryview.c:1948
+#: src/summaryview.c:1996 src/summaryview.c:2063
 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:1873
+#: src/summaryview.c:1875
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1897
+#: src/summaryview.c:1899
 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1933 src/summaryview.c:1981
+#: src/summaryview.c:1935 src/summaryview.c:1983
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1934
+#: src/summaryview.c:1936
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1958
+#: src/summaryview.c:1960
 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1982
+#: src/summaryview.c:1984
 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2015 src/summaryview.c:2048
+#: src/summaryview.c:2017 src/summaryview.c:2050
 msgid "No more marked messages"
 msgstr "Plus de messages marqu?s"
 
-#: src/summaryview.c:2016
+#: src/summaryview.c:2018
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqu?s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2025
+#: src/summaryview.c:2027
 msgid "No marked messages."
 msgstr "Pas de message marqu?."
 
-#: src/summaryview.c:2049
+#: src/summaryview.c:2051
 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqu?s. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2082 src/summaryview.c:2111
+#: src/summaryview.c:2084 src/summaryview.c:2113
 msgid "No more labeled messages"
 msgstr "Plus de messages colori?s"
 
-#: src/summaryview.c:2083
+#: src/summaryview.c:2085
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages colori?s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2092 src/summaryview.c:2125
+#: src/summaryview.c:2094 src/summaryview.c:2127
 msgid "No labeled messages."
 msgstr "Plus de messages colori?s."
 
-#: src/summaryview.c:2112
+#: src/summaryview.c:2114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages colori?s. Rechercher depuis le d?but ?"
 
-#: src/summaryview.c:2439
+#: src/summaryview.c:2441
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet.."
 
-#: src/summaryview.c:2624
+#: src/summaryview.c:2626
 #, c-format
 msgid "%d deleted"
 msgstr "%d d?truit(s)"
 
-#: src/summaryview.c:2628
+#: src/summaryview.c:2630
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d d?plac?(s)"
 
-#: src/summaryview.c:2629 src/summaryview.c:2636
+#: src/summaryview.c:2631 src/summaryview.c:2638
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2634
+#: src/summaryview.c:2636
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copi?(s)"
 
-#: src/summaryview.c:2648
+#: src/summaryview.c:2650
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " objet s?lectionn?"
 msgstr[1] " s?lection"
 
-#: src/summaryview.c:2666 src/summaryview.c:2709
+#: src/summaryview.c:2668 src/summaryview.c:2711
 #, 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:2684
+#: src/summaryview.c:2686
 msgid "Message summary"
 msgstr "Liste des messages"
 
-#: src/summaryview.c:2685
+#: src/summaryview.c:2687
 msgid "New:"
 msgstr "Nouveaux :"
 
-#: src/summaryview.c:2686
+#: src/summaryview.c:2688
 msgid "Unread:"
 msgstr "Non lus :"
 
-#: src/summaryview.c:2687
+#: src/summaryview.c:2689
 msgid "Total:"
 msgstr "Total :"
 
-#: src/summaryview.c:2689
+#: src/summaryview.c:2691
 msgid "Marked:"
 msgstr "Marqu?s :"
 
-#: src/summaryview.c:2690
+#: src/summaryview.c:2692
 msgid "Replied:"
 msgstr "R?pondus :"
 
-#: src/summaryview.c:2691
+#: src/summaryview.c:2693
 msgid "Forwarded:"
 msgstr "Transf?r?s :"
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2694
 msgid "Locked:"
 msgstr "Verrouill?s :"
 
-#: src/summaryview.c:2693
+#: src/summaryview.c:2695
 msgid "Ignored:"
 msgstr "Ignor?s :"
 
-#: src/summaryview.c:2694
+#: src/summaryview.c:2696
 msgid "Watched:"
 msgstr "Suivis :"
 
-#: src/summaryview.c:2704
+#: src/summaryview.c:2706
 #, 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:2997
+#: src/summaryview.c:2999
 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages.."
 
-#: src/summaryview.c:3136
+#: src/summaryview.c:3138
 msgid "Setting summary from message data..."
 msgstr "D?finition de la liste des messages ? partir des donn?es du message.."
 
-#: src/summaryview.c:3341
+#: src/summaryview.c:3343
 msgid "(No Date)"
 msgstr "(Pas de date)"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3395
 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 
-#: src/summaryview.c:3428
+#: src/summaryview.c:3430
 #, c-format
 msgid "From: %s, on %s"
 msgstr "De : %s, le %s"
 
-#: src/summaryview.c:3437
+#: src/summaryview.c:3439
 #, c-format
 msgid "To: %s, on %s"
 msgstr "? : %s, le %s"
 
-#: src/summaryview.c:4279
+#: src/summaryview.c:4300
 msgid "You're not the author of the article.\n"
 msgstr "Vous n'?tes pas l'auteur de cet article.\n"
 
-#: src/summaryview.c:4369
+#: src/summaryview.c:4390
 #, 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:4372
+#: src/summaryview.c:4393
 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:4536
+#: src/summaryview.c:4557
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:4637
+#: src/summaryview.c:4658
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
-#: src/summaryview.c:4802
+#: src/summaryview.c:4823
 msgid "Append or Overwrite"
 msgstr "Ajouter ou ?craser"
 
-#: src/summaryview.c:4803
+#: src/summaryview.c:4824
 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe d?j?. Ajouter au fichier existant ou bien l'?craser ?"
 
-#: src/summaryview.c:4804
+#: src/summaryview.c:4825
 msgid "_Append"
 msgstr "_Ajouter"
 
-#: src/summaryview.c:4804
+#: src/summaryview.c:4825
 msgid "_Overwrite"
 msgstr "_?craser"
 
-#: src/summaryview.c:4845
+#: src/summaryview.c:4866
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -19373,29 +19364,29 @@ msgstr ""
 "Vous ?tes sur le point d'imprimer %d messages un par un. Voulez-vous "
 "continuer ?"
 
-#: src/summaryview.c:5303
+#: src/summaryview.c:5324
 msgid "Building threads..."
 msgstr "Construction des threads.."
 
-#: src/summaryview.c:5551
+#: src/summaryview.c:5572
 msgid "Skip these rules"
 msgstr "Ignorer ces r?gles"
 
-#: src/summaryview.c:5554
+#: src/summaryview.c:5575
 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:5557
+#: src/summaryview.c:5578
 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:5586
+#: src/summaryview.c:5607
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/summaryview.c:5587
+#: src/summaryview.c:5608
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19403,55 +19394,55 @@ msgstr ""
 "Il y a des r?gles de filtrage rattach?es ? des comptes.\n"
 "Veuillez s?lectionner ce que vous souhaitez faire avec ces r?gles :"
 
-#: src/summaryview.c:5617
+#: src/summaryview.c:5638
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
 
-#: src/summaryview.c:5696
+#: src/summaryview.c:5717
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
-#: src/summaryview.c:6242
+#: src/summaryview.c:6263
 msgid "Ignored thread"
 msgstr "Fil de discussion ignor?"
 
-#: src/summaryview.c:6244
+#: src/summaryview.c:6265
 msgid "Watched thread"
 msgstr "Fil de discussion suivi"
 
-#: src/summaryview.c:6252
+#: src/summaryview.c:6273
 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:6254
+#: src/summaryview.c:6275
 msgid "Replied - click to see reply"
 msgstr "R?pondu - cliquer pour voir la r?ponse"
 
-#: src/summaryview.c:6266
+#: src/summaryview.c:6287
 msgid "To be moved"
 msgstr "? deplacer"
 
-#: src/summaryview.c:6268
+#: src/summaryview.c:6289
 msgid "To be copied"
 msgstr "? copier"
 
-#: src/summaryview.c:6280
+#: src/summaryview.c:6301
 msgid "Signed, has attachment(s)"
 msgstr "Sign? et contenant une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:6284
+#: src/summaryview.c:6305
 msgid "Encrypted, has attachment(s)"
 msgstr "Chiffr? et contenant une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6307
 msgid "Encrypted"
 msgstr "Chiffr?"
 
-#: src/summaryview.c:6288
+#: src/summaryview.c:6309
 msgid "Has attachment(s)"
 msgstr "Contient une ou plusieurs pi?ces jointes"
 
-#: src/summaryview.c:7932
+#: src/summaryview.c:7953
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19460,11 +19451,11 @@ msgstr ""
 "Erreur dans l'expression r?guli?re (regexp) :\n"
 "%s"
 
-#: src/summaryview.c:8035
+#: src/summaryview.c:8056
 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:8040
+#: src/summaryview.c:8061
 msgid "Go back to the folder list"
 msgstr "Revenir ? la liste des dossiers"
 
@@ -19627,286 +19618,330 @@ msgstr "Attention : Tentative d'hame?onnage (phishing)"
 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 
-#: src/toolbar.c:192 src/toolbar.c:1930
+#: src/toolbar.c:216 src/toolbar.c:2208
 msgid "Receive Mail from all Accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/toolbar.c:193 src/toolbar.c:1935
+#: src/toolbar.c:217 src/toolbar.c:2213
 msgid "Receive Mail from current Account"
 msgstr "Relever le courrier du compte courant"
 
-#: src/toolbar.c:194 src/toolbar.c:1939
+#: src/toolbar.c:218 src/toolbar.c:2217
 msgid "Send Queued Messages"
 msgstr "Envoyer les messages en attente"
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+#: src/toolbar.c:219 src/toolbar.c:999 src/toolbar.c:2235 src/toolbar.c:2246
 msgid "Compose Email"
 msgstr "Composer un message"
 
-#: src/toolbar.c:196
+#: src/toolbar.c:220
 msgid "Compose News"
 msgstr "Composer un article"
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+#: src/toolbar.c:221 src/toolbar.c:2274 src/toolbar.c:2284
 msgid "Reply to Message"
 msgstr "R?pondre au message"
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+#: src/toolbar.c:222 src/toolbar.c:2291 src/toolbar.c:2301
 msgid "Reply to Sender"
 msgstr "R?pondre ? l'exp?diteur"
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+#: src/toolbar.c:223 src/toolbar.c:2308 src/toolbar.c:2318
 msgid "Reply to All"
 msgstr "R?pondre ? tous"
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+#: src/toolbar.c:224 src/toolbar.c:2325 src/toolbar.c:2335
 msgid "Reply to Mailing-list"
 msgstr "R?pondre ? la liste"
 
-#: src/toolbar.c:201 src/toolbar.c:1951
+#: src/toolbar.c:225 src/toolbar.c:2229
 msgid "Open email"
 msgstr "Ouvrir le message"
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+#: src/toolbar.c:226 src/toolbar.c:2342 src/toolbar.c:2353
 msgid "Forward Message"
 msgstr "Transf?rer le(s) message(s) s?lectionn?(s)"
 
-#: src/toolbar.c:203 src/toolbar.c:2080
+#: src/toolbar.c:227 src/toolbar.c:2358
 msgid "Trash Message"
 msgstr "D?placer le(s) message(s) s?lectionn?(s) vers la corbeille"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
+#: src/toolbar.c:228 src/toolbar.c:2362
 msgid "Delete Message"
 msgstr "Supprimer le(s) message(s) s?lectionn?(s)"
 
-#: src/toolbar.c:206 src/toolbar.c:2092
+#: src/toolbar.c:230 src/toolbar.c:2370
 msgid "Go to Previous Unread Message"
 msgstr "Aller au message non lu pr?c?dent"
 
-#: src/toolbar.c:207 src/toolbar.c:2096
+#: src/toolbar.c:231 src/toolbar.c:2374
 msgid "Go to Next Unread Message"
 msgstr "Aller au message non lu suivant"
 
-#: src/toolbar.c:210 src/toolbar.c:421
+#: src/toolbar.c:235
+msgid "Mark Message"
+msgstr "Marquer"
+
+#: src/toolbar.c:236
+msgid "Unmark Message"
+msgstr "D?-marquer"
+
+#: src/toolbar.c:237
+msgid "Lock Message"
+msgstr "Verrouiller"
+
+#: src/toolbar.c:238
+msgid "Unlock Message"
+msgstr "D?verrouiller"
+
+#: src/toolbar.c:239
+msgid "Mark all Messages as read"
+msgstr "Marquer tous les messages comme lus"
+
+#: src/toolbar.c:240
+msgid "Mark all Messages as unread"
+msgstr "Marquer tous les messages comme non lus"
+
+#: src/toolbar.c:241
+msgid "Mark Message as read"
+msgstr "Marquer comme lu"
+
+#: src/toolbar.c:242
+msgid "Mark Message as unread"
+msgstr "Marquer comme non lu"
+
+#: src/toolbar.c:244 src/toolbar.c:495
 msgid "Print"
 msgstr "Impression"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:245
 msgid "Learn Spam or Ham"
 msgstr "Appliquer l'op?ration d'apprentissage de SpamAssassin"
 
-#: src/toolbar.c:212
+#: src/toolbar.c:246
 msgid "Open folder/Go to folder list"
 msgstr "Ouvrir le dossier / la liste des dossiers"
 
-#: src/toolbar.c:215 src/toolbar.c:2102
+#: src/toolbar.c:249 src/toolbar.c:2380
 msgid "Send Message"
 msgstr "Envoyer le message"
 
-#: src/toolbar.c:216 src/toolbar.c:2106
+#: src/toolbar.c:250 src/toolbar.c:2384
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/toolbar.c:217 src/toolbar.c:2110
+#: src/toolbar.c:251 src/toolbar.c:2388
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/toolbar.c:218 src/toolbar.c:2114
+#: src/toolbar.c:252 src/toolbar.c:2392
 msgid "Insert file"
 msgstr "Ins?rer un fichier"
 
-#: src/toolbar.c:219 src/toolbar.c:2118
+#: src/toolbar.c:253 src/toolbar.c:2396
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
-#: src/toolbar.c:220 src/toolbar.c:2122
+#: src/toolbar.c:254 src/toolbar.c:2400
 msgid "Insert signature"
 msgstr "Ins?rer la signature"
 
-#: src/toolbar.c:221 src/toolbar.c:2126
+#: src/toolbar.c:255 src/toolbar.c:2404
 msgid "Replace signature"
 msgstr "Remplacer la signature"
 
-#: src/toolbar.c:222 src/toolbar.c:2130
+#: src/toolbar.c:256 src/toolbar.c:2408
 msgid "Edit with external editor"
 msgstr "?diter avec un ?diteur auxiliaire"
 
-#: src/toolbar.c:223 src/toolbar.c:2134
+#: src/toolbar.c:257 src/toolbar.c:2412
 msgid "Wrap long lines of current paragraph"
 msgstr "Justifier le paragraphe actuel"
 
-#: src/toolbar.c:224 src/toolbar.c:2138
+#: src/toolbar.c:258 src/toolbar.c:2416
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+#: src/toolbar.c:261 src/toolbar.c:512 src/toolbar.c:2425
 msgid "Check spelling"
 msgstr "V?rifier l'orthographe"
 
-#: src/toolbar.c:229
+#: src/toolbar.c:263
 msgid "Claws Mail Actions Feature"
 msgstr "Actions Claws Mail"
 
-#: src/toolbar.c:230 src/toolbar.c:2163
+#: src/toolbar.c:264 src/toolbar.c:2441
 msgid "Cancel receiving"
 msgstr "Interrompre la rel?ve du courrier"
 
-#: src/toolbar.c:232 src/toolbar.c:2171
+#: src/toolbar.c:266 src/toolbar.c:2449
 msgid "Cancel receiving/sending"
 msgstr "Interrompre la rel?ve et/ou l'envoi"
 
-#: src/toolbar.c:233 src/toolbar.c:1943
+#: src/toolbar.c:267 src/toolbar.c:2221
 msgid "Close window"
 msgstr "Fermer la fen?tre"
 
-#: src/toolbar.c:235
+#: src/toolbar.c:269
 msgid "Claws Mail Plugins"
 msgstr "Modules Claws Mail"
 
-#: src/toolbar.c:379 src/toolbar.c:414
+#: src/toolbar.c:433 src/toolbar.c:478
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr "Dossiers"
-
-#: src/toolbar.c:404
+#: src/toolbar.c:467
 msgid "Get Mail"
 msgstr "Relever"
 
-#: src/toolbar.c:405
+#: src/toolbar.c:468
 msgid "Get"
 msgstr "Relever"
 
-#: src/toolbar.c:407 src/toolbar.c:408
+#: src/toolbar.c:470 src/toolbar.c:471
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Composer"
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr "? tous"
-
-#: src/toolbar.c:411
+#: src/toolbar.c:473
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Exp?diteur"
 
-#: src/toolbar.c:412
+#: src/toolbar.c:474
+msgid "All"
+msgstr "? tous"
+
+#: src/toolbar.c:475
 msgid "List"
 msgstr "? la liste"
 
-#: src/toolbar.c:417
+#: src/toolbar.c:481
 msgid "Prev"
 msgstr "Pr?c?dent"
 
-#: src/toolbar.c:418
+#: src/toolbar.c:482
 msgid "Next"
 msgstr "Suivant"
 
-#: src/toolbar.c:426
+#: src/toolbar.c:490
+msgid "All read"
+msgstr "Tous lus"
+
+#: src/toolbar.c:491
+msgid "All unread"
+msgstr "To_us non lus"
+
+#: src/toolbar.c:492
+msgid "Read"
+msgstr "Lus"
+
+#: src/toolbar.c:497
+msgid "Folders"
+msgstr "Dossiers"
+
+#: src/toolbar.c:502
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/toolbar.c:429
+#: src/toolbar.c:505
 msgid "Insert sig."
 msgstr "Ins?rer signature"
 
-#: src/toolbar.c:430
+#: src/toolbar.c:506
 msgid "Replace sig."
 msgstr "Rempl. signature"
 
-#: src/toolbar.c:431
+#: src/toolbar.c:507
 msgid "Edit"
 msgstr "?diter"
 
-#: src/toolbar.c:432
+#: src/toolbar.c:508
 msgid "Wrap para."
 msgstr "Justifier para."
 
-#: src/toolbar.c:433
+#: src/toolbar.c:509
 msgid "Wrap all"
 msgstr "Justifier tout"
 
-#: src/toolbar.c:435 src/toolbar.c:436
+#: src/toolbar.c:515 src/toolbar.c:516
 msgid "Stop"
 msgstr "Interrompre"
 
-#: src/toolbar.c:437
+#: src/toolbar.c:517
 msgid "Stop all"
 msgstr "Interrompre"
 
-#: src/toolbar.c:897
+#: src/toolbar.c:991
 msgid "Compose News message"
 msgstr "Composer un article de groupe de discussion"
 
-#: src/toolbar.c:936
+#: src/toolbar.c:1030
 msgid "Learn spam"
 msgstr "Marquer le(s) courriel(s) s?lectionn?(s) comme pourriel(s)"
 
-#: src/toolbar.c:945
+#: src/toolbar.c:1039
 msgid "Ham"
 msgstr "L?gitime"
 
-#: src/toolbar.c:947
+#: src/toolbar.c:1041
 msgid "Learn ham"
 msgstr "Marquer le(s) courriel(s) s?lectionn?(s) comme l?gitime(s)"
 
-#: src/toolbar.c:1925
+#: src/toolbar.c:2203
 msgid "Go to folder list"
 msgstr "Ouvrir la liste des dossiers"
 
-#: src/toolbar.c:1931
+#: src/toolbar.c:2209
 msgid "Receive Mail from selected Account"
 msgstr "Relever le courrier du compte s?lectionn?"
 
-#: src/toolbar.c:1947
+#: src/toolbar.c:2225
 msgid "Open preferences"
 msgstr "Ouvrir les pr?f?rences"
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:2236
 msgid "Compose with selected Account"
 msgstr "Composer un message avec le compte s?lectionn?"
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:2257
 msgid "Learn as..."
 msgstr "Marquer comme.."
 
-#: src/toolbar.c:1989
+#: src/toolbar.c:2267
 msgid "Learn as _Spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/toolbar.c:1990
+#: src/toolbar.c:2268
 msgid "Learn as _Ham"
 msgstr "Marquer comme _l?gitime"
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:2275
 msgid "Reply to Message options"
 msgstr "Options de r?ponse ? un message"
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+#: src/toolbar.c:2279 src/toolbar.c:2296 src/toolbar.c:2313 src/toolbar.c:2330
 msgid "_Reply with quote"
 msgstr "R?pondre en _citant le message"
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+#: src/toolbar.c:2280 src/toolbar.c:2297 src/toolbar.c:2314 src/toolbar.c:2331
 msgid "Reply without _quote"
 msgstr "R?pondre _sans citer le message"
 
-#: src/toolbar.c:2014
+#: src/toolbar.c:2292
 msgid "Reply to Sender options"
 msgstr "Options de r?ponse ? l'exp?diteur"
 
-#: src/toolbar.c:2031
+#: src/toolbar.c:2309
 msgid "Reply to All options"
 msgstr "Options de r?ponse ? tous"
 
-#: src/toolbar.c:2048
+#: src/toolbar.c:2326
 msgid "Reply to Mailing-list options"
 msgstr "Options de r?ponse ? la liste"
 
-#: src/toolbar.c:2065
+#: src/toolbar.c:2343
 msgid "Forward Message options"
 msgstr "Options de transfert d'un message"
 
@@ -20219,6 +20254,17 @@ msgstr ""
 "Vous pouvez maintenant cliquer sur ? Enregistrer ? pour\n"
 "d?buter et appr?cier.."
 
+#~ msgid "The only recipient is the default BCC address. Send anyway?"
+#~ msgstr ""
+#~ "Le seul destinataire est l'adresse ? Cci: ? par d?faut. Voulez-vous quand "
+#~ "m?me envoyer le message ?"
+
+#~ msgid "Keep addresses which appear in 'Cc' headers"
+#~ msgstr "Collecter les adresses pr?sentes dans les en-t?tes 'Cc'"
+
+#~ msgid "Keep addresses which appear in 'Bcc' headers"
+#~ msgstr "Collecter les adresses pr?sentes dans les en-t?tes 'Cci' ('Bcc')"
+
 #~ msgid "SSL"
 #~ msgstr "SSL"
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Dec 23 11:23:57 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri, 23 Dec 2016 11:23:57 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-73-g5d7ec23
Message-ID: <20161223102357.479EB36A44FA@mx.colino.net>

The branch, master has been updated
       via  5d7ec238391a19048f4dd807b6763eaf9b8d525f (commit)
      from  bb7178864f2ff7f07ba9b8a632eeb005887e3820 (commit)

Summary of changes:
 po/fr.po | 1218 +++++++++++++++-----------------------------------------------
 1 file changed, 293 insertions(+), 925 deletions(-)


- Log -----------------------------------------------------------------
commit 5d7ec238391a19048f4dd807b6763eaf9b8d525f
Author: wwp <wwp at free.fr>
Date:   Fri Dec 23 11:22:29 2016 +0100

    Review of the French translation for Xmas:
     - huge amount of corrections and changes,
     - removed the enormous useless notes chunk.

diff --git a/po/fr.po b/po/fr.po
index 00d55ea..e7779c9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,9 +1,9 @@
 # French translation of Claws Mail
-# Copyright ? 1999-2014 The Claws Mail team.
+# Copyright ? 1999-2016 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-#   Paul Rolland <rol at as2917.net>, 2000.
+#   Paul Rolland <rol at as2917.net>, 2000
 #   S?bastien Rodriguez <srodriguez at ifrance.com>
 #   P'tit Lu <ptitlu at ptitlu.org>
 #   Philippe trbich <philippe.trbich at free.fr>
@@ -11,640 +11,12 @@
 #   Melvin Hadasht <melvin.hadasht at free.fr>, 2001 (2001-12-11) - 2004
 #   Fabien Vantard <fzzzzz at gmail.com>, 2004 (2004-08-22) - 2007
 #
-# L?gende des notes :  '.' effectu?, '-' v?rifi?, '>' ? effectuer, '?' envisag?
-#  Format des msgstr : le " final doit ?tre au max. le 79i?me car.
-#  Caract?res sp?ciaux (pr copier/coller) : ??
-#
-# 2008-02-10 [fv] 3.3.0cvs4
-# > /_Delete , /Delete _all , /_Reset to default : append a '...'
-# > Dialog "Delete all actions" : "OK" should not be selected by default
-# > Dialog "Delete rule" : GTK_STOCK_DELETE should not be selected by default
-# > Dialog "Delete all rules" : GTK_STOCK_DELETE should not be selected by default
-#
-# 2007-12-14 [fv] 3.1.0cvs68 (3.2.0)
-# > todo in code :
-# 	organisation" (src/addrcustomattr.c:68) -> organiZation
-#
-# 2007-11-18 [fv] 3.0.2cvs139 (3.1.0)
-# . "Bo?te de r?ception" -> "Dossier de r?ception"
-# . <compose>/Options/Jeux de caract?res/D?tection automati_que
-#   -> <compose>/Options/Jeux de caract?res/_D?tection automatique
-# . <main>/Vue/Jeux de caract?res/D?tection automati_que
-#   -> <main>/Vue/Jeux de caract?res/_D?tection automatique
-# > todo in code :
-#    > "/_Set picture" -> "/_Set picture..."
-#    > "Chinese/ISO-2022-_CN"  forgot in <compose>/_Options/Char...
-#    > "+Discard" : add accelerator
-#    > " Selection when entering a folder"  : Remove the first space
-#
-# 2007-10-26 [fv] 3.0.2cvs92
-# . save : sauvegarder -> enregistrer
-#
-# 2007-10-19 [fv] 3.0.2cvs92
-# . Distinguished Name -> Nom absolu (dn)
-# > Factoriz:	"Distinguished Name (dn) :"	/ browseldap.c:253
-# 		"Distinguished Name"		/ expldifdlg.c:736
-#
-# 2007-09-02 [fab]	2.10.0cvs189 (3.0.0)
-# ? Labels enregistr?s / Label existants ?
-# . Ouvrir le dernier dossier consult? au d?marrage
-# 	-> Ouvrir au d?marrage le dernier dossier consult?
-# . Le nom du menu n'a pas ?t? d?fini. -> Le nom du menu n'est pas d?fini.
-# . La commande n'a pas ?t? d?finie. -> La commande n'est pas d?finie.
-# ? Watch thread : Fil sous surveillance, Fil suivi ?
-# > TODO : use "Maemo|string" for all Maemo specifics strings.
-#
-# 2007-08-31 [fab]	2.10.0cvs189
-# . Tags: Marqueurs, Labels, ... Choix="Labels" pr Colin, Wwp et moi.
-# . (Veuillez laisser ce champ vide pour utiliser le m?me qu'en r?ception)
-# 	-> (Si non renseign?, utilise le m?me qu'en r?ceptioin.)
-# > Dossiers inscrits (IMAP) : meilleure traduc ?
-# > Liste de diff: abonnemt/d?sabonnmt ou inscription/d?sincription
-#
-# 2007-07-01 [fab]	2.9.2cvs76
-# > Maemo contextual strings :   "Maemo|string"
-# > meilleure traduc ?  Run on select -> S?lection validante
-# > parent folder / root folder / top level folder -> uniformiser
-# . Citation lors d'une r?ponse -> Mod?le de formatage lors d'une r?ponse
-# . Citation lors d'un transfert -> Mod?le de formatage lors d'un transfert
-# > Open last opened folder at startup ; startup -> start-up
-# > Action on folder opening : Action -> Actions
-# > Go to ... : Aller ? -> S?lectionner
-#
-# 2007-06-27 [fab]	2.9.2cvs73
-# > Compose / Add to address _book  ->  ajouter "..." ? la fin
-# > factorize :
-# 	src/prefs_logging.c / "Filtering/processing log"
-# 	src/mainwindow.c / "Filtering/processing debug log"
-#
-# 2007-03-29 [fab]	2.8.1cvs62
-# > "_Cancel" (src/messageview.c:1405) -> GTK_STOCK_CANCEL
-#
-# 2007-01-16 [fab]	2.7.1cvs6
-# . These preferences will not be saved ...  -> oubli de traduction
-#
-# 2007-01-12 [fab]	2.7.0cvs10
-# . Bogofilter: learning from message... / learning from message[S]..
-# 	The plural form was considered by me but seems to be not possible due
-# 	to a 0^n regression with ngettext() call in bogofilter_learn() func.
-#
-# 2007-01-10 [fab]	2.7.0cvs4
-# - factorize "Copying %s to %s...\n" and "Copying %s to %s..." (the end \n)
-# 	isn't possible due to call to log_message() with special fmt.
-#
-# 2006-12-14 [fab]	2.6.1cvs34
-# > src/editaddress.c : [Discard] , [Apply]  use accelerators with _
-#
-# 2006-11-28 [fab]	2.6.0cvs56
-# . /Supprimer la _bo?te aux lettres... -> /Enlever la _bo?te aux lettres...
-# . Suppression de bo?tes aux lettres -> Enl?vement de ...
-# . Voulez-vous ne plus utiliser la bo?te aux lettres ? %s ? ?\n"
-# 	-> ?tes-vous s?r de ne plus vouloir utiliser ...
-# . Supp_rimer -> Enleve_r
-#
-# 2006-11-14 [fab]	2.6.0cvs39
-#  . Sylpheed-Claws -> Claws Mail
-#  ? groupe(s) de discussion(s)?  -> s ou pas s
-#
-# 2006-10-31 [fab]	2.5.6cvs11
-#  . textview.c (error msg) :
-# 	Outils/Afficher les traces -> Outils/Fen?tre de traces
-#  > textview.c : 'View Log' -> 'Log window'
-#
-# 2006-10-20 [fab]	2.5.5cvs18
-#  . La version de SC actuellement install?e -> actuellement utilis?e
-#  > [all plugins] actuellement install?e -> utilis?e
-#  . La version de SC actuellement utilis?e est ... que celle avec laquelle
-#      le module ... a ?t? compil?e  -> que celle POUR laquelle
-#  . --on/offline : travailler en [de]connexion  ->  travailler en/hors ligne
-#
-# 2006-10-16 [fab]	2.5.5cvs6
-#  . Enregistrer les messages chiffr?s envoy?s en tant que messages vides
-# 	-> [...] envoy?s en texte clair
-# 	(erreur de traduc rapport?e par Fabrice Delliaux : merci !)
-#  . Voulez-vous supprimer la(les) adresse(s) s?lectionn?e(s) ?"
-# 	-> [...]  la(les) adresse(s) ou groupe(s) s?lectionn?e(s) ?"
-#  > Really delete the address(es)?"  ->  the address(es) or group(s)
-#  > Do you want to delete '%s'?\nThe addresses it contains will not be lost.
-#    Really delete the group(s)?\nThe addresses it contains will not be lost.
-# 	-> factorize "The addresses it contains will not be lost."
-#
-# 2006-09-18 [fab]	2.4.0cvs195
-#  . aggregator[en] (2x 'g') / agr?gateur[fr] (1x 'g')
-#  ? refresh : rafra?chir / mettre ? jour
-#
-# 2006-09-11 [fab]	2.4.0cvs172
-#  . compte (actuel/courant/utilis?) -> courant
-# 	/Message/R?ception/Relever le courrier du compte _actuel
-# 		-> ... compte _courant"		[a]-> [c]
-#  . crypter/cryptage -> chiffrer/chiffrement	(et non pas : chiffrage)
-#  . /Options/Cr_ypter -> _Chiffrer	[y]->[c]
-# 	/Options/Syst?me de _confidentialit? -> S_yst?me de ...  [c]->[y]
-#
-# 2006-09-07 [fab]	2.4.0cvs157
-#  . Afficher certains en-t?tes dans la fen?tre des messages -> les en-t?tes
-#  > Couldn't generate a new key pair: %s
-#    Couldn't generate a new key pair: unknown error	-> factorize
-#
-# 2006-09-06 [fab]	2.4.0cvs153
-#  ? Message marqu? pour suppression / en vue d'?tre supprim?"
-# 	Message marqu? pour d?placement / en vue d'?tre d?plac?"
-# 	Message marqu? pour copie / en vue d'?tre copi?"
-#  . /Vue/Afficher tous les _en-t?tes  ->  /Vue/Tous les _en-t?tes
-#  . /Vue/Voir le code _source du message... -> /Vue/Code _source du message...
-#  . /Vue/D?_ployer les fils de discussion -> D?plo_yer 	[p]->[y]
-#    /Vue/_Compacter les fils de discussion -> Com_pacter	[c]->[p]
-#    /Vue/_Citations -> [c]
-#
-# 2006-07-05 [fab]	2.3.1cvs59
-#  . Module d?j? charg? -> Module d?j? charg?.
-#
-# 2006-06-27 [fab]
-#  . Attention : Tentative d'hame?onnage (phishing)
-# 	(c'est la traduction officielle wikip?dia, il y a aussi "app?tage".)
-#  . Sylpheed - Message View  ->  Sylpheed-Claws - Message View   (2.3.1cvs25)
-#  > [code] Error occurred / happened
-#
-# 2006-06-12 [fab]	2.2.3cvs14 (2.3.0)
-#  . Exit this program? = Quitter Sylpheed ? -> Quitter Sylpheed-Claws ?
-#
-# 2006-06-06 [fab]
-#  . "Newsgroups:" = "Groupe de discussion :" > "Groupe de discussion:"
-#    "Followup-To:" = "Donnant suite ?" -> "Donnant suite ?:"
-#  . "Newsgroup name" = "Groupe de discussion" > "Nom des groupes de discussion"
-#  . "Message-ID" = "Identifiant du message (en-t?te ? Message-Id: ?)"
-# 	-> "Identifiant du message"
-#    "Newsgroups" = "Groupe de discussion (en-t?te ? Newsgroups: ?)"
-# 	-> "Groupe de discussion"
-#    "References" = "R?f?rences (en-t?te ? Reference: ?)"
-# 	-> "R?f?rences"
-# 	(retour ? l'ancienne traduction car probl?me de contexte)
-#
-# 2006-05-21 [fab]
-#  . sender : auteur/exp?diteur -> exp?diteur
-#  . messages contenant S dans l'en-t?te ? Sender: ?
-# 	-> ... dans l'en-t?te d'exp?diteur (en-t?te ? Sender: ?)
-# 	/Message/R?pondre ?/? l'_auteur -> l'_exp?diteur
-# 	/Message/R?pondre ?/? _tous -> .../R?pondre ?/_tous
-# 	/Message/R?pondre ?/? la _liste -> .../R?pondre ?/la _liste
-#  . <main>/Message/_Liste de diffusion  (nouveau et entra?ne : )
-# 	<main>/Message/Co_lorier -> <main>/Message/C_olorier [L -> O]
-#  > voir dans <summaryview>/Co_lorier
-#  > Erreur lors de l'importation mbox -> du/d'un fichier mbox
-#    Erreur lors de l'importation mbox. L'importation mbox a ?chou?.
-#
-# 2006-05-05 [fab]	2.1.1cvs51 (2.2.0)
-#  . PGP Core: Impossible d'obtenir la cl? - pas de gpg-agent disponible.
-# 	-> aucun gpg-agent disponible.
-#  . L'affichage des en-t?tes habituels (comme ? From: ?, ? Subject: ?) sera
-# 	-> des en-t?tes courants
-#  . Utiliser le programme auxiliaire suivant -> Utiliser le programme suivant
-# 	('programme auxiliaire' se trouve d?j? ds titre de frame)
-#  > Montrer la description au lieu du nom des pi?ces attach?es -> meilleure tr
-#  ? pas un caract?re valide dans le nom d'un dossier. -> dans un nom de dossier
-#
-# 2006-05-04 [fab]
-#  . R?cup?ration de tous les messages dans %s... -> de l'ensemble des messages
-#  . messages qui sont dans le groupe de discussion S -> appartenant au
-#  ? Supprimer les messages en double -> Supprimer les doublons ?
-#  ? Composer un _nouveau message -> Composer un message
-#  ? message multipart ou multi-partie
-#  ? (Fen?tre|Vue) de(s) messages
-#  . 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.)   ->  ? Configuration ... de messages ?
-#  ? Dossier contenant des nouveaux messages -> de nouveaux messages ?
-#  ? Avertir s'il y a des messages ? envoyer en file d'attente
-# 	Avertir s'il reste, en file d'attente, des messages ? envoyer ?
-#  ? les messages en file d'attente -> les messages en attente d'envoi
-#  . Body: = Message : -> Corps du\nmessage :
-#  . Marquer le(s) message(s) s?lectionn?(s) comme pourriel(s)
-# 	-> Marquer le(s) courriel(s) s?lectionn?(s) comme pourriel(s)
-#  . Marquer le(s) message(s) s?lectionn?(s) comme courriel(s) l?gitime(s)
-# 	-> Marquer le(s) courriel(s) s?lectionn?(s) comme l?gitime(s)
-#
-# 2006-05-03 [fab]	2.1.1cvs43
-#  . Text Options = Texte -> Corps du message
-#  . Le source du message -> Le code source du message
-#  . Le courrier sera relev? suivant l'ordre des comptes. -> Le courriel
-#  . ?chec lors de la r?cup?ration du fichier du message %d
-# 	-> ... du fichier correspondant au message %d.
-#  > [code] ajouter un point ? "Could not get message file %d"
-#
-#  ? Message(s) -> Courriel(s)
-# 	Apr?s discussion avec Wwp et Colin, le terme 'message' doit ?tre
-# 	conserv? qd le contexte n'indique pas explicitement un courrier
-# 	?lectronique (ex: un article rss).
-# 	-> Proposition de fab suivant le contexte :
-# 		compose,smtp : courriel(mh,imap) ou article(news)
-# 		mh,imap,clamav,spamass : courriel
-# 		news : article
-# 		interface,inc : message
-#
-# 2006-05-02 [fab]	2.1.1cvs43
-#
-#  . Sommaire -> Liste des messages
-#  . Relever automatiquement le courrier toutes les X minutes
-# 	-> Relever automatiquement toutes les X minutes
-# 	(car 'le courrier' est d?j? pr?sent dans le titre de la frame)
-#  . Relever le courrier au d?marrage -> Relever au d?marrage    (m?me raison)
-#  . Toujours crypter le message en r?pondant ? un message crypt?
-# 	-> Toujours crypter la r?ponse ? un message crypt?
-#  . Ne pas afficher de fen?tre d'erreur lors d'une erreur de r?ception
-# 	-> Ne pas afficher de fen?tre lors d'une erreur de r?ception
-#  > [code] ... to the LDAP server via SSL.If connection fails, be
-# 	... via SSL.If ... ->  ... via SSL. If ...  (space)
-#  > [code] This Header name -> This header name ('H'->'h')
-#  > Crypter les messages envoy?s avec votre propre cl? en plus de celle du
-# 	destinataire -> meilleure traduc ?
-#  > Montrer la description au lieu du nom des pi?ces attach?es -> meill. trad
-#  > Ex?cution d'une commande si du courriel arrive
-# 	apr?s une rel?ve automatique
-# 	apr?s une rel?ve manuelle	-> meilleure traduc
-#  ? Dialogs -> Fen?tres / Bo?tes de dialogue
-#
-# 2006-04-21 [fab]	2.1.1cvs15
-#  . S?lection d'un module ? charger -> d'un ou plusieurs modules
-#  . Charger un module... -> Charger un(des) module(s)...
-#
-# 2006-04-16 [fab]	2.1.0cvs48
-#  > (prochaine version) email/message -> courriel
-# 	adresse email -> adresse mel
-#  > (code) uniformiser les messages sensiblemt identiques :
-# 	Pick color for # level text
-# 		/ Pick color for quotation level #
-# 	Pick color for # level text background
-# 		/ Pick color for quotation level # background
-# 	Pick color for links / Pick color for URI
-#
-#  . S?lection d'une couleur pour les mots incorrects -> de la couleur des mots
-#  . Selection -> S?lection (accent)
-#
-#  > (code) (redondance)
-# 	"Pick color for Target folder. Target folder is used when the option
-# 	'Execute immediately when moving or deleting messages' is turned off"
-# 	->
-# 	"Pick color for Target folder. Target folder is used when the option '"
-# 	+ "Execute immediately when moving or deleting messages"
-# 	+ "' is turned off"
-#
-# 	Pick color for misspelled word. Use black to underline
-# 	-> "Pick color for misspelled word" + ". Use black to underline"
-#
-# 	But: ne traduire qu'une seule fois
-#
-#  . Si plus de 3 niveaux de citation existent, les couleurs seront r?utilis?es.
-# 	-> seront utilis?es en boucle. (couleur niveau 4 = couleur niveau 1)
-#  . R?utiliser les couleurs de citation
-# 	-> Utiliser les couleurs en boucle
-#  . Signatures -> Signature (que des noms singuliers)
-#
-# 2006-04-14 [fab]	2.1.0cvs27
-#  . Apr?s concertation, wwp, colin et moi-m?me d?cidont d'utiliser le couple
-# 	? pourriel/courriel l?gitime ? pour traduire Spam/Ham.
-# 	A titre d'infos, nous avons h?sit? avec :
-# 	- pourriel, ind?sirable, courrier (ind?sirable|non (sollicit?|d?sir?))
-# 	- acceptable, courrie(r|l) (acceptable|solicit?|d?sirable), non pourriel
-#
-#  . Les actions suivantes peuvent ?tre effectu?es sur cette partie\n"
-# 	-> [...] ?tre effectu?es sur l'?l?ment actuellement s?lectionn?
-#  . SpamAssassin : filtrage du(des) message(s)...
-# 	-> SpamAssassin : analyse du(des) message(s)...
-#
-# 2006-03-31 [fab]	2.0.0cvs181
-#  .  [...] non envoy?s sont dans la file d'attente. Quitter maintenant ?"
-# 	-> [...] la file d'attente. Voulez-vous quitter maintenant ?
-#  . messages => courrier (suivant contexte) :
-# 	. /_Relever les messages -> /_Relever le courrier
-# 	. [...] dossiers locaux apr?s la r?ception des messages -> du courrier
-# 	. Traitement des messages -> Traitement du courrier
-# 	. vous pouvez relever vos messages -> vous pouvez relever votre courrier
-# 	. Envoi des messages -> Envoi du courrier
-# 	. R?ception des messages -> R?ception du courrier
-#  . dictionnaire alterne -> alternatif
-#  ? dictionnaire alternatif ou alternant
-#  > Colonne 'G'="Get Mails" dans prefs_accounts : ? traduire -> 'R'="Relever"
-#
-# 2006-03-30 [fab]	2.0.0cvs181
-#  . "mot ou phrase:" -> "mot ou phrase :"
-#  . l'en-t?te toto: -> l'en-t?te ? toto: ?
-#  . external program : programme externe -> auxiliaire
-# 	(on garde qd m?me : commande ou module externe)
-#  . ID du message -> Identifiant du message (en-t?te ? Message-Id: ?)
-#  . Groupe de discussion -> Groupe de discussion (en-t?te ? Newsgroups: ?)
-#  . R?f?rences -> R?f?rences (en-t?te ? Reference: ?)
-#  - pi?ces-jointes -> pi?ces jointes
-#  . spam/ham -> [courrier] ind?sirable/acceptable
-# 	(pourriel -> ind?sirable , c plus parlant)
-#  ? marquer comme ind?sirable / ?tant non d?sir?
-#  . SpamAssassin : filtrage du message...  filtrage du(des) message(s)...
-#  . '%c' n'est pas valide dans le nom du dossier.
-# 	-> '%c' n'est pas un caract?re valide dans le nom d'un dossier.
-#
-# 2006-03-27 [fab]	2.0.0cvs161
-#  . /Message/Transf?rer en pi?ce jointe -> [...] en pi?ce _jointe
-#  . Utiliser un programme externe pour l'incorporation
-# 	-> Utiliser un programme auxiliaire pour la r?ception des messages
-#  . Mettre ? jour l'ensemble des dossiers locaux apr?s incorporation
-# 	-> Mettre ? jour [...] apr?s la r?ception des messages
-#  . learning : op?ration d'apprentissage du module SpamAssassin
-#  . T[Oo] -> ?:  ,  C[Cc] -> Cc:  ,  B[Cc][Cc] -> Cci:
-# 	(suivant contexte : entour?s ou non de ??)
-#  >(TODO in english)  to|TO: -> To:  cc|CC: -> Cc:  (uniformiser)
-#  . Ce message demande un accus? de r?ception, or d'apr?s les
-#    en-t?tes ? De ? et ? Cc ?, vous n'en ?tes pas le ...
-# 	? De ? -> ? ? ?  (correction de non-sens)
-#  . Lorsqu'un fichier attach? se rev?le infect? par un virus, il peut ?tre ...
-# 	-> ... par un virus, le message correspondant peut ?tre ...
-#  . "d?placer dans" -> "d?placer vers"
-# 	dont :	/Message/D?placer dan_s la corbeille -> D?placer ver_s la corb.
-# 		/D?placer dan_s la corbeille -> /D?placer ver_s la corbeille
-#  . Couleur des mots inconnus :
-# 	-> Selection d'une couleur pour les mots incorrects
-#  . Chemin des dictionnaires -> S?lection du r?pertoire des dictionnaires
-#
-#  ? Ignore thread  -> Ignorer du fil de discussion   'du' ou 'le'
-#  ? "Veuillez-vous [...]" ou "Veuillez vous [...]"
-#  ? Color label -> Couleur  /  Color labels -> Couleurs
-# 	msgstr[0] "Couleur" , msgstr[1] "Couleurs"
-# 	-> plural mecanism of .po files.
-#  > Ancien carnet d'adresses converti,\n
-# 	mais impossible d'enregistrer le nouveau fichier index.
-# 	-> faire des phrases (alertpanel)
-#  > un acc?s r?seau pour acc?der au serveur : acc?s/acc?der
-#  ? learner=op?rateur d'apprentissage : meilleure traduc ?
-#  > Passage "Cc:"->"Cci :" (prefs_templ,addbook,compose)
-# 	voir si passage "Cc:" en "Cc :" n'a d'incidence que sur affichage
-# 	pareil pr "?:"->"? :" et "Cci:"->"Cci :"
-#
-# 2006-03-13 [fab]	2.0.0cvs136
-#  . Choisir la couleur noire pour utiliser le soulignement des mots (en rouge).
-# 	-> Choisir la couleur noire pour utiliser\n
-# 	   le soulignement des mots (en rouge).
-#  . Pour l'envoi, utiliser le jeu de caract?res
-# 	-> Pour l'envoi, utiliser le jeu\nde caract?res suivant
-#
-# 2006-03-01 [fab]	2.0.0cvs87
-#  . NEW - /Edition/Chercher dans le _message...
-# 	Modif :	/Edition/Justifier tout le _message
-# 	  ->	/Edition/_Justifier tout le message
-#  . NEW - mn?moniques dans les onglets :
-# 	(compose window, @book, apropos, prefs_account)
-# 	- E_n-t?te / Pi?ces _jointes / A_utres
-# 	- Nom d'_utilisateur / _Adresses Email / Donn?es _suppl?mentaires
-# 	- _Description / _Auteurs / _Licence
-# 	- _G?n?ral / R?ce_ption / _Composition / Con_fidentialit? / _SSL /
-# 		/ _Avanc?
-#
-# 	Doublon de mn?moniques :
-# 	(pb car '_Envoyer' est traduit ailleurs et '_Edit' est natif ? GTK)
-# 	<prefs_account>/_Composition/_Edit    et    <prefs_account>/_Envoyer
-#
-#  . Transf?rer le message
-# 	-> Transf?rer le(s) message(s) s?lectionn?(s)
-#  . D?placer le message dans la corbeille
-# 	-> D?placer le(s) message(s) s?lectionn?(s) dans la corbeille
-#
-#  . Supprimer le message
-# 	-> Supprimer le(s) message(s) s?lectionn?(s)
-#
-# 2006-02-07 [fab]	2.0.0cvs26
-#  . --subscribe [uri]	: oubli WebCal fonctionnant avec module vCalendar.
-#  . <Compose>/Options/Jeux de caract?res : Vue->Options (erreur)
-#  . Prefs/Trt des messages/Envoyer : Jeu de caract?res pour l'envoi
-# 	-> Pour l'envoi, utiliser le jeu de caract?res
-#  . Prefs/Composition/Composer : S?lection automatique de compte
-# 	-> S?lectionner automatiquement le compte
-#  . Prefs/Affichage/Couleurs : Coloration du texte des messages
-# 	-> Colorier le texte des messages
-#
-# 2006-01-25 [fab]	1.9.15cvs185 (en vue de la future 2.0.0)
-#
-#  ---- V?rif. typos (et correction si besoin) -----------
-#  .  address[en] / adresse[fr]  (fix double 'd')
-#  .  bo?te ('?' et non pas 'i')
-#  .  License[en], Licence[fr|en] : selon Paul : 'LicenCe'[en] aussi valable.
-#  .  une/la fichier -> un/le fichier
-#  .  cr?e -> cr??
-#  .  terminaison de verbes : -er ou -ez (ex : cliquer ou cliquez)
-# 	-> selon contexte, pr?fixation par "Veuillez ..."
-# 	Ex : Saisissez -> Veuillez saisir
-#  .  connection[en]/connexion[fr] , connect[en]/connecter[fr]
-#  .  un espace avant les caract?res  ?!:;??
-# 	http://fr.wikipedia.org/wiki/Ponctuation
-#  ?  et la virgule ?
-#
-#  ---- Modifications -----------
-#  .  <AddressBook>/Adresse/_Supprimer  ->  <AddressBook>/Adresse/Supp_rimer
-# 	(du fait de l'ajout de <AddressBook>/Adresse/_S?lectionner tout ). Idem
-# 	pr <AddressBookList>/_Supprimer ( <AddressBookList>/S?lectionner tout )
-#  .  Choisissez/S?lectionnez -> Veuillez choisir/s?lectionner
-#  .  Impossible de coller. Le carnet d'adresses vis? est en lecture seule.
-# 	carnet d'adresses 'vis?' -> 'de destination'
-#  .  Voulez-vous supprimer la(les) adresse(s) s?lectionn?e(s) ?
-# 	-> normalement "l'(les) adresse(s)" mais c'est plus joli avec le 'la'.
-#  .  messages pour lesquels une r?ponse a ?t? envoy?e : lesquel -> lesquels
-#  .  souhaitez-vous -> voulez-vous
-#  .  log -> traces (+ acc?l?rateurs modifi?s)
-# 	<mainwindow>/Outils/-
-# 		-/Fen?tre de _log  ->  Fen?tre de _traces
-# 		-/Cr?er une r?gle de _traitement  -> [...] traite_ment
-#  .  SC s'est crash? -> s'est anormalement interrompu
-#  .  Enregistrer les donn?es du crash -> ... de l'interruption inattendue
-#  ?  mail/message -> courriel ?
-#  .  Ic?nes/Texte seulement -> seules/seul
-#  .  Veuillez fermer toutes les fen?tres de composition avant de [...]
-# 	-> Veuillez toutes les fermer avant de [...]
-#  .  <Compose>/Outils/Afficher une _r?gle  ->  [...] la r?gle
-#  .  [...] pas de compte pour envoyer un message. -> pr l'envoi de messages.
-#     [...] pour envoyer un article de groupes de discussion. (idem)
-#  .  bug -> bogue
-#  .  Ajouter une personne -> Ajout d'une personne (Titre bo?te de dialogue)
-#  .  L'adresse email est obligatoire. -> [...] est requise.
-#  .  Un nom et une valeur doivent ?tre donn?s. -> [...] sont requis.
-#  .  Nouveau groupe -> Ajout d'un nouveau groupe
-#  .  Le Nom Affich? du carnet -> Le nom d'affichage du carnet.
-#  .  Il n'est pas possible de d?placer un dossier vers un de ces sous-dossiers.
-# 	-> un de SES sous-dossiers
-#  .  Compose/spell/Accepter dans cette session -> pour cette session seulement
-#  .  Compose/spell/Remplacer par... -> Remplacer par...
-#  .  Quicksearch/Aide : distinguer maj./min. : maj->MAJ
-#  .  <main>/Edition/Chercher ds message/dossier : idem (maj->MAJ)
-#  .  <Filtrage,Traitement>/Condition Filtrage : idem (maj->MAJ)
-#  .  log_warning() : impossible de -> Impossible de  (i -> I)
-#  >  Sticky -> Permanent : trouver une traduction + parlante.
-#  .  Impossible de renommer la bo?te aux lettres [de] %s en %s
-#  .  un champs -> un champ
-#  .  Impossible d'?crire le fichier. ?crire -> enregistrer
-#  .  [...] pas autoris? ? faire d?buter un nom du menu [...] -> un nom DE menu
-# 	? un nom de menu / le nom du menu
-#  .  Rel?ve automatique du courrier chaque X minutes :
-# 	-> Relever automatiquement le courrier toutes les X minutes.
-#  .  Confirmer avant de marquer [...] -> Demander confirmation
-#  .  [..] tous les messages d'un dossier comme lu -> comme lus
-#  .  Ce dossier ne semble pas ?tre le dossier d'un th?me.
-# 	-> [...] pas ?tre celui d'un th?me.
-#  .  Justification automatique pendant ... -> Justifier automatiquement pdt ...
-#  .  Justification avant l'envoi -> Justifier avant l'envoi
-#  .  Justification de la citation -> Justifier la citation
-#  .  Justification lors d'un copier/coller -> Justifier lors d'un ...
-#  >  D'une mani?re g?n?rale, mettre des verbes plut?t que des noms (prefs)
-#  .  Composition d'un message -> Composer un message
-#  .  Orthographe -> V?rifier l'orthographe
-#  .  bouton 'Relever' "qui se trouve ?" gauche dans la barre ... -> situ? ?
-#  .  Choix d'un dossier -> S?lection d'un dossier
-#  .  Choix du fichier ? importer -> S?lection du [..]
-#  .  <main>/Vue/Cho_ix des ?l?ments affich?s -> /Vue/S?lect_ion des elmt [..]
-#  .  <main>/Configuration/Choisir un autre comp_te -> _S?lectionner un [..]
-#  .  Choix du dossier de destination -> S?lection du [..]
-#  .  <prefs_filtering_action.c> [Select ...] : Choisir... -> Parcourir...
-#  .  Carnet d'adresses : Personne -> Contact
-#  .  nom du fichier -> chemin du fichier :
-#     - ('%s' sera remplac? par le nom du fichier)
-#     - Nom du fichier :
-#     - Veuillez sp?cifier le dossier ? exporter et le chemin du fichier mbox qui
-#     - Veuillez sp?cifier le nom du carnet d'adresses et le nom du fichier ?
-#     - Aide : la chaine %s sera remplac?e par le nom du fichier ou de l'URI.
-#     - Nom du fichier - ne doit pas ?tre modifi?
-#  .  Veuillez sp?cifier le nom du dossier et le nom du fichier ? cr?er.
-#     -> Veuillez sp?cifier le chemin du fichier ? cr?er.
-#  .  0 jours : suppression imm?diate -> 0 jour : ...
-#  .  sans message[s] -> selon contexte : sans messages
-# 	(voir http://grammaire.reverso.net/index_alpha/Fiches/Fiche248.htm)
-#  .  provide[d] : donn? -> fourni
-#  .  Taille maximale des messages qui seront analys?s -> .. messages ? analyser
-#  .  formatting[en] formater[fr] : formatter -> formater
-#  .  cl?/clef : il semble que 'cl?' soit majoritairement utilis?.
-#  .  spam[s] -> pourriel[s]
-#  .  Abbr?vier -> Abr?ger
-#  .  uniquely : univoquement -> uniquement (de mani?re unique)
-#  .  ordre de tri dans la vue des dossiers. -> dans la liste des dossiers.
-#  .  Veuillez choisir un fichier/dossier -> Veuillez s?lectionner ...
-#  .  Supprimer tous les messages de la corbeille ? -> Voulez-vous vraiment ..
-#  .  Envoyer tous les messages en file d'attente ?
-# 	-> Voulez-vous envoyer l'ensemble des messages en file d'attente ?
-#  . Specifier = Code -> Symbole (prefs_summaries, format date)
-#  . Pr?fixes de citations -> Pr?fixe de citation
-#  . Veuillez saisir le mot de passe -> Saisie du mot de passe
-#  . Veuillez saisir le mot de passe de %s pour %s :
-# 	-> Veuillez saisir le mot de passe du compte %s sur le serveur %s :
-#  . Fermer quand m?me ? -> Voulez-vous quand m?me fermer ?"
-#  . Supprimer tous les messages de toutes les corbeilles ?   ->  Voulez-vous
-# 	vraiment supprimer tous les messages de toutes les corbeilles ?
-#  . S_ynchroniser : acc?l.'y' utilis? = respect homog?n?it? avec menu-entries :
-# 	<(IMAP|News)Folder>/S_ynchroniser
-# 	<Main>/_Fichier/S_ynchroniser les dossiers distants
-#  . Les symboles suivants sont utilisables :
-# 	-> Il est possible d'utiliser les symboles suivants :
-#  . Type de condition : ? Test ?  ->  Condition de filtrage : ? Test ?
-#  . L'URL point? (%s) est diff?rent de\nl'URL affich? (%s).
-# 	->	L'URL point? est diff?rent de l'URL affich? :
-# 		- URL point?  : %s
-# 		- URL affich? : %s
-#  . Voulez-vous maintenant synchroniser vos dossiers distants ?
-# 	-> Voulez-vous vraiment synchroniser [...]
-#  . Choix de la couleur -> S?lection de la couleur
-#  . une pi?ce d'un message multipart -> une partie d'un message multipart
-#  . Les double-points ? : ? ne sont pas accept?s dans le nom du menu.
-# 	-> [...] dans un nom de menu.
-#  . par le chemin du fichier ou de l'URI. -> par le ... ou l'URI.
-#  . Confirmer en quittant -> Demander une confirmation pour quitter
-#  . Demander avant de vider -> Demander une confirmation pour vider
-#  . Voulez-vous quand m?me l'installer ? -> [...] poursuivre l'installation ?
-#  . (prefs_toolbar) Composition -> Fen?tre de composition   -- merci Colin
-# 	-> corrige bug de rattachement de PrefsPage dans le TreeView des Prefs
-#  .  G?n?rale (Account Prefs) -> G?n?ral
-#
-#
-# 2005-10-30 [fab]	1.9.15cvs126 (en vue de la future 1.9.99)
-#
-# 	Quelques notes ...
-#
-# En plus des habituelles traductions concernant des ajouts ou modifications de
-# fonctionnalit?s, certains petits changements ont ?t? op?r?s, d'autres sont
-# envisag?s ou demandent r?flexion. En voici la liste :
-#
-#  .  compose.c
-# 	"Le sujet est vide. Voulez-vous quand m?me envoyer le message ?"
-# 	- "n?anmoins"  ->  "quand m?me"
-#
-#  .  compose.c
-# 	"Ce message a ?t? modifi? mais non envoy?. Voulez-vous interrompre sa "
-# 		"composition ?"
-# 	- "pas envoy?"  ->  "non envoy?"
-# 	- "la composition"  ->  "sa composition"
-#
-#  .  compose.c
-# 	longueur ligne taille max. conseill?e (bytes -> octets)
-#
-#  .  prefs_summaries.c
-# 	"Affichage de la fen?tre ? Plus de message non lu (ou nouveau) ?"
-# 	- ajout de "Affichage de la -".
-#
-#  .  prefs_actions.c
-# 	"Inclure / dans le nom du menu pour faire des sous-menus."
-# 	- correction : "de sous-menus"  ->  "des sous-menus"
-#
-#  .  send_message.c
-# 	- ajout de '...' ? la fin de : (conform?ment au msgid correspondant)
-# 		"Envoi de RCPT TO..."   et   "Envoi de DATA..."
-#  .  inc.c
-# 	- Override : "Outrepasser" -> "Continuer et ignorer l'avertissement"
-#
-#  .  "icone"  ->  "ic?ne"
-#  .  "<mot> ..."  ->  "<mot>..."
-# 	- En fin de phrase, les ... ne sont pr?c?d?s d'aucun espace.
-#  .  Sylpheed Claws  ->  Sylpheed-Claws
-#  .  L'?quipe  ->  L'?quipe
-#  .  Sylpheed  ->  Sylpheed-Claws
-#  .  click(er)  ->  clique(r)
-#  .  login  ->  nom d'utilisateur
-#  ?  Un clique  OU  un clic
-#  ?  double-cli(que|c)  OU  double cli(que|c)  :  trait d'union ?
-#
-#  .  acc?l?rateurs :
-# 	<Compose>/Options/Syst?me de _confidentialit?	(avant : aucun)
-# 	<Carnet>/_Carnet/_Supprimer
-# 		->  <Carnet>/_Carnet/Supp_rimer		('r' de _Remove)
-# 	<Carnet>/_Carnet/En_registrer
-# 		->  <Carnet>/_Carnet/Enregi_strer	('s' de _Save)
-# 	But : harmoniser l'acc?l?rateur des diff?rents menus Enregistrer. ('s')
-#
-#  ?  Western Europe : de l'ouest / orientale (occidentale)
-#  .  check : "tester"  ->  "v?rifier"
-#  ?  sauver / enregistrer / m?moriser
-#  ?  dossier / r?pertoire
-#  >  " " -> ? ?
-#  ?  "Marquer tous comme lu"   OU   "Marquer tous comme luS"
-#  ?  "Confirmer" ou "Demander confirmation"
-# 	-> "Confirmer" a l'avantage d'?tre plus court,
-# 	-> "Demander (une)? confirmation" reste plus explicite mais bcp
-# 		+ long surtout si on ajoute l'article ind?fini 'une'.
-# 	=> Dans l'imm?diat, on conserve le terme "Confirmer".
-#
-#  >  <Main>, Barre d'outils :  Composition  OU  Composer
-# 	-> actuellement impossible d? ? factorisation tradution de 'compose'
-#  >  compose : "emails multiples" -> meilleure traduction ?
-#  >  folderview : "supprimera les caches locaux" -> meilleure traduction ?
-#  >  <Main>/Vue/Jeux de caract?res/Europe de l'Ouest (Windows-1252)
-# 	- trouver un acc?l?rateur non encore utilis?.
-#
-# Pr?c?demment : (quand ?)
-# 	<Main>/Fichier/_Vider toutes les corbeilles...
-# 	- ajout des ... ? la fin car une confirmation est demand?e.
-#
-# Pr?c?demment : (quand ?)
-# 	<Main>/_Outils  ->  <Main>/Ou_tils
-# 	- harmoniser les acc?l. pr les fen?tres <Main> et <Compose>
-# 	- (accessoirement) retrouver le T de '_Tools', menu ? l'origine
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-12-21 16:02+0100\n"
-"PO-Revision-Date: 2016-12-21 16:00+0100\n"
+"POT-Creation-Date: 2016-12-21 19:15+0100\n"
+"PO-Revision-Date: 2016-12-23 11:22+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
 "MIME-Version: 1.0\n"
@@ -966,15 +338,15 @@ msgid ""
 "contacts."
 msgstr ""
 "L'ajout ou la suppression de noms d'attributs n'affectera pas ceux d?j? "
-"d?finis dans des contacts."
+"d?finis dans les contacts."
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
-msgstr "Afficher les contacts se trouvant en double dans un m?me carnet"
+msgstr "Afficher les contacts en double dans un m?me carnet"
 
 #: src/addrduplicates.c:133
 msgid "Show duplicates in different books"
-msgstr "Afficher les contacts en double ? travers diff?rents carnets"
+msgstr "Afficher les contacts en double dans des carnets diff?rents"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
@@ -1550,7 +922,7 @@ msgstr "Chercher dans les en-t?tes suivants"
 
 #: src/addrgather.c:426
 msgid "Include subfolders"
-msgstr "Inclure les sous-dossiers"
+msgstr "Appliquer aux sous-dossiers"
 
 #: src/addrgather.c:450 src/prefs_filtering_action.c:1425
 msgid "Header Name"
@@ -1603,12 +975,12 @@ msgstr ""
 "La mise ? jour a ?chou?. Les modifications ne seront pas appliqu?es au "
 "r?pertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9481
+#: src/alertpanel.c:146 src/compose.c:9505
 msgid "Notice"
 msgstr "Information"
 
 #: src/alertpanel.c:159 src/compose.c:5695 src/compose.c:6218
-#: src/compose.c:11902 src/file_checker.c:78 src/file_checker.c:100
+#: src/compose.c:11926 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:854 src/messageview.c:875
 #: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1782,22 +1154,22 @@ msgstr "D?passement du d?lai d'attente de la connexion.\n"
 #: src/common/socket.c:732
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
-msgstr "%s:%d: la connexion a ?chou? (%s).\n"
+msgstr "%s:%d : la connexion a ?chou? (%s).\n"
 
 #: src/common/socket.c:972
 #, c-format
 msgid "%s:%d: unknown host.\n"
-msgstr "%s:%d: h?te inconnu.\n"
+msgstr "%s:%d : h?te inconnu.\n"
 
 #: src/common/socket.c:1064
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
-msgstr "%s:%s: ?chec de la recherche de l'h?te (%s).\n"
+msgstr "%s:%s : ?chec de la recherche de l'h?te (%s).\n"
 
 #: src/common/socket.c:1368
 #, c-format
 msgid "write on fd%d: %s\n"
-msgstr "?criture sur fd%d: %s\n"
+msgstr "?criture sur fd%d : %s\n"
 
 #: src/common/ssl_certificate.c:326
 #, c-format
@@ -2149,7 +1521,7 @@ msgstr "Envoyer _ult?rieurement"
 
 #: src/compose.c:612
 msgid "_Attach file"
-msgstr "_Joindre un fichier"
+msgstr "_Adjoindre un fichier"
 
 #: src/compose.c:613
 msgid "_Insert file"
@@ -2275,7 +1647,7 @@ msgstr "_Justifier tout le message"
 
 #: src/compose.c:662
 msgid "Edit with e_xternal editor"
-msgstr "?diter avec un ?diteur au_xiliaire"
+msgstr "?diter avec un programme e_xterne"
 
 #: src/compose.c:665
 msgid "_Check all or check selection"
@@ -2484,7 +1856,7 @@ msgstr "Le corps du mod?le ? Transfert ? a une erreur ? la ligne %d."
 
 #: src/compose.c:2067
 msgid "Fw: multiple emails"
-msgstr "Fw: emails multiples"
+msgstr "Fw : emails multiples"
 
 #: src/compose.c:2550
 #, c-format
@@ -2493,38 +1865,38 @@ msgstr "Le corps du mod?le ? Redirection ? a une erreur ? la ligne %d."
 
 #: src/compose.c:2617 src/gtk/headers.h:14
 msgid "Cc:"
-msgstr "Cc:"
+msgstr "Cc :"
 
 #: src/compose.c:2620 src/gtk/headers.h:15
 msgid "Bcc:"
-msgstr "Cci:"
+msgstr "Cci :"
 
 #: src/compose.c:2623 src/gtk/headers.h:12
 msgid "Reply-To:"
-msgstr "R?pondre ?:"
+msgstr "R?pondre ? :"
 
 #: src/compose.c:2626 src/compose.c:4942 src/compose.c:4944
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
-msgstr "Groupe de discussion:"
+msgstr "Groupe de discussion :"
 
 #: src/compose.c:2629 src/gtk/headers.h:34
 msgid "Followup-To:"
-msgstr "Donnant suite ?:"
+msgstr "Donnant suite ? :"
 
 #: src/compose.c:2632 src/gtk/headers.h:17
 msgid "In-Reply-To:"
-msgstr "En r?ponse ?:"
+msgstr "En r?ponse ? :"
 
 #: src/compose.c:2636 src/compose.c:4939 src/compose.c:4947
 #: src/gtk/headers.h:13 src/summary_search.c:433
 msgid "To:"
-msgstr "?:"
+msgstr "? :"
 
 #: src/compose.c:2822
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
-"Impossible de joindre le fichier au message (?chec de conversion de jeu de "
+"Impossible d'adjoindre le fichier au message (?chec de conversion de jeu de "
 "caract?res)."
 
 #: src/compose.c:2828
@@ -2564,7 +1936,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?tes-vous s?r ?"
 
-#: src/compose.c:3624 src/compose.c:10507 src/compose.c:11383
+#: src/compose.c:3624 src/compose.c:10531 src/compose.c:11407
 msgid "_Insert"
 msgstr "_Ins?rer"
 
@@ -2661,7 +2033,7 @@ msgstr "Voulez-vous quand m?me le mettre en file d'attente d'envoi ?"
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5173 src/compose.c:9979
+#: src/compose.c:5173 src/compose.c:10003
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2671,7 +2043,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caract?res a ?chou?."
 
-#: src/compose.c:5176 src/compose.c:9982
+#: src/compose.c:5176 src/compose.c:10006
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2681,7 +2053,7 @@ msgstr ""
 "\n"
 "La cl? de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5182 src/compose.c:9976
+#: src/compose.c:5182 src/compose.c:10000
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2884,78 +2256,60 @@ msgstr "_Aucun"
 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:8691
-msgid "Template From format error."
-msgstr "Erreur de formatage dans l'en-t?te ? De: ? du mod?le."
-
-#: src/compose.c:8709
-msgid "Template To format error."
-msgstr "Erreur de formatage dans l'en-t?te ? ?: ? du mod?le."
-
-#: src/compose.c:8727
-msgid "Template Cc format error."
-msgstr "Erreur de formatage dans l'en-t?te ? Cc: ? du mod?le."
-
-#: src/compose.c:8745
-msgid "Template Bcc format error."
-msgstr "Erreur de formatage dans l'en-t?te ? Cci: ? du mod?le."
-
-#: src/compose.c:8763
-msgid "Template Reply-To format error."
-msgstr "Erreur de formatage dans l'en-t?te ? Reply-To: ? du mod?le."
-
-#: src/compose.c:8782
-msgid "Template subject format error."
-msgstr "Erreur de formatage dans le sujet du mod?le."
+#: src/compose.c:8692 src/compose.c:8714 src/compose.c:8736 src/compose.c:8758
+#: src/compose.c:8780 src/compose.c:8803
+#, c-format
+msgid "Template '%s' format error."
+msgstr "Erreur de formatage dans l'en-t?te ? %s ? du mod?le."
 
-#: src/compose.c:9051
+#: src/compose.c:9075
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9066
+#: src/compose.c:9090
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9140
+#: src/compose.c:9164
 msgid "Properties"
 msgstr "Propri?t?s"
 
-#: src/compose.c:9157
+#: src/compose.c:9181
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9198
+#: src/compose.c:9222
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9218
+#: src/compose.c:9242
 msgid "Path"
 msgstr "Chemin d'acc?s"
 
-#: src/compose.c:9219
+#: src/compose.c:9243
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9478
+#: src/compose.c:9502
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
 "process group id: %d"
 msgstr ""
-"L'?diteur auxiliaire est encore ouvert.\n"
+"L'?diteur externe est encore ouvert.\n"
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9945 src/messageview.c:1088
+#: src/compose.c:9969 src/messageview.c:1088
 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:9971
+#: src/compose.c:9995
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9973
+#: src/compose.c:9997
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2966,15 +2320,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10151
+#: src/compose.c:10175
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10155
+#: src/compose.c:10179
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10156
+#: src/compose.c:10180
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2983,24 +2337,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'?dition de ce message ?"
 
-#: src/compose.c:10158
+#: src/compose.c:10182
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10158
+#: src/compose.c:10182
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10318 src/compose.c:10332
+#: src/compose.c:10342 src/compose.c:10356
 msgid "Select file"
 msgstr "Veuillez s?lectionner un fichier"
 
-#: src/compose.c:10346
+#: src/compose.c:10370
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "?chec lors de la lecture de ? %s ?."
 
-#: src/compose.c:10348
+#: src/compose.c:10372
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3009,54 +2363,54 @@ msgstr ""
 "Le fichier ? %s ? contient des caract?res n'appartenant pas\n"
 "? l'encodage courant : l'insertion peut ?tre incorrecte."
 
-#: src/compose.c:10427
+#: src/compose.c:10451
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10428
+#: src/compose.c:10452
 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:10429 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10453 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10429 src/compose.c:10433
+#: src/compose.c:10453 src/compose.c:10457
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10431 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10455 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10432
+#: src/compose.c:10456
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
 "modifications ?"
 
-#: src/compose.c:10433
+#: src/compose.c:10457
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10504
+#: src/compose.c:10528
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le mod?le ? %s ? ?"
 
-#: src/compose.c:10506
+#: src/compose.c:10530
 msgid "Apply template"
 msgstr "Utiliser le mod?le"
 
-#: src/compose.c:10507 src/prefs_actions.c:329
+#: src/compose.c:10531 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1060
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11376
+#: src/compose.c:11400
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -3066,25 +2420,25 @@ msgid_plural ""
 "attach them to the email?"
 msgstr[0] ""
 "Voulez-vous ins?rer le contenu du fichier directement dans le corps du "
-"message ou le joindre en tant que pi?ce jointe ?"
+"message ou l'adjoindre en tant que pi?ce jointe ?"
 msgstr[1] ""
 "Voulez-vous ins?rer le contenu des %d fichiers directement dans le corps du "
-"message ou les joindre en tant que pi?ces jointes ?"
+"message ou les adjoindre en tant que pi?ces jointes ?"
 
-#: src/compose.c:11382
+#: src/compose.c:11406
 msgid "Insert or attach?"
-msgstr "Ins?rer ou joindre ?"
+msgstr "Ins?rer ou adjoindre ?"
 
-#: src/compose.c:11383
+#: src/compose.c:11407
 msgid "_Attach"
-msgstr "_Joindre"
+msgstr "_Adjoindre"
 
-#: src/compose.c:11601
+#: src/compose.c:11625
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation ? la ligne %d."
 
-#: src/compose.c:11896
+#: src/compose.c:11920
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3299,7 +2653,7 @@ msgstr "?dition du carnet d'adresses"
 
 #: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
-msgstr " Verifier le fichier "
+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:1976
@@ -4369,7 +3723,7 @@ msgstr "Marquer tou_s comme non lus"
 
 #: src/folderview.c:249
 msgid "Mark all read recursi_vely"
-msgstr "Marquer comme lu r?cursivement"
+msgstr "Marquer tous comme lus r?cursivement"
 
 #: src/folderview.c:250
 msgid "Mark all unread recursi_vely"
@@ -4678,13 +4032,10 @@ msgid ""
 "\n"
 "For further information visit the Claws Mail website:\n"
 msgstr ""
-"Claws Mail est un client email con?u pour ?tre :\n"
-"  - l?ger et rapide,\n"
-"  - avec une interface agr?able et simple ? utiliser,\n"
-"  - largement configurable intuitivement,\n"
-"  - dot? de nombreuses fonctionnalit?s.\n"
+"Claws Mail est un client email con?u pour ?tre l?ger, rapide,\n"
+"et hautement configurable.\n"
 "\n"
-"Pour d'autres informations, vous pouvez consulter le site internet de Claws "
+"Pour plus informations, vous pouvez consulter le site internet de Claws "
 "Mail :\n"
 
 #: src/gtk/about.c:137
@@ -4843,7 +4194,7 @@ msgstr "support pour la gestion des sessions.\n"
 #: src/gtk/about.c:511
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
-msgstr "support pour la d?tection des changements de connexions r?seaux,\n"
+msgstr "support pour la d?tection des changements de connexions r?seau,\n"
 
 # NDT : r?f?rences : <http://fsffrance.org/gpl/gpl-fr.fr.html> et
 # <http://www.gnu.org/licenses/translations.fr.html>
@@ -4899,7 +4250,7 @@ msgstr "Trafic entrant\n"
 #: src/gtk/about.c:721 src/main.c:2594
 #, c-format
 msgid "Received messages: %d\n"
-msgstr "Messages re?us: %d\n"
+msgstr "Messages re?us : %d\n"
 
 #: src/gtk/about.c:728 src/main.c:2600
 msgid "Outgoing traffic\n"
@@ -4908,22 +4259,22 @@ msgstr "Trafic sortant\n"
 #: src/gtk/about.c:731 src/main.c:2603
 #, c-format
 msgid "New/redirected messages: %d\n"
-msgstr "Nouveaux messages et redirections: %d\n"
+msgstr "Nouveaux messages et redirections : %d\n"
 
 #: src/gtk/about.c:736 src/main.c:2607
 #, c-format
 msgid "Replied messages: %d\n"
-msgstr "R?ponses: %d\n"
+msgstr "R?ponses : %d\n"
 
 #: src/gtk/about.c:741 src/main.c:2611
 #, c-format
 msgid "Forwarded messages: %d\n"
-msgstr "Messages transf?r?s: %d\n"
+msgstr "Messages transf?r?s : %d\n"
 
 #: src/gtk/about.c:746 src/main.c:2615
 #, c-format
 msgid "Total outgoing messages: %d\n"
-msgstr "Total des messages sortants: %d\n"
+msgstr "Total des messages sortants : %d\n"
 
 #: src/gtk/about.c:773
 msgid "About Claws Mail"
@@ -4957,7 +4308,7 @@ msgstr "_Licence"
 
 #: src/gtk/about.c:871
 msgid "_Release Notes"
-msgstr "_Notes de sortie"
+msgstr "_Notes de version"
 
 #: src/gtk/about.c:877
 msgid "_Statistics"
@@ -5152,7 +4503,7 @@ msgstr "?chec : service non fourni."
 
 #: src/gtk/gtkutils.c:1930
 msgid "Failed: network error."
-msgstr "?chec: probl?me de connexion r?seau."
+msgstr "?chec : probl?me de connexion r?seau."
 
 #: src/gtk/gtkutils.c:1933
 #, c-format
@@ -5217,7 +4568,7 @@ msgstr "Identifiant du message"
 
 #: src/gtk/headers.h:16
 msgid "Message-ID:"
-msgstr "Identifiant du message:"
+msgstr "Identifiant du message :"
 
 #: src/gtk/headers.h:17
 msgid "In-Reply-To"
@@ -5230,7 +4581,7 @@ msgstr "R?f?rences"
 
 #: src/gtk/headers.h:18
 msgid "References:"
-msgstr "R?f?rences:"
+msgstr "R?f?rences :"
 
 #: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
 #: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
@@ -5249,7 +4600,7 @@ msgstr "Commentaires"
 
 #: src/gtk/headers.h:20
 msgid "Comments:"
-msgstr "Commentaires:"
+msgstr "Commentaires :"
 
 #: src/gtk/headers.h:21
 msgid "Keywords"
@@ -5338,15 +4689,15 @@ msgstr "Groupe de discussion"
 
 #: src/gtk/headers.h:34
 msgid "Followup-To"
-msgstr "Donnant suite ?:"
+msgstr "Donnant suite ?"
 
 #: src/gtk/headers.h:35
 msgid "Delivered-To"
-msgstr "Delivered-To"
+msgstr "D?livr? ?"
 
 #: src/gtk/headers.h:35
 msgid "Delivered-To:"
-msgstr "Delivered-To :"
+msgstr "D?livr? ? :"
 
 #: src/gtk/headers.h:36
 msgid "Seen"
@@ -5364,7 +4715,7 @@ msgstr "?tat"
 
 #: src/gtk/headers.h:37 src/prefs_themes.c:880
 msgid "Status:"
-msgstr "Status :"
+msgstr "?tat :"
 
 #: src/gtk/headers.h:38
 msgid "Face"
@@ -5376,19 +4727,19 @@ msgstr "Face :"
 
 #: src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
-msgstr "Disposition-Notification-To"
+msgstr "Notification de disposition ?"
 
 #: src/gtk/headers.h:39
 msgid "Disposition-Notification-To:"
-msgstr "Disposition-Notification-To :"
+msgstr "Notification de disposition ? :"
 
 #: src/gtk/headers.h:40
 msgid "Return-Receipt-To"
-msgstr "Return-Receipt-To"
+msgstr "Retour de re?u ?"
 
 #: src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
-msgstr "Return-Receipt-To :"
+msgstr "Retour de re?u ? :"
 
 #: src/gtk/headers.h:41
 msgid "User-Agent"
@@ -5424,11 +4775,11 @@ msgstr "Version MIME :"
 
 #: src/gtk/headers.h:45
 msgid "Precedence"
-msgstr "Precedence"
+msgstr "Pr?c?dence"
 
 #: src/gtk/headers.h:45
 msgid "Precedence:"
-msgstr "Precedence :"
+msgstr "Pr?c?dence :"
 
 #: src/gtk/headers.h:46 src/prefs_account.c:1066
 msgid "Organization"
@@ -5512,11 +4863,11 @@ msgstr "X-Mailer :"
 
 #: src/gtk/headers.h:58
 msgid "X-Status"
-msgstr "X-?tat"
+msgstr "X-Status"
 
 #: src/gtk/headers.h:58
 msgid "X-Status:"
-msgstr "X-?tat :"
+msgstr "X-Status :"
 
 #: src/gtk/headers.h:59
 msgid "X-Face"
@@ -5532,7 +4883,7 @@ msgstr "X-No-Archive"
 
 #: src/gtk/headers.h:60
 msgid "X-No-Archive:"
-msgstr "X-No-Archive:"
+msgstr "X-No-Archive :"
 
 #: src/gtk/headers.h:63
 msgid "In reply to"
@@ -5540,7 +4891,7 @@ msgstr "En r?ponse ?"
 
 #: src/gtk/headers.h:63
 msgid "In reply to:"
-msgstr "En r?ponse ?:"
+msgstr "En r?ponse ? :"
 
 #: src/gtk/headers.h:64
 msgid "To or Cc"
@@ -5548,7 +4899,7 @@ msgstr "? ou Cc"
 
 #: src/gtk/headers.h:64
 msgid "To or Cc:"
-msgstr "? ou Cc:"
+msgstr "? ou Cc :"
 
 #: src/gtk/headers.h:65
 msgid "From, To or Subject"
@@ -5556,7 +4907,7 @@ msgstr "De, ? ou Sujet"
 
 #: src/gtk/headers.h:65
 msgid "From, To or Subject:"
-msgstr "De, ? ou Sujet:"
+msgstr "De, ? ou Sujet :"
 
 #: src/gtk/icon_legend.c:67
 msgid "New message"
@@ -5576,7 +4927,7 @@ msgstr "Message transf?r?"
 
 #: src/gtk/icon_legend.c:71
 msgid "Message has been forwarded and replied to"
-msgstr "Le message a ?t? transf?r? et a aussi fait l'objet d'une r?ponse"
+msgstr "Message ayant ?t? transf?r? et ayant aussi fait l'objet d'une r?ponse"
 
 #: src/gtk/icon_legend.c:72
 msgid "Message is in an ignored thread"
@@ -5592,7 +4943,7 @@ msgstr "Message pourriel"
 
 #: src/gtk/icon_legend.c:76
 msgid "Message has attachment(s)"
-msgstr "Messages contenant une ou plusieurs pi?ces jointes"
+msgstr "Message contenant une ou plusieurs pi?ces jointes"
 
 #: src/gtk/icon_legend.c:77
 msgid "Digitally signed message"
@@ -5648,7 +4999,7 @@ msgstr "Dossier IMAP contenant uniquement des sous-dossiers"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
-msgstr "Afficher seulement les dossiers inscrits dans bo?te aux lettres IMAP"
+msgstr "Dossier IMAP affichant seulement les dossiers inscrits"
 
 #: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
@@ -5844,12 +5195,11 @@ msgstr "message contenant S"
 
 #: src/gtk/quicksearch.c:486
 msgid "messages carbon-copied to S"
-msgstr "messages contenant S dans l'en-t?te ? Cc: ?"
+msgstr "messages contenant S dans l'en-t?te ? Cc : ?"
 
 #: src/gtk/quicksearch.c:487
-#, fuzzy
 msgid "message is either To: or Cc: to S"
-msgstr "messages contenant S dans les en-t?tes ? ?: ? ou ? Cc: ?"
+msgstr "messages contenant S dans les en-t?tes ? ? : ? ou ? Cc : ?"
 
 #: src/gtk/quicksearch.c:488
 msgid "deleted messages"
@@ -5857,7 +5207,8 @@ msgstr "messages supprim?s"
 
 #: src/gtk/quicksearch.c:489
 msgid "messages which contain S in the Sender field"
-msgstr "messages contenant S dans l'en-t?te d'exp?diteur (en-t?te ? Sender: ?)"
+msgstr ""
+"messages contenant S dans l'en-t?te d'exp?diteur (en-t?te ? ?metteur : ?)"
 
 #: src/gtk/quicksearch.c:490
 msgid "true if execute \"S\" succeeds"
@@ -5885,11 +5236,11 @@ msgstr "messages contenant S dans la valeur d'un en-t?te"
 
 #: src/gtk/quicksearch.c:496
 msgid "messages which contain S in Message-ID header"
-msgstr "messages contenant S dans l'en-t?te ? Message-Id: ?"
+msgstr "messages contenant S dans l'en-t?te ? Message-ID : ?"
 
 #: src/gtk/quicksearch.c:497
 msgid "messages which contain S in In-Reply-To header"
-msgstr "messages contenant S dans l'en-t?te ? In-Reply-To: ?"
+msgstr "messages contenant S dans l'en-t?te ? En r?ponse ? : ?"
 
 #: src/gtk/quicksearch.c:498
 msgid "messages which are marked with color #"
@@ -5973,18 +5324,18 @@ msgstr "messages non lus"
 
 #: src/gtk/quicksearch.c:518
 msgid "messages which contain S in References header"
-msgstr "messages contenant S dans l'en-t?te ? References: ?"
+msgstr "messages contenant S dans l'en-t?te ? R?f?rences : ?"
 
 #: src/gtk/quicksearch.c:519
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
-"messages qui, pass?s ? la commande ? cmd ?, lui font faire\n"
+"messages qui, pass?s ? la commande ? cmd ?, lui font\n"
 "retourner 0 (%F ?tant le fichier correspondant au message)"
 
 #: src/gtk/quicksearch.c:520
 msgid "messages which contain S in X-Label header"
-msgstr "messages contenant S dans l'en-t?te ? X-Label: ?"
+msgstr "messages contenant S dans l'en-t?te ? X-Label : ?"
 
 #: src/gtk/quicksearch.c:522
 msgid "logical AND operator"
@@ -6004,9 +5355,7 @@ msgstr "recherche sensible ? la casse"
 
 #: src/gtk/quicksearch.c:526
 msgid "match using regular expressions instead of substring search"
-msgstr ""
-"correspondance ? l'aide d'expressions r?guli?res au lieu de recherche de "
-"sous-cha?nes"
+msgstr "recherche par expressions r?guli?res au lieu de sous-cha?nes"
 
 #: src/gtk/quicksearch.c:528
 msgid "all filtering expressions are allowed"
@@ -6069,7 +5418,7 @@ msgstr "_Information"
 
 #: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
 msgid "E_dit"
-msgstr "E_dition"
+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
@@ -6989,10 +6338,10 @@ msgstr ""
 "Veuillez choisir, dans la liste ci-dessous, le champ LDIF devant ?tre "
 "renomm? ou s?lectionn? pour l'import. Les champs reserv?s (marqu?s dans la "
 "colonne ? R ?), sont automatiquement import?s et ne peuvent ?tre renomm?s. Un "
-"clique dans la colonne de s?lection (? S ?) permet de s?lectionner le champ "
+"clic dans la colonne de s?lection (? S ?) permet de s?lectionner le champ "
 "pour l'import. Un clique en dehors de cette colonne s?lectionne le champ "
 "pour le renommer dans le champ de saisie au-dessous de la liste. Un double-"
-"clique ?galement en dehors de cette colonne permet de s?lectionner le champ "
+"clic ?galement en dehors de cette colonne permet de s?lectionner le champ "
 "pour l'import."
 
 #: src/importldif.c:822
@@ -7420,11 +6769,11 @@ msgstr "En-t?te non conforme\n"
 
 #: src/main.c:1780
 msgid "Duplicated 'To:' header\n"
-msgstr "En-t?te ? ?: ? en plusieurs exemplaires\n"
+msgstr "En-t?te ? ? : ? en plusieurs exemplaires\n"
 
 #: src/main.c:1791
 msgid "Missing required 'To:' header\n"
-msgstr "L'en-t?te 'To:' est manquant\n"
+msgstr "L'en-t?te ? ? : ? est manquant\n"
 
 #: src/main.c:1934
 #, c-format
@@ -7751,7 +7100,7 @@ msgstr "D?plo_yer les fils de discussion"
 
 #: src/mainwindow.c:575
 msgid "Co_llapse all threads"
-msgstr "Com_pacter les fils de discussion"
+msgstr "Re_plier les fils de discussion"
 
 #: src/mainwindow.c:577 src/messageview.c:231
 msgid "_Go to"
@@ -8017,16 +7366,16 @@ msgstr "Marquer _tous comme non lus"
 #: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:233
 #: src/toolbar.c:484
 msgid "Ignore thread"
-msgstr "Ignorer du f_il de discussion"
+msgstr "Ignorer du fil de discussion"
 
 #: src/mainwindow.c:712
 msgid "Unignore thread"
-msgstr "Inclure dans f_il de discussion"
+msgstr "Inclure dans fil de discussion"
 
 #: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:234
 #: src/toolbar.c:485
 msgid "Watch thread"
-msgstr "_Suivre le fil de discussion"
+msgstr "Suivre le fil de discussion"
 
 #: src/mainwindow.c:714
 msgid "Unwatch thread"
@@ -8042,11 +7391,11 @@ msgstr "Marquer comme courrier _l?gitime"
 
 #: src/mainwindow.c:721 src/prefs_filtering_action.c:181 src/toolbar.c:488
 msgid "Lock"
-msgstr "_Bloquer"
+msgstr "Bloquer"
 
 #: src/mainwindow.c:722 src/prefs_filtering_action.c:182 src/toolbar.c:489
 msgid "Unlock"
-msgstr "D?blo_quer"
+msgstr "D?bloquer"
 
 #: src/mainwindow.c:724 src/summaryview.c:429
 msgid "Color la_bel"
@@ -8104,12 +7453,12 @@ msgstr "_Automatiquement"
 #: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:861
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
-msgstr "Par _De"
+msgstr "Par ? De : ?"
 
 #: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:862
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
-msgstr "A_vec ? ?: ?"
+msgstr "Par ? ? : ?"
 
 #: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:321
 #: src/messageview.c:327
@@ -8126,7 +7475,7 @@ msgstr "_Liste d'URLs.."
 
 #: src/mainwindow.c:767
 msgid "Ch_eck for new messages in all folders"
-msgstr "Examen de tous les dossiers pour _nouveaux messages"
+msgstr "Recherche de _nouveaux messages dans tous les dossiers"
 
 #: src/mainwindow.c:768
 msgid "Delete du_plicated messages"
@@ -8158,7 +7507,7 @@ msgstr "Traces de _filtrage"
 
 #: src/mainwindow.c:783
 msgid "Network _Log"
-msgstr "Traces _r?seaux"
+msgstr "Traces _r?seau"
 
 #: src/mainwindow.c:785
 msgid "_Forget all session passwords"
@@ -8413,7 +7762,7 @@ msgstr "S?lectionner un compte"
 
 #: src/mainwindow.c:2022 src/prefs_logging.c:140
 msgid "Network log"
-msgstr "Traces r?seaux"
+msgstr "Traces r?seau"
 
 #: src/mainwindow.c:2026
 msgid "Filtering/Processing debug log"
@@ -8458,7 +7807,7 @@ msgid ""
 "scanned automatically."
 msgstr ""
 "Veuillez saisir le chemin vers la bo?te aux lettres :\n"
-"(Si elle existe d?j?, elle sera automatiquement analys?e.)"
+"(si elle existe d?j?, elle sera automatiquement analys?e.)"
 
 #: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
@@ -8694,7 +8043,7 @@ msgstr "Claws Mail - Message"
 
 #: src/messageview.c:840
 msgid "<No Return-Path found>"
-msgstr "< ? Return-Path: ? introuvable>"
+msgstr "< ? Return-Path : ? introuvable>"
 
 #: src/messageview.c:848
 #, c-format
@@ -9596,7 +8945,7 @@ msgstr "Oui"
 #: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:521
 #: src/prefs_summaries.c:372 src/prefs_summaries.c:504
 msgid "No"
-msgstr "Aucun"
+msgstr "Non"
 
 #: src/plugins/archive/archiver_gtk.c:802
 msgid "MD5 checksum"
@@ -9947,8 +9296,8 @@ msgstr "attach"
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
-"Au moins une des expressions r?guli?res suivantes est pr?sente (une par "
-"ligne)"
+"Au moins une des expressions r?guli?res suivantes a une correspondance (une "
+"par ligne)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -10376,7 +9725,7 @@ msgstr ""
 #: src/plugins/clamd/clamav_plugin.c:146
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
-msgstr "Fichier: %s. Taille (%d) sup?rieure ? la limite (%d)\n"
+msgstr "Fichier : %s. Taille (%d) sup?rieure ? la limite (%d)\n"
 
 #: src/plugins/clamd/clamav_plugin.c:174
 msgid "ClamAV: scanning message..."
@@ -10670,7 +10019,7 @@ msgstr "Serveur mandataire"
 
 #: src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
-msgstr "Utiliser les param?tres de proxy de GNOME"
+msgstr "Utiliser les param?tres de serveur mandataire de GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
 msgid "Use proxy"
@@ -11139,8 +10488,8 @@ msgstr ""
 "\n"
 "Ce module utilise la librairie libcurl afin de r?cup?rer les images, si vous "
 "?tes derri?re un\n"
-"proxy, r?f?rez-vous ? la page de manuel de curl(1) concernant l'usage de "
-"'http_proxy'\n"
+"serveur mandataire, r?f?rez-vous ? la page de manuel de curl(1) concernant "
+"l'usage de 'http_proxy'.\n"
 "Consultez le fichier README pour plus de d?tails ? propos de ce module.\n"
 "\n"
 "Vos commentaires et retours sont les bienvenus aupr?s de <ricardo at mones."
@@ -11226,7 +10575,7 @@ msgstr "Intervalle de rafra?chissement du cache"
 #: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1490
 #: src/prefs_matcher.c:336 src/prefs_receive.c:177
 msgid "hours"
-msgstr "heures"
+msgstr "heure(s)"
 
 #: src/plugins/libravatar/libravatar_prefs.c:305
 msgid "Mystery man"
@@ -11312,7 +10661,7 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "Request timeout"
-msgstr "D?lait d'expiration de requ?te."
+msgstr "D?lai d'expiration de requ?te"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "second(s)"
@@ -11390,7 +10739,7 @@ msgstr "D?connect? : %s"
 #: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
-msgstr "message non reconnu lors de la session Sieve: %s\n"
+msgstr "message non reconnu lors de la session Sieve : %s\n"
 
 #: src/plugins/managesieve/managesieve.c:731
 msgid "STARTTLS failed"
@@ -11412,11 +10761,11 @@ msgstr "erreur pendant la session Sieve. Donn?es : %s\n"
 #: src/plugins/managesieve/managesieve.c:874
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
-msgstr "message non reconnu lors de la session Sieve: %d\n"
+msgstr "message non reconnu lors de la session Sieve : %d\n"
 
 #: src/plugins/managesieve/managesieve.c:1131
 msgid "Sieve: retrying auth\n"
-msgstr "Sieve: nouvel essai d'authentification\n"
+msgstr "Sieve : nouvel essai d'authentification\n"
 
 #: src/plugins/managesieve/managesieve.c:1133
 msgid "Auth method not available"
@@ -12145,7 +11494,7 @@ msgstr "Activer les raccourcis globaux"
 #: src/plugins/notification/notification_prefs.c:1882
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
-msgstr "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
+msgstr "Exemples de raccourcis : <b>%s</b> et <b>%s</b>"
 
 #: src/plugins/notification/notification_prefs.c:1882
 msgid "<control><shift>F11"
@@ -14926,7 +14275,7 @@ msgstr "M'alerter"
 
 #: src/plugins/vcalendar/vcal_prefs.c:338
 msgid "minutes before an event"
-msgstr "minutes avant un rendez-vous"
+msgstr "minute(s) avant un rendez-vous"
 
 #: src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Calendar export"
@@ -14996,7 +14345,7 @@ msgstr "Commande ? ex?cuter apr?s l'export de l'?tat de disponibilit?"
 
 #: src/plugins/vcalendar/vcal_prefs.c:559
 msgid "Get free/busy status of others from"
-msgstr "R?cup?rer les informations de disponibilit? des autres sur"
+msgstr "R?cup?rer les informations de disponibilit? des autres ? partir de"
 
 #: src/plugins/vcalendar/vcal_prefs.c:567
 #, c-format
@@ -15245,7 +14594,7 @@ msgstr "Filtrage des messages ? la r?ception"
 
 #: src/prefs_account.c:1639
 msgid "Allow filtering using plugins on receiving"
-msgstr "Permission aux modules de filtrer les messages ? la r?ception"
+msgstr "Autoriser les modules ? filtrer les messages ? la r?ception"
 
 #: src/prefs_account.c:1643
 msgid "'Get Mail' checks for new messages on this account"
@@ -15260,15 +14609,15 @@ msgstr "En-t?te"
 
 #: src/prefs_account.c:1727
 msgid "Generate Message-ID"
-msgstr "G?n?ration de l'en-t?te ? Message-Id: ?"
+msgstr "G?n?ration de l'en-t?te ? Message-ID ?"
 
 #: src/prefs_account.c:1730
 msgid "Send account mail address in Message-ID"
-msgstr "Mettre l'adresse email dans le Message-ID"
+msgstr "Mettre l'adresse email dans le ? Message-ID ?"
 
 #: src/prefs_account.c:1733
 msgid "Add user agent header"
-msgstr "Ajouter l'en-t?te user agent"
+msgstr "Ajouter l'en-t?te ? User-Agent ?"
 
 #: src/prefs_account.c:1740
 msgid "Add user-defined header"
@@ -15423,7 +14772,7 @@ msgstr "Utiliser la communication SSL/TLS non bloquante"
 
 #: src/prefs_account.c:2591
 msgid "Turn this off if you have SSL/TLS connection problems"
-msgstr "? d?sactiver en cas de probl?mes de connexion SSL/TLS"
+msgstr "? d?sactiver en cas de probl?me de connexion SSL/TLS"
 
 #: src/prefs_account.c:2726
 msgid "SMTP port"
@@ -15451,7 +14800,7 @@ msgid ""
 "connecting to SMTP servers."
 msgstr ""
 "Le nom de domaine sera utilis? dans la partie droite des identifiants de "
-"messages g?n?r?s (Message-ID) et lors de la connexion aux serveurs SMTP."
+"messages g?n?r?s (? Message-ID ?) et lors de la connexion aux serveurs SMTP."
 
 #: src/prefs_account.c:2770
 msgid "Use command to communicate with server"
@@ -15803,7 +15152,7 @@ msgstr ""
 
 #: src/prefs_actions.c:994
 msgid "for a literal %"
-msgstr "Caract?re ? % ?"
+msgstr "caract?re ? % ?"
 
 #: src/prefs_actions.c:1004 src/prefs_themes.c:935
 msgid "Actions"
@@ -15846,8 +15195,9 @@ msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
-"\\n\\n----- Message Transf?r? -----\\n\\n?d{Date: %d\\n}?f{De: %f\\n}?t{?: %t"
-"\\n}?c{Cc: %c\\n}?n{Groupe de discussion: %n\\n}?s{Sujet: %s\\n}\\n\\n%M"
+"\\n\\n----- Message Transf?r? -----\\n\\n?d{Date : %d\\n}?f{De : %f\\n}?t"
+"{? : %t\\n}?c{Cc : %c\\n}?n{Groupe de discussion : %n\\n}?s{Sujet : %s\\n}\\n"
+"\\n%M"
 
 #: src/prefs_common.c:453
 msgid "%x(%a) %H:%M"
@@ -15875,7 +15225,7 @@ msgstr "Edition"
 
 #: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
-msgstr "Lancer automatiquement l'?diteur auxiliaire"
+msgstr "Lancer automatiquement l'?diteur externe"
 
 #: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
@@ -15901,7 +15251,7 @@ msgstr ""
 
 #: src/prefs_compose_writing.c:211
 msgid "KB into message body "
-msgstr "Ko dans le corps du message"
+msgstr "Ko"
 
 #: src/prefs_compose_writing.c:217
 msgid "Replying"
@@ -15939,11 +15289,11 @@ msgstr "Demander"
 
 #: src/prefs_compose_writing.c:246 src/toolbar.c:503
 msgid "Insert"
-msgstr "Insertion"
+msgstr "Ins?rer"
 
 #: src/prefs_compose_writing.c:247 src/toolbar.c:504
 msgid "Attach"
-msgstr "Joindre"
+msgstr "Adjoindre"
 
 #: src/prefs_compose_writing.c:374
 msgid "Writing"
@@ -16048,7 +15398,7 @@ msgstr "Cet en-t?te est d?j? dans la liste."
 #: src/prefs_ext_prog.c:102
 #, c-format
 msgid "%s will be replaced with file name / URI"
-msgstr "Aide : la chaine %s sera remplac?e par le chemin du fichier ou l'URI."
+msgstr "Aide : la cha?ne %s sera remplac?e par le chemin du fichier ou l'URI."
 
 #: src/prefs_ext_prog.c:110
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
@@ -16064,7 +15414,7 @@ msgstr "Navigateur Web"
 
 #: src/prefs_ext_prog.c:178
 msgid "Text editor"
-msgstr "Editeur de texte"
+msgstr "?diteur de texte"
 
 #: src/prefs_ext_prog.c:210
 msgid "Command for 'Display as text'"
@@ -16086,7 +15436,7 @@ msgstr "Vue du message"
 
 #: src/prefs_ext_prog.c:283
 msgid "External Programs"
-msgstr "Programmes auxiliaires"
+msgstr "Programmes externes"
 
 #: src/prefs_filtering_action.c:175
 msgid "Move"
@@ -16110,7 +15460,7 @@ msgstr "?tats de message"
 #: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
 #: src/prefs_summary_column.c:78 src/summaryview.c:2790 src/toolbar.c:486
 msgid "Mark"
-msgstr "Marque"
+msgstr "Marquer"
 
 #: src/prefs_filtering_action.c:183
 msgid "Mark as read"
@@ -16235,11 +15585,11 @@ msgstr "Aucune action n'a ?t? sp?cifi?e."
 #: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
 #: src/quote_fmt.c:79
 msgid "literal %"
-msgstr "Caract?re ? % ?"
+msgstr "caract?re ? % ?"
 
 #: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
 msgid "filename (should not be modified)"
-msgstr "Chemin du fichier (Ne doit pas ?tre modifi? !)"
+msgstr "Chemin du fichier (ne doit pas ?tre modifi?)"
 
 #: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
 #: src/quote_fmt.c:87
@@ -16248,7 +15598,7 @@ msgstr "Retour chariot"
 
 #: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
 msgid "escape character for quotes"
-msgstr "Caract?re d'?chappement"
+msgstr "caract?re d'?chappement"
 
 #: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
 msgid "quote character"
@@ -16265,7 +15615,7 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 "L'action de filtrage ? Ex?cuter ? permet ? l'utilisateur d'envoyer un message "
-"ou ?l?ment d'en-t?te de message ? un programme ou un script auxiliaire.\n"
+"ou ?l?ment d'en-t?te de message ? un programme ou un script externe.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 #: src/prefs_filtering_action.c:1422
@@ -16448,7 +15798,7 @@ msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
-"Inclure les\n"
+"Appliquer aux\n"
 "sous-dossiers"
 
 #: src/prefs_folder_item.c:314
@@ -16594,7 +15944,7 @@ msgstr "Message"
 #: src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr ""
-"D?duire les polices 'petit' et 'gras' de la police des listes de dossiers et "
+"D?river les polices 'petit' et 'gras' de la police des listes de dossiers et "
 "de message"
 
 #: src/prefs_fonts.c:136
@@ -16686,7 +16036,7 @@ msgstr ""
 
 #: src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
-msgstr "Tracer les r?gles pour :"
+msgstr "Tracer les r?gles de.."
 
 #: src/prefs_logging.c:191
 msgid "filtering at incorporation"
@@ -16759,7 +16109,7 @@ msgstr "Messages d'avertissement"
 
 #: src/prefs_logging.c:291
 msgid "Network protocol messages"
-msgstr "Traces de protocoles r?seaux"
+msgstr "Traces de protocoles r?seau"
 
 #: src/prefs_logging.c:295
 msgid "Error messages"
@@ -16799,7 +16149,7 @@ msgstr "inf?rieur ?"
 
 #: src/prefs_matcher.c:344 src/prefs_matcher.c:350
 msgid "exactly"
-msgstr "vaut exactement"
+msgstr "exactement"
 
 #: src/prefs_matcher.c:348
 msgid "greater than"
@@ -16831,7 +16181,7 @@ msgstr "ne contient pas"
 
 #: src/prefs_matcher.c:385
 msgid "headers part"
-msgstr "En-t?tes du message"
+msgstr "en-t?tes du message"
 
 #: src/prefs_matcher.c:386
 msgid "headers values"
@@ -16839,11 +16189,11 @@ msgstr "valeurs d'en-t?te"
 
 #: src/prefs_matcher.c:387
 msgid "body part"
-msgstr "Corps du message"
+msgstr "corps du message"
 
 #: src/prefs_matcher.c:388
 msgid "whole message"
-msgstr "Tout le message"
+msgstr "tout le message"
 
 #: src/prefs_matcher.c:394 src/summaryview.c:6285
 msgid "Marked"
@@ -16896,7 +16246,7 @@ msgstr "n'importe quel label"
 
 #: src/prefs_matcher.c:416
 msgid "Specific tag"
-msgstr "Label pr?cis"
+msgstr "label pr?cis"
 
 #: src/prefs_matcher.c:420
 msgid "ignored"
@@ -16924,11 +16274,11 @@ msgstr "non trouv?"
 
 #: src/prefs_matcher.c:432
 msgid "0 (Passed)"
-msgstr "0 (Succ?s)"
+msgstr "0 (succ?s)"
 
 #: src/prefs_matcher.c:433
 msgid "non-0 (Failed)"
-msgstr "Diff?rent de 0 (?chou?)"
+msgstr "diff?rent de 0 (?chec)"
 
 #: src/prefs_matcher.c:569
 msgid "Condition configuration"
@@ -16936,7 +16286,7 @@ msgstr "Conditions de filtrage"
 
 #: src/prefs_matcher.c:613
 msgid "Match criteria:"
-msgstr "Crit?re"
+msgstr "Crit?re :"
 
 #: src/prefs_matcher.c:622
 msgid "All messages"
@@ -16968,7 +16318,7 @@ msgstr "Partiellement t?l?charg?"
 
 #: src/prefs_matcher.c:634
 msgid "External program test"
-msgstr "Test par programme auxiliaire"
+msgstr "Test par programme externe"
 
 #: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
 #: src/prefs_matcher.c:2516
@@ -16994,7 +16344,7 @@ msgstr "toutes les"
 
 #: src/prefs_matcher.c:827
 msgid "of above rules"
-msgstr "r?gles ci-dessus."
+msgstr "r?gles ci-dessus"
 
 #: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
 msgid "Search pattern is not set."
@@ -17126,7 +16476,7 @@ msgid ""
 msgstr ""
 "La condition de filtrage ? Test ? permet ? l'utilisateur de faire un test sur "
 "un message ou ?l?ment d'en-t?te de message en utilisant un programme ou un "
-"script auxiliaire. Le programme doit retourner 0 ou 1 (0 ?tant la valeur "
+"script externe. Le programme doit retourner 0 ou 1 (0 ?tant la valeur "
 "validant la condition de filtrage).\n"
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
@@ -17165,9 +16515,7 @@ msgstr "Afficher les messages HTML en texte"
 
 #: src/prefs_message.c:162
 msgid "Render HTML-only messages with plugin if possible"
-msgstr ""
-"Afficher les messages uniquement en HTML avec un module dans la mesure du "
-"possible"
+msgstr "Afficher les messages uniquement en HTML avec un module si possible"
 
 #: src/prefs_message.c:165
 msgid "Select the HTML part of multipart/alternative messages"
@@ -17199,7 +16547,7 @@ msgstr "par pas de"
 
 #: src/prefs_message.c:230
 msgid "Show attachment descriptions (rather than names)"
-msgstr "Montrer la description au lieu du nom des pi?ces attach?es"
+msgstr "Montrer la description au lieu du nom des pi?ces jointes"
 
 #: src/prefs_message.c:233
 msgid "Quotation"
@@ -17207,7 +16555,7 @@ msgstr "Citation"
 
 #: src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr "Fermer "
+msgstr "Replier les citations par un double-clic"
 
 #: src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
@@ -17451,7 +16799,7 @@ msgstr ""
 
 #: src/prefs_other.c:496
 msgid "Add address to destination when double-clicked"
-msgstr "Un double-clique sur une adresse l'ajoute ? la liste des destinataires"
+msgstr "Un double-clic sur une adresse l'ajoute ? la liste des destinataires"
 
 #: src/prefs_other.c:499
 msgid "On exit"
@@ -17459,11 +16807,11 @@ msgstr "En quittant"
 
 #: src/prefs_other.c:502
 msgid "Confirm on exit"
-msgstr "Demander une confirmation pour quitter"
+msgstr "Demander confirmation"
 
 #: src/prefs_other.c:509
 msgid "Empty trash on exit"
-msgstr "Vider la corbeille en quittant"
+msgstr "Vider la corbeille"
 
 #: src/prefs_other.c:512
 msgid "Warn if there are queued messages"
@@ -17504,8 +16852,8 @@ msgid ""
 msgstr ""
 "Le mode ? moins risqu? ? demande au syst?me d'exploitation\n"
 "d'?crire les m?tadonn?es sur le disque imm?diatement.\n"
-"Ceci ?vite certaines pertes de donn?es apr?s un crash\n"
-"syst?me, mais peut prendre plus de temps."
+"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
 msgid "Safer"
@@ -17585,7 +16933,7 @@ msgstr "Le %d,\\n%f a ?crit :\\n\\n%q"
 
 #: src/prefs_receive.c:142
 msgid "External incorporation program"
-msgstr "Programme auxiliaire pour la r?ception du courriel"
+msgstr "Programme externe pour la r?ception du courriel"
 
 #: src/prefs_receive.c:145
 msgid "Use external program for receiving mail"
@@ -17846,7 +17194,7 @@ msgstr "Activer la v?rification orthographique"
 
 #: src/prefs_spelling.c:134
 msgid "Enable alternate dictionary"
-msgstr "Permettre un dictionnaire alternatif"
+msgstr "Utiliser un dictionnaire alternatif"
 
 #: src/prefs_spelling.c:139
 msgid "Faster switching with last used dictionary"
@@ -18169,7 +17517,7 @@ msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
-"Forcer l'ent?te ? De: ? du compte de composition. Cela ne changera pas le "
+"Forcer l'ent?te ? De : ? du compte de composition. Cela ne changera pas le "
 "compte de composition pour l'envoi."
 
 #: src/prefs_template.c:309
@@ -18381,7 +17729,7 @@ msgstr ""
 #: src/prefs_themes.c:666
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
-msgstr "%d th?mes disponibles (%d utilisateur(s), %d syst?me(s), 1 interne)"
+msgstr "%d th?mes disponibles (%d utilisateur, %d syst?me, 1 interne)"
 
 #: src/prefs_themes.c:707
 #, c-format
@@ -18511,15 +17859,15 @@ msgstr "Ic?ne de l'?l?ment de barre d'outils"
 
 #: src/prefs_wrapping.c:80
 msgid "Auto wrapping"
-msgstr "Justifier automatiquement pendant la saisie"
+msgstr "Justification automatique pendant la saisie"
 
 #: src/prefs_wrapping.c:81
 msgid "Wrap quotation"
-msgstr "Justifier la citation"
+msgstr "Justification de la citation"
 
 #: src/prefs_wrapping.c:82
 msgid "Wrap pasted text"
-msgstr "Justifier lors d'un copier/coller"
+msgstr "Justification des copier/coller"
 
 #: src/prefs_wrapping.c:83
 msgid "Auto indent"
@@ -18527,7 +17875,7 @@ msgstr "Indentation automatique"
 
 #: src/prefs_wrapping.c:89
 msgid "Wrap text at"
-msgstr "Retourner ? la ligne apr?s"
+msgstr "Retour ? la ligne apr?s"
 
 #: src/prefs_wrapping.c:154
 msgid "Wrapping"
@@ -18636,129 +17984,129 @@ msgstr "<span weight=\"bold\">Symboles :</span>"
 
 #: src/quote_fmt.c:48
 msgid "customized date format (see 'man strftime')"
-msgstr "Personnaliser le format de la date (voir 'man strftime')"
+msgstr "personnaliser le format de la date (voir 'man strftime')"
 
 #: src/quote_fmt.c:51
 msgid "email address of sender"
-msgstr "Adresse email de l'exp?diteur"
+msgstr "adresse email de l'exp?diteur"
 
 #: src/quote_fmt.c:52
 msgid "full name of sender"
-msgstr "Nom complet de l'exp?diteur"
+msgstr "nom complet de l'exp?diteur"
 
 #: src/quote_fmt.c:53
 msgid "first name of sender"
-msgstr "Pr?nom de l'exp?diteur"
+msgstr "pr?nom de l'exp?diteur"
 
 #: src/quote_fmt.c:54
 msgid "last name of sender"
-msgstr "Nom de l'exp?diteur"
+msgstr "nom de l'exp?diteur"
 
 #: src/quote_fmt.c:55
 msgid "initials of sender"
-msgstr "Initiales de l'exp?diteur"
+msgstr "initiales de l'exp?diteur"
 
 #: src/quote_fmt.c:62
 msgid "message body"
-msgstr "Corps du message"
+msgstr "corps du message"
 
 #: src/quote_fmt.c:63
 msgid "quoted message body"
-msgstr "Corps du message en tant que citation"
+msgstr "corps du message en tant que citation"
 
 #: src/quote_fmt.c:64
 msgid "message body without signature"
-msgstr "Corps du message sans signature"
+msgstr "corps du message sans signature"
 
 #: src/quote_fmt.c:65
 msgid "quoted message body without signature"
-msgstr "Corps du message sans signature en tant que citation"
+msgstr "corps du message sans signature en tant que citation"
 
 #: src/quote_fmt.c:66
 msgid "message tags"
-msgstr "Labels du messsage"
+msgstr "labels du messsage"
 
 #: src/quote_fmt.c:67
 msgid "current dictionary"
-msgstr "Dictionnaire courant"
+msgstr "dictionnaire courant"
 
 #: src/quote_fmt.c:68
 msgid "cursor position"
-msgstr "Position du curseur"
+msgstr "position du curseur"
 
 #: src/quote_fmt.c:69
 msgid "account property: your name"
-msgstr "Param?tre de compte : votre nom"
+msgstr "param?tre de compte : votre nom"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "Param?tre de compte : votre adresse email"
+msgstr "param?tre de compte : votre adresse email"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
-msgstr "Param?tre de compte : nom du compte"
+msgstr "param?tre de compte : nom du compte"
 
 #: src/quote_fmt.c:72
 msgid "account property: organization"
-msgstr "Param?tre de compte : soci?t?"
+msgstr "param?tre de compte : soci?t?"
 
 #: src/quote_fmt.c:73
 msgid "account property: signature"
-msgstr "Param?tre de compte : signature"
+msgstr "param?tre de compte : signature"
 
 #: src/quote_fmt.c:74
 msgid "account property: signature path"
-msgstr "Param?tre de compte : chemin vers signature"
+msgstr "param?tre de compte : chemin vers signature"
 
 #: src/quote_fmt.c:75
 msgid "account property: default dictionary"
-msgstr "Param?tre de compte : dictionnaire par d?faut"
+msgstr "param?tre de compte : dictionnaire par d?faut"
 
 #: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
 msgstr ""
-"<span style=\"oblique\">Compl?tion</span> par le carnet d'adresses : Cc"
+"<span style=\"oblique\">compl?tion</span> par le carnet d'adresses : Cc"
 
 #: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: From"
 msgstr ""
-"<span style=\"oblique\">Compl?tion</span> par le carnet d'adresses : De"
+"<span style=\"oblique\">compl?tion</span> par le carnet d'adresses : De"
 
 #: src/quote_fmt.c:78
 msgid "address book <span style=\"oblique\">completion</span>: To"
-msgstr "<span style=\"oblique\">Compl?tion</span> par le carnet d'adresses : ?"
+msgstr "<span style=\"oblique\">compl?tion</span> par le carnet d'adresses : ?"
 
 #: src/quote_fmt.c:80
 msgid "literal backslash"
-msgstr "Caract?re ? \\ ?"
+msgstr "caract?re ? \\ ?"
 
 #: src/quote_fmt.c:81
 msgid "literal question mark"
-msgstr "Caract?re ? ? ?"
+msgstr "caract?re ? ? ?"
 
 #: src/quote_fmt.c:82
 msgid "literal exclamation mark"
-msgstr "Caract?re ? ! ?"
+msgstr "caract?re ? ! ?"
 
 #: src/quote_fmt.c:83
 msgid "literal pipe"
-msgstr "Caract?re ? | ?"
+msgstr "caract?re ? | ?"
 
 #: src/quote_fmt.c:84
 msgid "literal opening curly brace"
-msgstr "Caract?re ? { ?"
+msgstr "caract?re ? { ?"
 
 #: src/quote_fmt.c:85
 msgid "literal closing curly brace"
-msgstr "Caract?re ? } ?"
+msgstr "caract?re ? } ?"
 
 #: src/quote_fmt.c:86
 msgid "tab"
-msgstr "Tabulation"
+msgstr "tabulation"
 
 #: src/quote_fmt.c:89
 msgid "<span weight=\"bold\">commands:</span>"
-msgstr "<span weight=\"bold\">Commandes :</span>"
+msgstr "<span weight=\"bold\">commandes :</span>"
 
 #: src/quote_fmt.c:90
 msgid ""
@@ -18766,10 +18114,10 @@ msgid ""
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"Si x est d?fini, ins?rer <span style=\"oblique\">expr</span>\n"
+"si x est d?fini, ins?rer <span style=\"oblique\">expr</span>\n"
 "(x appartenant aux symboles [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, "
 "ABf, ABt]\n"
-"ou leurs ?quivalents longs)."
+"ou leurs ?quivalents longs)"
 
 #: src/quote_fmt.c:91
 msgid ""
@@ -18778,10 +18126,10 @@ msgid ""
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
-"Si x n'est pas d?fini, ins?rer <span style=\"oblique\">expr</span>\n"
+"si x n'est pas d?fini, ins?rer <span style=\"oblique\">expr</span>\n"
 "(x appartenant aux symboles [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, "
 "ABf, ABt]\n"
-"ou leurs ?quivalents longs)."
+"ou leurs ?quivalents longs)"
 
 #: src/quote_fmt.c:92
 msgid ""
@@ -18789,9 +18137,9 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to insert"
 msgstr ""
-"Ins?rer un fichier :\n"
-"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que chemin vers "
-"le fichier ? ins?rer."
+"ins?rer un fichier :\n"
+"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que chemin vers\n"
+"le fichier ? ins?rer"
 
 #: src/quote_fmt.c:93
 msgid ""
@@ -18800,9 +18148,9 @@ msgid ""
 "get\n"
 "the output from"
 msgstr ""
-"Ins?rer la sortie d'une ligne de commande :\n"
-"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que ligne de "
-"commande ? ex?cuter pour en r?cup?rer la sortie."
+"ins?rer la sortie d'une ligne de commande :\n"
+"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que ligne de\n"
+"commande ? ex?cuter pour en r?cup?rer la sortie"
 
 #: src/quote_fmt.c:94
 msgid ""
@@ -18810,11 +18158,11 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
 "user-entered text"
 msgstr ""
-"Ins?rer un texte saisi par l'utilisateur :\n"
-"<span style=\"oblique\">sub_expr</span> d?finit une variable ? remplacer par "
-"un texte fourni par l'utilisateur. Plusieurs appels identiques sont "
-"possibles : ils seront tous remplac?s par le m?me texte associ? ? la "
-"variable."
+"ins?rer un texte saisi par l'utilisateur :\n"
+"<span style=\"oblique\">sub_expr</span> d?finit une variable ? remplacer\n"
+"par un texte fourni par l'utilisateur. Plusieurs appels identiques sont "
+"possibles :\n"
+"ils seront tous remplac?s par le m?me texte associ? ? la variable"
 
 #: src/quote_fmt.c:95
 msgid ""
@@ -18822,9 +18170,9 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
 msgstr ""
-"Joindre un fichier :\n"
-"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que chemin vers "
-"le fichier ? joindre."
+"adjoindre un fichier :\n"
+"<span style=\"oblique\">sub_expr</span> est ?valu? en tant que chemin vers\n"
+"le fichier ? adjoindre"
 
 #: src/quote_fmt.c:96
 msgid ""
@@ -18833,29 +18181,30 @@ msgid ""
 "get\n"
 "the filename from"
 msgstr ""
-"joindre un fichier :\n"
+"adjoindre un fichier :\n"
 "<span style=\"oblique\">sub_expr</span> est ?valu? en tant que ligne de "
-"commande ? ex?cuter et dont la sortie repr?sente le nom du fichier ? joindre."
+"commande\n"
+"? ex?cuter et dont la sortie repr?sente le nom du fichier ? adjoindre"
 
 #: src/quote_fmt.c:98
 msgid "<span weight=\"bold\">definition of terms:</span>"
-msgstr "<span weight=\"bold\">Definition des termes :</span>"
+msgstr "<span weight=\"bold\">d?finition des termes :</span>"
 
 #: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
-"Texte pouvant contenir n'importe quels symboles ou commandes de la liste ci-"
-"dessus."
+"texte pouvant contenir n'importe quels symboles\n"
+"ou commandes de la liste ci-dessus"
 
 #: src/quote_fmt.c:100
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
-"Texte pouvant contenir n'importe quels symboles (pas de commandes) de la "
-"liste ci-dessus."
+"texte pouvant contenir n'importe quels symboles\n"
+"(pas de commandes) de la liste ci-dessus"
 
 #: src/quote_fmt.c:101
 msgid ""
@@ -18864,9 +18213,10 @@ msgid ""
 "of the contact if that address matches exactly\n"
 "one contact in the address book"
 msgstr ""
-"La compl?tion depuis le carnet d'adresses fonctionne seulement avec la "
-"premi?re adresse de l'ent?te. Elle renseigne le nom complet du contact si "
-"l'adresse correspond exactement ? celle d'un contact du carnet."
+"la compl?tion depuis le carnet d'adresses fonctionne\n"
+"seulement avec la premi?re adresse de l'ent?te.\n"
+"Elle renseigne le nom complet du contact si l'adresse\n"
+"correspond exactement ? celle d'un contact du carnet"
 
 #: src/quote_fmt.c:110
 msgid "Description of symbols"
@@ -18880,7 +18230,7 @@ msgstr "Il est possible d'utiliser les symboles et commandes suivants :"
 msgid "Use template when composing new messages"
 msgstr ""
 "Utiliser un mod?le de formatage personnalis? lors de la composition de "
-"nouveaux messages :"
+"nouveaux messages"
 
 #: src/quote_fmt.c:198
 msgid ""
@@ -18892,7 +18242,7 @@ msgstr ""
 
 #: src/quote_fmt.c:300
 msgid "Use template when replying to messages"
-msgstr "Utiliser un mod?le de formatage personnalis? lors d'une r?ponse :"
+msgstr "Utiliser un mod?le de formatage personnalis? lors d'une r?ponse"
 
 #: src/quote_fmt.c:324
 msgid "Override From header. This doesn't change the account used to reply."
@@ -18906,7 +18256,7 @@ msgstr "Pr?fixe de citation"
 
 #: src/quote_fmt.c:430
 msgid "Use template when forwarding messages"
-msgstr "Utiliser un mod?le de formatage personnalis? lors d'un transfert :"
+msgstr "Utiliser un mod?le de formatage personnalis? lors d'un transfert"
 
 #: src/quote_fmt.c:454
 msgid "Override From header. This doesn't change the account used to forward."
@@ -19513,7 +18863,7 @@ msgstr ""
 
 #: src/textview.c:922
 msgid "'Network Log'"
-msgstr "'Traces r?seaux'"
+msgstr "'Traces r?seau'"
 
 #: src/textview.c:923
 msgid " in the Tools menu for more information."
@@ -19554,7 +18904,7 @@ msgstr "Afficher comme du texte"
 #: src/textview.c:1015
 msgid "     - To open with an external program, select "
 msgstr ""
-"     - Pour l'ouvrir avec le programme auxiliaire correspondant, veuillez "
+"     - Pour l'ouvrir avec le programme externe correspondant, veuillez "
 "s?lectionner ? "
 
 #: src/textview.c:1016
@@ -19563,7 +18913,7 @@ msgstr "Ouvrir"
 
 #: src/textview.c:1024
 msgid "       (alternately double-click, or click the middle "
-msgstr "       (un double-clique ou un clique avec le bouton "
+msgstr "       (un double-clic ou un clic avec le bouton "
 
 #: src/textview.c:1025
 msgid "mouse button)\n"
@@ -19572,7 +18922,7 @@ msgstr "du milieu sont ?galement possibles.);\n"
 #: src/textview.c:1027
 msgid "     - Or use "
 msgstr ""
-"     - Pour l'ouvrir avec un programme auxiliaire de votre choix, veuillez "
+"     - Pour l'ouvrir avec un programme externe de votre choix, veuillez "
 "s?lectionner ? "
 
 #: src/textview.c:1028
@@ -19592,7 +18942,7 @@ msgstr ""
 
 #: src/textview.c:2196
 msgid "Tags: "
-msgstr "Labels: "
+msgstr "Labels : "
 
 #: src/textview.c:2904
 msgid "The real URL is different from the displayed URL."
@@ -19740,7 +19090,7 @@ msgstr "Ins?rer un fichier"
 
 #: src/toolbar.c:253 src/toolbar.c:2396
 msgid "Attach file"
-msgstr "Joindre un fichier"
+msgstr "Adjoindre un fichier"
 
 #: src/toolbar.c:254 src/toolbar.c:2400
 msgid "Insert signature"
@@ -19752,7 +19102,7 @@ msgstr "Remplacer la signature"
 
 #: src/toolbar.c:256 src/toolbar.c:2408
 msgid "Edit with external editor"
-msgstr "?diter avec un ?diteur auxiliaire"
+msgstr "?diter avec un programme externe"
 
 #: src/toolbar.c:257 src/toolbar.c:2412
 msgid "Wrap long lines of current paragraph"
@@ -20254,6 +19604,24 @@ msgstr ""
 "Vous pouvez maintenant cliquer sur ? Enregistrer ? pour\n"
 "d?buter et appr?cier.."
 
+#~ msgid "Template From format error."
+#~ msgstr "Erreur de formatage dans l'en-t?te ? De : ? du mod?le."
+
+#~ msgid "Template To format error."
+#~ msgstr "Erreur de formatage dans l'en-t?te ? De : ? du mod?le."
+
+#~ msgid "Template Cc format error."
+#~ msgstr "Erreur de formatage dans l'en-t?te ? Cc : ? du mod?le."
+
+#~ msgid "Template Bcc format error."
+#~ msgstr "Erreur de formatage dans l'en-t?te ? Cci : ? du mod?le."
+
+#~ msgid "Template Reply-To format error."
+#~ msgstr "Erreur de formatage dans l'en-t?te ? R?ponse ? : ? du mod?le."
+
+#~ msgid "Template subject format error."
+#~ msgstr "Erreur de formatage dans le sujet du mod?le."
+
 #~ msgid "The only recipient is the default BCC address. Send anyway?"
 #~ msgstr ""
 #~ "Le seul destinataire est l'adresse ? Cci: ? par d?faut. Voulez-vous quand "

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Fri Dec 23 12:20:37 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Fri, 23 Dec 2016 12:20:37 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-74-gf5ea218
Message-ID: <20161223112038.A6DF336A45FE@mx.colino.net>

The branch, master has been updated
       via  f5ea218791a8368ef2f903cdf480dca53662eed0 (commit)
      from  5d7ec238391a19048f4dd807b6763eaf9b8d525f (commit)

Summary of changes:
 po/bg.po    |   62 --
 po/ca.po    | 2132 -----------------------------------------------------------
 po/cs.po    | 1260 -----------------------------------
 po/da.po    |   57 --
 po/el.po    | 1425 ---------------------------------------
 po/en_GB.po |   10 -
 po/eo.po    |  336 ----------
 po/fi.po    |   39 --
 po/fr.po    |  629 ------------------
 po/he.po    | 1273 -----------------------------------
 po/hr.po    | 1817 --------------------------------------------------
 po/id_ID.po |  781 ----------------------
 po/it.po    | 1089 ------------------------------
 po/ja.po    |  740 ---------------------
 po/ko.po    | 1326 -------------------------------------
 po/lt.po    | 1180 ---------------------------------
 po/nb.po    | 1288 ------------------------------------
 po/pl.po    |  794 ----------------------
 po/pt_BR.po |   39 --
 po/pt_PT.po |  495 --------------
 po/ru.po    |  272 --------
 po/sk.po    | 1294 ------------------------------------
 po/sr.po    | 1631 ---------------------------------------------
 po/tr.po    | 1060 -----------------------------
 po/uk.po    |  517 ---------------
 po/zh_CN.po |  549 ---------------
 26 files changed, 22095 deletions(-)


- Log -----------------------------------------------------------------
commit f5ea218791a8368ef2f903cdf480dca53662eed0
Author: Paul <paul at claws-mail.org>
Date:   Fri Dec 23 11:20:30 2016 +0000

    removed all useless comments from the end of the po files

diff --git a/po/bg.po b/po/bg.po
index 345132d..115876b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -19179,65 +19179,3 @@ msgid ""
 msgstr ""
 "???????????????????? ?? ????????????\n"
 "?????????????????? \"??????????????????\""
-
-#~ msgid "_Subject:"
-#~ msgstr "_??????????????:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "?????????????????? ???? ???????????? \"To\""
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "?????????????????? ???? ???????????? \"Cc\""
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "?????????????????? ???? ???????????? \"Bcc\""
-
-#~ msgid "Stylesheet:"
-#~ msgstr "????????:"
-
-#~ msgid "slow"
-#~ msgstr "??????????"
-
-#~ msgid "fast"
-#~ msgstr "??????????"
-
-#~ msgid "Use this"
-#~ msgstr "????????????????????"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "???????????? ?????? ?????????????????????? ???? ??????????????: %s"
-
-#~ msgid "E-mail client"
-#~ msgstr "???????????????? ????????????"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "?????? ?? ???????? ???????????????? ????????????"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;??????;"
-#~ "????????;????????"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail ?? ????????, ?????????? ?? ?????????????????????? ???????????????? ????????????."
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr "?????????????????? ?????????????????? ???? ???????????????????? ???????????? ?? ?????????????? ?????????? ?? ????????????????"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "?????????????????? ?????????????????? ???? ???????????? ???? ?????????????? ??????????"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "???????????????????? ???? ???????????????????? ?????????????? ???? ??????????????"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "?????????????????????? ???? ???????????? ?? ???????????????? ???? ??????????"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "?????????????????????? ???? ???????????????????? ???? ????????????????????"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "???????????????????? ???? ???????? ???? ???????????????? ??????????"
diff --git a/po/ca.po b/po/ca.po
index d88ff54..82af4c8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -19403,2135 +19403,3 @@ msgid ""
 msgstr ""
 "El Claws Mail ja est?? a punt.\n"
 "Feu clic a Desa per comen??ar."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Activa la connexi?? segura al servidor LDAP a trav??s de SSL. Si la "
-#~ "connexi?? falla, assegureu-vos que la configuraci?? al fitxer ldap.conf ??s "
-#~ "correcta (camps TLS_CACERTDIR i TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "Sense TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registra el Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Usa SSL per a la connexi?? POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Usa SSL per a la connexi?? IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Usa SSL per a la connexi?? NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Usa SSL per a la connexi?? SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "Es_borra"
-
-#~ msgid " authenticated\n"
-#~ msgstr " amb autenticaci??\n"
-
-#~ msgid " not authenticated\n"
-#~ msgstr " sense autenticaci??\n"
-
-#~ msgid " bad state\n"
-#~ msgstr " estat erroni\n"
-
-#~ msgid " stream error\n"
-#~ msgstr " error de flux\n"
-
-#~ msgid " parse error (very probably non-RFC compliance from the server)\n"
-#~ msgstr ""
-#~ " error d'an??lisi (molt probablement el servidor incompleix la norma RFC)\n"
-
-#~ msgid " connection refused\n"
-#~ msgstr " connexi?? rebutjada\n"
-
-#~ msgid " memory error\n"
-#~ msgstr " error de mem??ria\n"
-
-#~ msgid " fatal error\n"
-#~ msgstr " error fatal\n"
-
-#~ msgid " protocol error (very probably non-RFC compliance from the server)\n"
-#~ msgstr ""
-#~ " error de protocol (molt probablement el servidor incompleix la norma "
-#~ "RFC)\n"
-
-#~ msgid " connection not accepted\n"
-#~ msgstr " connexi?? no acceptada\n"
-
-#~ msgid " APPEND error\n"
-#~ msgstr " error d'APEND\n"
-
-#~ msgid " NOOP error\n"
-#~ msgstr " error de NOOP\n"
-
-#~ msgid " LOGOUT error\n"
-#~ msgstr " error de LOGOUT\n"
-
-#~ msgid " CAPABILITY error\n"
-#~ msgstr " error de CAPABILITY\n"
-
-#~ msgid " CHECK error\n"
-#~ msgstr " error de CHECK\n"
-
-#~ msgid " CLOSE error\n"
-#~ msgstr " error de CLOSE\n"
-
-#~ msgid " EXPUNGE error\n"
-#~ msgstr " error d'EXPUNGE\n"
-
-#~ msgid " COPY error\n"
-#~ msgstr " error de COPY\n"
-
-#~ msgid " UID COPY error\n"
-#~ msgstr " error d'UID COPY\n"
-
-#~ msgid " CREATE error\n"
-#~ msgstr " error de CREATE\n"
-
-#~ msgid " DELETE error\n"
-#~ msgstr " error de DELETE\n"
-
-#~ msgid " EXAMINE error\n"
-#~ msgstr " error d'EXAMINE\n"
-
-#~ msgid " FETCH error\n"
-#~ msgstr " error de FETCH\n"
-
-#~ msgid " UID FETCH error\n"
-#~ msgstr " error d'UID FETCH\n"
-
-#~ msgid " LIST error\n"
-#~ msgstr " error de LIST\n"
-
-#~ msgid " LOGIN error\n"
-#~ msgstr " error de LOGIN\n"
-
-#~ msgid " LSUB error\n"
-#~ msgstr " error de LSUB\n"
-
-#~ msgid " RENAME error\n"
-#~ msgstr " error de RENAME\n"
-
-#~ msgid " SEARCH error\n"
-#~ msgstr " error de SEARCH\n"
-
-#~ msgid " UID SEARCH error\n"
-#~ msgstr " error d'UID SEARCH\n"
-
-#~ msgid " SELECT error\n"
-#~ msgstr " error de SELECT\n"
-
-#~ msgid " STATUS error\n"
-#~ msgstr " error de STATUS\n"
-
-#~ msgid " STORE error\n"
-#~ msgstr " error de STORE\n"
-
-#~ msgid " UID STORE error\n"
-#~ msgstr " error d'UID STORE\n"
-
-#~ msgid " SUBSCRIBE error\n"
-#~ msgstr " error de SUBSCRIBE\n"
-
-#~ msgid " UNSUBSCRIBE error\n"
-#~ msgstr " error d'UNSUBSCRIBE\n"
-
-#~ msgid " STARTTLS error\n"
-#~ msgstr " error de STARTTLS\n"
-
-#~ msgid " INVAL error\n"
-#~ msgstr " error d'INVAL\n"
-
-#~ msgid " EXTENSION error\n"
-#~ msgstr " error d'EXTENSION\n"
-
-#~ msgid " SASL error\n"
-#~ msgstr " error de SASL\n"
-
-#~ msgid " SSL error\n"
-#~ msgstr " error de SSL\n"
-
-#~ msgid " Unknown error [%d]\n"
-#~ msgstr "Error desconegut [%d]\n"
-
-#~ msgid ""
-#~ "You have one or more IMAP accounts defined. However this version of Claws "
-#~ "Mail has been built without IMAP support; your IMAP account(s) are "
-#~ "disabled.\n"
-#~ "\n"
-#~ "You probably need to install libetpan and recompile Claws Mail."
-#~ msgstr ""
-#~ "Teniu un o m??s comptes IMAP definit(s). Tot i aix??, aquesta versi?? del "
-#~ "Claws Mail ha estat compilada sense suport IMAP; els compte(s) seran "
-#~ "inhabilitats.\n"
-#~ "\n"
-#~ "Probablement necessiteu instal??lar libetpan i recompilar el Claws Mail."
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Altra carpeta..."
-
-#~ msgid ""
-#~ "You have one or more News accounts defined. However this version of Claws "
-#~ "Mail has been built without News support; your News account(s) are "
-#~ "disabled.\n"
-#~ "\n"
-#~ "You probably need to install libetpan and recompile Claws Mail."
-#~ msgstr ""
-#~ "Teniu un o m??s comptes de not??cies definits. Tot i aix??, aquesta versi?? "
-#~ "del Claws Mail ha estat compilada sense suport de not??cies; els vostres "
-#~ "comptes de not??cies seran inhabilitats.\n"
-#~ "\n"
-#~ "Probablement necessiteu instal??lar libetpan i recompilar el Claws Mail."
-
-#~ msgid ""
-#~ "All folder(s) and message(s) under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "S'esborraran totes les carpetes i missatges que pengen de \"%s\".\n"
-#~ "Realment voleu esborrar-los?"
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Importar claus no est?? implementat a Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "minut(s)"
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "La clau exportada no est?? implementada a Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "dies"
-
-#~ msgid ""
-#~ "Claws Mail needs network access in order to feed this mail(s) to the "
-#~ "remote learner."
-#~ msgstr ""
-#~ "El Claws Mail necessita acc??s a la xarxa per enviar aquest correu al "
-#~ "programa d'aprenentatge remot."
-
-#~ msgid ""
-#~ "The following person(s) are busy at the time of your planned meeting:\n"
-#~ "- "
-#~ msgstr ""
-#~ "Les persones seg??ents estan ocupades a l'hora prevista de la reuni??:\n"
-#~ "- "
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr ""
-#~ "Mou els correus esborrats a la paperera i suprimeix-los immediatament"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Mou els correus esborrats a la paperera enlloc d'usar l'indicador "
-#~ "d'esborrat sense suprimir-los."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Autom??tic (recomanat)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Esborra missatge(s)"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Ha fallat el registre intern de renderitzaci?? de l'avatar"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: la cerca de l'amfitri?? a superat el temps d'espera\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s amfitri?? desconegut.\n"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Insertar"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Enviar"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+De_sar en Esborranys"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Reempla??ar \"%s\" amb: </span>"
-
-#~ msgid "Failed."
-#~ msgstr "Ha fallat."
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Error IMAP a %s: autentificada\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Error IMAP a %s: no autenticada\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Error IMAP a %s: error de fluxe\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "Error IMAP a %s: connexi?? rebutjada\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Error IMAP a %s: error fatal\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Error IMAP a %s: error a NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Error IMAP a %s: error de COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Error IMAP a %s: error de LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Error IMAP a %s: error de LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Error IMAP a %s: error de SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Error IMAP a %s: error de SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Error IMAP a %s: error desconegut [%d]\n"
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "El nou nom de la carpeta no ha de contenir el separador de l'espai de noms"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Des_ubscriure's"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr ""
-#~ "Ha fallat el registre de l'enlla?? d'actualitzaci?? d'elements de carpeta"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? d'actualitzaci?? de les carpetes"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "no s'ha pogut copiar el missatge %s a %s\n"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Tipus: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Tamany: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Nom del fitxer: </b>"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "no ha pogut escriure el fitxer de configuraci?? de Fetchinfo\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Connector GData: Error al escriure el fitxer de la configuraci?? del "
-#~ "connector\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "S'ha trobat la localitzaci??: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Pa??s al??legat d'origen: "
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "No s'ha pogut resoldre la direcci?? de l'adre??a IP "
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Intentar localitzar el remitent"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Emirats ??rabs Units"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua I Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguila"
-
-#~ msgid "Albania"
-#~ msgstr "Alb??nia"
-
-#~ msgid "Armenia"
-#~ msgstr "Arm??nia"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Antilles Holandeses"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Ant??rtida"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
-
-#~ msgid "American Samoa"
-#~ msgstr "Samoa Americana"
-
-#~ msgid "Austria"
-#~ msgstr "??ustria"
-
-#~ msgid "Australia"
-#~ msgstr "Austr??lia"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaidjan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "B??snia I Hercegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
-
-#~ msgid "Belgium"
-#~ msgstr "B??lgica"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulg??ria"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Ben??n"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bol??via"
-
-#~ msgid "Brazil"
-#~ msgstr "Brasil"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahames"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Illa Bouvet"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Bielor??ssia"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Canad??"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Illes Cocos (Keeling)"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Rep??blica Centreafricana"
-
-#~ msgid "Congo"
-#~ msgstr "Congo"
-
-#~ msgid "Switzerland"
-#~ msgstr "Su??ssa"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Costa d'Ivori"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Illes Cook"
-
-#~ msgid "Chile"
-#~ msgstr "Xile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Camerun"
-
-#~ msgid "China"
-#~ msgstr "Xina"
-
-#~ msgid "Colombia"
-#~ msgstr "Colombia"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
-
-#~ msgid "Cuba"
-#~ msgstr "Cuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Cap Verd"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Illa de Nadal"
-
-#~ msgid "Cyprus"
-#~ msgstr "Xipre"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Rep??blica Txeca"
-
-#~ msgid "Germany"
-#~ msgstr "Alemanya"
-
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
-
-# RML To be consistent with previous one.
-#~ msgid "Denmark"
-#~ msgstr "Dinamarca"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Rep??blica Dominicana"
-
-#~ msgid "Algeria"
-#~ msgstr "Alg??ria"
-
-#~ msgid "Ecuador"
-#~ msgstr "Equador"
-
-#~ msgid "Estonia"
-#~ msgstr "Est??nia"
-
-#~ msgid "Egypt"
-#~ msgstr "Egipte"
-
-#~ msgid "Western Sahara"
-#~ msgstr "S??hara Occidental"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "Espanya"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Eti??pia"
-
-#~ msgid "Finland"
-#~ msgstr "Finl??ndia"
-
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Illes Falkland (Malvines)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Micron??sia, Estats Federats de"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Illes F??roe"
-
-#~ msgid "France"
-#~ msgstr "Fran??a"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Fran??a, Metropolitana"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Regne Unit"
-
-#~ msgid "Grenada"
-#~ msgstr "Granada"
-
-#~ msgid "Georgia"
-#~ msgstr "Ge??rgia"
-
-#~ msgid "French Guiana"
-#~ msgstr "Guiana franc??s"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greenland"
-#~ msgstr "Groenl??ndia"
-
-#~ msgid "Gambia"
-#~ msgstr "G??mbia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadalupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Guinea Equatorial"
-
-#~ msgid "Greece"
-#~ msgstr "Gr??cia"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Ge??rgia del Sud i les Illes Sandwich del Sud"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guaiana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Illa Illes Heard i McDonald"
-
-#~ msgid "Honduras"
-#~ msgstr "Hondures"
-
-#~ msgid "Croatia"
-#~ msgstr "Cro??cia"
-
-#~ msgid "Haiti"
-#~ msgstr "Hait??"
-
-#~ msgid "Hungary"
-#~ msgstr "Hongria"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indon??sia"
-
-#~ msgid "Ireland"
-#~ msgstr "Irlanda"
-
-#~ msgid "Israel"
-#~ msgstr "Israel"
-
-#~ msgid "India"
-#~ msgstr "??ndia"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Territori Brit??nic De l'Oce?? ??ndic"
-
-#~ msgid "Iraq"
-#~ msgstr "Iraq"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iran, Rep??blica Isl??mica de l '"
-
-#~ msgid "Iceland"
-#~ msgstr "Isl??ndia"
-
-#~ msgid "Italy"
-#~ msgstr "It??lia"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaica"
-
-#~ msgid "Jordan"
-#~ msgstr "Jord??nia"
-
-#~ msgid "Japan"
-#~ msgstr "Jap??"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kyrgyzstan"
-
-#~ msgid "Cambodia"
-#~ msgstr "Cambodja"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Comores"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Sant Crist??bal i Nieves"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Rep??blica de Corea, Popular Democr??tica de"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Rep??blica De Corea"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Illes Caiman"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakhstan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Rep??blica Democr??tica Popular Lao"
-
-#~ msgid "Lebanon"
-#~ msgstr "L??ban"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Santa Ll??cia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Lib??ria"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litu??nia"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxemburg"
-
-#~ msgid "Latvia"
-#~ msgstr "Let??nia"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Jamahiriya ??rab L??bia"
-
-#~ msgid "Morocco"
-#~ msgstr "Marroc"
-
-#~ msgid "Monaco"
-#~ msgstr "M??naco"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Mold??via, Rep??blica de"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagascar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Illes Marshall"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Maced??nia, Antiga Rep??blica Iugoslava de"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-# RML To be consistent with previous one.
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mong??lia"
-
-#~ msgid "Macao"
-#~ msgstr "Macau"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Illes Marianes Del Nord"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinica"
-
-#~ msgid "Mauritania"
-#~ msgstr "Maurit??nia"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Maurici"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldives"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "M??xic"
-
-#~ msgid "Malaysia"
-#~ msgstr "Mal??isia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mo??ambic"
-
-#~ msgid "Namibia"
-#~ msgstr "Nam??bia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Nova Caled??nia"
-
-#~ msgid "Niger"
-#~ msgstr "N??ger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Illa Norfolk"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nig??ria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Pa??sos Baixos"
-
-#~ msgid "Norway"
-#~ msgstr "Noruega"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Nova Zelanda"
-
-#~ msgid "Oman"
-#~ msgstr "Oman"
-
-#~ msgid "Panama"
-#~ msgstr "Panam??"
-
-#~ msgid "Peru"
-#~ msgstr "Per??"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Polin??sia franc??s"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Nova Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filipines"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Pol??nia"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Sant Pere i Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguai"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
-
-#~ msgid "Romania"
-#~ msgstr "Romania"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Federaci?? Russa"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Ar??bia Saudita"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Illes Salom??"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychelles"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Sweden"
-#~ msgstr "Su??cia"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Santa Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Eslov??nia"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard i Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Eslov??quia"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "Sant Mar??"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Som??lia"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sant Vaig prendre I Pr??ncep"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Rep??blica ??rab S??ria"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swazil??ndia"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Illes Turks i Caicos"
-
-#~ msgid "Chad"
-#~ msgstr "Chad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Territoris Francesos del Sud"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Tail??ndia"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadjikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tun??sia"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "Timor Oriental"
-
-#~ msgid "Turkey"
-#~ msgstr "Turquia"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinitat I Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan, Prov??ncia De la Xina"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanz??nia, Rep??blica Unida de"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ucra??na"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Illes menors allunyades dels Estats Units"
-
-#~ msgid "United States"
-#~ msgstr "Estats Units"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguai"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Santa Seu (Ciutat del Vatic??)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent i les Grenadines"
-
-#~ msgid "Venezuela"
-#~ msgstr "Vene??uela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Illes Verges Brit??niques"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Illes Verges dels Estats Units"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis i Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Y??men"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mai??ta"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "S??rbia i Montenegro"
-
-#~ msgid "South Africa"
-#~ msgstr "Sud-??frica"
-
-#~ msgid "Zambia"
-#~ msgstr "Z??mbia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Rep??blica Democr??tica Del Congo"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "Geolocalitzaci??"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "No s'ha pogut inicialitzar el corrector"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "No s'ha pogut crear l'expressi?? regular: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Ha fallat el registre de vi_sualitzacio de la vista del missatge en el "
-#~ "connector de GeoLocalitzaci??"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Aquest connector proporciona la funcionalitat de geolocalitzaci?? per "
-#~ "Claws Mail.\n"
-#~ "\n"
-#~ "Atenci??: ??s t??cnicament impossible derivar la ubicaci?? geogr??fica dels "
-#~ "remitents dels correus electr??nics amb qualsevol quantitat de certesa. "
-#~ "Els resultats presentats per aquest connector s??n nom??s estimacions "
-#~ "aproximades. En particular, els administradors de la llista de correu "
-#~ "sovint despullen informaci?? del remitent dels correus, per la qual les "
-#~ "llistes de correu poden ser assignades enlloc del remitent del correu.\n"
-#~ "En cas de dubte, no confien en els resultats d'aquest connector, i no "
-#~ "confiar en aquesta informaci?? per divorciar-se de la seva c??njuge.\n"
-#~ "\n"
-#~ "La teva opini?? ??s benvinguda a <berndth at gmx.de> (per?? nom??s si no es "
-#~ "tracta de baralles conjugals)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integraci?? per Geolocalitzaci??"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Error en la lectura d'estad??stiques de mem??ria cau</"
-#~ "span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Utilitzant %s a %d fitxers,%d  directoris, %d altres "
-#~ "i %d errors</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Error al esborrar la mem??ria cau d'avatars.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+De_sar"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Connector de notificaci??: Error al escriure la configuraci?? del m??dul a "
-#~ "l'arxiu\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la paraula "
-#~ "de pas per: </span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "               uid \"%s\" (Validesa: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Recupera comentaris afegit abans de :</b>\n"
-#~ "<small>(En dies; escriu -1 per recuperar tots els comentaris)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Interval de refresc en minuts:</b>\n"
-#~ "<small>(Poseu a 0 per desactivar el refresc autom??tic per aquest feed)</"
-#~ "small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Si un element canvia, no marcar-lo com nou.</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(aquest event es recurrent)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> a:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Descartar"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Desar dar missatges enviats a la carpeta Enviat"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Resum de missatges</b>\n"
-#~ "<b>Nous:</b> %d\n"
-#~ "<b>Sense llegir:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Tamany:</b> %s\n"
-#~ "\n"
-#~ "<b>Marcats:</b> %d\n"
-#~ "<b>Contestats:</b> %d\n"
-#~ "<b>Reenviats:</b> %d\n"
-#~ "<b>Bloquejats:</b> %d\n"
-#~ "<b>Ignorats:</b> %d\n"
-#~ "<b>Llegits:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Des de: %s, a %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>A: %s, a %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">El vostre nom:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">La vostra adre??a de correu:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Nom de la b??stia:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adre??a del servidor SMTP:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adre??a del servidor:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">B??stia local:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Tipus de servidor:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Nom d'usuari:</span>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2014\n"
-#~ "The Claws Mail Team\n"
-#~ " and Hiroyuki Yamamoto"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2014\n"
-#~ "The Claws Mail Team\n"
-#~ " and Hiroyuki Yamamoto"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2014\n"
-#~ "The Claws Mail Team\n"
-#~ "and Hiroyuki Yamamoto"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2014\n"
-#~ "The Claws Mail Team\n"
-#~ "i Hiroyuki Yamamoto"
-
-#~ msgid "GData plugin: Authentication error: %s\n"
-#~ msgstr "Connector GData: Error d'autenticaci??: %s\n"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Connector GData: Autenticat\n"
-
-#~ msgid "GData plugin: Starting async authentication\n"
-#~ msgstr "Connector GData: Iniciant l'autentificaci?? as??ncrona\n"
-
-#~ msgid "Use this"
-#~ msgstr "Useu aquest"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr ""
-#~ "Claws Mail es un client de correu electr??nic r??pid, potent i f??cilment "
-#~ "extensible."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "??s altament configurable i pot treballar amb centenars de milers de "
-#~ "correus f??cilment. Els missatges es gestionen en format obert, i es molt "
-#~ "senzill interaccionar amb ells."
-
-#~ msgid "E-mail client"
-#~ msgstr "Client de correu electr??nic"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Client de correu electr??nic lleuger i r??pid basat en GTK+"
-
-#~ msgid ""
-#~ "Some composing windows are open.\n"
-#~ "Please close all the composing windows before editing the accounts."
-#~ msgstr ""
-#~ "Hi ha finestres de composici?? obertes.\n"
-#~ "Tanqueu totes les finestres de composici?? abans d'editar els comptes."
-
-#~ msgid "From: <i>%s</i>"
-#~ msgstr "Desde: <i>%s</i>"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "missatges que contenen la cap??alera S"
-
-#~ msgid "From/To/Subject/Tag"
-#~ msgstr "Des de/a/Assumpte/Etiqueta"
-
-#~ msgid ""
-#~ "Connection to %s failed: server requires TLS, but Claws Mail has been "
-#~ "compiled without OpenSSL support.\n"
-#~ msgstr ""
-#~ "La connexi?? a %s ha fallat: el servidor reqauerexi TLS, per?? Claws Mail "
-#~ "ha estat compilat sense suport OpenSSL.\n"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Mantenir adresses 'Per a'"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Mantenir adresses 'Cc'"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Mantenir adresses 'Bcc'"
-
-#, fuzzy
-#~ msgid ""
-#~ "Exclude addresses matching the following regular expressions (one per "
-#~ "line):"
-#~ msgstr ""
-#~ "Avisar quan es compleixin les seg??ents expressions regulars:\n"
-#~ "(una per l??nia)"
-
-#, fuzzy
-#~ msgid "One of the following regular expressions is matched (one per line):"
-#~ msgstr ""
-#~ "Avisar quan es compleixin les seg??ents expressions regulars:\n"
-#~ "(una per l??nia)"
-
-#, fuzzy
-#~ msgid "Use proxy:"
-#~ msgstr "Usar exp.reg."
-
-#~ msgid "RSS folders"
-#~ msgstr "Carpetes de RSS"
-
-#~ msgid "Calendar folders"
-#~ msgstr "Carpetes de calendaris"
-
-#~ msgid "slow"
-#~ msgstr "lent"
-
-#~ msgid "fast"
-#~ msgstr "r??pid"
-
-#~ msgid "Maximum number of messages (0 means unlimited)"
-#~ msgstr "N??mero m??xim de missatges (0 significa il??limitat)"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Amplada de l'anunci en pixels (0 significa pantalla sencera)"
-
-#~ msgid "Popup timeout:"
-#~ msgstr "Temps l??mit d'elements emergents:"
-
-#~ msgid "Command to execute:"
-#~ msgstr "Comanda a executar:"
-
-#~ msgid "Hostname:Port of LCDd server:"
-#~ msgstr "Nom de servidor:Port del servei LCDd"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Activar av??s emergents"
-
-#~ msgid "Toggle minimize:"
-#~ msgstr "Alternar minimitzar:"
-
-#~ msgid "Good signature from %s."
-#~ msgstr "Signatura v??lida de %s."
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Signatura v??lida(sense confian??a)  de %s."
-
-#~ msgid "Expired signature from %s."
-#~ msgstr "Signatura caducada de %s"
-
-#, fuzzy
-#~ msgid "Good signature from %s, but the key has expired."
-#~ msgstr "Signatura v??lida de %s."
-
-#, fuzzy
-#~ msgid "Good signature from %s, but the key has been revoked."
-#~ msgstr "Signatura v??lida de %s."
-
-#~ msgid "Bad signature from %s."
-#~ msgstr "Signatura err??nia de %s."
-
-#~ msgid "Key 0x%s not available to verify this signature."
-#~ msgstr "Clau 0x%s no disponible per verificar aquesta signatura."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "No s'ha pogut obrir l'arxiu temporal"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "No s'ha pogut iniciar libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Obtenint '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Feed malformat"
-
-#~ msgid "Refreshing feed '%s'..."
-#~ msgstr "Refrescant feed '%s'..."
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: No es poden obtenir els comentaris amb feeds RDF. No es podem "
-#~ "obtenir els comentaris de '%s'"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Aquest format de feed no est?? suportat encara."
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld byte"
-#~ msgstr[1] "%ld bytes"
-
-#~ msgid "size unknown"
-#~ msgstr "tamany desconegut"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: No es pot actualitzar el feed %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Ja esteu subscrit a aquest feed."
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No es pot arrivar a la URL '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "No es pot arrivar a la URL '%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "No es pot subscriure al feed '%s'."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Temps d'espera exhaurit connectamt a la URL %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "No es pot arrivar a la URL %s\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Error parsejant el feed desde la URL %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Tipus de feed no suportat a la URL %s\n"
-
-#~ msgid "RSSyl: Updating feed %s\n"
-#~ msgstr "RSSyl: Actualitzant feed %s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: Actualitzaci?? del feed avortada, sortint de l'aplicaci??.\n"
-
-#, fuzzy
-#~ msgid "Really remove the folder tree '%s'?\n"
-#~ msgstr "Realment voleu esborrar l'arbre de la carpeta '%s' ?\n"
-
-#~ msgid "Remove folder tree"
-#~ msgstr "Esborrar arbre de la carpeta"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "No es pot esborrar el feed '%s'."
-
-#~ msgid "Select a .opml file"
-#~ msgstr "Selecciona un arxiu .opml"
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Refresc_ar tots els feeds"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "Des_ubscriure's al feed..."
-
-#~ msgid "Feed pr_operties..."
-#~ msgstr "Pr_opietats del feed..."
-
-#~ msgid "_Create new folder..."
-#~ msgstr "_Crear nova carpeta..."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Esborrar arbre de carpe_tes..."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Mantenir el n??mero d'entrades caducades per defecte"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>N??mero d'entrades caducades a mantenir:</b>\n"
-#~ "<small>(Poseu a -1 si voleu mantenir les entrades caducades)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as unread:</b>"
-#~ msgstr "<b>Si una ocurr??ncia canvia, no la marqueu com a no llegida:</b>"
-
-#~ msgid "Always mark as unread"
-#~ msgstr "Marqueu sempre com a no llegida"
-
-#~ msgid "Never mark as unread"
-#~ msgstr "No marqueu mai com a no llegit"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Desubsciure's del feed"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Voleu realment esborrar el feed"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Esborrar entrades guardades"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Interval de refresc per defecte en minuts"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "N??mero d'ocurr??ncies caducades a mantenir per defecte"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Poseu a -1 per mantenir ocurr??ncies caducades"
-
-#, fuzzy
-#~ msgid "Verify SSL certificate validity for new feeds"
-#~ msgstr "Certificat SSL per a %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %d %b %Y %H:%M:%S"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%d/%m/%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Hi ha m??s m??duls disponibles a la p??gina web de Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' no s'ha pogut incloure al nom de la carpeta."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d nou Missatge"
-#~ msgstr[1] "Claws Mail: %d nous missatges"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "Impossible connectar: esteu sense l??nia"
-
-#~ msgid "Exiting..."
-#~ msgstr "Sortint..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail not pot iniciar-se sense les dades de volum (%s)"
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "Cap visor registrat per aquest tipus d'arxiu."
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "Saltar l??nies marcades"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "Saltar respostes i redireccions"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "Signatura"
-
-#~ msgid "Select ..."
-#~ msgstr "Seleccionar ..."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Error d'impressi????:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr ""
-#~ "Imprimir HTML nom????s es possible si el programa 'html2ps' est???? "
-#~ "instal????lat."
-
-#~ msgid "Filename is null."
-#~ msgstr "El nom d'arxiu es null."
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Conversi???? a postscript fallida."
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "La impresora %s no accepta arxius PostScript."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error d'impressi????:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "Configurar b??stia"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "Carrega imatges autom????ticament"
-
-#~ msgid "Block external content"
-#~ msgstr "Bloqueja contingut extern"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "La b??stia '%s' ja existeix."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "La carpeta '%s' ja existeix."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "No s'ha pogut crear la carpeta '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Eliminar realment la b??stia '%s'?\n"
-#~ "(Els missatges NO seran esborrats del disc)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "No es pot eliminar la carpeta '%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Introdueixi el nou nom per a '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (m??dul no carregat)"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "M??dul visor de PDFs"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "For the most up-to-date API documentation, type\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "in the interactive Python console under Tools -> Show Python console.\n"
-#~ "\n"
-#~ "The source distribution of this plugin comes with various example scripts "
-#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
-#~ "interested in sharing, feel free to send it to me to have it considered "
-#~ "for inclusion in the examples.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Aquest m??dul ofereix funcions d'integraci?? amb Python.\n"
-#~ "\n"
-#~ "Per una documentaci?? m??s actualitzada, teclejeu\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "a la consola interactiva de Python sota Eines -> Mostrar console Python.\n"
-#~ "\n"
-#~ "La distribuci?? font d'aquest m??dul ve amb diversos scripts d'exemple al "
-#~ "directori \"exemples\". Si escrius un script que pot ser interessant de "
-#~ "compartir, no dubtis en enviar-me'l per tenir-lo en consideraci?? per "
-#~ "inclou-re'l en els exemples.\n"
-#~ "\n"
-#~ "Comentaris a <berndth at gmx.de> s??n benvinguts."
-
-#, fuzzy
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "Generar un nou parell de claus"
-
-#~ msgid "Replace"
-#~ msgstr "Reempla??ar"
-
-#~ msgid "Blink LED"
-#~ msgstr "diode intermitent"
-
-#~ msgid "Play sound"
-#~ msgstr "So"
-
-#~ msgid "Show info banner"
-#~ msgstr "Mostrar b??ner d'informaci??"
-
-#~ msgid "on external memory card"
-#~ msgstr "a la tarja de mem??ria externa"
-
-#~ msgid "on internal memory card"
-#~ msgstr "a la tarja de mem??ria interna"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">Emmaguetzema dades</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Navegador Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Carregar els enlla??os remots als correus"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Equivalent a la opci?? '--local' de Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Encara podeu carregar els enlla??os remots recarregant la p??gina"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Nom??s per remitents trobats a l'agenda/carpeta"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Mode finestra completa (ocultar controls)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Equivalent a la opci?? '--fullwindow' de Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Visor HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr "No s'ha pogut trobar l'executable de dillo al PATH. ??s instal??lat?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Aquest m??dul mostra el correu HTML usant el navegador Dillo.\n"
-#~ "\n"
-#~ "Les opcions podeu trobar-les a /Configuraci??/Preferencies/M??duls/"
-#~ "Navegador Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Icona de safata"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? del canvi a mode sense connexi??"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? de la llista de comptes canviats"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? de tancament"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? d'iconitzaci??"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Ha fallat el registre de l'enlla?? de canvi de tema."
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Aquest m??dul coloca la icona d'una b??stia a la safata de notificaci?? que "
-#~ "indica si teniu correu nou o no llegit.\n"
-#~ "\n"
-#~ "La b??stia apareix buida si no teniu correu sense llegir, sin?? mostrar?? "
-#~ "una carta. Un consel flotant mostra el n de correus nous, sense llegir i "
-#~ "total."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Oculta Claws Mail a l'inici"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Oculteu Claws Mail usant la icona de safata enlloc de tancar-lo\n"
-#~ "quan el bot?? de tancament de la finestra ??s clicat"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimitzar a la safata"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "Oculteu Claws Mail usant la icona de safata enlloc de minimitzar-lo"
-
-#~ msgid "Failed to register compose create hook in the Python plugin"
-#~ msgstr ""
-#~ "Error al registrar l'enlla?? de composar crear dins els m??dul de Python"
-
-#~ msgid "(%d page%s)"
-#~ msgstr "(%d p??gina%s)"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. %s it anyway?"
-#~ msgstr ""
-#~ "Un adjunt ??s anomenat al missatge que esteu enviant, per?? cap arxiu va "
-#~ "ser adjuntat. %s de totes maneres?"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No s'ha pogut iniciar l'ordre. Ha fallat la creaci?? de la tuberia.\n"
-#~ "%s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Composar: entrada del proc??s de monitoritzat\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "i l'equip de Claws Mail"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "i l'equip de Claws Mail"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Canviar diccionari"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Certificat SSL desconegut"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Certificat SSL caducat"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Certificat SSL canviat"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "Connectant al servidor IMAP4 %s...\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ha estat compilat amb una llibreria GTK+ m??s recent de la "
-#~ "disponible actualment. Aix?? causar?? un error. Necessiteu actualitzar GTK+ "
-#~ "orecompilar Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ha estat compilat amb una llibreria GTK+ m??s antiga de la "
-#~ "disponible actualment. Aix?? causar?? un error. Necessiteu recompilar Claws "
-#~ "Mail."
-
-#~ msgid "  --search folder type request [recursive]"
-#~ msgstr "  --petici?? de tipus de carpeta de recerca [recursiu] "
-
-#~ msgid "                         searches mail"
-#~ msgstr "                         cerca correu"
-
-#~ msgid ""
-#~ "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""
-#~ msgstr ""
-#~ "                         carpeta ex.: \"#mh/Mailbox/inbox\" or \"Correu\""
-
-#, fuzzy
-#~ msgid ""
-#~ "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "or g: tag"
-#~ msgstr ""
-#~ "                         tipus: t[??tol], d[des de], [a], e[xt??s], m[ixte] "
-#~ "o g: etiqueta"
-
-#~ msgid "                         request: search string"
-#~ msgstr "                         petici??: cerca cadena"
-
-#~ msgid ""
-#~ "                         recursive: false if arg. starts with 0, n, N, f "
-#~ "or F"
-#~ msgstr ""
-#~ "                         recursiu: false si l'argument comen??a amb 0, n, "
-#~ "N, f o F"
-
-#~ msgid "Last read message"
-#~ msgstr "??ltim missatge llegit"
-
-#~ msgid "_all"
-#~ msgstr "_tots"
-
-#~ msgid "_sender"
-#~ msgstr "re_mitent"
-
-#~ msgid "_Fold all"
-#~ msgstr "P_legar tots"
-
-#~ msgid "by _Date"
-#~ msgstr "per _Data"
-
-#~ msgid "by _From"
-#~ msgstr "per _Des de"
-
-#~ msgid "by _To"
-#~ msgstr "per P_er a"
-
-#~ msgid "by S_ubject"
-#~ msgstr "per Ass_umpte"
-
-#~ msgid "by Tag"
-#~ msgstr "per Etiqueta"
-
-#~ msgid "by _Mark"
-#~ msgstr " per _Marca"
-
-#~ msgid "headers line"
-#~ msgstr "L??nia de cap??aleres"
-
-#~ msgid "message line"
-#~ msgstr "L??nia de missatge"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Obrir (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Obrir _amb (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Veure com a text (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_Guardar com (y)..."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "creant la connexi?? NNTP amb %s:%d ...\n"
-
-#~ msgid "Trust key"
-#~ msgstr "Clau de confian??a"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Exp.reg. de testeig"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Configuraci?? de la barra principal"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Configuraci?? de la barra de composici??"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Configuraci?? de la barra de vista de missatges"
-
-#~ msgid " items selected"
-#~ msgstr " elements seleccionats"
-
-#~ msgid "'View Log'"
-#~ msgstr "'Veure Tra??a'"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Drecera: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr "(Drecera: 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr "(Drecera: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "Contrassenya SMTP:\n"
-#~ "<span size=\"small\">(buit per usar el mateix que a la recepci??)</span>"
-
-#~ msgid "/Message/Create meeting from message..."
-#~ msgstr "/Missatge/Crear reuni?? des del missatge..."
-
-#~ msgid "/New meeting..."
-#~ msgstr "/Nova reuni??..."
-
-#~ msgid "/Export calendar..."
-#~ msgstr "/Exportar calendari..."
-
-#~ msgid "/Subscribe to webCal..."
-#~ msgstr "/Subscriure's a webCal..."
-
-#~ msgid "/Unsubscribe..."
-#~ msgstr "/Desubscriure's..."
-
-#~ msgid "/Rename..."
-#~ msgstr "/Renombrar..."
-
-#~ msgid "/Update subscriptions"
-#~ msgstr "/Actualitzar subscripcions"
-
-#~ msgid "text/calendar"
-#~ msgstr "text/calendar"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: No es poden obtenir els comentaris amb feeds Atom. No es podem "
-#~ "obtenir els comentaris de '%s'"
-
-#~ msgid "/Refresh feed"
-#~ msgstr "/Refrescar el feed"
-
-#~ msgid "/Subscribe new feed..."
-#~ msgstr "/Subscriure's a un nou feed..."
-
-#~ msgid "/Unsubscribe feed..."
-#~ msgstr "/Desubscriure's a un feed..."
-
-#~ msgid "/Feed properties..."
-#~ msgstr "/Propietats del feed..."
-
-#~ msgid "/Create new folder..."
-#~ msgstr "/Crear nova carpeta..."
-
-#~ msgid "/Delete folder..."
-#~ msgstr "/Esborrar carpeta..."
-
-#~ msgid "/Remove folder tree..."
-#~ msgstr "/Renombrar arbre de carpetes..."
-
-#~ msgid "/File/Add mailbox/RSSyl..."
-#~ msgstr "/Arxiu/Afegir b??stia/RSSyl..."
-
-#~ msgid "Timeout for downloading feeds in seconds"
-#~ msgstr "Temps d'espera esgotat per descarregar els feeds en segons"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Aquest m??dul proporciona caracter??stiques d'integraci?? amb Python.\n"
-#~ "\n"
-#~ "Impressions a <berndth at gmx.de> s??n benvingudes."
-
-#~ msgid "/Message/Report spam online"
-#~ msgstr "/Missatge/Reportar correu brossa en l??nia"
diff --git a/po/cs.po b/po/cs.po
index 8fc6f70..efa30bb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -19184,1263 +19184,3 @@ msgid ""
 msgstr ""
 "Claws Mail je nyn?? p??ipraven.\n"
 "Stiskn??te ulo??it a m????eme za????t."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Povoluje zabezpe??en?? p??ipojen?? k LDAP serveru pomoc?? SSL. Pokud "
-#~ "p??ipojov??n?? sel??e, zkontrolujte nastaven?? v ldap.conf (volby "
-#~ "TLS_CACERTDIR a TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "????dn?? TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registrovat Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Pou????t SSL pro POP3 spojen??"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Pou????t SSL pro IMAP4 spojen??"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Pou????t SSL pro NNTP p??ipojen??"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Pou????t SSL pro SMTP p??ipojen??"
-
-#~ msgid "Re_move"
-#~ msgstr "Odstranit"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Jin?? slo??ka..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Import kl????e nen?? ve Windows implementov??n.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "minut"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Podpis nem????e b??t zkontrolov??n - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Export kl????e nen?? ve Windows implementov??n."
-
-#~ msgid "day(s)"
-#~ msgstr "den(??)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "P??esunout smazan?? maily do ko??e a okam??it?? vymazat"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "P??esunout smazan?? maily do ko??e nam??sto pou??it?? \\Deleted flag, bez "
-#~ "vymaz??n??."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Autodetekce (doporu??eno)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Odstranit zpr??vu(y)"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Vlo??it"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Odeslat"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+Ulo??it jako _koncept"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Nahradit \"%s\" s: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "IMAP chyba na %s: ov????en\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "IMAP chyba na %s: neov????en\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "IMAP chyba na %s: chyba streamu\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "IMAP chyba na %s: p??ipojen?? odm??tnuto\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "IMAP chyba na %s: fat??ln?? chyba\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "IMAP chyba na %s: NOOP chyba\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "IMAP chyba na %s: COPY chyba\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "IMAP chyba na %s: LIST chyba\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "IMAP chyba na %s: LSUB chyba\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "IMAP chyba na %s: SASL chyba\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "IMAP chyba na %s: SSL chyba\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "IMAP chyba na %s: Nezn??m?? chyba [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Odhl??sit"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (nebo star????)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (nebo star????)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (nebo star????)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Typ: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Velikost: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>N??zev souboru: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Chyba ??ten?? statistiky vyrovn??vac?? pam??ti</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Pou??it?? %s v %d souborech, %d adres??????ch, %d dal????ch "
-#~ "a %d chyb??ch</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">Chyba ??i??t??n?? vyrovn??vac?? pam??ti</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+_Ulo??it"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPros??m vlo??te heslo pro:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (Platnost: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>St??hnout koment????e pro zpr??vy mlad???? ne??:</b>\n"
-#~ "<small>(Ve dnech; nastaven?? -1 st??hnout v??echny koment????e)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Interval aktualizace:</b>\n"
-#~ "<small>(Vlo??te 0, pokud tento kan??l nechcete aktualizovat automaticky.)</"
-#~ "small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Jestli se polo??ka zm??n??, neozna??ovat jako nep??e??tenou:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(ud??lost se opakuje)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> p??es:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Zahodit"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Shrnut?? zpr??v</b>\n"
-#~ "<b>Nov??:</b> %d\n"
-#~ "<b>Nep??e??ten??:</b> %d\n"
-#~ "<b>Celkem:</b> %d\n"
-#~ "<b>Velikost:</b> %s\n"
-#~ "\n"
-#~ "<b>Ozna??en??:</b> %d\n"
-#~ "<b>S odpov??d??:</b> %d\n"
-#~ "<b>P??eposlan??:</b> %d\n"
-#~ "<b>Zam??en??:</b> %d\n"
-#~ "<b>Ignorovan??:</b> %d\n"
-#~ "<b>Sledovan??:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Od: %s, on %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Komu: %s, on %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Va??e jm??no:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Va??e e-mailov?? adresa:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">N??zev schr??nky (mailbox):</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">SMTP server:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Server:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Lok??ln?? mailbox:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Typ serveru:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">P??ihla??ovac?? jm??no:</span>"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Selhala registrace renderov??n?? avatar??"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: ??asov?? limit pro hled??n?? hostitele vypr??el.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: nezn??m?? hostitel.\n"
-
-#~ msgid "Failed."
-#~ msgstr "Selhalo."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "N??zev slo??ky nesm?? obsahovat znaky pou????van?? serverem IMAP jako odd??lova??e"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr ""
-#~ "Nepoda??ilo se zaregistrovat funkci pro obslou??en?? ud??losti \"zm??na "
-#~ "polo??ky slo??ky\""
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr ""
-#~ "Nepoda??ilo se zaregistrovat funkci pro obslou??en?? ud??losti \"zm??na slo??ky"
-#~ "\""
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "Nemohu zkop??rovat zpr??vu %s do %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "Selhal z??pis konfigurace Fetchinfo\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Z??suvn?? modul GData: Selhalo zaps??n?? konfigurace do souboru\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Nalezeno m??sto: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "??dajn?? zem?? p??vodu: "
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Nelze z??skat um??st??n?? IP adresy "
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Pokusit se ur??it m??sto odes??latele"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra "
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Spojen?? Arabsk?? Emir??ty"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afgh??nist??n "
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua a Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Alb??nie"
-
-#~ msgid "Armenia"
-#~ msgstr "Arm??nie"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Nizozemsk?? Antily"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktida"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
-
-#~ msgid "American Samoa"
-#~ msgstr "Americk?? Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "Rakousko"
-
-#~ msgid "Australia"
-#~ msgstr "Austr??lie"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajd????n"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosna a Hercegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Banglad????"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgie"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulharsko"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Sultan??t Brunei"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bol??vie"
-
-#~ msgid "Brazil"
-#~ msgstr "Braz??lie"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamy"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bh??t??n"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet??v ostrov"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "B??lorusko"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosov?? ostrovy (Keeling)"
-
-#~ msgid "Central African Republic"
-#~ msgstr "St??edoafrick?? republika"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "??v??carsko"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Pob??e???? slonoviny"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cookovy ostrovy"
-
-#~ msgid "Chile"
-#~ msgstr "Chile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "????na"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbie"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kostarika"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Cape Verde"
-
-#~ msgid "Christmas Island"
-#~ msgstr "V??no??n?? ostrov"
-
-#~ msgid "Cyprus"
-#~ msgstr "Kypr"
-
-#~ msgid "Czech Republic"
-#~ msgstr "??esk?? republika"
-
-#~ msgid "Germany"
-#~ msgstr "N??mecko"
-
-#~ msgid "Djibouti"
-#~ msgstr "D??ibutsko"
-
-#~ msgid "Denmark"
-#~ msgstr "D??nsko"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominik??nsk?? republika"
-
-#~ msgid "Algeria"
-#~ msgstr "Al????r"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekv??dor"
-
-#~ msgid "Estonia"
-#~ msgstr "Estonsko"
-
-#~ msgid "Egypt"
-#~ msgstr "Egypt"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Z??padn?? Sahara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "??pan??lsko"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopie"
-
-#~ msgid "Finland"
-#~ msgstr "Finsko"
-
-#~ msgid "Fiji"
-#~ msgstr "Fid??i"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikron??sie"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Faersk?? ostrovy"
-
-#~ msgid "France"
-#~ msgstr "Francie"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Francie, Metropolitan"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Velk?? Brit??nie"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Gruzie"
-
-#~ msgid "French Guiana"
-#~ msgstr "Francouzsk?? Guyana"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greenland"
-#~ msgstr "Gr??nsko"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambie"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovn??kov?? Guinea"
-
-#~ msgid "Greece"
-#~ msgstr "??ecko"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Ji??n?? Georgie a Ji??n?? Sandwichovy ostrovy"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heard??v ostrov a McDonaldovy ostrovy"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Chorvatsko"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Ma??arsko"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indon??sie"
-
-#~ msgid "Ireland"
-#~ msgstr "Irsko"
-
-#~ msgid "Israel"
-#~ msgstr "Izrael"
-
-#~ msgid "India"
-#~ msgstr "Indie"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britsk?? ??zem?? v Indick??m oce??nu"
-
-#~ msgid "Iraq"
-#~ msgstr "??r??k"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "??r??n"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "Italy"
-#~ msgstr "It??lie"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
-
-#~ msgid "Jordan"
-#~ msgstr "Jord??nsko"
-
-#~ msgid "Japan"
-#~ msgstr "Japonsko"
-
-#~ msgid "Kenya"
-#~ msgstr "Ke??a"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kyrgyzst??n"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambod??a"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komory"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Svat?? Kry??tof a Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "KLDR"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Ji??n?? Korea"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuvajt"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmansk?? ostrovy"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazachst??n"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laos"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Svat?? Lucie"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichten??tejnsko"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sr?? Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Lib??rie"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litva"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Lucembursko"
-
-#~ msgid "Latvia"
-#~ msgstr "Loty??sko"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libye"
-
-#~ msgid "Morocco"
-#~ msgstr "Maroko"
-
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Mold??vie"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallovy ostrovy"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Makedonie"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolsko"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severn?? Mariany"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauret??nie"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauricius"
-
-#~ msgid "Maldives"
-#~ msgstr "Maledivy"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexiko"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malajsie"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibie"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Nov?? Kaledonie"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk?? ostrov"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nig??rie"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Nizozem??"
-
-#~ msgid "Norway"
-#~ msgstr "Norsko"
-
-#~ msgid "Nepal"
-#~ msgstr "Nep??l"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Nov?? Z??land"
-
-#~ msgid "Oman"
-#~ msgstr "Om??n"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Francouzsk?? Polyn??sie"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Nov?? Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filip??ny"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakist??n"
-
-#~ msgid "Poland"
-#~ msgstr "Polsko"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint-Pierre a Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugalsko"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay "
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "R??union"
-
-#~ msgid "Romania"
-#~ msgstr "Rumunsko"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Rusko"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudsk?? Ar??bie"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomonovy ostrovy"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
-
-#~ msgid "Sudan"
-#~ msgstr "S??d??n"
-
-#~ msgid "Sweden"
-#~ msgstr "??v??dsko"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Svat?? Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovinsko"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "??picberky a Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovensko"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Som??lsko"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome a Principe"
-
-#~ msgid "El Salvador"
-#~ msgstr "Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "S??rie"
-
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
-
-#~ msgid "Chad"
-#~ msgstr "??ad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Francouzsk?? ji??n?? ??zem??"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thajsko"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tad??ikist??n"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenist??n"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisko"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "V??chodn?? Timor"
-
-#~ msgid "Turkey"
-#~ msgstr "Turecko"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad a Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Tchaj-wan"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzanie"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukrajina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Spojen?? st??ty Men???? odlehl?? ostrovy"
-
-#~ msgid "United States"
-#~ msgstr "Spojen?? St??ty"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekist??n"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Vatik??n"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Svat?? Vincenc a Grenadiny"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Britsk?? Panensk?? ostrovy"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Americk?? Panensk?? ostrovy"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis a Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Srbsko a ??ern?? Hora"
-
-#~ msgid "South Africa"
-#~ msgstr "Ji??n?? Afrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambie"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Demokratick?? republika Kongo"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoLocation"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Nelze inicializovat nepo????dek"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Nepoda??ilo se vytvo??it regul??rn?? v??raz: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Z??suvn??mu modulu GeoLocation se nepoda??ilo se zaregistrovat zobrazen?? "
-#~ "Okna zpr??vy"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Tento z??suvn?? modul poskytuje funk??nost GeoLocation pro Claws Mail.\n"
-#~ "\n"
-#~ "Varov??n??: Je technicky nemo??n?? ur??it lokalizaci odes??latele s jistou "
-#~ "d??vkou jistoty. V??sledek poskytovan?? z??suvn??m modulem je jen hrub?? odhad. "
-#~ "Zejm??na, spr??vci emailov??ch konferenc?? ??asto odstra??uj?? informace o "
-#~ "odes??lateli, tak??e maily z e-mailov??ch konferenc?? mohou b??t p??i??azeny k "
-#~ "um??st??n?? serveru nam??sto odes??latele.\n"
-#~ "Pokud si nejste jisti, nev????te v??sledk??m tohoto z??suvn??ho modulu a "
-#~ "nespol??hejte na tyto informace p??i rozvodu.\n"
-#~ "\n"
-#~ "Zp??tn?? vazba na <berndth at gmx.de> je v??t??na (ale pouze v p????pad??, ??e to "
-#~ "nen?? o man??elsk??ch h??dk??ch)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "GeoLocation integrace"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Z??suvn?? modul \"Upozor??ov??n??\": Nepoda??ilo se zapsat konfiguraci modoulu "
-#~ "do souboru\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Ulo??it odeslan?? zpr??vy do slo??ky Odeslan?? po??ta"
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail byl zaregistrov??n jako v??choz?? klient."
-
-#~ msgid "messages which contain header S"
-#~ msgstr "zpr??vy obsahuj??c?? z??hlav?? S"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Uchov?? 'To' adresy"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Uchov?? 'Cc' adresy"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Uchov?? 'Bcc' adresy"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Z??suvn?? modul GData: Autentizov??n\n"
-
-#~ msgid "slow"
-#~ msgstr "pomalu"
-
-#~ msgid "fast"
-#~ msgstr "rychle"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "??????ka banneru v pixelech (0 znamen?? velikost obrazovky)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Povolit vyskakovac?? okno"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Spr??vn?? podpis (ned??v??ryhodn??) od %s."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Nepoda??ilo se otev????t pomocn?? soubor"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Nepoda??ilo se inicializovat knihovnu libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Stahuji '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Po??kozen?? kan??l"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Pro RDF kan??ly nen?? stahov??n?? koment?????? podporov??no. Nepoda??ilo se "
-#~ "st??hnout koment????e pro '%s'."
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Form??t tohoto kan??lu zat??m nen?? podporov??n."
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld bajt"
-#~ msgstr[1] "%ld bajty"
-#~ msgstr[2] "%ld bajt??"
-
-#~ msgid "size unknown"
-#~ msgstr "nezn??m?? velikost"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Nepodarilo sa aktualizova?? kan??l %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Tento kan??l u?? odeb??r??te."
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nepoda??ilo se st??hnout URL '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Nepoda??ilo se st??hnout URL '%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Nepoda??ilo se p??ihl??sit k odb??ru kan??lu '%s'."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "??asov?? limit pro p??ipojen?? k URL %s vypr??el\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Nepoda??ilo se st??hnout URL %s\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Nepoda??ilo se zpracovat data z URL %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Nepodporovan?? typ kan??lu na URL %s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: Feed update zru??en, aplikace se ukon????.\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Nepoda??ilo se odstranit kan??l '%s'."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Aktualizovat _v??echny kan??ly"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "Odhl??sit kan??l..."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Odstranit strom slo??ek..."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Pou????t v??choz?? po??et ponech??van??ch star??ch zpr??v"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Po??et ponech??van??ch star??ch zpr??v:</b>\n"
-#~ "<small>(Vlo??te -1, pokud chcete ponechat v??echny star?? zpr??vy.)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Odhl????en?? kan??lu"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Opravdu chcete odhl??sit kan??l"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Odstranit lok??ln?? (offline) kopie zpr??v"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "V??choz?? interval aktualizace kan??lu (v minut??ch)"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "V??choz?? po??et star??ch zpr??v, kter?? budou ponech??ny"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Vlo??te -1, pokud chcete ponechat v??echny star?? zpr??vy"
-
-#~ msgid "Use this"
-#~ msgstr "Pou????t tento"
diff --git a/po/da.po b/po/da.po
index 7d33276..b2df8ff 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19192,60 +19192,3 @@ msgid ""
 msgstr ""
 "Claws Mail er nu klart til brug.\n"
 "Klik Gem for at begynde."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Aktiv??r sikker forbindelse til LDAP-server med SSL. Tjek konfigurationen "
-#~ "i ldap.conf (felterne TLS_CACERTDIR og TLS_REQCERT), hvis forbindelsen "
-#~ "mislykkes."
-
-#~ msgid "No TLS"
-#~ msgstr "Ingen TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registr??r Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Brug SSL ved POP3 forbindelser"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Brug SSL ved IMAP4 forbindelser"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Brug SSL ved NNTP forbindelser"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Brug SSL ved SMTP forbindelser"
-
-#~ msgid "Re_move"
-#~ msgstr "Fj_ern"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Anden mappe..."
-
-#~ msgid "minute(s)"
-#~ msgstr "minutter"
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Eksport af n??gler er ikke implementeret i Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "dage"
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatisk (anbefalet)"
-
-#~ msgid "Western European (ISO-8859-2)"
-#~ msgstr "Vesteurop??isk (ISO-8859-2"
diff --git a/po/el.po b/po/el.po
index 97cc7c4..dba771f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -20619,1428 +20619,3 @@ msgstr ""
 "???????? ???????????????? ???? ???????????????????? ???? Sylpheed-Claws.\n"
 "\n"
 "???????????????? ???????????????????? ?????? ???? ????????????????????."
-
-#~ msgid ""
-#~ "New messages will be checked in this order. Check the boxes\n"
-#~ "on the 'G' column to enable message retrieval by 'Get Mail'."
-#~ msgstr ""
-#~ "?? ?????????????? ?????? ?????? ???????????????? ???? ?????????? ???? ???????? ???? ??????????. ???????????????? ???? "
-#~ "????????????????\n"
-#~ "?????? ?????????? 'G' ?????? ???? ???????????????????????????? ???? ???????? ?????????????????? ???? ?????? ???????????? '???????? "
-#~ "????????'."
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?? ???????????? ?????? ???????? ???????????? ???? ????????????????????. ?? ???????????????????? ?????? ???????????????????????? "
-#~ "??????????????.\n"
-#~ "%s"
-
-#~ msgid "/_Book/New LDAP _Server"
-#~ msgstr "/_??????????????????/???????? ??????????????_???????? LDAP"
-
-#~ msgid "/_Book/---"
-#~ msgstr "/_??????????????????/---"
-
-#~ msgid "/_Book/_Save"
-#~ msgstr "/_??????????????????/_????????????????????"
-
-#~ msgid "/_Book/_Close"
-#~ msgstr "/_??????????????????/_????????????????"
-
-#~ msgid "/_Address"
-#~ msgstr "/_??????????????????"
-
-#~ msgid "/_Address/_Select all"
-#~ msgstr "/_??????????????????/????????_?????? ????????"
-
-#~ msgid "/_Address/---"
-#~ msgstr "/_??????????????????/---"
-
-#~ msgid "/_Address/C_ut"
-#~ msgstr "/_??????????????????/_??????????????"
-
-#~ msgid "/_Address/_Copy"
-#~ msgstr "/_??????????????????/??_????????????????"
-
-#~ msgid "/_Address/_Paste"
-#~ msgstr "/_??????????????????/??_??????????????????"
-
-#~ msgid "/_Address/_Edit"
-#~ msgstr "/_??????????????????/_??????????????????????"
-
-#~ msgid "/_Address/_Delete"
-#~ msgstr "/_??????????????????/_????????????????"
-
-#~ msgid "/_Address/New _Address"
-#~ msgstr "/_??????????????????/?????? ??_????????????????"
-
-#~ msgid "/_Address/New _Group"
-#~ msgstr "/_??????????????????/?????? ??_????????"
-
-#~ msgid "/_Address/_Mail To"
-#~ msgstr "/_??????????????????/???????????????? _??????????????????"
-
-#~ msgid "/_Tools/---"
-#~ msgstr "/_????????????????/---"
-
-#~ msgid "/_Help/_About"
-#~ msgstr "/_??????????????/_??????????????"
-
-#~ msgid "/---"
-#~ msgstr "/---"
-
-#~ msgid "No folder or message was selected."
-#~ msgstr "?????? ???????? ???????????????? ???????????? ?? ??????????????."
-
-#~ msgid ""
-#~ "Please select a folder to process from the folder\n"
-#~ "list. Alternatively, select one or messages from\n"
-#~ "the message list."
-#~ msgstr ""
-#~ "???????????????? ???????????????? ?????? ???????????? ?????? ?????????????????????? ?????? ????\n"
-#~ "?????????? ??????????????. ??????????????????????, ???????????????? ?????? ???????????? ??????\n"
-#~ "???? ?????????? ??????????????????."
-
-#~ msgid "protocol error\n"
-#~ msgstr "???????????? ??????????????????????\n"
-
-#~ msgid "Error occurred while posting\n"
-#~ msgstr "???????????????? ???????????? ???????? ?????? ????????????????\n"
-
-#~ msgid "Error occurred while sending command\n"
-#~ msgstr "???????????????? ???????????? ???????? ?????? ???????????????? ?????? ??????????????\n"
-
-#~ msgid ""
-#~ "  Owner: %s (%s) in %s\n"
-#~ "  Signed by: %s (%s) in %s\n"
-#~ "  Fingerprint: %s\n"
-#~ "  Signature status: %s"
-#~ msgstr ""
-#~ "  ????????????????????: %s (%s) ?????? %s\n"
-#~ "  ???????????????????? ??????: %s (%s) ?????? %s\n"
-#~ "  ??????????????????: %s\n"
-#~ "  ?????????????????? ??????????????????: %s"
-
-#~ msgid "Can't load X509 default paths"
-#~ msgstr "?????? ???????? ???????????? ?? ?????????????? ?????? ???????????????????????????? ?????????????????? ?????? X509"
-
-#~ msgid "%.1fKB"
-#~ msgstr "%.1fKB"
-
-#~ msgid "%.2fMB"
-#~ msgstr "%.2fMB"
-
-#~ msgid "/_Remove"
-#~ msgstr "/_????????????????"
-
-#~ msgid "/_Message/_Send"
-#~ msgstr "/_????????????/??_??????????????"
-
-#~ msgid "/_Message/Send _later"
-#~ msgstr "/_????????????/????????????_???? ????????????????"
-
-#~ msgid "/_Message/---"
-#~ msgstr "/_????????????/---"
-
-#~ msgid "/_Message/_Attach file"
-#~ msgstr "/_????????????/_?????????????????? ??????????????"
-
-#~ msgid "/_Message/_Insert file"
-#~ msgstr "/_????????????/??_?????????????? ??????????????"
-
-#~ msgid "/_Message/Insert si_gnature"
-#~ msgstr "/_????????????/???????????????? _??????????????????"
-
-#~ msgid "/_Message/_Save"
-#~ msgstr "/_????????????/_????????????????????"
-
-#~ msgid "/_Message/_Close"
-#~ msgstr "/_????????????/_????????????????"
-
-#~ msgid "/_Edit/_Undo"
-#~ msgstr "/_??????????????????????/????????????????"
-
-#~ msgid "/_Edit/_Redo"
-#~ msgstr "/_??????????????????????/??????????????????"
-
-#~ msgid "/_Edit/---"
-#~ msgstr "/_??????????????????????/---"
-
-#~ msgid "/_Edit/Cu_t"
-#~ msgstr "/_??????????????????????/??????????????"
-
-#~ msgid "/_Edit/_Copy"
-#~ msgstr "/_??????????????????????/??????????????????"
-
-#~ msgid "/_Edit/_Paste"
-#~ msgstr "/_??????????????????????/????????????????????"
-
-#~ msgid "/_Edit/Special paste/as _quotation"
-#~ msgstr "/_??????????????????????/???????????? ????????????????????/???? ????????????????"
-
-#~ msgid "/_Edit/Special paste/_wrapped"
-#~ msgstr "/_??????????????????????/???????????? ????????????????????/_????????????????????????"
-
-#~ msgid "/_Edit/Special paste/_unwrapped"
-#~ msgstr "/_??????????????????????/???????????? ????????????????????/?????? ????????????????????????"
-
-#~ msgid "/_Edit/Select _all"
-#~ msgstr "/_??????????????????????/?????????????? ????????"
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/_??????????????????????/????????????"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/_??????????????????????/????????????/???????????????? ??????????????"
-
-#~ msgid "/_Edit/A_dvanced/Delete entire line"
-#~ msgstr "/_??????????????????????/????????????/???????????????? ?????????????????? ??????????????"
-
-#~ msgid "/_Edit/_Find"
-#~ msgstr "/_??????????????????????/_????????????"
-
-#~ msgid "/_Edit/Wrap all long _lines"
-#~ msgstr "/_??????????????????????/???????????????????? ???????????? _??????????????"
-
-#~ msgid "/_Edit/Aut_o wrapping"
-#~ msgstr "/??????????????????????/???????????????? ????????????????????"
-
-#~ msgid "/_Edit/Edit with e_xternal editor"
-#~ msgstr "/_??????????????????????/?????????????????????? ???? ?????????????????? ??????????????????"
-
-#~ msgid "/_Spelling/---"
-#~ msgstr "/_????????????????????/---"
-
-#~ msgid "/_Spelling/Options"
-#~ msgstr "/_????????????????????/????????????????"
-
-#~ msgid "/_Options/Privacy System/None"
-#~ msgstr "/??_??????????????/?????????????????? ?????????????????? ??????????????????/????????????"
-
-#~ msgid "/_Options/Si_gn"
-#~ msgstr "/??_??????????????/_????????????????"
-
-#~ msgid "/_Options/---"
-#~ msgstr "/??_??????????????/---"
-
-#~ msgid "/_Options/Priority/_Highest"
-#~ msgstr "/??_??????????????/_??????????????????????????/??????????????????"
-
-#~ msgid "/_Options/Priority/Hi_gh"
-#~ msgstr "/??_??????????????/_??????????????????????????/??????????"
-
-#~ msgid "/_Options/Priority/_Normal"
-#~ msgstr "/??_??????????????/_??????????????????????????/????????????????"
-
-#~ msgid "/_Options/Priority/Lo_w"
-#~ msgstr "/??_??????????????/_??????????????????????????/????????????"
-
-#~ msgid "/_Options/Priority/_Lowest"
-#~ msgstr "/??_??????????????/_??????????????????????????/????????????????????"
-
-#~ msgid "/_Options/_Request Return Receipt"
-#~ msgstr "/??_??????????????/???????????????? ??????????????????"
-
-#~ msgid "/_Options/Character _encoding"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????"
-
-#~ msgid "/_Options/Character _encoding/_Automatic"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/_????????????????"
-
-#~ msgid "/_Options/Character _encoding/---"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/---"
-
-#~ msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/7bit ascii (US-ASC_II)"
-
-#~ msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/Unicode (_UTF-8)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? ?????????????? (ISO-8859-_1)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? ?????????????? (ISO-8859-15)"
-
-#~ msgid "/_Options/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/_????????????????/????_???????????????????? ????????????????????/?????????????? ?????????????? (Windows-1252)"
-
-#~ msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? ?????????????? (ISO-8859-_2)"
-
-#~ msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/_???????????????? (ISO-8859-13)"
-
-#~ msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????? (ISO-8859-_4)"
-
-#~ msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????? (ISO-8859-_7)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? (ISO-8859-_8)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? (Windows-1255)"
-
-#~ msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? (ISO-8859-_6)"
-
-#~ msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????? (Windows-1256)"
-
-#~ msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????? (ISO-8859-_9)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? (ISO-8859-_5)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? (KOI8-_R)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? (KOI8-U)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? (Windows-1251)"
-
-#~ msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????? (ISO-2022-_JP)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????????? ???????????????? (_GB2312)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????????? ???????????????? (GBK)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????????? ???????????????? (_Big5)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????????? ???????????????? (EUC-_TW)"
-
-#~ msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/?????????????????? (EUC-_KR)"
-
-#~ msgid "/_Options/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????????? (TIS-620)"
-
-#~ msgid "/_Options/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/??_??????????????/????_???????????????????? ????????????????????/???????????????????????? (Windows-874)"
-
-#~ msgid "/_Tools/_Address book"
-#~ msgstr "/_????????????????/_?????????????????? ??????????????????????"
-
-#~ msgid "/_Tools/_Template"
-#~ msgstr "/_????????????????/_??????????????"
-
-#~ msgid "/_Tools/Actio_ns"
-#~ msgstr "/_????????????????/??_????????????????"
-
-#~ msgid "Message reply/forward format error."
-#~ msgstr "???????????? ???????? ????????????????/???????????????? ?????? ??????????????????."
-
-#~ msgid "No account for posting news available!"
-#~ msgstr "?????? ?????????????? ?????????????????????? ?????? ???????????????? ?????????????????? ????????!"
-
-#~ msgid "Message Cc format error."
-#~ msgstr "???????????? ?????? ?????????? ?????? ???????????????????????? ?????? ??????????????????."
-
-#~ msgid "Message Bcc format error."
-#~ msgstr "???????????? ?????? ?????????? ?????? ???????????? ???????????????????????? ?????? ??????????????????."
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "??????????????: ???????????????? ?????? ???????????????????????????????? ??????????????????\n"
-
-# Untranslatable
-#~ msgid "/------trashsep"
-#~ msgstr "/------trashsep"
-
-# Untranslatable
-#~ msgid "/------queuesep"
-#~ msgstr "/------queuesep"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "???????????????????????? ??????????????..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "?????????????????????? ?????????????? %d ?????? %d..."
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "???????????????? ?????????????? %d ?????? %d..."
-
-#~ msgid "Page %N of %Q"
-#~ msgstr "???????????? %N ?????? %Q"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Sylpheed-Claws team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "?????? ?? ?????????? ?????????????????? ?????? Sylpheed-Claws"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "The Sylpheed-Claws Team\n"
-#~ msgstr "?? ?????????? ?????? Sylpheed-Claws\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Icons\n"
-#~ msgstr ""
-#~ "\n"
-#~ "??????????????????\n"
-
-#~ msgid ""
-#~ "This product includes software developed by the OpenSSL Project for use "
-#~ "in the OpenSSL Toolkit ("
-#~ msgstr ""
-#~ "???????? ???? ???????????? ???????????????????????? ?????????????????? ?????? ?????????????????????? ?????? ???? OpenSSL "
-#~ "Project ?????? ?????????? ?????? OpenSSL Toolkit ("
-
-#~ msgid ").\n"
-#~ msgstr ").\n"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "?????????????????? ???????????????? ??????????????????"
-
-#, fuzzy
-#~ msgid "Source Buffer"
-#~ msgstr "?????????????? Buffer"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "?????????????????????? GtkTextBuffer ?????? ????????????????"
-
-#~ msgid "Tabs Width"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "???????????? ???????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "???????????????????? ??????????????????????"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "???? ???? ?????????????? ???????????????? ?????? ???????????????? ???? ???????????????????? ????????????????"
-
-#~ msgid "Font"
-#~ msgstr "??????????????????????????"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr ""
-#~ "?????????????????????????? ?????? Gnome ?????? ???? ???????????????????????????? ?????? ?????????????? ?????? ???????????????? "
-#~ "(?????? ??????????????????)"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "?????????????????????????? ?????? ???? ???????????????????????????? ?????? ?????????????? ?????? ???????????????? (??.??. "
-#~ "\"Monospace 10\")"
-
-#~ msgid "Numbers Font"
-#~ msgstr "?????????????????????????? ??????????????"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr ""
-#~ "?????????? ???????????????????????????? Gnome ?????? ?????????? ?????????? ???????????????? ?????????????? (?????? "
-#~ "??????????????????)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "?????????????????? ???????????????????????????? ?????? ?????????? ?????????? ???????????????? ??????????????"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr ""
-#~ "???????????????? ?????? ?????????????????????? ?????????????? ?????????????? (???? 0 ?????? ???????????????????????? ??????????????)"
-
-#~ msgid "Print Header"
-#~ msgstr "?????????????????????? ??????????????????"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "?????? ???? ?????????????????????? ???????????????? ???? ???????? ????????????"
-
-#~ msgid "Print Footer"
-#~ msgstr "???????????????? ????????????????????"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "?????? ???? ?????????????????????? ?????????????????? ???? ???????? ????????????"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "?????????????????????????? ?????????????????? ?????? ????????????????????"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr ""
-#~ "?????????? ???????????????????????????? Gnome ?????? ?????????? ???????? ?????????????????? ?????? ???? ?????????????????? (???? "
-#~ "????????????????)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "?????????????????? ?????????????????? ?????? ????????????????????"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr "?????????????????????????? ?????????????????? ?????? ???????????????????? (??.??. \"Monospace 10\")"
-
-#~ msgid "Normal Mode"
-#~ msgstr "???????????????? ????????????????????"
-
-#~ msgid "Bad Spellers Mode"
-#~ msgstr "???????????????????? ?????????? ????????????????????"
-
-#~ msgid "Unknown suggestion mode."
-#~ msgstr "?????????????? ?????????????????? ??????????????????."
-
-#~ msgid "Change dictionary"
-#~ msgstr "???????????? ??????????????"
-
-#~ msgid "Protocol log"
-#~ msgstr "?????????????????? ??????????????????????"
-
-#~ msgid " Extended Symbols... "
-#~ msgstr " ???????????????????? ??????????????... "
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "?????????????? ?????????????????????????? SSL"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "?????????????? ?????????????????????????? SSL"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "???? ?????????????????????????? SSL ????????????"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "?????????????? ???? ?????? ???????????????????? IMAP4 %s...\n"
-
-#~ msgid "iconv cannot convert UTF-7 to %s\n"
-#~ msgstr "?????? ?????????? ???????????? ?? ?????????????????? ?????? UTF-7 ???? %s ?????? ???? iconv\n"
-
-#~ msgid "iconv cannot convert %s to UTF-7\n"
-#~ msgstr "?????? ?????????? ???????????? ?? ?????????????????? ?????? %s ???? UTF-7 ?????? ???? iconv\n"
-
-#~ msgid "iconv cannot convert UTF-8 to UTF-7\n"
-#~ msgstr "?????? ?????????? ???????????? ?? ?????????????????? ?????? UTF-8 ???? UTF-7 ?????? ???? iconv\n"
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "???? `%c' ?????? ???????????? ???? ?????????????????????????????????? ???? ?????????? ??????????????."
-
-#~ msgid "Error occurred while downloading messages in '%s'."
-#~ msgstr "???????????? ???????????? ???????? ?????? ???????? ?????????????????? ?????? '%s'."
-
-#~ msgid "Error reading LDIF fields."
-#~ msgstr "???????????? ???????? ?????? ???????????????? ?????? ???????????? LDIF."
-
-#~ msgid "???"
-#~ msgstr ";;;"
-
-#~ msgid "Connection failed."
-#~ msgstr "?? ?????????????? ??????????????."
-
-#~ msgid "1.0.5 or previous"
-#~ msgstr "1.0.5 ?? ??????????????????????"
-
-#~ msgid "1.9.15 or previous"
-#~ msgstr "1.9.15 ?? ??????????????????????"
-
-#~ msgid "Really quit?"
-#~ msgstr "????????????;"
-
-#~ msgid "Composing message exists."
-#~ msgstr "?????????????? ?????? ???????????? ?????? ??????????????."
-
-#~ msgid "_Save to Draft"
-#~ msgstr "???????????????????? ?????? _????????????????"
-
-#~ msgid "/_File/_Add mailbox"
-#~ msgstr "/_????????????/_???????????????? ????????????????????????????????"
-
-#~ msgid "/_File/_Add mailbox/MH..."
-#~ msgstr "/_????????????/_???????????????? ????????????????????????????????/MH..."
-
-#~ msgid "/_File/---"
-#~ msgstr "/_????????????/---"
-
-#~ msgid "/_File/_Import mbox file..."
-#~ msgstr "/_????????????/??_?????????????? ?????????????? mbox..."
-
-#~ msgid "/_File/_Export to mbox file..."
-#~ msgstr "/_????????????/_?????????????? ???? ???????????? mbox..."
-
-#~ msgid "/_File/_Save as..."
-#~ msgstr "/_????????????/???????????????????? _????..."
-
-#~ msgid "/_File/_Print..."
-#~ msgstr "/_????????????/????????_????????..."
-
-#~ msgid "/_File/_Work offline"
-#~ msgstr "/_????????????/?????????????? ?????????? ??????????????"
-
-#~ msgid "/_File/E_xit"
-#~ msgstr "/_????????????/??_??????????"
-
-#~ msgid "/_Edit/_Find in current message..."
-#~ msgstr "/_??????????????????????/????_???????? ?????? ???????????? ????????????..."
-
-#~ msgid "/_Edit/_Search folder..."
-#~ msgstr "/_??????????????????????/???????????? _?????? ????????????..."
-
-#~ msgid "/_View/Show or hi_de/_Folder tree"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/?????????? _??????????????"
-
-#~ msgid "/_View/Show or hi_de/_Message view"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/?????????????? _??????????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
-#~ msgstr ""
-#~ "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????/_?????????????? ???????? ?????? ???? "
-#~ "??????????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
-#~ msgstr ""
-#~ "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????/_?????????????? ?????????? ?????? ???? "
-#~ "??????????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????/???????? _??????????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Text only"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????/???????? _??????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Hide"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/_????????????????????????/_????????????????"
-
-#~ msgid "/_View/Show or hi_de/Status _bar"
-#~ msgstr "/_??????????????/???????????????? ?? ??_??????????????/_???????????? ????????????????????"
-
-#~ msgid "/_View/Set displayed _columns"
-#~ msgstr "/_??????????????/????_?????????? ?????????????????????????? ??????????????????"
-
-#~ msgid "/_View/Set displayed _columns/in _Folder list..."
-#~ msgstr "/_??????????????/????_?????????? ?????????????????????????? ??????????????????/?????? ?????????? _??????????????..."
-
-#~ msgid "/_View/Set displayed _columns/in _Message list..."
-#~ msgstr "/_??????????????/????_?????????? ?????????????????????????? ??????????????????/?????? ?????????? _??????????????????..."
-
-#~ msgid "/_View/---"
-#~ msgstr "/_??????????????/---"
-
-#~ msgid "/_View/Separate f_older tree"
-#~ msgstr "/_??????????????/???????????????????? ???????????? _??????????????"
-
-#~ msgid "/_View/Separate _message view"
-#~ msgstr "/_??????????????/???????????????????? ???????????????? _??????????????????"
-
-#~ msgid "/_View/_Sort"
-#~ msgstr "/_??????????????/_????????????????????"
-
-#~ msgid "/_View/_Sort/by _number"
-#~ msgstr "/_??????????????/_????????????????????/???????? _??????????????"
-
-#~ msgid "/_View/_Sort/by S_ize"
-#~ msgstr "/_??????????????/_????????????????????/???????? _??????????????"
-
-#~ msgid "/_View/_Sort/by _Date"
-#~ msgstr "/_??????????????/_????????????????????/???????? _????????????????????"
-
-#~ msgid "/_View/_Sort/by _From"
-#~ msgstr "/_??????????????/_????????????????????/???????? _??????????????????"
-
-#~ msgid "/_View/_Sort/by _To"
-#~ msgstr "/_??????????????/_????????????????????/???????? _??????????????????"
-
-#~ msgid "/_View/_Sort/by S_ubject"
-#~ msgstr "/_??????????????/_????????????????????/???????? _????????"
-
-#~ msgid "/_View/_Sort/by _color label"
-#~ msgstr "/_??????????????/_????????????????????/???????? ????_?????????????? ??????????????"
-
-#~ msgid "/_View/_Sort/by _mark"
-#~ msgstr "/_??????????????/_????????????????????/???????? _????????????????"
-
-#~ msgid "/_View/_Sort/by _status"
-#~ msgstr "/_??????????????/_????????????????????/???????? _??????????????????"
-
-#~ msgid "/_View/_Sort/by a_ttachment"
-#~ msgstr "/_??????????????/_????????????????????/???????? ??????_????????????"
-
-#~ msgid "/_View/_Sort/by score"
-#~ msgstr "/_??????????????/_????????????????????/???????? ????????????????????"
-
-#~ msgid "/_View/_Sort/by locked"
-#~ msgstr "/_??????????????/_????????????????????/???????? ????????????????"
-
-#~ msgid "/_View/_Sort/D_on't sort"
-#~ msgstr "/_??????????????/_????????????????????/??????_????????????????"
-
-#~ msgid "/_View/_Sort/---"
-#~ msgstr "/_??????????????/_????????????????????/---"
-
-#~ msgid "/_View/_Sort/Ascending"
-#~ msgstr "/_??????????????/_????????????????????/??????????????"
-
-#~ msgid "/_View/_Sort/Descending"
-#~ msgstr "/_??????????????/_????????????????????/????????????????"
-
-#~ msgid "/_View/_Go to/_Next message"
-#~ msgstr "/_??????????????/????????_????????/_?????????????? ????????????"
-
-#~ msgid "/_View/_Go to/---"
-#~ msgstr "/_??????????????/????????_????????/---"
-
-#~ msgid "/_View/_Go to/P_revious unread message"
-#~ msgstr "/_??????????????/????????_????????/??_???????????????????? ???? ?????????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/N_ext unread message"
-#~ msgstr "/_??????????????/????????_????????/?????????????? ???? ?????????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/Ne_xt new message"
-#~ msgstr "/_??????????????/????????_????????/?????????????? ?????? ????????????"
-
-#~ msgid "/_View/_Go to/Next m_arked message"
-#~ msgstr "/_??????????????/????????_????????/?????????????? ???????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/Next la_beled message"
-#~ msgstr "/_??????????????/????????_????????/?????????????? ???????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/_Other folder..."
-#~ msgstr "/_??????????????/????????_????????/??_?????? ????????????..."
-
-#~ msgid "/_View/Character _encoding/---"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/---"
-
-#~ msgid "/_View/Character _encoding/_Auto detect"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/_???????????????? ????????????????????"
-
-#~ msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/7bit ascii (US-ASC_II)"
-
-#~ msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/Unicode (_UTF-8)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? ?????????????? (ISO-8859-_1)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? ?????????????? (ISO-8859-15)"
-
-#~ msgid "/_View/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? ?????????????? (Windows-1252)"
-
-#~ msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? ?????????????? (ISO-8859-_2)"
-
-#~ msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/_???????????????? (ISO-8859-13)"
-
-#~ msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????? (ISO-8859-_4)"
-
-#~ msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????? (ISO-8859-_7)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? (ISO-8859-_8)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? (Windows-1255)"
-
-#~ msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? (ISO-8859-_6)"
-
-#~ msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????? (Windows-1256)"
-
-#~ msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????? (ISO-8859-_9)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (ISO-8859-_5)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (KOI8-_R)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (KOI8-U)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (Windows-1251)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????? (ISO-2022-_JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????? (ISO-2022-JP-2)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????? (_EUC-JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????? (_Shift__JIS)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????????? ???????????????? (_GB2312)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????????? ???????????????? (GBK)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????????? ???????????????? (_Big5)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????????? ???????????????? (EUC-_TW)"
-
-#~ msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????? (ISO-2022-_CN)"
-
-#~ msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (EUC-_KR)"
-
-#~ msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/?????????????????? (ISO-2022-KR)"
-
-#~ msgid "/_View/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????????? (TIS-620)"
-
-#~ msgid "/_View/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/_??????????????/???????????????????????? _????????????????????/???????????????????????? (Windows-874)"
-
-#~ msgid "/_View/Decode/---"
-#~ msgstr "/_??????????????/??????????????????????????????/---"
-
-#~ msgid "/_View/Decode/_8bit"
-#~ msgstr "/_??????????????/??????????????????????????????/_8bit"
-
-#~ msgid "/_View/Decode/_Quoted printable"
-#~ msgstr "/_??????????????/??????????????????????????????//_Quoted printable"
-
-#~ msgid "/_View/Decode/_Base64"
-#~ msgstr "/_??????????????/??????????????????????????????/_Base64"
-
-#~ msgid "/_View/Decode/_Uuencode"
-#~ msgstr "/_??????????????/??????????????????????????????/_Uuencode"
-
-#~ msgid "/_View/Show all headers"
-#~ msgstr "/_??????????????/???????????????? ???????? ?????? ??????????????????"
-
-#~ msgid "/_Message/Recei_ve"
-#~ msgstr "/_????????????/_????????"
-
-#~ msgid "/_Message/Recei_ve/---"
-#~ msgstr "/_????????????/_????????/---"
-
-#~ msgid "/_Message/_Send queued messages"
-#~ msgstr "/_????????????/???????????????? ?????????????????? ???????? _????????"
-
-#~ msgid "/_Message/Compose a news message"
-#~ msgstr "/_????????????/?????????????? ?????????????????? ????????"
-
-#~ msgid "/_Message/_Reply"
-#~ msgstr "/_????????????/??_??????????????"
-
-#~ msgid "/_Message/Repl_y to"
-#~ msgstr "/_????????????/???????????????? _????"
-
-#~ msgid "/_Message/Repl_y to/_all"
-#~ msgstr "/_????????????/???????????????? _????/????_??????"
-
-#~ msgid "/_Message/Repl_y to/_sender"
-#~ msgstr "/_????????????/???????????????? _????/_??????????????????"
-
-#~ msgid "/_Message/Repl_y to/mailing _list"
-#~ msgstr "/_????????????/???????????????? _????/_?????????? ??????????????????????????"
-
-#~ msgid "/_Message/_Forward"
-#~ msgstr "/_????????????/_????????????????"
-
-#~ msgid "/_Message/For_ward as attachment"
-#~ msgstr "/_????????????/??_?????????????? ???? ??????????????????"
-
-#~ msgid "/_Message/Redirect"
-#~ msgstr "/_????????????/??????????????????????"
-
-#~ msgid "/_Message/Mailing-_List/Post"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/????????????????"
-
-#~ msgid "/_Message/Mailing-_List/Help"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/??????????????"
-
-#~ msgid "/_Message/Mailing-_List/Subscribe"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/??????????????"
-
-#~ msgid "/_Message/Mailing-_List/Unsubscribe"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/????????????????"
-
-#~ msgid "/_Message/Mailing-_List/View archive"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/?????????????? ??????????????"
-
-#~ msgid "/_Message/Mailing-_List/Contact owner"
-#~ msgstr "/_????????????/_?????????? ??????????????????????????/?????????????????????? ???? ????????????"
-
-#~ msgid "/_Message/M_ove..."
-#~ msgstr "/_????????????/_????????????????????..."
-
-#~ msgid "/_Message/_Copy..."
-#~ msgstr "/_????????????/_??????????????????..."
-
-#~ msgid "/_Message/Move to _trash"
-#~ msgstr "/_????????????/????????_???????????? ?????? ??????????????????????"
-
-#~ msgid "/_Message/_Delete..."
-#~ msgstr "/_????????????/_????????????????..."
-
-#~ msgid "/_Message/_Mark"
-#~ msgstr "/_????????????/??_??????????????"
-
-#~ msgid "/_Message/_Mark/_Mark"
-#~ msgstr "/_????????????/??_??????????????/??_??????????????"
-
-#~ msgid "/_Message/_Mark/_Unmark"
-#~ msgstr "/_????????????/??_??????????????/_???????????????? ??????????????????"
-
-#~ msgid "/_Message/_Mark/---"
-#~ msgstr "/_????????????/??_??????????????/---"
-
-#~ msgid "/_Message/_Mark/Mark as unr_ead"
-#~ msgstr "/_????????????/??_??????????????/???? _???? ??????????????????????"
-
-#~ msgid "/_Message/_Mark/Mark as rea_d"
-#~ msgstr "/_????????????/??_??????????????/???? _??????????????????????"
-
-#~ msgid "/_Message/_Mark/Mark all _read"
-#~ msgstr "/_????????????/??_??????????????/??_?????? ???? ??????????????????????"
-
-#~ msgid "/_Message/_Mark/Mark as _spam"
-#~ msgstr "/_????????????/??_??????????????/_?????????????????????? ????????????????????????"
-
-#~ msgid "/_Message/_Mark/Mark as _ham"
-#~ msgstr "/_????????????/??_??????????????/_?????????????????? ????????????????????????"
-
-#~ msgid "/_Message/Color la_bel"
-#~ msgstr "/_????????????/_?????????????????? ??????????????"
-
-#~ msgid "/_Tools/_Address book..."
-#~ msgstr "/_????????????????/_?????????????????? ??????????????????????..."
-
-#~ msgid "/_Tools/Add sender to address boo_k"
-#~ msgstr "/_????????????????/???????????????? ?????????????????? ?????? ?????????????????? _??????????????????????"
-
-#~ msgid "/_Tools/_Harvest addresses"
-#~ msgstr "/_????????????????/_?????????????? ??????????????????????"
-
-#~ msgid "/_Tools/_Harvest addresses/from _Folder..."
-#~ msgstr "/_????????????????/_?????????????? ??????????????????????/?????? _????????????..."
-
-#~ msgid "/_Tools/_Harvest addresses/from _Messages..."
-#~ msgstr "/_????????????????/_?????????????? ??????????????????????/?????? _????????????????..."
-
-#~ msgid "/_Tools/_Create filter rule"
-#~ msgstr "/_????????????????/????_???????????????? ??????????????"
-
-#~ msgid "/_Tools/_Create filter rule/_Automatically"
-#~ msgstr "/_????????????????/????_???????????????? ??????????????/_????????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _From"
-#~ msgstr "/_????????????????/????_???????????????? ??????????????/?????? ?????? ??????_????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _To"
-#~ msgstr "/_????????????????/????_???????????????? ??????????????/?????? ???????? _????????????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _Subject"
-#~ msgstr "/_????????????????/????_???????????????? ??????????????/?????? ???? _????????"
-
-#~ msgid "/_Tools/C_reate processing rule"
-#~ msgstr "/_????????????????/???????????????????? _???????????? ????????????????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/_Automatically"
-#~ msgstr "/_????????????????/???????????????????? _???????????? ????????????????????????/_????????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _From"
-#~ msgstr "/_????????????????/???????????????????? _???????????? ????????????????????????/?????? ?????? ??????_????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _To"
-#~ msgstr "/_????????????????/???????????????????? _???????????? ????????????????????????/?????? ???????? _????????????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _Subject"
-#~ msgstr "/_????????????????/???????????????????? _???????????? ????????????????????????/?????? ???? _????????"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In selected folder"
-#~ msgstr "/_????????????????/???????????????? ??_?????????? ??????????????????/???????? ???????????????????? ????????????"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In all folders"
-#~ msgstr "/_????????????????/???????????????? ??_?????????? ??????????????????/???? ?????????? ???????? ????????????????"
-
-#~ msgid "/_Tools/E_xecute"
-#~ msgstr "/_????????????????/????????_????????"
-
-#~ msgid "/_Tools/SSL cer_tificates..."
-#~ msgstr "/_????????????????/??????_???????????????????? SSL..."
-
-#~ msgid "/_Tools/_Log window"
-#~ msgstr "/_????????????????/????_???????????? ????????????????????"
-
-#~ msgid "/_Configuration/_Edit accounts..."
-#~ msgstr "/_??????????????????/_?????????????????????? ??????????????????????..."
-
-#~ msgid "/_Configuration/---"
-#~ msgstr "/_??????????????????/---"
-
-#~ msgid "/_Configuration/P_references..."
-#~ msgstr "/_??????????????????/_??????????????????????..."
-
-#~ msgid "/_Configuration/_Filtering..."
-#~ msgstr "/_??????????????????/_????????????..."
-
-#~ msgid "/_Configuration/_Templates..."
-#~ msgstr "/_??????????????????/??_????????????..."
-
-#~ msgid "/_Configuration/_Actions..."
-#~ msgstr "/_??????????????????/????????????_??????..."
-
-#~ msgid "/_Configuration/Plu_gins..."
-#~ msgstr "/_??????????????????/????????_????????..."
-
-#~ msgid "/_Help/Icon _Legend"
-#~ msgstr "/_??????????????/_?????????????????? ????????????????????"
-
-#~ msgid "/_Help/---"
-#~ msgstr "/_??????????????/---"
-
-#~ msgid "not initialized\n"
-#~ msgstr "?????? ???????? ??????????????????????????\n"
-
-#~ msgid "selecting folder '%s'\n"
-#~ msgstr "?????????????? ?????????????? '%s'\n"
-
-#~ msgid "/_File/_Close"
-#~ msgstr "/_????????????/_????????????????"
-
-#~ msgid "/_Message/Compose _new message"
-#~ msgstr "/_????????????/?????????????? _???????? ??????????????????"
-
-#~ msgid "/_Message/Redirec_t"
-#~ msgstr "/_????????????/??????????_????????????"
-
-#~ msgid "/_Tools/Create processing rule"
-#~ msgstr "/_????????????????/???????????????????? ???????????? ????????????????????????"
-
-#~ msgid "/_Tools/Create processing rule/_Automatically"
-#~ msgstr "/_????????????????/???????????????????? ???????????? ????????????????????????/_????????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _From"
-#~ msgstr "/_????????????????/???????????????????? ???????????? ????????????????????????/?????? ?????? ??????_????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _To"
-#~ msgstr "/_????????????????/???????????????????? ???????????? ????????????????????????/?????? ?????? _??????????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _Subject"
-#~ msgstr "/_????????????????/???????????????????? ???????????? ????????????????????????/?????? ???? _????????"
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "???????????????? ?????? ???????????? ?????????????? ?????? ?????? ????????????????:\n"
-#~ "(???? '%s' ???? ???????????????????????????? ???? ???? ?????????? ??????????????)"
-
-#~ msgid ""
-#~ "Print command line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "?? ???????????? ?????????????????? ?????????? ??????????:\n"
-#~ "'%s'"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "?????????????????? NNTP ?????????????? ?????? %s:%d ...\n"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "?????? ???????? ???????????? ?? ???????? ?????? ???????????? ???????????? ????????????????????\n"
-
-#~ msgid "can't post article.\n"
-#~ msgstr "?????? ?????????? ???? ???????????? ???? ??????????.\n"
-
-#~ msgid "can't retrieve article %d\n"
-#~ msgstr "?????? ?????????? ???? ???????? ???? ?????????? %d\n"
-
-#, fuzzy
-#~ msgid "getting xover %d in %s...\n"
-#~ msgstr "???? ?????????????????? ?????????? ???? ??????????"
-
-#~ msgid "error occurred while getting xover.\n"
-#~ msgstr "???????????? ???????????? ?????????? ?????????????? xover.\n"
-
-#~ msgid "error occurred while getting xhdr.\n"
-#~ msgstr "???????????? ???????????? ?????????? ?????????????? xhdr.\n"
-
-#~ msgid "Scan archive contents"
-#~ msgstr "?????????????? ???????????????????????? ??????????????"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "???????????????????? ?????????????????????? Dillo"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "???????????????????? ???? ?????? ?????????????? '--local' ?????? Dillo"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "???????????????????? ?????????????? ?????????????????? (???????????????? ?????????????????? ??????????????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "???????????????????? ???? ?????? ?????????????? '--fullwindow' ?????? Dillo"
-
-#~ msgid "Please select key for '%s'"
-#~ msgstr "???????????????? ???????????????? ?????? ???????????? ?????? ???? '%s'"
-
-#~ msgid "kB"
-#~ msgstr "kB"
-
-#~ msgid "/E_xit Sylpheed-Claws"
-#~ msgstr "/??_?????????? ?????? ???? Sylpheed-Claws"
-
-#~ msgid "/Work Offline"
-#~ msgstr "/?????????????? ?????????? ??????????????"
-
-#~ msgid "/Get Mail"
-#~ msgstr "/???????? ??????????????????????????"
-
-#~ msgid "Exit this program?"
-#~ msgstr "???????????? ?????? ???? ??????????????????;"
-
-#~ msgid "Orientation"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "_Basic"
-#~ msgstr "_????????????"
-
-#~ msgid "Co_mpose"
-#~ msgstr "????_??????????"
-
-#~ msgid "SS_L"
-#~ msgstr "SS_L"
-
-#~ msgid "Download all messages on server"
-#~ msgstr "???????? ???????? ?????? ?????????????????? ?????? ?????? ????????????????????"
-
-#~ msgid " Edit... "
-#~ msgstr " ??????????????????????... "
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "???????????????? ???????????????? ??????????????????"
-
-#~ msgid "Unsupported (%s)"
-#~ msgstr "???? ???????????????????????????? (%s)"
-
-#~ msgid "Replace"
-#~ msgstr "??????????????????????????"
-
-#~ msgid "Info ..."
-#~ msgstr "?????????????????????? ..."
-
-#~ msgid "Ask whether to insert or attach"
-#~ msgstr "?????????????? ?????? ???????????????? ?? ??????????????????"
-
-#~ msgid "Always insert"
-#~ msgstr "???? ?????????????? ?????????? ????????????????"
-
-#~ msgid "Always attach"
-#~ msgstr "???? ?????????????? ?????????? ??????????????????"
-
-#~ msgid "Audio player"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Print command"
-#~ msgstr "???????????? ??????????????????"
-
-#~ msgid "Condition: "
-#~ msgstr "??????????????????: "
-
-#~ msgid "Default To: "
-#~ msgstr "?????????????????????????? ????????: "
-
-#~ msgid "Default dictionary: "
-#~ msgstr "?????????????????????????? ????????????: "
-
-#, fuzzy
-#~ msgid "Unread flag"
-#~ msgstr "?????????????????? ??????????????"
-
-#, fuzzy
-#~ msgid "Marked flag"
-#~ msgstr "???????????? ??????????????????"
-
-#, fuzzy
-#~ msgid "Forwarded flag"
-#~ msgstr "?????????????????? ??????????????"
-
-#, fuzzy
-#~ msgid "Locked flag"
-#~ msgstr "?????????????????? ??????????????"
-
-#~ msgid "Score greater than"
-#~ msgstr "???????? ???????????????????? ??????"
-
-#~ msgid "Score equal to"
-#~ msgstr "???????? ?????? ????"
-
-#~ msgid "Test"
-#~ msgstr "????????????"
-
-#~ msgid "or"
-#~ msgstr "??"
-
-#~ msgid " Info... "
-#~ msgstr " ??????????????????????... "
-
-#~ msgid "Predicate"
-#~ msgstr "????????????????"
-
-#, fuzzy
-#~ msgid "Boolean Op"
-#~ msgstr "???????? Boolean "
-
-#~ msgid "Pick color for 'color %d' "
-#~ msgstr "?????????????? ???????? ???????????????? ?????? ???? 'color %d' "
-
-#~ msgid "Pick color for 1st level text "
-#~ msgstr "?????????????? ???????????????? ???????????????? ???????????? ???????????????? "
-
-#~ msgid "Pick color for 2nd level text "
-#~ msgstr "?????????????? ???????????????? ???????????????? ???????????????? ???????????????? "
-
-#~ msgid "Pick color for 3rd level text "
-#~ msgstr "?????????????? ???????????????? ???????????????? ???????????? ???????????????? "
-
-#~ msgid "Pick color for 1st level text background "
-#~ msgstr "?????????????? ???????????????? ?????????????????????? ???????????? ???????????????? "
-
-#~ msgid "Pick color for 2nd level text background "
-#~ msgstr "?????????????? ???????????????? ?????????????????????? ???????????????? ???????????????? "
-
-#~ msgid "Pick color for 3rd level text background "
-#~ msgstr "?????????????? ???????????????? ?????????????????????? ???????????? ???????????????? "
-
-#~ msgid "Pick color for links "
-#~ msgstr "?????????????? ???????????????? ?????? ???????? ???????????????????? "
-
-#~ msgid "Pick color for signatures "
-#~ msgstr "?????????????? ???????????????? ?????????????????? "
-
-#~ msgid "Clip the log size"
-#~ msgstr "?????????????????????? ???????????????? ?????????????? ????????????????????"
-
-#~ msgid "Log window length"
-#~ msgstr "?????????????? ?????? ?????????????????? ????????????????????"
-
-#~ msgid "Reply format"
-#~ msgstr "?????????? ??????????????????"
-
-#~ msgid "Forward format"
-#~ msgstr "?????????? ??????????????????"
-
-#~ msgid " Description of symbols... "
-#~ msgstr " ?????????????????? ????????????????... "
-
-#~ msgid "Quotation characters"
-#~ msgstr "???????????????????? ??????????????????"
-
-#~ msgid "Quoting"
-#~ msgstr "????????????????"
-
-#~ msgid "Automatically check for new mail"
-#~ msgstr "?????????????? ?????? ?????? ????????????????"
-
-#~ msgid "every"
-#~ msgstr "????????"
-
-#~ msgid "Dictionary path"
-#~ msgstr "???????????????? ??????????????"
-
-#~ msgid "Automatic spelling"
-#~ msgstr "?????????????????? ??????????????"
-
-#, fuzzy
-#~ msgid "Select key bindings"
-#~ msgstr "???????????????????? ?????????????????? ????????????????."
-
-#~ msgid "Old Sylpheed"
-#~ msgstr "?????????? Sylpheed"
-
-#~ msgid "Messages will be marked until execution if this is turned off"
-#~ msgstr ""
-#~ "???? ???????????????? ???? ???????????????????? ?????????? ?????? ???????????????? ???? ???????? ?????????? ??????????????????????????"
-
-#~ msgid "Select first unread (or new or marked) message"
-#~ msgstr "?????????????? ???????????? ???????????????????? (?? ????????) ??????????????????"
-
-#~ msgid "Select first unread (or marked or new) message"
-#~ msgstr "?????????????? ???????????? ???????????????????? (?? ??????????????????????) ??????????????????"
-
-#~ msgid "Select first new (or unread or marked) message"
-#~ msgstr "?????????????? ???????????? ???????? (?? ????????????????????) ??????????????????"
-
-#~ msgid "Select first new (or marked or unread) message"
-#~ msgstr "?????????????? ???????????? ???????? (?? ??????????????????????) ??????????????????"
-
-#~ msgid "Select first marked (or new or unread) message"
-#~ msgstr "?????????????? ???????????? ?????????????????????? (?? ????????) ??????????????????"
-
-#~ msgid "Select first marked (or unread or new) message"
-#~ msgstr "?????????????? ???????????? ?????????????????????? (?? ????????????????????) ??????????????????"
-
-#~ msgid " Set key bindings... "
-#~ msgstr " ?????????????? ???????????????????????? ??????????????????????????... "
-
-#~ msgid "Template name"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid " Symbols... "
-#~ msgstr " ??????????????... "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "?????????????? ?????? ???????????? ??????????????????????????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "?????????????? ?????? ?????????????????????????? ????????????????"
-
-#, fuzzy
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "?????????????????? ???????????? ?????? ???????????? ??????????????????"
-
-#~ msgid "Sylpheed-Claws Action"
-#~ msgstr "?????????????????? ?????? Sylpheed-Claws"
-
-#~ msgid "Available toolbar icons"
-#~ msgstr "?????????????????? ?????????????????? ?????????????? ??????????????????"
-
-#~ msgid "Displayed toolbar items"
-#~ msgstr "???????????????????????? ??????????????????????"
-
-#~ msgid "Customize Toolbars"
-#~ msgstr "??????????????????????????"
-
-#~ msgid "Wrap messages at"
-#~ msgstr "???????????????????? ?????????????????? ??????????"
-
-#~ msgid "Already trying to send\n"
-#~ msgstr "?????????????? ?????? ????????????????\n"
-
-#~ msgid "linefeed"
-#~ msgstr "???????????? ??????????????"
-
-#~ msgid "/Repl_y to/_all"
-#~ msgstr "/??????????_?????? ????/_??????????"
-
-#~ msgid "/Repl_y to/_sender"
-#~ msgstr "/??????????_?????? ????/_??????????????????"
-
-#~ msgid "/Redirect"
-#~ msgstr "/??????????????????????"
-
-#~ msgid "/_Mark/_Mark"
-#~ msgstr "/????_????????????/????_????????????"
-
-#~ msgid "/_Mark/_Unmark"
-#~ msgstr "/????_????????????/_???????????????? ??????????????????"
-
-#~ msgid "/_Mark/---"
-#~ msgstr "/????_????????????/---"
-
-#~ msgid "/_Mark/Mark as unr_ead"
-#~ msgstr "/????_????????????/_???? ???? ??????????????????????"
-
-#~ msgid "/_Mark/Mark as rea_d"
-#~ msgstr "/????_????????????/???? ????????_??????????????"
-
-#~ msgid "/_Mark/Mark all read"
-#~ msgstr "/????_????????????/???????? ???? ??????????????????????"
-
-#~ msgid "/_Mark/Ignore thread"
-#~ msgstr "/????_????????????/?????????????? ??????????????"
-
-#~ msgid "/_Mark/Unignore thread"
-#~ msgstr "/????_????????????/?????????????? ???????????????? ??????????????"
-
-#~ msgid "/_Mark/Lock"
-#~ msgstr "/????_????????????/????????????????"
-
-#~ msgid "/_Mark/Unlock"
-#~ msgstr "/????_????????????/????????????????????"
-
-#~ msgid "/Create f_ilter rule/_Automatically"
-#~ msgstr "/???????????????????? _??????????????/_????????????????"
-
-#~ msgid "/Create f_ilter rule/by _From"
-#~ msgstr "/???????????????????? _??????????????/?????? ?????? ??????_????????????"
-
-#~ msgid "/Create f_ilter rule/by _To"
-#~ msgstr "/???????????????????? _??????????????/?????? ?????? _??????????????????"
-
-#~ msgid "/Create f_ilter rule/by _Subject"
-#~ msgstr "/???????????????????? _??????????????/?????? ???? _????????"
-
-#~ msgid "/Create processing rule/_Automatically"
-#~ msgstr "/???????????????????? ???????????? ????????????????????????/_????????????????"
-
-#~ msgid "/Create processing rule/by _From"
-#~ msgstr "/???????????????????? ???????????? ????????????????????????/?????? ?????? ??????_????????????"
-
-#~ msgid "/Create processing rule/by _To"
-#~ msgstr "/???????????????????? ???????????? ????????????????????????/?????? ?????? _??????????????????"
-
-#~ msgid "/Create processing rule/by _Subject"
-#~ msgstr "/???????????????????? ???????????? ????????????????????????/?????? ???? _????????"
-
-#~ msgid "/_View/_Source"
-#~ msgstr "/??????_????????/?????????????? _????????????"
-
-#~ msgid "/_View/All _header"
-#~ msgstr "/??????_????????/??_?????? ?????? ??????????????????"
-
-#~ msgid " items selected"
-#~ msgstr " ???????????????????? ??????????????????????"
-
-#~ msgid " (Shortcut key: 't')\n"
-#~ msgstr " (?????????????? ??????????????????????: 't')\n"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (?????????????? ??????????????????????: 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')\n"
-#~ msgstr " (?????????????? ??????????????????????: 'o')\n"
-
-#~ msgid "/Reply to all with _quote"
-#~ msgstr "/???????????????? ???? ?????????? ???? _????????????????"
-
-#~ msgid "/_Reply to all without quote"
-#~ msgstr "/_???????????????? ???? ?????????? ?????????? ????????????????"
-
-#~ msgid "/Reply to list with _quote"
-#~ msgstr "/???????????????? ?????? ?????????? ???? _????????????????"
-
-#~ msgid "/_Reply to list without quote"
-#~ msgstr "/_???????????????? ?????? ?????????? ?????????? ????????????????"
-
-#~ msgid "/Reply to sender with _quote"
-#~ msgstr "/???????????????? ???????? ?????????????????? ???? _????????????????"
-
-#~ msgid "/_Reply to sender without quote"
-#~ msgstr "/_???????????????? ???????? ?????????????????? ?????????? ????????????????"
-
-#~ msgid "Sylpheed-Claws Team"
-#~ msgstr "?? ?????????? ?????? Sylpheed-Claws"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as reception)</span>"
-#~ msgstr ""
-#~ "?????????????? SMTP:\n"
-#~ "<span size=\"small\">(???????????? ???? ???????? ?????? ???? ???????????????????????????? ???? ???????? ???? ?????? "
-#~ "??????????)</span>"
-
-#~ msgid "Welcome to Sylpheed-Claws"
-#~ msgstr "?????????? ???????????? ?????? Sylpheed-Claws"
-
-#~ msgid "Security"
-#~ msgstr "????????????????"
diff --git a/po/en_GB.po b/po/en_GB.po
index fdd3b45..8de3cb7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -17956,13 +17956,3 @@ msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Move deleted mails to wastebin and expunge immediately"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Moves deleted mails to wastebin instead of using the \\Deleted flag "
-#~ "without expunging."
diff --git a/po/eo.po b/po/eo.po
index ad823ef..3a30edf 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -19961,339 +19961,3 @@ msgid ""
 msgstr ""
 "Claws Mail nun estas preta.\n"
 "Alklaku Konservu por komenci."
-
-#~ msgid "E-mail client"
-#~ msgstr "Retpo??tilo"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Malpeza kaj rapida GTK+-bazita retpo??tilo"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "malpeza;rapida;grafika fasono;etendebla;kromprogramo;pop;pop3;imap;imap4;"
-#~ "nntp;news;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail estas rapida, potenca kaj ja etendebla retpo??tilo."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "Estas ja agordebla kaj traktas cent miloj da repo??toj facile. Mesa??oj "
-#~ "estas mastrumataj je malferma aran??o, sed estas facile interagi kun ili."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "Multo da plua kapableco estas provizata de kromprogramoj, kiel PGP "
-#~ "subskriboj kaj en??ifrado, RSS-fluo. kalendaro, potenca trudfiltrado, Perl "
-#~ "kaj Pitona interagaj, HTML kaj PDF prezento, kaj pli."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr "Ebligas retpo??tan avizon pere de LED-oj ??e kelkaj tekkomputiloj"
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr ""
-#~ "Permesas konservi elirantajn adresojn al titolita dosierujo en la "
-#~ "adreslibro"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "Permesas fari tar a?? zip arojn da malnovaj dosierujoj"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "Permesas vin forpreni alglua??ojn de retpo??toj"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr ""
-#~ "Avertas kiam mesa??o menciante alglua??on en mesa??a korpo sen algluante "
-#~ "iujn ajn dosierojn"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "Ebligas skanadon de eniranta repo??to ricevita de POP, IMAP a?? LOKA konto "
-#~ "uzante Bogofilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "Kontrolu ??iujn mesa??ojn kiuj estis ricevitaj de IMAP, LOKA a?? POP konto "
-#~ "por truda??oj uzante Bsfilter "
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "Skanas ??iujn mesa??ojn kiuj estis ricevitaj de IMAP, LOKA a?? POP konto "
-#~ "uzante clamd (Clam AV)."
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr "Prezentas HTML retpo??ton uzante la WebKit bibliotekon"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "Enmetas ??apojn enhavante: UIDL, ;a kontnomo de Claws, POP servilo, uzanta "
-#~ "identeco kaj riceva horo"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Liveras interfacon al Guglaj servoj"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Liveras Geolokan kapablon"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr ""
-#~ "Montras libravatarajn/gravatarajn profilajn bildojn a?? dinamike generita "
-#~ "a?? anta??difinita alternativo"
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Rekta subteno por po??tkestoj en mbox aran??o"
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr ""
-#~ "Skribas mesa??an ??apan resumon al protokola dosiero je alveno de nova "
-#~ "retpo??to post ordigo"
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Liveras diversajn manierojn por avizi la uzanto de nova kaj nelegita "
-#~ "retpo??to"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "Ebligas la vidon de PDF kaj Postskriptan alglua??ojn uzante la Poppler "
-#~ "biblioteko kaj Ghostscript"
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr "Permesas la plenan potencon de Perl en retpo??taj filtriloj"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "Traktas kernajn PGP funkciojn kaj dependas de kaj PGP/enlinia kaj PGP/"
-#~ "MIME kromprogramoj."
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Traktas PGP/enlinian subskribitan kaj/a?? en??ifritaj retpo??toj"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Traktas PGP/MIME subskribitaj kaj/a?? en??ifritaj retpo??toj"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Liveras Pitonan skriptadon. Kodo povas esti enmetita en enkorpigitan "
-#~ "Pitonan konzolon a?? enmemorigita"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "Legu viajn RSS plej??atatajn fluojn"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Traktas S/MIME subskribitajn kaj/a?? en??ifritajn retpo??tojn"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Raportas truda??ojn al diversaj lokoj"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "Ebligas la skanadon de envenanta retpo??to ricevita de POP, IMAP a?? LOKA "
-#~ "konto uzante SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "Ebligas legadon de aplika??aj/ms-tnef alglua??oj"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "Ebligas vKalendarajn mesa??traktadon kaj traktas webCal subskriboj. "
-#~ "Liveras kalendaran importon"
-
-#~ msgid "_Subject:"
-#~ msgstr "_Temo:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Konservu 'Al' adresojn"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Konservu 'Kk' adresojn"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Konservu 'Bkk' adresojn"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "Stilfolio:"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData kromprogramo: A??tentigita\n"
-
-#~ msgid "slow"
-#~ msgstr "malrapida"
-
-#~ msgid "fast"
-#~ msgstr "rapida"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Standarda lar??o en bilderoj (0 signifas ekrangrando)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Ebligu ??pruca??on"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Defa??lta refre??iga intervalo la?? minutoj"
-
-#~ msgid "Use this"
-#~ msgstr "Uzu ??i tion"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Ne povis en??ifri la retpo??ton: %s"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld bitoko"
-#~ msgstr[1] "%ld bitokoj"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Nombro da fini??intaj enigoj por konservi:</b>\n"
-#~ "<small>(Fiksu al -1 se vi volas konservi fini??intajn enigojn)</small>"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Ne povas forigi fluon `%s'."
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Ne povas subskribi fluon `%s'."
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Ne povas pravalorizi na libCURL"
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Ne povas malfermi provizoran dosieron"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Ne povis alporti retadreson %s\n"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne povis alporti retadreson `%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Ne povis alporti retadreson `%s':\n"
-#~ "%s\n"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Defa??lta nombro da fini??antaj eroj por konservi"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "??u vi vere volas forigi la fluon"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Eraro sintakse analizante fluon de retadreso %s\n"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Alportas `%s'..."
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Bona subskribo (nefidinda) de %s."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Retenu defa??ltan nombron da fini??intaj eniga??oj"
-
-#~ msgid "Malformed feed"
-#~ msgstr "Misformita fluo"
-
-#~ msgid "N/A"
-#~ msgstr "Ne aplikebla"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Ne povas ??isdatigi fluon %s:\n"
-#~ "%s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: Flua ??isdatigo abortita, aplika??o eliras.\n"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Alporti komentojn ne estas subtenata por RDF fluoj. Ne povas "
-#~ "alporti komentojn de `%s'"
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Refre??igu ??iujn fluojn"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Forigu ka??itajn enskribojn"
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Forigu dosierujan arbon..."
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Fiksu al -1 por teni fini??intajn erojn"
-
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "Fiksu al 0 por malebligi a??tomatan refre??igon"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "??i tiu flua aran??o estas ankora?? ne subtenata."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Eltempi??o konektante al retadreso %s\n"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Malsubskribu fluon"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Nesubtenata flua tipo ??e retadreso %s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Vi jam estas  subskribata al ??i tiu fluo."
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "Mals_ubskribu fluon..."
-
-#~ msgid "messages which contain header S"
-#~ msgstr "mesa??oj kiuj enhavas ??apon S"
-
-#~ msgid "size unknown"
-#~ msgstr "grando nekonata"
diff --git a/po/fi.po b/po/fi.po
index 64b9906..18861f8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19122,42 +19122,3 @@ msgid ""
 msgstr ""
 "Claws Mail on valmis\n"
 "Tallenna???painikkeella aloitetaan."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Ota k??ytt????n turvallinen yhteys LDAP-palvelimeen SSL:ll??. Jos yhteys "
-#~ "ep??onnistuu, tarkista asetukset ldap.confista (TLS_CACERTDIR tai "
-#~ "TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "Ei TLS:????"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Rekister??i Claws Mailiin"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "K??yt?? SSL:???? POP3-yhteydelle"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "K??yt?? SSL:???? IMAP4-yhteydelle"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "K??yt?? SSL:???? NNTP-yhteydelle"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "K??yt?? SSL:???? SMTP-yhteydelle"
-
-#~ msgid "Re_move"
-#~ msgstr "_Poista"
diff --git a/po/fr.po b/po/fr.po
index e7779c9..7f94b06 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19603,632 +19603,3 @@ msgstr ""
 "\n"
 "Vous pouvez maintenant cliquer sur ?? Enregistrer ?? pour\n"
 "d??buter et appr??cier.."
-
-#~ msgid "Template From format error."
-#~ msgstr "Erreur de formatage dans l'en-t??te ?? De : ?? du mod??le."
-
-#~ msgid "Template To format error."
-#~ msgstr "Erreur de formatage dans l'en-t??te ?? De : ?? du mod??le."
-
-#~ msgid "Template Cc format error."
-#~ msgstr "Erreur de formatage dans l'en-t??te ?? Cc : ?? du mod??le."
-
-#~ msgid "Template Bcc format error."
-#~ msgstr "Erreur de formatage dans l'en-t??te ?? Cci : ?? du mod??le."
-
-#~ msgid "Template Reply-To format error."
-#~ msgstr "Erreur de formatage dans l'en-t??te ?? R??ponse ?? : ?? du mod??le."
-
-#~ msgid "Template subject format error."
-#~ msgstr "Erreur de formatage dans le sujet du mod??le."
-
-#~ msgid "The only recipient is the default BCC address. Send anyway?"
-#~ msgstr ""
-#~ "Le seul destinataire est l'adresse ?? Cci: ?? par d??faut. Voulez-vous quand "
-#~ "m??me envoyer le message ?"
-
-#~ msgid "Keep addresses which appear in 'Cc' headers"
-#~ msgstr "Collecter les adresses pr??sentes dans les en-t??tes 'Cc'"
-
-#~ msgid "Keep addresses which appear in 'Bcc' headers"
-#~ msgstr "Collecter les adresses pr??sentes dans les en-t??tes 'Cci' ('Bcc')"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Active la connexion s??curis??e au serveur LDAP via SSL. Si la connexion "
-#~ "??choue, veuillez v??rifier la configuration dans le fichier ldap.conf "
-#~ "(champs TLS_CACERTDIR et TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "Pas de TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Enregistrer Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Utiliser SSL pour les connexions POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Utiliser SSL pour les connexions IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Utiliser SSL pour les connexions NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Utiliser SSL pour les connexions SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "Suppri_mer"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Chercher dans le dossier.."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   L'importation de cl??s n'est pas impl??ment??e sous Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "minute(s)"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "La signature ne peut ??tre v??rifi??e - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "L'exportation de cl??s n'est pas impl??ment??e sous Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "jour(s)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr ""
-#~ "D??placer les mails supprim??s ?? la corbeille, et purger imm??diatement"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Met les messages supprim??s ?? la corbeille au lieu d'utiliser le drapeau "
-#~ "\\Deleted sans purger."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatique (recommand??)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Suppression de message(s)"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Ins??rer"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Envoyer"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "Enregi_strer un brouillon"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">.\n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Remplacer \"%s\" par :</span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Erreur IMAP sur %s : authentifi??\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Erreur IMAP sur %s : non authentifi??\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de flux\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "Erreur IMAP sur %s : connexion refus??e\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur fatale\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? NOOP ??\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? COPY ??\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? LIST ??\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? LSUB ??\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? SASL ??\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Erreur IMAP sur %s : erreur de la commande ?? SSL ??\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Erreur IMAP sur %s : erreur inconnue [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+Se _d??sinscrire"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (ou ant??rieur)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (ou ant??rieur)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (ou ant??rieur)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Type :</b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Taille :</b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Nom du fichier : </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Erreur lors de lecture des statistiques du cache</"
-#~ "span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and %"
-#~ "d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Utilisation de %s dans %d fichiers, %d r??pertoires, %"
-#~ "d autres et %d erreurs</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Erreur lors de la suppression du contenu du cache des "
-#~ "ic??nes.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+Enregi_strer"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s Veuillez saisir la phrase "
-#~ "secr??te pour :</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                alias ?? %s ?? (Confiance: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>R??cup??rer les commentaires sur les articles de moins de :</b>\n"
-#~ "<small>(En jours ; -1 pour r??cup??rer tous les commentaires)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Intervalle de mise ?? jour, en minutes :</b>\n"
-#~ "<small>(Saisissez 0 pour d??sactiver la mise ?? jour automatique de ce flux)"
-#~ "</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Si un article change, ne pas le marquer comme non lu :</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(cet ??v??nement est r??current)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> le :</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+_Supprimer"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>R??sum?? des messages</b>\n"
-#~ "<b>Nouveaux:</b> %d\n"
-#~ "<b>Non Lus:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Taille:</b> %s\n"
-#~ "\n"
-#~ "<b>Marqu??s:</b> %d\n"
-#~ "<b>R??pondus:</b> %d\n"
-#~ "<b>Transf??r??s:</b> %d\n"
-#~ "<b>Bloqu??s:</b> %d\n"
-#~ "<b>Ignor??s:</b> %d\n"
-#~ "<b>Suivis:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>De: %s, le %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>?? : %s, le %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Votre nom :</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Votre adresse email :</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Nom de la bo??te aux lettres :</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adresse du serveur d'envoi (SMTP) :</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adresse du serveur :</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Bo??te aux lettres locale :</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Type de serveur :</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Utilisateur :</span>"
-
-#, fuzzy
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Impossible d'enregistrer le connecteur 'avatar image render'"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr ""
-#~ "%s: d??passement du d??lai d'attente lors de la recherche de l'h??te.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: h??te inconnu.\n"
-
-#~ msgid "Failed."
-#~ msgstr "??chec."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "Le nouveau nom de dossier ne doit pas contenir le s??parateur de chemin."
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr ""
-#~ "??chec lors de la d??claration du hook de mise ?? jour d'un ??l??ment de "
-#~ "dossier"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "??chec lors de la d??claration du hook de mise ?? jour d'un dossier"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "impossible de copier %s vers %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "impossible d'??crire le fichier de configuration de Fetchinfo\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Module GData : impossible d'enregistrer la configuration\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Localisation trouv??e : (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Pays d'origine tel que d??clar?? :"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Localisation de l'??metteur"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentine"
-
-#~ msgid "China"
-#~ msgstr "Chine"
-
-#~ msgid "Colombia"
-#~ msgstr "Colombie"
-
-#~ msgid "Denmark"
-#~ msgstr "Danemark"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Sahara Occidental"
-
-#~ msgid "France"
-#~ msgstr "France"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greenland"
-#~ msgstr "Groenland"
-
-#~ msgid "Greece"
-#~ msgstr "Gr??ce"
-
-#~ msgid "India"
-#~ msgstr "Inde"
-
-#~ msgid "Japan"
-#~ msgstr "Japon"
-
-#~ msgid "Comoros"
-#~ msgstr "Comores"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "??les Marshall"
-
-#~ msgid "Myanmar"
-#~ msgstr "Birmanie"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Nouvelle Cal??donie"
-
-#~ msgid "Norway"
-#~ msgstr "Norv??ge"
-
-#~ msgid "Philippines"
-#~ msgstr "Philippines"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
-
-#~ msgid "Qatar"
-#~ msgstr "Qatar"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Thailand"
-#~ msgstr "Tha??lande"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vi??t Nam"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoLocation"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Impossible de cr??er l'expression r??guli??re : %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Impossible d'enregistrer le connecteur 'messageview_show' dans le module "
-#~ "GeoLocation"
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Int??gration de GeoLocation"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Module Notification : impossible d'??crire le fichier de configuration\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Enregistrer les messages envoy??s dans le dossier ?? Envoy??s ??"
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail est maintenant le client par d??faut."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "Il est tr??s configurable et peut g??rer des centaines de milliers de "
-#~ "courriels facilement. Les messages sont stock??s sous un format ouvert "
-#~ "dans lequel il est facile d'interagir avec."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "Beaucoup de fonctionnalit??s suppl??mentaires sont fournies par des "
-#~ "modules, comme le support des signatures et du chiffrement PGP, un "
-#~ "aggr??gateur RSS, un calendrier, de puissants filtres anti-pourriel, "
-#~ "l'interaction via Perl ou Python, le rendu HTML et PDF, et plus encore."
-
-#~ msgid "E-mail client"
-#~ msgstr "Client de messagerie ??lectronique"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Client de messagerie l??ger et rapide"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "messages contenant l'en-t??te S"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Collecter les adresses '??'"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Collecter les adresses 'Cc'"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Collecter les adresses 'Cci'"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Module GData : identifi??\n"
-
-#~ msgid "slow"
-#~ msgstr "lent"
-
-#~ msgid "fast"
-#~ msgstr "rapide"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Largeur de la banni??re en pixels (0 pour tout l'??cran)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Activer la popup"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Signature correcte (inconnue) de ?? %s ??."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Impossible d'ouvrir un fichier temporaire"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Impossible d'initialiser libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "R??cup??ration de '%s'.."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Flux mal form??"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl : La r??cup??ration des commentaires n'est pas possible pour les flux "
-#~ "RDF. Impossible de r??cup??rer les commentaires de '%s'."
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Le format de ce flux n'est pas encore support??."
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld octet"
-#~ msgstr[1] "%ld octets"
-
-#~ msgid "size unknown"
-#~ msgstr "taille inconnue"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Impossible de mettre ?? jour le flux %s :\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Vous ??tes d??j?? abonn?? ?? ce flux."
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible d'atteindre l'URL '%s' :\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Impossible d'atteindre l'URL '%s' :\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Impossible de s'abonner au flux '%s'."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "D??lai d'attente d??pass?? lors de la connexion ?? '%s'\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Impossible d'atteindre l'URL '%s'\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Erreur lors de l'analyse du flux ?? l'URL '%s'\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Type de flux non encore support?? ?? l'URL '%s'\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl : mise ?? jour du flux annul??e : l'application quitte.\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Impossible de supprimer la flux '%s'."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Mettre _a jour tous les flux"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "Se d??sabonner du fl_ux.."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Supprimer toute l'ar_borescence.."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl.."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Conserver le nombre par d??faut d'articles expir??s"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Nombre d'articles expir??s ?? conserver :</b>\n"
-#~ "<small>(Saisissez -1 pour tout conserver)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Se d??sabonner du flux"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Voulez-vous vraiment vous d??sabonner du flux"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Supprimer les articles en cache"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Intervalle de mise ?? jour par d??faut en minutes"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Nombre par d??faut d'articles expir??s ?? conserver"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Veuillez saisir -1 pour conserver les articles expir??s"
-
-#~ msgid "Use this"
-#~ msgstr "Choisir"
diff --git a/po/he.po b/po/he.po
index 61018c8..069b164 100644
--- a/po/he.po
+++ b/po/he.po
@@ -19271,1276 +19271,3 @@ msgid ""
 msgstr ""
 "???Claws Mail ???????? ???????? ??????.\n"
 "????????????, ?????? ???? ????????."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "???????? ?????????? ???????????? ???????? LDAP ???????? ???? SSL. ???? ?????????? ????????, ?????? ???????? ?????????? ???? "
-#~ "???????????? ?????????????? ???????? ldap.conf (???????? TLS_CACERTDIR ?????? TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "?????? TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "?????????? Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "?????????? ???????????? SSL ???????? ?????????? POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "?????????? ???????????? SSL ???????? ?????????? IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "?????????? ???????????? SSL ???????? ?????????? NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "?????????? ???????????? SSL ???????? ?????????? SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "????_??"
-
-#~ msgid "_Other folder..."
-#~ msgstr "???????????? _????????..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   ?????????? ???????? ???????? ?????????? ?????? Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "??????(????)"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "???????????? ???? ?????????? ???????????? - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "?????????? ???????? ???????? ?????????? ?????? Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "????????"
-
-# ????????
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "???????? ???????? ???????? ?????????? ???????????? ?????????????? ??????????"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "???????? ???????? ???????? ?????????? ?????????? ?????????? ?????????? ???????? ???\\Deleted??? ?????? ???????? ????????????."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "?????????????? (????????????)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "?????????? ??????????(????)"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_??????"
-
-#~ msgid "+_Send"
-#~ msgstr "+_??????"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+_???????? ??????????????"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ "???>. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">???????? ???? \"%s\" ????: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "?????????? IMAP ?????? %s: ????????????\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "?????????? IMAP ?????? %s: ???? ????????????\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? ??????\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? ????????\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? ????????????\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "?????????? IMAP ?????? %s: ?????????? SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "?????????? ?????? %s: ?????????? ???? ?????????? [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_?????? ??????????"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>??????????: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>????????: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>???? ????????: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span color=\"red\">?????????? ???????????? ???????????????????? ??????????</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">?????????? ???????????? ?????????? ??????.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "???mbox ???(!etPan)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+_????????"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s?????? ?????? ?????????? ?????????? ????????:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    ??????????? ?????????? (uid) ???\"%s\" (??????????: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>???????? ???????????? ???? ?????????????? ?????????? ?????? ????:</b>\n"
-#~ "<small>(??????????; ???????? ???? 1- ?????? ?????????? ???? ??????????)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>???????????? ?????????? ??????????:</b>\n"
-#~ "<small>(???????? ???? 0 ?????? ?????????? ?????????? ?????????????? ???????? ???????? ????)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>???? ???????? ??????????, ???? ?????????? ???????? ????????:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(?????????? ???? ????????)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> ????????:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+??????"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>?????????? ??????????</b>\n"
-#~ "<b>??????????:</b> %d\n"
-#~ "<b>???? ??????????:</b> %d\n"
-#~ "<b>???? ??????:</b> %d\n"
-#~ "<b>????????:</b> %s\n"
-#~ "\n"
-#~ "<b>??????????????:</b> %d\n"
-#~ "<b>??????????:</b> %d\n"
-#~ "<b>????????????:</b> %d\n"
-#~ "<b>????????????:</b> %d\n"
-#~ "<b>??????????????:</b> %d\n"
-#~ "<b>??????????????:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>??????: %s, ???????????? %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>????: %s, ???????????? %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">??????:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? ???????????? ??????:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">???? ???????? ????????:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? ?????? SMTP:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? ??????:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">???????? ???????? ????????????:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? ??????:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">???? ??????????:</span>"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "?????? ???????????? hook ?????????? ?????????? ???? ????????????????"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "???%s: ?????? ?????????? ???????? ??????.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "???%s: ???????? ???? ????????.\n"
-
-#~ msgid "Failed."
-#~ msgstr "????????."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "???? ???????????? ???????? ???? ???????? ?????????? ???????? namespace ??????????"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "?????? ???????????? hook ?????????? ???????? ????????????"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "?????? ???????????? hook ????????????"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "?????? ???????????? ???????????? ?????????? %s ???? %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "?????? ???????????? ?????????? Fetchinfo ??????????\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "???????? GData: ?????? ???????????? ?????????? ???????? ??????????\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "???????? ??????????: (???%.2f,%.2f???)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "?????? ???????? ??????????????: "
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "???? ???????? ???????????? ?????????? ?????????? ???? ?????????? IP??? "
-
-#~ msgid "Try to locate sender"
-#~ msgstr "?????? ???????? ????????"
-
-#~ msgid "Andorra"
-#~ msgstr "???????????? ????????????"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "?????????? ?????????????????? ??????????????"
-
-#~ msgid "Afghanistan"
-#~ msgstr "????????????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "???????????????? ?????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Anguilla"
-#~ msgstr "???????????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Albania"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Armenia"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "???????????????? ?????????????????? (?????????? ?????????? ??????????)"
-
-#~ msgid "Angola"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Antarctica"
-#~ msgstr "????????????????????"
-
-#~ msgid "Argentina"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "American Samoa"
-#~ msgstr "?????????? ?????????????????? (?????????????????? ??????????)"
-
-#~ msgid "Austria"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Australia"
-#~ msgstr "?????????????? ???????????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Aruba"
-#~ msgstr "?????????? (?????????????????? ??????????; ?????????? ?????????? ??????????)"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "??????????????????, ?????????????????? ????"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "???????????? ????????????????????"
-
-#~ msgid "Barbados"
-#~ msgstr "???????????? (????; ?????? ?????????? ????????????)"
-
-#~ msgid "Bangladesh"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ???????????? ????"
-
-#~ msgid "Belgium"
-#~ msgstr "?????????? ??????????"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "?????????????? ????????"
-
-#~ msgid "Bulgaria"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Bahrain"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Burundi"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Benin"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Bermuda"
-#~ msgstr "?????? ???????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "???????????? ???????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Bolivia"
-#~ msgstr "??????????????, ?????????? ???? ???????????? ????"
-
-#~ msgid "Brazil"
-#~ msgstr "??????????, ?????????????????? ?????????????? ????"
-
-#~ msgid "Bahamas"
-#~ msgstr "?????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Bhutan"
-#~ msgstr "?????????? ??????????"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "?????????????? (????; ?????????????????? ??????????????)"
-
-#~ msgid "Botswana"
-#~ msgstr "?????????????????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Belarus"
-#~ msgstr "????????????"
-
-#~ msgid "Belize"
-#~ msgstr "???????? (?????? ?????????? ????????????)"
-
-#~ msgid "Canada"
-#~ msgstr "???????? (?????? ?????????? ????????????)"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "?????? ?????????? (????????????) (?????????????????? ????????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Central African Republic"
-#~ msgstr "?????????????????? ?????????? ????????????????"
-
-#~ msgid "Congo"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Switzerland"
-#~ msgstr "??????????????????"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "?????? ??????????, ?????????????????? ????"
-
-#~ msgid "Cook Islands"
-#~ msgstr "?????? ?????? (?????????????????? ?????? ??????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Chile"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Cameroon"
-#~ msgstr "?????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "China"
-#~ msgstr "??????, ?????????????????? ???????????? ????"
-
-#~ msgid "Colombia"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "Costa Rica"
-#~ msgstr "?????????? ????????, ?????????????????? ????"
-
-#~ msgid "Cuba"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Cape Verde"
-#~ msgstr "?????? ???????? ????????????????"
-
-#~ msgid "Christmas Island"
-#~ msgstr "?????????????? (????; ?????????????????? ????????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Cyprus"
-#~ msgstr "?????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Czech Republic"
-#~ msgstr "?????????????????? ????????????"
-
-#~ msgid "Germany"
-#~ msgstr "????????????, ?????????????????? ?????????????? ????"
-
-#~ msgid "Djibouti"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "Denmark"
-#~ msgstr "?????????? ??????????"
-
-#~ msgid "Dominica"
-#~ msgstr "???????????????? (?????? ?????????? ????????????), ???????????????? ????"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "?????????????????? ??????????????????????"
-
-#~ msgid "Algeria"
-#~ msgstr "???????????????? (?????????????????? ???????????????????? ?????????????????? ????????????)"
-
-#~ msgid "Ecuador"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Estonia"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Egypt"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Western Sahara"
-#~ msgstr "???????? ?????????????? (?????????????????? ??????????)"
-
-#~ msgid "Eritrea"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Spain"
-#~ msgstr "?????????? ????????"
-
-#~ msgid "Ethiopia"
-#~ msgstr "??????????????, ?????????????????? ?????????????????? ?????????????? ????"
-
-#~ msgid "Finland"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Fiji"
-#~ msgstr "?????? ?????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "?????? ???????????? (??????????????) (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "??????????????????, ???????????? ?????????????? ????"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "?????? ???????? (?????????????????? ??????????)"
-
-#~ msgid "France"
-#~ msgstr "?????????????????? ??????????????"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "????????, ??????????????????"
-
-#~ msgid "Gabon"
-#~ msgstr "?????????????????? ??????????????"
-
-#~ msgid "United Kingdom"
-#~ msgstr "???????????? ?????????????? ???? ?????????????? ???????????? ?????????? ???????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Grenada"
-#~ msgstr "?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Georgia"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "French Guiana"
-#~ msgstr "?????????? ?????????????? (?????????????????? ????????)"
-
-#~ msgid "Ghana"
-#~ msgstr "???????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Gibraltar"
-#~ msgstr "???????????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Greenland"
-#~ msgstr "?????????????? (?????????????????? ??????????)"
-
-#~ msgid "Gambia"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Guinea"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "?????? ???????????????? (?????????????????? ????????)"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "?????????? ????????????????, ?????????????????? ????"
-
-#~ msgid "Greece"
-#~ msgstr "???????? (?????????????????? ????????????)"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr ""
-#~ "???????? ?????????????? ???????? ???????? ????????????' (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Guatemala"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Guam"
-#~ msgstr "???????? (?????????????????? ??????????)"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "??????????-??????????, ?????????????????? ????"
-
-#~ msgid "Guyana"
-#~ msgstr "?????????? (?????? ?????????? ????????????), ?????????????????? ???????????????? ????"
-
-#~ msgid "Hong Kong"
-#~ msgstr "???????? ???????? (?????????????????? ??????)"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "?????? (????) ???????? ?????????????? (?????????????????? ????????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Honduras"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Croatia"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Haiti"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Hungary"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Indonesia"
-#~ msgstr "??????????????????, ?????????????????? ????"
-
-#~ msgid "Ireland"
-#~ msgstr "???????????? (?????????????????? ??????????????), ?????????????????? ????"
-
-#~ msgid "Israel"
-#~ msgstr "?????????? ??????????"
-
-#~ msgid "India"
-#~ msgstr "???????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr ""
-#~ "?????????????????? ?????????????? ?????????????????? ?????????? (?????? ??????????) (?????????????????? ??????????????; ?????? "
-#~ "?????????? ????????????)"
-
-#~ msgid "Iraq"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "??????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Iceland"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Italy"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Jamaica"
-#~ msgstr "?????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Jordan"
-#~ msgstr "????????, ???????????? ?????????????? ????"
-
-#~ msgid "Japan"
-#~ msgstr "?????????? ??????"
-
-#~ msgid "Kenya"
-#~ msgstr "???????? (?????? ?????????? ????????????)"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "Cambodia"
-#~ msgstr "?????????? ??????????????"
-
-#~ msgid "Kiribati"
-#~ msgstr "???????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Comoros"
-#~ msgstr "?????? ????????????, ?????????? ????"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "?????????? ???????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "????????????, ?????????????????? ???????????? ???????????????? ????"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Kuwait"
-#~ msgstr "?????????? ??????????"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "?????? ???????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "????????, ?????????????????? ?????????????????? ???????????? ????"
-
-#~ msgid "Lebanon"
-#~ msgstr "?????????????????? ????????????????"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "?????????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "???????????? ????????????????????"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "?????? ???????? (?????? ?????????? ????????????), ?????????????????? ?????????????????? ???????????????????????? ????"
-
-#~ msgid "Liberia"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Lesotho"
-#~ msgstr "?????????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Lithuania"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Luxembourg"
-#~ msgstr "??????????????????, ?????????????? ???????????? ????"
-
-#~ msgid "Latvia"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "??????, ?????????????????? ???????????? ??????????"
-
-#~ msgid "Morocco"
-#~ msgstr "?????????? ????????"
-
-#~ msgid "Monaco"
-#~ msgstr "???????????? ??????????"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Madagascar"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "?????? ????????, ?????????????????? ????"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "??????????????, ?????????????????? ???????????????????? ?????????? ????"
-
-#~ msgid "Mali"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Myanmar"
-#~ msgstr "?????????? ???????????? (?????????? ??????????)"
-
-#~ msgid "Mongolia"
-#~ msgstr "????????????????"
-
-#~ msgid "Macao"
-#~ msgstr "???????? (?????????????????? ??????)"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "?????? ?????????? ?????????????? (?????????????????? ??????????), ???????????????? ????"
-
-#~ msgid "Martinique"
-#~ msgstr "?????????????? (?????????????????? ????????)"
-
-#~ msgid "Mauritania"
-#~ msgstr "??????????????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Montserrat"
-#~ msgstr "???????????????? (????; ?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Malta"
-#~ msgstr "???????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Mauritius"
-#~ msgstr "?????????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Maldives"
-#~ msgstr "?????????????????? (?????????? ??????????????????; ?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Malawi"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Mexico"
-#~ msgstr "?????????????? ???????????????????? ????????????????"
-
-#~ msgid "Malaysia"
-#~ msgstr "?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Mozambique"
-#~ msgstr "?????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Namibia"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "New Caledonia"
-#~ msgstr "?????????????? ?????????? (?????????????????? ????????)"
-
-#~ msgid "Niger"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "?????????????? (????; ?????????????????? ????????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Nigeria"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ?????????????? ????"
-
-#~ msgid "Nicaragua"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "Netherlands"
-#~ msgstr "?????????? (?????????? ?????????? ??????????)"
-
-#~ msgid "Norway"
-#~ msgstr "?????????? ??????????????"
-
-#~ msgid "Nepal"
-#~ msgstr "????????, ?????????????????? ?????????????? ???????????????? ????"
-
-#~ msgid "Nauru"
-#~ msgstr "?????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Niue"
-#~ msgstr "?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "New Zealand"
-#~ msgstr "?????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Oman"
-#~ msgstr "?????????????? ??????????"
-
-#~ msgid "Panama"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Peru"
-#~ msgstr "??????, ?????????????????? ????"
-
-#~ msgid "French Polynesia"
-#~ msgstr "???????????????? ?????????????? (?????????????????? ????????)"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "???????????? ?????????? ?????????? (?????? ?????????? ????????????), ???????????? ?????????????? ????"
-
-#~ msgid "Philippines"
-#~ msgstr "????????????????????, ?????????????????? ????"
-
-#~ msgid "Pakistan"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ?????????????????? ????"
-
-#~ msgid "Poland"
-#~ msgstr "??????????, ?????????????????? ????"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "?????????? ???????? ?????????????? (?????????????????? ????????)"
-
-#~ msgid "Pitcairn"
-#~ msgstr ""
-#~ "?????????? ????????????, ??????????????, ??????????, ???????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "?????????????? ???????????? ???????? (?????????????????? ??????????)"
-
-#~ msgid "Portugal"
-#~ msgstr "?????????????????? ????????????????????"
-
-#~ msgid "Palau"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Paraguay"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Qatar"
-#~ msgstr "???????????? ????????"
-
-#~ msgid "Reunion"
-#~ msgstr "?????????????? (????; ?????????????????? ????????)"
-
-#~ msgid "Romania"
-#~ msgstr "????????????"
-
-#~ msgid "Russian Federation"
-#~ msgstr "?????????????? ????????????"
-
-#~ msgid "Rwanda"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "?????????? ?????? ??????????????"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "?????? ???????? (?????? ?????????? ????????????)"
-
-#~ msgid "Seychelles"
-#~ msgstr "?????? ?????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Sudan"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Sweden"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Singapore"
-#~ msgstr "?????????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Saint Helena"
-#~ msgstr "?????????? ???????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Slovenia"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "?????????????? ???????? ????????"
-
-#~ msgid "Slovakia"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "?????????? ?????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "San Marino"
-#~ msgstr "?????? ????????????, ?????????????????? ?????????????? ?????????? ????"
-
-#~ msgid "Senegal"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Somalia"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Suriname"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "?????? ???????? ??????????????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "El Salvador"
-#~ msgstr "???? ????????????, ?????????????????? ????"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "?????????????????? ???????????? ??????????"
-
-#~ msgid "Swaziland"
-#~ msgstr "?????????? ?????????????????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "?????? ???????? ?????????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Chad"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "???????????????????? ???????????????? ???? ????????"
-
-#~ msgid "Togo"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Thailand"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Tajikistan"
-#~ msgstr "??????????????????, ?????????????????? ????"
-
-#~ msgid "Tokelau"
-#~ msgstr "???????????? (?????????????????? ?????? ??????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "????????????????????, ?????????????????? ????"
-
-#~ msgid "Tunisia"
-#~ msgstr "??????????????, ?????????????????? ????"
-
-#~ msgid "Tonga"
-#~ msgstr "?????????? ?????????? (?????? ?????????? ????????????)"
-
-#~ msgid "East Timor"
-#~ msgstr "???????? ??????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Turkey"
-#~ msgstr "????????????, ?????????????????? ????"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "?????????????? ???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Tuvalu"
-#~ msgstr "???????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "??????????????, ???????? ???? ??????"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ?????????????? ????"
-
-#~ msgid "Ukraine"
-#~ msgstr "????????????????"
-
-#~ msgid "Uganda"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "???????? ???????????????? ???????????? ???? ?????????? ??????????"
-
-#~ msgid "United States"
-#~ msgstr "?????????? ?????????? ???? ????????????"
-
-#~ msgid "Uruguay"
-#~ msgstr "??????????????????, ?????????????????? ?????????????? ????"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "??????????????????, ?????????????????? ????"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "?????????????? ???????????? (?????? ?????????? ???? ??????????????)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "?????????? ???????????? ???????????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Venezuela"
-#~ msgstr "??????????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "?????? ????????????, ?????????????? (?????????????????? ??????????????; ?????? ?????????? ????????????)"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "?????? ????????????, ?????????? (?????????????????? ??????????)"
-
-#~ msgid "Viet Nam"
-#~ msgstr "???????? ??????, ?????????????????? ???????????????????????? ????"
-
-#~ msgid "Vanuatu"
-#~ msgstr "???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "?????????? ?????????????? (?????????????????? ????????), ???????????????? ???? ?????????? ????"
-
-#~ msgid "Samoa"
-#~ msgstr "?????????? ?????????? ?????????????? (?????? ?????????? ????????????)"
-
-#~ msgid "Yemen"
-#~ msgstr "????????, ?????????????????? ????"
-
-#~ msgid "Mayotte"
-#~ msgstr "?????????? (?????????????????? ????????)"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "?????????? ??????????????????, ?????????? ?????????? ????"
-
-#~ msgid "South Africa"
-#~ msgstr "???????? ???????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Zambia"
-#~ msgstr "?????????? (?????? ?????????? ????????????), ?????????????????? ????"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "????????????, ?????????????????? ?????????????????? ????"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "????????????????, ?????????????????? ????"
-
-#~ msgid "GeoLocation"
-#~ msgstr "?????????? ??????????????"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "???? ???????? ???????????? ?????????? clutter"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "???? ???????? ?????????????? ?????????? ?????????? ????????????: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr "?????? ???????????? hook ???? messageview_show ?????????? GeoLocation"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "???????? ???? ???????? ???????????????????????? ???? GeoLocation ???????? Claws Mail.\n"
-#~ "\n"
-#~ "??????????: ?????????? ???? ???????? ?????????? ?????????? ???????????? ???? ?????????? ???????????????? ???? ???????? ???????? "
-#~ "???????????? ???????????? ???????? ???? ???? ???????? ???? ??????????. ?????????????? ?????? ???????????? ???? ?????? ???????? ???? "
-#~ "???????? ???????? ???? ???????????? ????????. ????????????, ?????????? ???????????? ?????????? ???????????? ???????????? ???????? "
-#~ "???????? ???????? ???????????? ????????, ???? ?????????? ???????? ???????????? ?????????? ???????? ?????????? ?????????? ?????????? "
-#~ "???? ???????? ???? ?????????? ???????????? ?????????? ???? ???? ???????? ??????????.\n"
-#~ "???????? ???????? ??????, ???? ???? ?????????? ?????????????? ???? ???????? ????, ?????? ???? ???????? ?????????? ???? ???????? "
-#~ "???? ?????? ???????????? ???? ????/???? ???????? ??????.\n"
-#~ "\n"
-#~ "???????? ?????????? <berndth at gmx.de> ?????????? ?????????? (???? ???????? ???????????? ???????? ???????????????? ???? "
-#~ "??????????????)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "?????????? GeoLocation"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "???????? ??????????: ?????? ???????????? ?????????? ???????? ??????????\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "???????? ???????????? ???????????? ?????????????? ???????? ????????"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "???Claws Mail ???????? ???????? ???????? ????????, ?????????? ?????? ???????? ???????????? ?????????? ????????."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "?????? ???????? ???????????? ?????????? ?????????????? ???????????? ???????? ?????????? ???? ?????????? ???? ???????????? ?????????? "
-#~ "??????????. ???????????? ?????????????? ???????????? ????????, ?????????????? ?????????????? ?????????? ??????????."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "???????????????? ???????? ?????????????????????????? ?????????? ?????????????? ?????? ????????????, ???????? ???????????? ???????????? "
-#~ "PGP, ???????? RSS, ?????? ??????, ?????????? ???????? ??????????, ?????????? Perl ?????? Python, ?????????? "
-#~ "HTML ?????? PDF, ????????."
-
-#~ msgid "E-mail client"
-#~ msgstr "???????? ??????????"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "???????? ???????? ???????? ?????? ???????? ?????????? +GTK"
-
-#~ msgid "Internal avatars rendering already initialized"
-#~ msgstr " ?????????? ?????????? ???? ???????????????? ?????? ??????????"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "???????????? ?????????????? ?????????? S"
-
-#~ msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-#~ msgstr "???ldapsvr_retrieve_item_person->?????? ???? ????????: %d"
-
-#~ msgid "ldapsvr_update_book: Could not clean cache\n"
-#~ msgstr "???ldapsvr_update_book: ???? ???????? ???????????? ?????????? ??????????"
-
-#~ msgid "ldapsvr_update_book->Unknown status: %s\n"
-#~ msgstr "???ldapsvr_update_book->?????? ???? ????????: %s\n"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "???????? ???????????? 'To'"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "???????? ???????????? 'Cc'"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "???????? ???????????? 'Bcc'"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "?????????? GData: ??????????\n"
-
-#~ msgid "slow"
-#~ msgstr "??????????"
-
-#~ msgid "fast"
-#~ msgstr "??????????"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "???????? ???????? ???????????????? (0 ???????? ???????? ????????)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "???????? ???????? ????????????"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "?????????? ???????? (???? ????????????) ?????? %s."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "?????? ???????????? ?????????? ???????? ????????"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "?????? ???????????? ?????????? libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "?????? ???????? '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "???????? ????????"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "???RSSyl: ?????????? ???????????? ???????? ?????????? ???????? ???????????? ???????????? ???? RDF. ?????? ???????????? "
-#~ "?????????? ???????????? ???? '%s'"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "?????????? ???????? ???? ???????? ???????? ??????????."
-
-#~ msgid "N/A"
-#~ msgstr "??\\/??"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld ??????"
-#~ msgstr[1] "%ld ????????"
-
-#~ msgid "size unknown"
-#~ msgstr "???????? ???? ????????"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "???RSSyl: ?????? ???????????? ?????????? ???????? %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "?????? ?????? ???????? ???? ???????? ????."
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "???? ???????? ???????????? ?????????? URL ???'%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "???? ???????? ???????????? ?????????? URL ???'%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "?????? ???????????? ???????????? ???? ???????? '%s'."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "???? ???????? ???????????????? ???? ?????????? %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "???? ???????? ???????????? ?????????? URL ???%s\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "?????????? ???????????? ???????? ???????????? %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "?????????? ???????? ???? ???????? ???????????? %s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "???RSSyl: ?????????? ???????? ??????????, ?????????? ???????? ??????.\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "?????? ???????????? ?????????? ???????? '%s'."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "???????? ???? _???? ??????????????"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "_?????????? ?????????? ??????????..."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "???????? _???? ??????????..."
-
-# Neither RLM nor RLE work.  Order has been reveresed, manually.  Edit: This is still not working.
-# *try again with claws > 3.8.1
-#~ msgid "RSSyl..."
-#~ msgstr "???RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "???????? ???????? ?????????? ???? ???????????? ??????????"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>???????? ???? ???????????? ?????????? ????????????:</b>\n"
-#~ "<small>(???????? ???? 1- ???? ???????????? ?????????? ???????????? ??????????)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "?????????? ?????????? ??????????"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "?????? ?????? ???????? ???? ???????????? ?????????? ????????"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "?????? ???????????? ??????????????"
-
-#~ msgid "RSSyl"
-#~ msgstr "???RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "???????????? ?????????? ???????????? ??????????"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "???????? ?????????? ???????? ?????? ?????????? ???? ???????????? ??????????"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "???????? ???? ???-1??? ?????? ?????????? ???????????? ??????????"
-
-# ?????????? ??????
-#~ msgid "Use this"
-#~ msgstr "?????? ???? ????"
diff --git a/po/hr.po b/po/hr.po
index cb7bc7e..7f37296 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -20656,1820 +20656,3 @@ msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
-
-#, fuzzy
-#~ msgid ""
-#~ "New messages will be checked in this order. Check the boxes\n"
-#~ "on the 'G' column to enable message retrieval by 'Get all'."
-#~ msgstr ""
-#~ "Nove poruke ?e biti provjeravane po ovom redosljedu. \n"
-#~ "Uklju?ite opciju u stupcu 'G' da omogu?ite primanje \n"
-#~ "poruka sa 'Primi sve'."
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Naredba ne mo?e zapo?eti. Neuspje?no kreiran cjevovod (pipe).\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "/_Book/New LDAP _Server"
-#~ msgstr "Dodaj novi LDAP poslu?itelj"
-
-#, fuzzy
-#~ msgid "/_Book/---"
-#~ msgstr "/_Alatii/---"
-
-#, fuzzy
-#~ msgid "/_Book/_Save"
-#~ msgstr "/_Datoteka/_Spremi"
-
-#, fuzzy
-#~ msgid "/_Book/_Close"
-#~ msgstr "/_Datoteka/_Zatvori"
-
-#~ msgid "/_Address"
-#~ msgstr "/_Adresa"
-
-#, fuzzy
-#~ msgid "/_Address/_Select all"
-#~ msgstr "/_Adresa/O_bri?i"
-
-#~ msgid "/_Address/---"
-#~ msgstr "/_Adresa/---"
-
-#, fuzzy
-#~ msgid "/_Address/C_ut"
-#~ msgstr "/_Adresa/_Uredi"
-
-#, fuzzy
-#~ msgid "/_Address/_Copy"
-#~ msgstr "/_Adresa"
-
-#, fuzzy
-#~ msgid "/_Address/_Paste"
-#~ msgstr "/_Adresa/O_bri?i"
-
-#~ msgid "/_Address/_Edit"
-#~ msgstr "/_Adresa/_Uredi"
-
-#~ msgid "/_Address/_Delete"
-#~ msgstr "/_Adresa/O_bri?i"
-
-#~ msgid "/_Address/New _Address"
-#~ msgstr "/_Adresa/Nova _adresa"
-
-#~ msgid "/_Address/New _Group"
-#~ msgstr "/_Adresa/Nova _grupa"
-
-#~ msgid "/_Address/_Mail To"
-#~ msgstr "/_Adresa/_Poruka za"
-
-#~ msgid "/_Tools/---"
-#~ msgstr "/_Alatii/---"
-
-#~ msgid "/_Help/_About"
-#~ msgstr "/Po_mo?/_O"
-
-#~ msgid "/---"
-#~ msgstr "/---"
-
-#~ msgid "E-Mail address"
-#~ msgstr "E-mail adresa"
-
-#, fuzzy
-#~ msgid "Really delete '%s' ?"
-#~ msgstr "Uistinu obrisati `%s' ?"
-
-#~ msgid "No folder or message was selected."
-#~ msgstr "Direktorij ili poruka nisu odabrani"
-
-#~ msgid ""
-#~ "Please select a folder to process from the folder\n"
-#~ "list. Alternatively, select one or messages from\n"
-#~ "the message list."
-#~ msgstr ""
-#~ "Odaberite direktorij od kojeg ?e po?eti prikupljanje adresa. Drugi na?in "
-#~ "je da odaberete jednu ili poruke sa popisa poruka."
-
-#~ msgid "protocol error\n"
-#~ msgstr "protokol gre?ka\n"
-
-#~ msgid "Error occurred while posting\n"
-#~ msgstr "Do?lo je do gre?ke prilikom slanja\n"
-
-#~ msgid "Error occurred while sending command\n"
-#~ msgstr "Do?lo je do gre?ke prilikom slanja naredbe\n"
-
-#~ msgid ""
-#~ "  Owner: %s (%s) in %s\n"
-#~ "  Signed by: %s (%s) in %s\n"
-#~ "  Fingerprint: %s\n"
-#~ "  Signature status: %s"
-#~ msgstr ""
-#~ "  Vlasnik: %s (%s) u %s\n"
-#~ "  Potpisano od: %s (%s) u %s\n"
-#~ "  Otisak: %s\n"
-#~ "  Status potpisa: %s"
-
-#~ msgid "Can't load X509 default paths"
-#~ msgstr "Ne mogu u?itati uobi?ajenu putanju do X509"
-
-#~ msgid ""
-#~ "%s presented an unknown SSL certificate:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s predstavlja nepoznati SSL certifikat:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Mail won't be retrieved on this account until you save the certificate.\n"
-#~ "(Uncheck the \"%s\" preference).\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Poruka ne?e biti primljena na ovaj ra?un sve dok ne spremite certifikat.\n"
-#~ "(Odzna?ite \"%s\" iz pode?avanja).\n"
-
-#~ msgid ""
-#~ "%s's SSL certificate changed !\n"
-#~ "We have saved this one:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "It is now:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "This could mean the server answering is not the known one."
-#~ msgstr ""
-#~ "%s SSL certifikat Promjenjen !\n"
-#~ "Ovo smo spremili:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Sada je:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Ovo mo?e zna?iti da poslu?itelj koji  ?alje odgovor nije me?u poznatima."
-
-#~ msgid "%.1fKB"
-#~ msgstr "%.1fKB"
-
-#~ msgid "%.2fMB"
-#~ msgstr "%.2fMB"
-
-#~ msgid "/_Message/_Send"
-#~ msgstr "/P_oruka/_Po?alji"
-
-#~ msgid "/_Message/Send _later"
-#~ msgstr "/P_oruka/Po?alji _kasnije"
-
-#~ msgid "/_Message/---"
-#~ msgstr "/P_oruka/---"
-
-#~ msgid "/_Message/_Attach file"
-#~ msgstr "/P_oruka/Pri_lo?i datoteku"
-
-#~ msgid "/_Message/_Insert file"
-#~ msgstr "/_Poruka/_Unesi datoteku"
-
-#~ msgid "/_Message/Insert si_gnature"
-#~ msgstr "/_Poruka/Unesi _potpis"
-
-#~ msgid "/_Message/_Save"
-#~ msgstr "/P_oruka/_Spremi"
-
-#~ msgid "/_Message/_Close"
-#~ msgstr "/P_oruka/_Zatvori"
-
-#~ msgid "/_Edit/_Undo"
-#~ msgstr "/_Uredi/Korak na_zad"
-
-#~ msgid "/_Edit/_Redo"
-#~ msgstr "/_Uredi/Korak na_prijed"
-
-#~ msgid "/_Edit/---"
-#~ msgstr "/_Uredi/---"
-
-#~ msgid "/_Edit/Cu_t"
-#~ msgstr "/_Uredi/_Re?i"
-
-#~ msgid "/_Edit/_Copy"
-#~ msgstr "/_Uredi/_Kopiraj"
-
-#~ msgid "/_Edit/_Paste"
-#~ msgstr "/_Uredi/U_baci"
-
-#, fuzzy
-#~ msgid "/_Edit/Special paste/as _quotation"
-#~ msgstr "/_Uredi/Ubaci kao _citat"
-
-#, fuzzy
-#~ msgid "/_Edit/Special paste/_wrapped"
-#~ msgstr "/_Uredi/Odaberi _niti"
-
-#~ msgid "/_Edit/Select _all"
-#~ msgstr "/_Uredi/Odaberi _sve"
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/_Uredi/_Napredno"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/_Uredi/Napre_dno/Obri?i red"
-
-#~ msgid "/_Edit/A_dvanced/Delete entire line"
-#~ msgstr "/_Uredi/Napre_dno/Obri?i cijeli red"
-
-#~ msgid "/_Edit/Wrap all long _lines"
-#~ msgstr "/_Uredi/Sa?mi sve duge _linije"
-
-#~ msgid "/_Edit/Edit with e_xternal editor"
-#~ msgstr "/_Uredi/Uredi s _vanjskim ure?iva?em"
-
-#~ msgid "/_Options/Privacy System/None"
-#~ msgstr "/_Postavke/Privatnost/Isklju?eno"
-
-#~ msgid "/_Options/Si_gn"
-#~ msgstr "/_Postavke/Potp_i?i"
-
-#~ msgid "/_Options/_Encrypt"
-#~ msgstr "/_Postavke/_Kriptiraj"
-
-#~ msgid "/_Options/---"
-#~ msgstr "/_Postavke/---"
-
-#~ msgid "/_Options/Priority/_Highest"
-#~ msgstr "/_Postavke/Prioritet/_Najvi?i"
-
-#~ msgid "/_Options/Priority/Hi_gh"
-#~ msgstr "/_Postavke/Prioritet/Vi_sok"
-
-#~ msgid "/_Options/Priority/_Normal"
-#~ msgstr "/_Postavke/Prioritet/Normalan"
-
-#~ msgid "/_Options/Priority/Lo_w"
-#~ msgstr "/_Postavke/Prioritet/Ni_zak"
-
-#~ msgid "/_Options/Priority/_Lowest"
-#~ msgstr "/_Postavke/Prioritet/Najni_?i"
-
-#~ msgid "/_Options/_Request Return Receipt"
-#~ msgstr "/_Postavke/Zahtjevaj potvr_du o primitku"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/_Automatic"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/_Automatski"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/_Pogled/_Znakovni standard/7bit ascii (US-ASC_II)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/_Pogled/_Znakovni standard/Unicode (_UTF-8)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/_Pogled/_Znakovni standard/Zapadno-europski (ISO-8859-_1)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/_Pogled/_Znakovni standard/Zapadno-europski (ISO-8859-_15)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/_Pogled/_Znakovni standard/Srednje-europski (ISO-8859-_2)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/_Pogled/_Znakovni standard/_Balti?ki (ISO-8859-13)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/_Pogled/_Znakovni standard/Balti?ki (ISO-8859-_4)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/_Pogled/_Znakovni standard/Gr?ki (ISO-8859-_7)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/_Pogled/_Znakovni standard/Turski (ISO-8859-_9)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (ISO-8859-_5)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (KOI8-_R)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (KOI8-U)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (Windows-1251)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/_Pogled/_Znakovni standard/Japanski (ISO-2022-_JP)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/_Pogled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/_Pogled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/_Pogled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/_Pogled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/_Pogled/_Znakovni standard/Korejski (EUC-_KR)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/_Pogled/_Znakovni standard/Thai (TIS-620)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/_Pogled/_Znakovni standard/Thai (Windows-874)"
-
-#~ msgid "/_Tools/_Address book"
-#~ msgstr "/_Alati/_Adresar"
-
-#~ msgid "/_Tools/_Template"
-#~ msgstr "/_Alati/_Predlo?ak"
-
-#~ msgid "/_Tools/Actio_ns"
-#~ msgstr "/_Alati/Ak_cije"
-
-#~ msgid "No account for posting news available!"
-#~ msgstr "Nema ra?una za postanje newsa!"
-
-#~ msgid "E-Mail Address"
-#~ msgstr "E-mail adresa"
-
-#~ msgid " -> "
-#~ msgstr " -> "
-
-#~ msgid " <- "
-#~ msgstr " <- "
-
-#~ msgid "Export"
-#~ msgstr "Izvezi"
-
-#~ msgid "Specify target folder and mbox file."
-#~ msgstr "Odredite ciljani direktorij i mbox datoteku."
-
-#~ msgid "/------"
-#~ msgstr "/------"
-
-#, fuzzy
-#~ msgid "The Sylpheed-Claws Team\n"
-#~ msgstr "Sylpheed Claws ekipa"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Icons\n"
-#~ msgstr "Ikonica"
-
-#~ msgid "Set folder sortorder"
-#~ msgstr "Pode?avanje redosljeda direktorija"
-
-#, fuzzy
-#~ msgid "Source Buffer"
-#~ msgstr "Izvorni dir:"
-
-#, fuzzy
-#~ msgid "Wrap Mode"
-#~ msgstr "Normalni mod"
-
-#, fuzzy
-#~ msgid "Font"
-#~ msgstr "Fontovi"
-
-#, fuzzy
-#~ msgid "Numbers Font"
-#~ msgstr "Broj"
-
-#, fuzzy
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "Prika?i opis priloga (umjesto imena)"
-
-#~ msgid "Bad Spellers Mode"
-#~ msgstr "Mod lo?eg pravopis"
-
-#~ msgid "Unknown suggestion mode."
-#~ msgstr "Nepoznati preporu?eni mod."
-
-#~ msgid "Change dictionary"
-#~ msgstr "Promjeni rje?nik"
-
-#, fuzzy
-#~ msgid "Has been replied to"
-#~ msgstr "Po?alji odgovor za: "
-
-#~ msgid "Protocol log"
-#~ msgstr "Zapis protokola"
-
-#~ msgid " ... "
-#~ msgstr " ... "
-
-#, fuzzy
-#~ msgid " Extended Symbols... "
-#~ msgstr "Simboli za napredno pretra?ivanje"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Nepoznat SSL certifikat"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Promjenjeni SSl certifikat"
-
-#~ msgid "IMAP4 authentication failed.\n"
-#~ msgstr "IMAP4 autorizacija nije uspjela.\n"
-
-#, fuzzy
-#~ msgid "iconv cannot convert UTF-7 to %s\n"
-#~ msgstr "iconv ne mo?e konvertirati UTF-7 u UTF-8\n"
-
-#, fuzzy
-#~ msgid "iconv cannot convert %s to UTF-7\n"
-#~ msgstr "iconv ne mo?e konvertirati UTF-8 u UTF-7\n"
-
-#~ msgid "iconv cannot convert UTF-8 to UTF-7\n"
-#~ msgstr "iconv ne mo?e konvertirati UTF-8 u UTF-7\n"
-
-#, fuzzy
-#~ msgid "Error occurred while downloading messages in '%s'."
-#~ msgstr "Do?lo je do gre?ke prilikom pruzimanja poruke u `%s'."
-
-#~ msgid "Error reading LDIF fields."
-#~ msgstr "Gre?ka prilokom ?itanja LDIF polja."
-
-#~ msgid "???"
-#~ msgstr "???"
-
-#~ msgid "Some errors occurred while getting mail."
-#~ msgstr "Do?lo je do gre?aka prilikom primanja po?te."
-
-#~ msgid "Connection failed."
-#~ msgstr "Veza nije uspjela."
-
-#~ msgid "Really quit?"
-#~ msgstr "Stvarno ?elite izi?i?"
-
-#~ msgid "Composing message exists."
-#~ msgstr "Pisanje poruke postoji."
-
-#, fuzzy
-#~ msgid "_Save to Draft"
-#~ msgstr "u Nedovr?eno"
-
-#~ msgid "/_File/_Add mailbox"
-#~ msgstr "/_Datoteka/Doda_j sandu?i?"
-
-#~ msgid "/_File/_Add mailbox/MH..."
-#~ msgstr "/_Datoteka/Doda_j sandu?i?/MH..."
-
-#~ msgid "/_File/---"
-#~ msgstr "/_Datoteka/---"
-
-#~ msgid "/_File/Change folder order"
-#~ msgstr "/_Datoteka/Promjeni redosljed direktorija"
-
-#~ msgid "/_File/_Export to mbox file..."
-#~ msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
-
-#~ msgid "/_File/_Save as..."
-#~ msgstr "/_Datoteka/Spremi _kao..."
-
-#~ msgid "/_File/_Print..."
-#~ msgstr "/_Datoteka/Is_pi?i..."
-
-#~ msgid "/_File/_Work offline"
-#~ msgstr "/_Datoteka/_Offline rad"
-
-#~ msgid "/_File/E_xit"
-#~ msgstr "/_Datoteka/I_zlaz"
-
-#~ msgid "/_Edit/_Find in current message..."
-#~ msgstr "/_Edit/P_retra?i u trenutnoj poruci..."
-
-#~ msgid "/_Edit/_Search folder..."
-#~ msgstr "/_Datoteka/_Pretra?i direktorij..."
-
-#~ msgid "/_View/Show or hi_de/_Folder tree"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Stablo direktorija"
-
-#~ msgid "/_View/Show or hi_de/_Message view"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/P_ogled na poruku"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Traka alata"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Traka alata/Ikonice i tekst"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Icon"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Traka alata/_Ikonice"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Text"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Traka alata/_Tekst"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_None"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/_Traka alata/_Ni?ta"
-
-#~ msgid "/_View/Show or hi_de/Status _bar"
-#~ msgstr "/_Pogled/Pri_ka?i ili sakrij/Stat_us traka"
-
-#~ msgid "/_View/---"
-#~ msgstr "/_Pogled/---"
-
-#~ msgid "/_View/Separate f_older tree"
-#~ msgstr "/_Pogled/Odvoji sta_blo direktorija"
-
-#, fuzzy
-#~ msgid "/_View/Separate _message view"
-#~ msgstr "/_Pogled/Odvoji pre_gled poruka"
-
-#~ msgid "/_View/_Sort"
-#~ msgstr "/_Pogled/_Poslo?i"
-
-#~ msgid "/_View/_Sort/by _number"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _broju"
-
-#, fuzzy
-#~ msgid "/_View/_Sort/by S_ize"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _veli?ini"
-
-#, fuzzy
-#~ msgid "/_View/_Sort/by _Date"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _datumu"
-
-#, fuzzy
-#~ msgid "/_View/_Sort/by _From"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _po?iljatelju"
-
-#, fuzzy
-#~ msgid "/_View/_Sort/by _To"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _po?iljatelju"
-
-#, fuzzy
-#~ msgid "/_View/_Sort/by S_ubject"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _temi"
-
-#~ msgid "/_View/_Sort/by _color label"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po ozna_kama boje"
-
-#~ msgid "/_View/_Sort/by _mark"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po oz_naci"
-
-#~ msgid "/_View/_Sort/by _status"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _statusu"
-
-#~ msgid "/_View/_Sort/by a_ttachment"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po p_rilogu"
-
-#~ msgid "/_View/_Sort/by score"
-#~ msgstr "/_Pogled/Pos_lo?i/Poslo?i po _bodovima"
-
-#~ msgid "/_View/_Sort/by locked"
-#~ msgstr "/_Pogled/_Poslo?i/Poslo?i po zaklju?a_vanju"
-
-#~ msgid "/_View/_Sort/D_on't sort"
-#~ msgstr "/_Pogled/Pos_lo?io/_Ni?ta"
-
-#~ msgid "/_View/_Sort/---"
-#~ msgstr "/_Pogled/Pos_lo?i/---"
-
-#~ msgid "/_View/_Sort/Ascending"
-#~ msgstr "/_Pogled/Pos_lo?i/Rastu?e"
-
-#~ msgid "/_View/_Sort/Descending"
-#~ msgstr "/Pregled/_Poslo?i/Silazno"
-
-#, fuzzy
-#~ msgid "/_View/Set displayed _columns"
-#~ msgstr "/_Pogled/Po_desi stavke za prikaz"
-
-#, fuzzy
-#~ msgid "/_View/Set displayed _columns/in _Folder list..."
-#~ msgstr "/_Pogled/Po_desi stavke za prikaz"
-
-#, fuzzy
-#~ msgid "/_View/Set displayed _columns/in _Message list..."
-#~ msgstr "/_Pogled/Po_desi stavke za prikaz"
-
-#~ msgid "/_View/_Go to/_Prev message"
-#~ msgstr "/_Odr?avanje/_Idi na/_Prethodna poruka"
-
-#~ msgid "/_View/_Go to/_Next message"
-#~ msgstr "/_Odr?avanje/_Idi na/Slij_ede?a poruka"
-
-#~ msgid "/_View/_Go to/---"
-#~ msgstr "/_Pogled/_Idi na/---"
-
-#~ msgid "/_View/_Go to/P_rev unread message"
-#~ msgstr "/_Pogled/Idi na/P_rethodna nepro?itana poruka"
-
-#~ msgid "/_View/_Go to/N_ext unread message"
-#~ msgstr "/_Pogled/_Idi na/Sljede?a _nepro?itana poruka"
-
-#~ msgid "/_View/_Go to/Prev ne_w message"
-#~ msgstr "/_Pogled/_Idi na/Prethodna no_va poruka"
-
-#~ msgid "/_View/_Go to/Ne_xt new message"
-#~ msgstr "/_Pogled/_Idi na/Slij_ede?a nova poruka"
-
-#~ msgid "/_View/_Go to/Prev _marked message"
-#~ msgstr "/_Pogled/_Idi na/Prethodna _ozna?ena poruka"
-
-#~ msgid "/_View/_Go to/Next m_arked message"
-#~ msgstr "/_Pogled/_Idi na/Sljede?a o_zna?ena poruka poruka"
-
-#~ msgid "/_View/_Go to/Prev _labeled message"
-#~ msgstr "/_Pogled/_Idi na/Prethodnu obo_janu poruku"
-
-#~ msgid "/_View/_Go to/Next la_beled message"
-#~ msgstr "/_Pogled/_Idi na/_Sljede?u obojanu poruku"
-
-#~ msgid "/_View/_Go to/Other _folder..."
-#~ msgstr "/_Pogled/_Idi na/_Drugi direktorij..."
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/---"
-#~ msgstr "/_Pogled/_De?ifriranje/---"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/_Auto detect"
-#~ msgstr "/_Pogled/_De?ifriranje/_Auto detekcija"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/_Pogled/_Znakovni standard/7bit ascii (US-ASC_II)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/_Pogled/_Znakovni standard/Unicode (_UTF-8)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/_Pogled/_Znakovni standard/Zapadno-europski (ISO-8859-_1)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/_Pogled/_Znakovni standard/Zapadno-europski (ISO-8859-_15)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/_Pogled/_Znakovni standard/Zapadno-europski (ISO-8859-_15)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/_Pogled/_Znakovni standard/Srednje-europski (ISO-8859-_2)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/_Pogled/_Znakovni standard/_Balti?ki (ISO-8859-13)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/_Pogled/_Znakovni standard/Balti?ki (ISO-8859-_4)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/_Pogled/_Znakovni standard/Gr?ki (ISO-8859-_7)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/_Pogled/_Znakovni standard/Gr?ki (ISO-8859-_7)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (Windows-1251)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/_Pogled/_Znakovni standard/Turski (ISO-8859-_9)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (ISO-8859-_5)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (KOI8-_R)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (KOI8-U)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/_Pogled/_Znakovni standard/?irilica (Windows-1251)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/_Pogled/_Znakovni standard/Japanski (ISO-2022-_JP)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-#~ msgstr "/_Pogled/_Znakovni standard/Japanski (ISO-2022-JP-2)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-#~ msgstr "/_Pogled/_Znakovni standard/Japanski (_EUC-JP)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-#~ msgstr "/_Pogled/_Znakovni standard/Japanski (_Shift__JIS)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/_Pogled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/_Pogled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/_Pogled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/_Pogled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-#~ msgstr "/_Pogled/_Znakovni standard/Kineski (ISO-2022-_CN)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/_Pogled/_Znakovni standard/Korejski (EUC-_KR)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-#~ msgstr "/_Pogled/_Znakovni standard/Korejski (ISO-2022-KR)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/_Pogled/_Znakovni standard/Thai (TIS-620)"
-
-#, fuzzy
-#~ msgid "/_View/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/_Pogled/_Znakovni standard/Thai (Windows-874)"
-
-#~ msgid "/_View/Decode/---"
-#~ msgstr "/_Pogled/_De?ifriranje/---"
-
-#~ msgid "/_View/Decode/_8bit"
-#~ msgstr "/_Pogled/De?ifriranje/_8bit"
-
-#~ msgid "/_View/Decode/_Quoted printable"
-#~ msgstr "/_Pogled/De?ifriranje/_Kao za ispis"
-
-#~ msgid "/_View/Decode/_Base64"
-#~ msgstr "/_Pogled/De?ifriranje/_Base64"
-
-#~ msgid "/_View/Decode/_Uuencode"
-#~ msgstr "/_Pogled/De?ifriranje/_Uuencode"
-
-#, fuzzy
-#~ msgid "/_View/Show all headers"
-#~ msgstr "/_Pogled/Prika?i s_vo zaglavlje"
-
-#~ msgid "/_Message/Recei_ve"
-#~ msgstr "/P_oruka/Pr_imi"
-
-#~ msgid "/_Message/Recei_ve/---"
-#~ msgstr "/P_oruka/Pri_manje/---"
-
-#~ msgid "/_Message/_Send queued messages"
-#~ msgstr "/P_oruka/Po?alji _odlo?ene poruke"
-
-#~ msgid "/_Message/Compose a news message"
-#~ msgstr "/P_oruka/Kreiraj _news poruku"
-
-#~ msgid "/_Message/_Reply"
-#~ msgstr "/P_oruka/O_dgovori"
-
-#~ msgid "/_Message/Repl_y to"
-#~ msgstr "/P_oruka/O_dgovori"
-
-#~ msgid "/_Message/Repl_y to/_all"
-#~ msgstr "/P_oruka/Od_govori .../Svi_ma"
-
-#~ msgid "/_Message/Repl_y to/_sender"
-#~ msgstr "/P_oruka/Od_govori .../_Po?iljatelju"
-
-#~ msgid "/_Message/Repl_y to/mailing _list"
-#~ msgstr "/P_oruka/Od_govori .../Na _mailing listu"
-
-#~ msgid "/_Message/Follow-up and reply to"
-#~ msgstr "/P_oruka/P_rosljedi i odgovori"
-
-#~ msgid "/_Message/_Forward"
-#~ msgstr "/P_oruka/P_rosljedi"
-
-#~ msgid "/_Message/For_ward as attachment"
-#~ msgstr "/P_oruka/Prosljedi kao prilo_g"
-
-#~ msgid "/_Message/Redirect"
-#~ msgstr "/P_oruka/Pr_eusmjeri"
-
-#~ msgid "/_Message/M_ove..."
-#~ msgstr "/P_oruka/Pre_mjesti..."
-
-#~ msgid "/_Message/_Copy..."
-#~ msgstr "/P_oruka/Kopira_j"
-
-#, fuzzy
-#~ msgid "/_Message/_Delete..."
-#~ msgstr "/P_oruka/O_bri?i"
-
-#~ msgid "/_Message/Cancel a news message"
-#~ msgstr "/P_oruka/Poni?ti news poruku"
-
-#~ msgid "/_Message/_Mark"
-#~ msgstr "/P_oruka/O_zna?i"
-
-#~ msgid "/_Message/_Mark/_Mark"
-#~ msgstr "/P_oruka/O_zna?i/_Ozna?i"
-
-#~ msgid "/_Message/_Mark/_Unmark"
-#~ msgstr "/P_oruka/O_zna?i/_Ukloni oznaku"
-
-#~ msgid "/_Message/_Mark/---"
-#~ msgstr "/P_oruka/O_zna?i/---"
-
-#~ msgid "/_Message/_Mark/Mark as unr_ead"
-#~ msgstr "/P_oruka/O_zna?i/Ozna?i kao _nepro?itano"
-
-#~ msgid "/_Message/_Mark/Mark as rea_d"
-#~ msgstr "/P_oruka/O_zna?i/Ozna?i kao _pro?itano"
-
-#~ msgid "/_Message/_Mark/Mark all _read"
-#~ msgstr "/P_oruka/O_zna?i/Ozna?i sve kao _pro?itano"
-
-#~ msgid "/_Message/Re-_edit"
-#~ msgstr "/P_oruka/Pre_uredi"
-
-#~ msgid "/_Tools/_Address book..."
-#~ msgstr "/_Alati/_Adresar..."
-
-#~ msgid "/_Tools/Add sender to address boo_k"
-#~ msgstr "/_Alati/_Dodaj po?iljatelja u adresar"
-
-#~ msgid "/_Tools/_Harvest addresses"
-#~ msgstr "/_Alati/Sakupi adres_e"
-
-#~ msgid "/_Tools/_Harvest addresses/from _Folder..."
-#~ msgstr "/_Alati/Sakupi adres_e/Iz di_rektorija"
-
-#~ msgid "/_Tools/_Harvest addresses/from _Messages..."
-#~ msgstr "/_Alati/Sakupi adres_e/Iz _poruka"
-
-#~ msgid "/_Tools/_Create filter rule"
-#~ msgstr "/_Alati/_Kreiraj filter pravilo"
-
-#~ msgid "/_Tools/_Create filter rule/_Automatically"
-#~ msgstr "/_Alati/_Kreiraj pravilo filtriranja/_Automatski"
-
-#~ msgid "/_Tools/_Create filter rule/by _From"
-#~ msgstr "/_Alati/_Kreiraj pravilo filtriranja/Po po?i_ljatelju"
-
-#~ msgid "/_Tools/_Create filter rule/by _To"
-#~ msgstr "/_Alati/_Kreiraj pravilo filtriranja/Po p_rimatelju"
-
-#~ msgid "/_Tools/_Create filter rule/by _Subject"
-#~ msgstr "/_Alati/_Kreiraj pravilo filtriranja/Po _temi"
-
-#, fuzzy
-#~ msgid "/_Tools/C_reate processing rule"
-#~ msgstr "/_Alati/_Kreiraj pravilo za izvo?enje"
-
-#, fuzzy
-#~ msgid "/_Tools/C_reate processing rule/_Automatically"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/_Automatski"
-
-#, fuzzy
-#~ msgid "/_Tools/C_reate processing rule/by _From"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po po?i_ljatelju"
-
-#, fuzzy
-#~ msgid "/_Tools/C_reate processing rule/by _To"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po p_rimatelju"
-
-#, fuzzy
-#~ msgid "/_Tools/C_reate processing rule/by _Subject"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po _temi"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In selected folder"
-#~ msgstr "/_Alati/_Obri?i duplicirane poruke/U ozna?enom direktoriju"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In all folders"
-#~ msgstr "/_Alati/_Obri?i duplicirane poruke/U svim direktorijima"
-
-#~ msgid "/_Tools/E_xecute"
-#~ msgstr "/_Alati/_Izvr?i"
-
-#, fuzzy
-#~ msgid "/_Tools/SSL cer_tificates..."
-#~ msgstr "/_Alati/SSL potv_rde..."
-
-#~ msgid "/_Tools/_Log window"
-#~ msgstr "/_Alati/Prozor d_nevnika"
-
-#~ msgid "/_Configuration/_Edit accounts..."
-#~ msgstr "/_Konfiguracija/_Uredi ra?une..."
-
-#~ msgid "/_Configuration/---"
-#~ msgstr "/_Konfiguracija/---"
-
-#, fuzzy
-#~ msgid "/_Configuration/P_references..."
-#~ msgstr "/_Konfiguracija/_Postavke..."
-
-#, fuzzy
-#~ msgid "/_Configuration/Pre-pr_ocessing..."
-#~ msgstr "/_Konfiguracija/Predizvo?enje..."
-
-#, fuzzy
-#~ msgid "/_Configuration/Post-pro_cessing..."
-#~ msgstr "/_Konfiguracija/Postizvo?enje..."
-
-#~ msgid "/_Configuration/_Filtering..."
-#~ msgstr "/_Konfiguracija/Postvke _filtera"
-
-#~ msgid "/_Configuration/_Templates..."
-#~ msgstr "/_Konfiguracija/Predlo_?ci..."
-
-#~ msgid "/_Configuration/_Actions..."
-#~ msgstr "/_Konfiguracija/_Akcije..."
-
-#, fuzzy
-#~ msgid "/_Configuration/Plu_gins..."
-#~ msgstr "/_Konfiguracija/_Dodaci..."
-
-#~ msgid "/_Help/---"
-#~ msgstr "/Po_mo?/---"
-
-#~ msgid "/_File/_Close"
-#~ msgstr "/_Datoteka/_Zatvori"
-
-#~ msgid "/_Message/Compose _new message"
-#~ msgstr "/P_oruka/Kreiraj _novu poruku"
-
-#~ msgid "/_Message/Redirec_t"
-#~ msgstr "/P_oruka/Pre_usmjeri"
-
-#, fuzzy
-#~ msgid "/_Tools/Create processing rule"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja"
-
-#~ msgid "/_Tools/Create processing rule/_Automatically"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/_Automatski"
-
-#~ msgid "/_Tools/Create processing rule/by _From"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po po?i_ljatelju"
-
-#~ msgid "/_Tools/Create processing rule/by _To"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po p_rimatelju"
-
-#~ msgid "/_Tools/Create processing rule/by _Subject"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po _temi"
-
-#~ msgid "Sylpheed - Message View"
-#~ msgstr "Sylpheed - Pregled poruka"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Unesite naredbu za idirektorij:\n"
-#~ "`%s' predstavlja datoteku)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Print command line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Naredba za idirektorij je pogre?na:\n"
-#~ "`%s'"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "ne mogu primiti listu news grupa\n"
-
-#~ msgid "can't post article.\n"
-#~ msgstr "ne mogu poslati ?lanak.\n"
-
-#~ msgid "can't retrieve article %d\n"
-#~ msgstr "ne mogu primiti ?lanak %d\n"
-
-#~ msgid "getting xover %d in %s...\n"
-#~ msgstr "primam xover %d  u %s...\n"
-
-#~ msgid "error occurred while getting xover.\n"
-#~ msgstr "do?lo je do gre?ke prilikom dobivanja xovera.\n"
-
-#~ msgid "error occurred while getting xhdr.\n"
-#~ msgstr "do?lo je do gre?ke prilikom dobivanja xhdra.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "This plugin uses Clam AntiVirus to scan all messages that are received "
-#~ "from an IMAP, LOCAL or POP account.\n"
-#~ "\n"
-#~ "When a message attachment is found to contain a virus it can be deleted "
-#~ "or saved in a specially designated folder.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ovaj dodatak koristi Clam AntiVirus za provjeru svih poruka koje su "
-#~ "primljene sa IMAP, LOCAL ili POP ra?una.\n"
-#~ "\n"
-#~ "Kada se otkrije virus u privitku poruke, ona mo?e biti obrisana ili "
-#~ "spremljena u za to odre?eni direktorij.\n"
-#~ "\n"
-#~ "Ovaj dodatak sadr?i samo osnovne funkcije za provjeru i brisanje ili "
-#~ "premje?tanje poruka. Vjerojatno ?ete htjeti da koristite i dodatak za Gtk"
-#~ "+ korisni?ko su?elje, u suprotnom ?ete morati ru?no pisati konfiguraciju "
-#~ "za ovaj dodatak.\n"
-
-#~ msgid "Scan archive contents"
-#~ msgstr "Provjeri sadr?aj arhive"
-
-#~ msgid "Leave empty to use the default trash folder"
-#~ msgstr "Ostavite prazno da bi koristili uobi?ajeni dirktorij 'Sme?e'."
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo preglednik"
-
-#~ msgid "Do not load remote links in mails"
-#~ msgstr "Nemoj pratiti udaljene linkove u porukama"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Ekvivalent Dillo opciji '--local'"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr ""
-#~ "Jo? uvijek mo?ete dozvoliti pra?enje linkova ponovnim u?itavanjem stranice"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Puni prozor mod (Sakrij kontrole)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Evivalent Dillo opciji '--fullwindow'"
-
-#~ msgid "This plugin renders HTML mail using the Dillo web browser."
-#~ msgstr "Ovaj dodatak prikazuje HTML mail koriste?i Dillo web preglednik."
-
-#, fuzzy
-#~ msgid "Please select key for '%s'"
-#~ msgstr "Molim, odaberite klju? za `%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "This plugin handles PGP core operations. It is used by other\n"
-#~ "plugins, like PGP/Mime.\n"
-#~ "\n"
-#~ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>\n"
-#~ msgstr ""
-#~ "Ovaj dodatak barata sa PGP/MIME potpisanim i/ili ?ifriranim porukama. "
-#~ "Mo?ete de?ifrirati poruke, ovjeriti potpis ili potpisati i ?ifrirati "
-#~ "svoje poruke.\n"
-#~ "\n"
-#~ "Dodatak koristi GPGME biblioteku kao omota? za GnuPG.\n"
-#~ "\n"
-#~ "GPGME je za?ti?en 2001 od strane Werner Koch <dd9jn at gnu.org>\n"
-
-#~ msgid "Maximum size a message is allowed to have to be checked"
-#~ msgstr "Maksimalna veli?ina poruke koja ?e se provjeriti"
-
-#~ msgid "kB"
-#~ msgstr "kB"
-
-#, fuzzy
-#~ msgid "Save mails that where identified as spam"
-#~ msgstr "Spremi poruke koje su prepoznate kao spam u direktorij"
-
-#, fuzzy
-#~ msgid "/E_xit Sylpheed-Claws"
-#~ msgstr "/I_zlaz"
-
-#, fuzzy
-#~ msgid "/Work Offline"
-#~ msgstr "/_Datoteka/_Offline rad"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Ovaj dodatak postavlja ikonicu sandu?i?a koja pokazuje dali imate novih "
-#~ "ili nepro?itanih poruka u sistemski tray.\n"
-#~ "\n"
-#~ "Sandu?i? je prazan ako nemate nepro?itanih poruka, u suprotnom sadr?i "
-#~ "pismo. Natuknica prikazuje nove, nepro?itane i ukupan broj svih poruka."
-
-#~ msgid "Exit this program?"
-#~ msgstr "Izlaz iz ovog programa?"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "Organizacija"
-
-#~ msgid "Download all messages on server"
-#~ msgstr "Primi sve poruke sa poslu?itelja"
-
-#~ msgid "Add Date"
-#~ msgstr "Dodaj datum"
-
-#~ msgid " Edit... "
-#~ msgstr " Uredi... "
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "Automatsko ubacivanje potpisa"
-
-#~ msgid "Encrypt message by default"
-#~ msgstr "Uvijek kriptiraj poruke"
-
-#~ msgid "Sign message by default"
-#~ msgstr "Uvijek potpi?i poruke"
-
-#~ msgid "Unsupported (%s)"
-#~ msgstr "Nepodr?ano (%s)"
-
-#, fuzzy
-#~ msgid " Syntax help... "
-#~ msgstr " Sintaksna pomo?"
-
-#~ msgid "MENU NAME:"
-#~ msgstr "Ime izbornika:"
-
-#~ msgid "COMMAND LINE:"
-#~ msgstr "Naredbeni redak:"
-
-#~ msgid "Begin with:"
-#~ msgstr "Po?inje sa"
-
-#~ msgid "End with:"
-#~ msgstr "Zavr?ava sa:"
-
-#~ msgid "Use:"
-#~ msgstr "Koristite:"
-
-#~ msgid "Audio player"
-#~ msgstr "Audio svira?"
-
-#~ msgid "Info ..."
-#~ msgstr "Info ..."
-
-#~ msgid "  Replace  "
-#~ msgstr "  Zamjeni  "
-
-#~ msgid "Default To: "
-#~ msgstr "Uobi?ajeni primatelj: "
-
-#~ msgid "Default dictionary: "
-#~ msgstr "Uobi?ajeni rje?nik: "
-
-#~ msgid "Unread flag"
-#~ msgstr "Oznaka 'Nepro?itano'"
-
-#~ msgid "Marked flag"
-#~ msgstr "Oznaka"
-
-#~ msgid "Forwarded flag"
-#~ msgstr "Oznaka 'Proslje?eno'"
-
-#~ msgid "Locked flag"
-#~ msgstr "Oznaka 'zaklju?ano'"
-
-#~ msgid "Score greater than"
-#~ msgstr "Broj bodova ve?i od"
-
-#~ msgid "Score equal to"
-#~ msgstr "Broj bodova je"
-
-#~ msgid "Test"
-#~ msgstr "Provjera"
-
-#~ msgid "or"
-#~ msgstr "ili"
-
-#, fuzzy
-#~ msgid " Info... "
-#~ msgstr "Info ..."
-
-#~ msgid "Predicate"
-#~ msgstr "Predikat"
-
-#~ msgid "Boolean Op"
-#~ msgstr "I/Ili"
-
-#, fuzzy
-#~ msgid ""
-#~ "The entry was not saved.\n"
-#~ "Have you really finished?"
-#~ msgstr ""
-#~ "Unos nija spremljen\n"
-#~ "Jeste li stvarno zavr?ili?"
-
-#~ msgid "'Test' allows you to test a message or message element"
-#~ msgstr "'Provjera' vam omogu?ava da provjerite poruku ili dio poruke"
-
-#~ msgid "using an external program or script. The program will"
-#~ msgstr "Kori?tenje vanjskog programa ili skripte. Program ?e"
-
-#~ msgid "return either 0 or 1"
-#~ msgstr "vrati 0 ili 1"
-
-#~ msgid "Quoted Text - First Level"
-#~ msgstr "Citirani tekst - prvi stupanj"
-
-#~ msgid "Quoted Text - Second Level"
-#~ msgstr "Citirani tekst - drugi stupanj"
-
-#~ msgid "Quoted Text - Third Level"
-#~ msgstr "Citirani tekst - tre?i stupanj"
-
-#~ msgid "Pick color for quotation level 2"
-#~ msgstr "Odaberite boju za citat 2. stupnja"
-
-#~ msgid "Pick color for quotation level 3"
-#~ msgstr "Odaberite boju za citat 3. stupnja"
-
-#~ msgid "Pick color for URI"
-#~ msgstr "Odaberite boju za URI"
-
-#~ msgid "Clip the log size"
-#~ msgstr "Skrati veliki dnevnik"
-
-#~ msgid "Log window length"
-#~ msgstr "Du?ina prozora dnevnika"
-
-#~ msgid "Reply format"
-#~ msgstr "Formatiranje odgovora"
-
-#~ msgid "Forward format"
-#~ msgstr "Format proslje?ivanja"
-
-#, fuzzy
-#~ msgid " Description of symbols... "
-#~ msgstr " Obja?njenje simbola "
-
-#~ msgid "Quotation characters"
-#~ msgstr "Znakovi za citiranje"
-
-#, fuzzy
-#~ msgid "Quoting"
-#~ msgstr "Izlazim"
-
-#~ msgid "Auto-check new mail"
-#~ msgstr "Auto-provjera nove po?te"
-
-#~ msgid "every"
-#~ msgstr "Svaki"
-
-#~ msgid "Run command when new mail arrives"
-#~ msgstr "Pokreni naredbu pri primanju novih poruka"
-
-#~ msgid "Dictionaries path:"
-#~ msgstr "Putanja do rje?nika:"
-
-#~ msgid "Key bindings"
-#~ msgstr "Postavke tipki"
-
-#~ msgid "Old Sylpheed"
-#~ msgstr "Stari Sylpheed"
-
-#, fuzzy
-#~ msgid "Translate header name (such as 'From:', 'Subject:')"
-#~ msgstr "Prevedi ime zaglavlja (kao ?to su `Od:' i `Tema:')"
-
-#~ msgid "Messages will be marked until execution if this is turned off"
-#~ msgstr "Poruke ?e biti ozna?ene do izvr?enja ako je ovo isklju?eno"
-
-#, fuzzy
-#~ msgid "Select first unread (or new) message"
-#~ msgstr "Zavr?eno (nema novih poruka)"
-
-#~ msgid " Set key bindings... "
-#~ msgstr " Odaberite skup tipkovni?kih kratica... "
-
-#~ msgid "Template name"
-#~ msgstr "Ime predlo?ka"
-
-#, fuzzy
-#~ msgid " Symbols... "
-#~ msgstr "Simboli"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Konfiguracija alatne trake glavnog prozora"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Konfiguracija alatne trake za pisanje poruka"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Konfiguracija alatne trake za pregled poruka"
-
-#, fuzzy
-#~ msgid "Sylpheed-Claws Action"
-#~ msgstr "Sylpheed Akcija"
-
-#~ msgid "Available toolbar icons"
-#~ msgstr "Dostupne ikonice za alatnu traku"
-
-#~ msgid "Displayed toolbar items"
-#~ msgstr "Prikazane stavke na alatnoj traci"
-
-#~ msgid "Customize Toolbars"
-#~ msgstr "Podesi alatnu traku"
-
-#~ msgid "Wrap on input"
-#~ msgstr "Sa?imanje pri upisu"
-
-#~ msgid "Wrap before sending"
-#~ msgstr "Sa?mi prije slanja"
-
-#~ msgid ""
-#~ "Insert expr if x is set\n"
-#~ "x is one of the characters above after %"
-#~ msgstr ""
-#~ "Ubaci izraz ako je dato x\n"
-#~ "x je bilo koji simbol poslje %"
-
-#~ msgid "Insert File"
-#~ msgstr "Unesi datoteku"
-
-#~ msgid "/Repl_y to/_all"
-#~ msgstr "/Odgovori _.../Svi_ma"
-
-#~ msgid "/Repl_y to/_sender"
-#~ msgstr "/Odgovori _.../Po?iljatelju"
-
-#~ msgid "/Redirect"
-#~ msgstr "/Preusmjeri"
-
-#~ msgid "/_Mark/_Mark"
-#~ msgstr "/_Ozna?i/_Ozna?i"
-
-#~ msgid "/_Mark/_Unmark"
-#~ msgstr "/_Ozna?i/_Ukloni oznaku"
-
-#~ msgid "/_Mark/---"
-#~ msgstr "/_Ozna?i/---"
-
-#~ msgid "/_Mark/Mark as unr_ead"
-#~ msgstr "/_Ozna?i/Ozna?i kao _nepro?itano"
-
-#~ msgid "/_Mark/Mark as rea_d"
-#~ msgstr "/_Ozna?i/Ozna?i kao _pro?itano"
-
-#~ msgid "/_Mark/Mark all read"
-#~ msgstr "/_Ozna?i/Ozna?i sve kao _pro?itano"
-
-#~ msgid "/_Mark/Ignore thread"
-#~ msgstr "/_Ozna?i/Zanemari nit"
-
-#~ msgid "/_Mark/Unignore thread"
-#~ msgstr "/_Ozna?i/Ponovno prati nit"
-
-#~ msgid "/_Mark/Lock"
-#~ msgstr "/_Ozna?i/Zaklju?aj"
-
-#~ msgid "/_Mark/Unlock"
-#~ msgstr "/_Ozna?i/_Odklju?aj"
-
-#~ msgid "/Create f_ilter rule/_Automatically"
-#~ msgstr "/Kreiraj f_ilter pravilo/_Automatski"
-
-#~ msgid "/Create f_ilter rule/by _From"
-#~ msgstr "/Kreiraj f_ilter pravilo/Po _po?iljatelju"
-
-#~ msgid "/Create f_ilter rule/by _To"
-#~ msgstr "/Kreiraj f_ilter pravilo/Po p_rimatelju"
-
-#~ msgid "/Create f_ilter rule/by _Subject"
-#~ msgstr "/Kreiraj f_ilter pravilo/Po_temi"
-
-#~ msgid "/Create processing rule/_Automatically"
-#~ msgstr "/Kreiraj pravilo izvo?enja/_Automatski"
-
-#~ msgid "/Create processing rule/by _From"
-#~ msgstr "/Kreiraj pravilo izvo?enja/Po _po?iljatelju"
-
-#~ msgid "/Create processing rule/by _To"
-#~ msgstr "/Kreiraj pravilo izvo?enja/Po p_rimatelju"
-
-#~ msgid "/Create processing rule/by _Subject"
-#~ msgstr "/Kreiraj pravilo izvo?enja/Po_temi"
-
-#~ msgid "/_View/_Source"
-#~ msgstr "/Pregled/I_zvor poruke"
-
-#~ msgid "/_View/All _header"
-#~ msgstr "/_Pogled/Svo za_glavlje"
-
-#~ msgid "No marked message found. Search from the beginning?"
-#~ msgstr "Nema vi?e ozna?enih poruka. Nastaviti od po?etka?"
-
-#~ msgid " items selected"
-#~ msgstr " odabrane(ih) poruke(a)"
-
-#~ msgid "Unthreading..."
-#~ msgstr "Rasipavam..."
-
-#~ msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
-#~ msgstr "    Za spremanje odaberite 'Spremi kao...' (Kratica 'k')\n"
-
-#~ msgid "(Shortcut key: 'l'),\n"
-#~ msgstr "(Kratica: 'o'),\n"
-
-#~ msgid "    or 'Open with...' (Shortcut key: 'o')\n"
-#~ msgstr "    ili 'Otvori sa...' (Kratica: 's')\n"
-
-#~ msgid "/Reply to all with _quote"
-#~ msgstr "/Odgovori svi_ma sa citatom"
-
-#~ msgid "/_Reply to all without quote"
-#~ msgstr "/_Odgovori svima bez citata"
-
-#~ msgid "/Reply to list with _quote"
-#~ msgstr "/Odgovori na listu sa citat_om"
-
-#~ msgid "/_Reply to list without quote"
-#~ msgstr "/Odgovori na _listu bez citata"
-
-#~ msgid "/Reply to sender with _quote"
-#~ msgstr "/Odgovor_i po?iljatelju sa citatom"
-
-#~ msgid "/_Reply to sender without quote"
-#~ msgstr "/Odgovor_i po?iljatelju bez citata"
-
-#, fuzzy
-#~ msgid "Sylpheed-Claws Team"
-#~ msgstr "Sylpheed Claws ekipa"
-
-#~ msgid "Security"
-#~ msgstr "Sigurnost"
-
-#~ msgid "Cloned %s"
-#~ msgstr "Kloniran %s"
-
-#~ msgid "+No"
-#~ msgstr "+Ne"
-
-#~ msgid "/_File/New _Server"
-#~ msgstr "/_Datoteka/Novi _server"
-
-#~ msgid "/_File/_Edit"
-#~ msgstr "/_Datoteka/_Uredi"
-
-#~ msgid "/_Edit/C_ut"
-#~ msgstr "/_Uredi/_Re?i"
-
-#~ msgid "/_Edit/Pa_ste Address"
-#~ msgstr "/_Uredi/_Ubaci adresu"
-
-#~ msgid "/_Address/New _Folder"
-#~ msgstr "/_Adresa/Novi _direktorij"
-
-#~ msgid "/Pa_ste Address"
-#~ msgstr "/Uba_ci adresu"
-
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
-#~ msgid "/_Spelling/---"
-#~ msgstr "/_Pravopis/---"
-
-#~ msgid "/_Spelling/_Spelling Configuration"
-#~ msgstr "/_Pravopis/_Postava pravopisa"
-
-#~ msgid ""
-#~ "Cannot re-edit an encrypted message. \n"
-#~ "Discard encrypted part?"
-#~ msgstr ""
-#~ "Nemo?ete ponovo ure?ivati ?ifriranu poruku.\n"
-#~ "Dali da zanemarim ?ifrirani dio?"
-
-#~ msgid "Move Up"
-#~ msgstr "Pomakni gore"
-
-#~ msgid "Move Down"
-#~ msgstr "Pomakni dolje"
-
-#~ msgid "Basic Data"
-#~ msgstr "Osnovni podaci"
-
-#~ msgid "Ok"
-#~ msgstr "U redu."
-
-#~ msgid "Replace \"%s\" with: "
-#~ msgstr "Zamjeni %s sa: "
-
-#~ msgid "creating tunneled IMAP4 connection\n"
-#~ msgstr "Uspostavljanje tunnel IMAP4 veze\n"
-
-#~ msgid "creating IMAP4 connection to %s:%d ...\n"
-#~ msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
-
-#~ msgid "can't set deleted flags: 1:*\n"
-#~ msgstr "ne mogu postaviti obrisane oznake: 1:*\n"
-
-#~ msgid "can't close folder\n"
-#~ msgstr "ne mogu zatvoriti direktorij\n"
-
-#~ msgid "error occurred while getting LIST.\n"
-#~ msgstr "do?lo je do gre?ke prilikom dobivanja LISTe.\n"
-
-#~ msgid "can't get envelope\n"
-#~ msgstr "ne mogu dobiti omot\n"
-
-#~ msgid "error occurred while getting envelope.\n"
-#~ msgstr "do?lo je do gre?ke prilikom dobivanja omota.\n"
-
-#~ msgid "can't parse envelope: %s\n"
-#~ msgstr "ne mogu analizirati omot: %s\n"
-
-#~ msgid "Can't establish IMAP4 session with: %s\n"
-#~ msgstr "Ne mogu uspostaviti IMAP4 sesiju sa: %s\n"
-
-#~ msgid "Can't establish IMAP4 session with: %s:%d\n"
-#~ msgstr "Ne mogu uspostaviti MAP4 sesija sa: %s:%d\n"
-
-#~ msgid "can't get namespace\n"
-#~ msgstr "ne mogu dobiti namespace\n"
-
-#~ msgid "IMAP4 login failed.\n"
-#~ msgstr "IMAP4 login propao.\n"
-
-#~ msgid "can't append %s to %s\n"
-#~ msgstr "ne mogu pri?vrstiti %s na %s\n"
-
-#~ msgid "can't append message to %s\n"
-#~ msgstr "ne mogu dodati poruku u %s\n"
-
-#~ msgid "error while imap command: STORE %s %s\n"
-#~ msgstr "gre?ka prilikom imap naredbe: STORE %s %s\n"
-
-#~ msgid "error while imap command: EXPUNGE\n"
-#~ msgstr "gre?ka prilikom imap naredbe: EXPUNGE\n"
-
-#~ msgid "error while imap command: CLOSE\n"
-#~ msgstr "gre?ka prilikom imap naredbe: CLOSE\n"
-
-#~ msgid "/IMAP4 _account settings"
-#~ msgstr "/Post_avke IMAP4 ra?una"
-
-#~ msgid "/Remove _IMAP4 account"
-#~ msgstr "/Ukloni _IMAP4 ra?un"
-
-#~ msgid "Really delete IMAP4 account `%s'?"
-#~ msgstr "Uistinu obrisati `%s' IMAP4 ra?un?"
-
-#~ msgid "Delete IMAP4 account"
-#~ msgstr "Obri?i IMAP4 ra?un"
-
-#~ msgid "You are offline. Go online?"
-#~ msgstr "Radite offline. Da pre?em na online?"
-
-#~ msgid "Draft them"
-#~ msgstr "Nedovr?eno"
-
-#~ msgid "/_View/_Sort/by _recipient"
-#~ msgstr "/_Pogled/Pos_lo?i/Po_slo?i po primatelju"
-
-#~ msgid "/_View/_Code set/---"
-#~ msgstr "/_Pogled/_Znakovni standard/---"
-
-#~ msgid "/_View/_Code set"
-#~ msgstr "/_Pogled/_Znakovni standard"
-
-#~ msgid "/_View/_Code set/_Auto detect"
-#~ msgstr "/_Pogled/_Znakovni standard/_Auto detekcija"
-
-#~ msgid "/_Tools/_Create processing rule/_Automatically"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/_Automatski"
-
-#~ msgid "/_Tools/_Create processing rule/by _From"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po po?i_ljatelju"
-
-#~ msgid "/_Tools/_Create processing rule/by _To"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po p_rimatelju"
-
-#~ msgid "/_Tools/_Create processing rule/by _Subject"
-#~ msgstr "/_Alati/_Kreiraj pravilo izvo?enja/Po _temi"
-
-#~ msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
-#~ msgstr "/Po_mo?/P_riru?nik (Sylpheed dokumentacija na webu)"
-
-#~ msgid "/_Help/_FAQ (Local)"
-#~ msgstr "/Po_mo?/_FAQ (lokalni)"
-
-#~ msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
-#~ msgstr "/Po_mo?/F_AQ (Sylpheed dokumentacija na webu)"
-
-#~ msgid "/_Help/_Claws FAQ (Claws Documentation)"
-#~ msgstr "/Po_mo?/_Claws FAQ (Claws dokumentacija)"
-
-#~ msgid "Backward search"
-#~ msgstr "Potraga unatra?ke"
-
-#~ msgid "Check"
-#~ msgstr "Ozna?i"
-
-#~ msgid "Full info"
-#~ msgstr "Puni info"
-
-#~ msgid "/News _account settings"
-#~ msgstr "/Post_avke news ra?una"
-
-#~ msgid "/Remove _news account"
-#~ msgstr "/Ukloni news _ra?un"
-
-#~ msgid "Really delete news account `%s'?"
-#~ msgstr "Uistinu obrisati `%s' news ra?un?"
-
-#~ msgid "Clam AntiVirus GTK"
-#~ msgstr "Clam AntiVirus GTK"
-
-#~ msgid ""
-#~ "This plugin provides a Preferences page for the Clam AntiVirus plugin.\n"
-#~ "\n"
-#~ "You will find the options in the Other Preferences window under Filtering/"
-#~ "Clam AntiVirus.\n"
-#~ "\n"
-#~ "With this plugin you can enable the scanning, enable archive content "
-#~ "scanning, set the maximum size of an attachment to be checked, (if the "
-#~ "attachment is larger it will not be checked), configure whether infected "
-#~ "mail should be received (default: Yes) and select the folder where "
-#~ "infected mail will be saved.\n"
-#~ msgstr ""
-#~ "Ovaj dodatak omogu?uje stranicu postavki za Clam AnitiVirus dodatak.\n"
-#~ "\n"
-#~ "Na?i ?ete opcije u prozoru \"Ostale postavke...\" pod \"Filtriranje/Clam "
-#~ "AntiVirus\".\n"
-#~ "\n"
-#~ "Sa ovim dodatkom mo?ete omogu?iti provjeru, provjeru sadr?aja arhive, "
-#~ "odrediti maksimalnu veli?inu priloga koji ?e biti provjeravani, ( ako je "
-#~ "prilog ve?i od zadanog ne?e biti provjeravan), odrediti dali ?e zara?ena "
-#~ "poruka biti primljena (default: Da) i odabrati direktorij za spremanje "
-#~ "zara?enih poruka.\n"
-
-#~ msgid ""
-#~ "This plugin uses either gdk-pixbuf or imlib to display attached images."
-#~ msgstr ""
-#~ "Ovaj dodatak koristi gdk-pixbuf ili imlib za prikaz prilo?enih slika."
-
-#~ msgid "MathML Viewer"
-#~ msgstr "MathML preglednik"
-
-#~ msgid ""
-#~ "This plugin uses the GtkMathView widget to render MathML attachments "
-#~ "(Content-Type: text/mathml)"
-#~ msgstr ""
-#~ "Ovaj dodatak koristi GtkMathView witget za prikaz MathML priloga (Content-"
-#~ "Type: text/mathml)"
-
-#~ msgid " List all keys "
-#~ msgstr " Izlistaj sve klju?eve "
-
-#~ msgid "Valid signature by %s (Trust: %s)"
-#~ msgstr "Va?e?i potpis %s (Povjerljivo: %s)"
-
-#~ msgid "The signature has expired"
-#~ msgstr "Potpis je istekao"
-
-#~ msgid "The key that was used to sign this part has expired"
-#~ msgstr "Klju? koji je kori?ten za potpis ovog dijela je istekao"
-
-#~ msgid "Not all signatures are valid"
-#~ msgstr "Nisu svi potpisi ispravni"
-
-#~ msgid "This signature is invalid"
-#~ msgstr "Potpis je neispravan"
-
-#~ msgid "Signature expires %s\n"
-#~ msgstr "Potpis isti?e %s \n"
-
-#~ msgid "Signature expired %s\n"
-#~ msgstr "Potpis je istekao %s \n"
-
-#~ msgid "Save Folder"
-#~ msgstr "Spremi direktorij"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "SpamAssassin GTK"
-#~ msgstr "SpamAssassin GTK"
-
-#~ msgid ""
-#~ "This plugin provides a Preferences page for the SpamAssassin plugin.\n"
-#~ "\n"
-#~ "You will find the options in the Other Preferences window under Filtering/"
-#~ "SpamAssassin.\n"
-#~ "\n"
-#~ "With this plugin you can enable the filtering, change the SpamAssassin "
-#~ "server host and port, set the maximum size of messages to be checked, (if "
-#~ "the message is larger it will not be checked), configure whether spam "
-#~ "mail should be received (default: Yes) and select the folder where spam "
-#~ "mail will be saved.\n"
-#~ msgstr ""
-#~ "Ovaj dodatak omogu?uje stranicu postavki za SpamAssassin dodatak.\n"
-#~ "\n"
-#~ "Na?i ?ete opcije u prozoru \"Ostale postavke...\" pod \"Filtriranje/"
-#~ "SpamAssassin.\n"
-#~ "\n"
-#~ "Sa ovim dodatkom mo?ete omogu?iti filtriranje, promjeniti host i port "
-#~ "SpamAssassin poslu?itelja, odrediti maksimalnu veli?inu poruka koje ?e "
-#~ "biti povjeravane, (ako je poruka ve?a od zadanog, ne?e biti provjeravana) "
-#~ "odrediti dali ?e ne?eljena po?ta biti primljena (default: Da) i odabrati "
-#~ "direktorij za spremanje ne?eljene po?te.\n"
-
-#~ msgid " Select... "
-#~ msgstr " Odaberite... "
-
-#~ msgid "Display recipient in `From' column if sender is yourself"
-#~ msgstr "Prika?i primatelja na `Od' stupcu ukoliko ste Vi autor"
-
-#~ msgid " Set displayed items in summary... "
-#~ msgstr " Postavi pojedinosti prikaza za sa?etak... "
-
-#~ msgid ""
-#~ "Display multi-byte alphanumeric as\n"
-#~ "ASCII character (Japanese only)"
-#~ msgstr ""
-#~ "Prika?i vi?ebytne alfanumeri?ke znakove kao ASCII znakove (Samo Japanski)"
-
-#~ msgid "Indent text"
-#~ msgstr "Uvla?enje teksta"
-
-#~ msgid "You will need to restart for the changes to take effect"
-#~ msgstr "Da bi promjene dobile efekat potreban je restart"
-
-#~ msgid "Displayed items configuration"
-#~ msgstr "Konfiguracija prikaza stavki"
-
-#~ msgid "  ->  "
-#~ msgstr "  ->  "
-
-#~ msgid "  <-  "
-#~ msgstr "  <-  "
-
-#~ msgid "Up"
-#~ msgstr "Gore"
-
-#~ msgid "Down"
-#~ msgstr "Dolje"
-
-#~ msgid "View"
-#~ msgstr "Pregled"
-
-#~ msgid "Select all matched"
-#~ msgstr "Odaberi sve"
-
-#~ msgid "No."
-#~ msgstr "Ne."
-
-#~ msgid "L"
-#~ msgstr "L"
-
-#~ msgid "Search again"
-#~ msgstr "Tra?i ponovo"
-
-#~ msgid "Do you really want to delete message(s) from the trash?"
-#~ msgstr "Uistinu obrisati poruku(e) iz sme?a?"
-
-#~ msgid "No filter rules defined."
-#~ msgstr "Nema definiranih filter pravila."
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Editor"
-#~ msgstr "Ure?iva?"
-
-#~ msgid "News"
-#~ msgstr "News"
diff --git a/po/id_ID.po b/po/id_ID.po
index 89bee60..ffe30da 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -19204,784 +19204,3 @@ msgid ""
 msgstr ""
 "Claws Mail telah siap.\n"
 "Klik Simpan untuk memulai."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Aktifkan koneksi yang aman ke server LDAP melalui SSL. Jika koneksi "
-#~ "gagal, pastikan untuk memeriksa konfigurasi di ldap.conf (kolom "
-#~ "TLS_CACERTDIR dan TLS_REQCERT)."
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registrasi Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Gunakan SSL untuk sambungan POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Gunakan SSL untuk sambungan IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Gunakan SSL untuk sambungan NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Gunakan SSL untuk sambungan SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "Ha_pus"
-
-#~ msgid "_Other folder..."
-#~ msgstr "Direkt_ori lain..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Impor kunci tidak diimplementasikan di Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "menit"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Tandatangan tidak dapat diperiksa - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Ekspor kunci tidak diimplementasikan di Windows."
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr ""
-#~ "Pindahkan surat yang dihapus ke tong sampah dan hilangkan secepatnya"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Pindahkan surat yang dihapus ke tong sampah sebagai ganti \\Penanda Hapus "
-#~ "tanpa menghilangkan."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Otomatis (Direkomendasikan)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Hapus pesan"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Sisip"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Kirim"
-
-#, fuzzy
-#~ msgid "<i>%s</i>"
-#~ msgstr "Dari: <i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+-Simpan sebagai Konsep"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Ganti \"%s\" dengan: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Kesalahan IMAP pada %s: diotentifikasi\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Kesalahan IMAP pada %s: tidak diotentifikasi\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan stream\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "kesalahan IMAP pada %s: sambungan ditolak\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan fatal\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Kesalahan IMAP pada %s: kesalahan tidak dikenal [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Unsubscribe"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (atau lebih lama)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (atau lebih lama)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (atau lebih lama)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Tipe: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Ukuran: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Namaberkas: </b>"
-
-#, fuzzy
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span weight=\"bold\">Alamat email anda:</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#, fuzzy
-#~ msgid "+_Save"
-#~ msgstr "_Simpan"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sMasukkan frasakunci untuk:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (Keabsahan: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Ambil komentar untuk berita yang berumur kurang dari:</b>\n"
-#~ "<small>(dalam hari; atur jadi -1 untuk mengambil seluruh komentar)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Jeda pembaharuan dalam menit:</b>\n"
-#~ "<small>(Atur jadi 0 untuk menonaktifkan pembaharuan otomatis untuk feed "
-#~ "ini)</small>"
-
-#, fuzzy
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Jika sebuah isi berubah, tandai sebagai belum dibaca:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(kegiatan ini rekursif)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> pada:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Batal"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Ringkasan pesan</b>\n"
-#~ "<b>Baru:</b> %d\n"
-#~ "<b>Belum dibaca:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Ukuran:</b> %s\n"
-#~ "\n"
-#~ "<b>Ditandai:</b> %d\n"
-#~ "<b>Dibalas:</b> %d\n"
-#~ "<b>Diteruskan:</b> %d\n"
-#~ "<b>Dikunci:</b> %d\n"
-#~ "<b>Diabaikan:</b> %d\n"
-#~ "<b>Diawasi:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Dari: %s, pada %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Kepada: %s, pada %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Nama anda:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Alamat email anda:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Nama kotaksurat:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">alamat server SMTP:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Alamat server:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Kotaksurat lokal:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Tipe server:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Nama pengguna:</span>"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: waktu pencarian host habis.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: host tidak diketahui.\n"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "pesan yang mengandung header S"
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "Nama direktori baru tidak boleh mengandung pemisah nama lokasi"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "Gagal untuk registrasi item direktori kaitan baru"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Gagal untuk registrasi direktori kaitan baru"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "tidak dapat menyalin pesan %s ke %s\n"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Pertahankan alamat 'Kepada'"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Pertahankan alamat 'Cc'"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Pertahankan alamat 'Bcc'"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "Gagal menulis konfigurasi PengambilInfo ke berkas\n"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Pengaya GData: Terotorisasi\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pengaya GData: Gagal untuk menulis konfigurasi pengaya ke dalam berkas\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pengaya Pemberitahuan: Gagal menulis konfigurasi pengaya ke berkas\n"
-
-#~ msgid "slow"
-#~ msgstr "pelan"
-
-#~ msgid "fast"
-#~ msgstr "cepat"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Lebar banner dalam piksel (0 berarti ukuran layar)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Aktifkan popup"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Tandatangan yang baik (tidak dapat dipercaya) dari %s."
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Standar jeda pembaharuan dalam menit"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Standar jumlah item kadaluarsa yang dipertahankan"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Atur jadi -1 untuk mempertahankan item kadaluarsa"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Perbaharui semu_a feeds"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "_Berhenti langganan feed..."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Hapus _pohon direktori..."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Pertahankan standar jumlah isian kadaluarsa"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Jumlah isian kadaluarsa yang ingin dipertahankan:</b>\n"
-#~ "<small>(Atur jadi -1 jika anda ingin mempertahankan isian kadaluarsa)</"
-#~ "small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Berhenti langganan feed"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Apakah anda benar-benar ingin menghapus feed"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Hapus isian tertampung"
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Waktu habis menyambung ke URL %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Tidak dapat mengambil URL %s\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Kesalahan mengurai feed dari URL %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Tipe feed tidak didukung pada URL %s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: Pembaharuan feed dibatalkan, aplikasi berhenti.\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Tidak dapat menghapus feed '%s'."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Tidak dapat membuka berkas sementara"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Tidak dapat menginisiasi libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Mengambil '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Feed yang berformat salah"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Pengambilan komentar tidak didukung untuk feed RDF. Tidak dapat "
-#~ "mengambil komentar dari '%s'"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Format feed ini belum di dukung."
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld byte"
-#~ msgstr[1] "%ld bytes"
-
-#~ msgid "size unknown"
-#~ msgstr "ukuran tidak diketahui"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Tidak dapat memperbaharui feed %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Anda telah terdaftar pada feed ini."
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tidak dapat mengambil URL '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Tidak dapat mengambil URL '%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Tidak dapat mendaftar feed '%s'."
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Simpan pesan terikirim pada direktori Terkirim"
-
-#~ msgid "Use this"
-#~ msgstr "Gunakan ini"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%d-%m-%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S :p"
-
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "Hasilkan header X-Mailer"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Pengaya lainnya tersedia di situs Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' tidak dapat dimasukkan dalam nama direktori."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d pesan baru"
-#~ msgstr[1] "Claws Mail: %d pesan baru"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "Tidak dapat menyambung: anda offline."
-
-#~ msgid "Exiting..."
-#~ msgstr "Keluar..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail tidak dapat berjalan tanpa volume data (%s)."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "Tidak ada program untuk melihat berkas dengan tipe ini."
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "Abaikan baris yang dikutip"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "Abaikan teruskan dan redireksi"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "Tandatangan"
-
-#~ msgid "Select ..."
-#~ msgstr "Pilih ..."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Gagal mencetak:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr ""
-#~ "Mencetak format HTML memungkinkan jika prgram 'html2ps' telah terpasang."
-
-#~ msgid "Filename is null."
-#~ msgstr "Nama berkasnya kosong."
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Konversi ke postscript gagal."
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "Pencetak %s tidak menerima berkas PostScript."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Gagal mencetak:\n"
-#~ "%s"
-
-#~ msgid "Proxy Setting"
-#~ msgstr "Pengaturan Proxy"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "Otomatis memuat gambar"
-
-#~ msgid "Block external content"
-#~ msgstr "Blokir konten dari luar"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "kotaksurat '%s' sudah ada."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "Direktori '%s' sudah ada."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Tidak dapat membuat direktori '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Yakin akan menghapus kotaksurat '%s' ?\n"
-#~ "(Pesan TIDAK dihapus dari media penyimpan)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Tidak dapat menghapus direktori '%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Masukkan nama baru untuk '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (pengaya tidak dimuat)"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "Pengaya Penampil PDF"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "For the most up-to-date API documentation, type\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "in the interactive Python console under Tools -> Show Python console.\n"
-#~ "\n"
-#~ "The source distribution of this plugin comes with various example scripts "
-#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
-#~ "interested in sharing, feel free to send it to me to have it considered "
-#~ "for inclusion in the examples.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Pengaya ini menyediakan fitur integrasi dengan Python.\n"
-#~ "\n"
-#~ "Untuk dokumentasi API terbaru, ketik\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "pada konsol interaktif Python di Alat -> Tampilkan konsol Python.\n"
-#~ "\n"
-#~ "Penyebaran sumber pengaya ini memiliki contoh skrip yang banyak di dalam "
-#~ "sub direktori \"examples\". Jika anda menulis skrip dan ingin membaginya, "
-#~ "silahkan kirim saja ke saya untuk dipertimbangkan dimasukkan ke dalam "
-#~ "contoh.\n"
-#~ "\n"
-#~ "Saran dan masukan ke <berndth at gmx.de> sangat dipersilahkan."
-
-#~ msgid "Replace"
-#~ msgstr "Timpa"
-
-#~ msgid "Blink LED"
-#~ msgstr "LED Kedip"
-
-#~ msgid "Play sound"
-#~ msgstr "Mainkan suara"
-
-#~ msgid "Show info banner"
-#~ msgstr "Tampilkan banner info"
-
-#~ msgid "on external memory card"
-#~ msgstr "pada kartu memori eksternal"
-
-#~ msgid "on internal memory card"
-#~ msgstr "pada kartu memori internal"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">Taruh data</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Peramban Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Muat tautan remot dalam surat"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Sama dengan '--local' pada pilihan Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Anda dapat memuat tautan remot dengan memuat ulang halaman tersebut"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Hanya untuk pengirim yang ada pada buku alamat/direktori"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Modus tampilan penuh (sembunyikan kontrol)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Sama dengan '--fullwindow' pada pilihan Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Penampil HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "Tidak dapat menemukan berkas dillo pada LOKASI. Apakah sudah terpasang?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Pengaya ini menghasilkan surat HTML menggunakan perambah web Dillo.\n"
-#~ "\n"
-#~ "Pilihan dapat ditemukan pada /Konfigurasi/Preferensi/Pengaya/Perambah "
-#~ "Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "Gagal untuk registrasi kaitan saklar offline"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "Gagal untuk registrasi kaitan daftar akun yang dirubah"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "Gagal untuk registrasi kaitan tutup"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "Gagal untuk registrasi kaitan terikonisasi"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "Gagal untuk registrasi kaitan perubahan tema"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Pengaya ini menempatkan ikon kotaksurat pada tray sistem yang "
-#~ "mengindikasikan adanya surat baru atau belum dibaca.\n"
-#~ "\n"
-#~ "Kotaksurat kosong jika tidak ada surat yang belum dibaca, namun berisi "
-#~ "surat. Tip menunjukkan pesan baru, belum dibaca dan jumlah total pesan."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Sembunyikan Claws Mail saat mulai"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Sembunyikan Claws Mail dengan ikon tray daripada menutupnya\n"
-#~ "ketika tombol tutup jendela diklik"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Sembunyikan ke tray"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "Sembunyikan Claws Mail menggunakan ikon tray daripada meminimasi"
-
-#~ msgid "%d page"
-#~ msgid_plural "%d pages"
-#~ msgstr[0] "%d halaman"
-
-#~ msgid ""
-#~ "This plugin provides access to the GData protocoll for Claws Mail.\n"
-#~ "\n"
-#~ "The GData protocoll is an interface to Google services.\n"
-#~ "Currently, the only implemented functionality is to include Google "
-#~ "Contacts into the Tab-address completion.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Pengaya ini menyediakan akses ke protokol GData untuk Claws Mail.\n"
-#~ "\n"
-#~ "Protokol GData adalah sebuah antarmuka untuk layanan Google.\n"
-#~ "Saat ini, fungsi yang telah terimplementasi adalah memasukkan Kontak "
-#~ "Google ke dalam Tab-pelengkap alamat.\n"
-#~ "\n"
-#~ "Silahkan kirim ke <berndth at gmx.de> untuk umpan balik."
-
-#~ msgid "GData plugin: Added %d of %d contacts to the cache\n"
-#~ msgstr "Pengaya GData: Ditambahkan %d dari %d kontak ke dalam tembolok\n"
-
-#~ msgid "GData plugin: Authentification error: %s\n"
-#~ msgstr "Pengaya GData: Terjadi kesalahan otentifikasi: %s\n"
-
-#~ msgid "GData plugin: Authentificated\n"
-#~ msgstr "Pengaya GData: Terotentifikasi\n"
-
-#~ msgid "GData plugin: Starting async authentification\n"
-#~ msgstr "Pengaya GData: Memulai otentifikasi secara async\n"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. Mention appears on line %d, which begins with text: <span "
-#~ "weight=\"bold\">%.20s</span>???\n"
-#~ "\n"
-#~ "%s it anyway?"
-#~ msgstr ""
-#~ "Sebuah lampiran disebutkan dalam surat yang anda kirim, tapi tidak ada "
-#~ "berkas yang dilampirkan. Disebutkan pada baris %d, yang dimulai dengan "
-#~ "tulisan: <span weight=\"bold\">%.20s</span>???\n"
-#~ "\n"
-#~ "%s saja?"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "Pengaya ini menyediakan fitur integrasi Python.\n"
-#~ "\n"
-#~ "Umpanbalik ke <berndth at gmx.de> sangat diterima."
diff --git a/po/it.po b/po/it.po
index 519b29e..9554d7a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19350,1092 +19350,3 @@ msgid ""
 msgstr ""
 "Claws Mail ?? pronto.\n"
 "Clicca su 'Salva' per iniziare."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Abilita una connessione sicura con il server LDAP via SSL. Se la "
-#~ "connessione non va a buon fine, controllare la configurazione in ldap."
-#~ "conf (campi TLS_CACERTDIR o TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "No TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registra Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Usa SSL per connessione POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Usa SSL per connessione IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Usa SSL per connessione NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Usa SSL per connessione SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "_Rimuovi"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Altra cartella..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   L'importazione di chiavi non ?? implementata in Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "minuti"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "La firma non pu?? essere controllata - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "L'esportazione chiave non ?? implementata in Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "giorno(i)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Sposta nel cestino i messaggi eliminati e rimuovili immediatamente"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Sposta nel cestino i messaggi eliminati invece di utilizzare il flag "
-#~ "\\Eliminato senza rimuoverli."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatico (Raccomandato)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Elimina messaggio"
-
-#~ msgid "+_Insert"
-#~ msgstr "_Inserisci"
-
-#~ msgid "+_Send"
-#~ msgstr "_Invia"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "_Salva nelle Bozze"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Sostituisci \"%s\" con: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Errore IMAP su %s: autenticato\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Errore IMAP su %s: non autenticato\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Errore IMAP su %s: errore di flusso\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "Errore IMAP su %s: connessione rifiutata\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Errore IMAP su %s: errore fatale\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Errore IMAP su %s: errore NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Errore IMAP su %s: errore COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Errore IMAP su %s: errore LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Errore IMAP su %s: errore LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Errore IMAP su %s: errore SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Errore IMAP su %s: errore SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Errore IMAP su %s: Errore sconosciuto [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "_Rimuovi sottoscrizione"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (o pi?? vecchio)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (o pi?? vecchio)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (o pi?? vecchio)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Tipo: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Dimensione: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Nome file: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span color=\"red\">Errore di lettura cache stats</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Uso di %s in %d file, %d directory, %d altro(i) e %d "
-#~ "errori</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">Errore svuotamento cache di icone.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "_Salva"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sInserire la passphrase per: </"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (Validit??: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Preleva i commenti sui post che hanno meno di:</b>\n"
-#~ "<small>(In giorni; impostare a -1 per prelevare tutti i commenti)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Se un elemento cambia, non contrassegnarlo come nuovo:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(ricorre questo evento)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> il:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "Scarica"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Sommario messaggi</b>\n"
-#~ "<b>Nuovi:</b> %d\n"
-#~ "<b>Non letti:</b> %d\n"
-#~ "<b>Totale:</b> %d\n"
-#~ "<b>Dimensione:</b> %s\n"
-#~ "\n"
-#~ "<b>Contrassegnati:</b> %d\n"
-#~ "<b>Risposti:</b> %d\n"
-#~ "<b>Inoltrati:</b> %d\n"
-#~ "<b>Bloccati:</b> %d\n"
-#~ "<b>Ignorati:</b> %d\n"
-#~ "<b>Osservati:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Da: %s, il %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>A: %s, il %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Nome:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Indirizzo email:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Nome casella di posta:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Indirizzo server SMTP:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Indirizzo server:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Casella di posta locale:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Tipo server:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Nome utente:</span>"
-
-# Messaggio di debug
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Fallito registrare hook di \"register avatars internal rendering\""
-
-#~ msgid "Failed."
-#~ msgstr "Fallito."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "Il nuovo nome della cartella non deve contenere il separatore di percorso "
-#~ "del namespace"
-
-# Messaggio di debug
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "Fallito registrare hook di \"folder item update\""
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Fallito registrare hook di \"folder update\""
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "impossibile copiare il messaggio %s in %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "fallita la scrittura della configurazione di Fetchinfo nel file\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Plugin GData: Fallita scrittura della configurazione del plugin su file\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Trovata posizione (lat, long): (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Presunta nazione di origine: "
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Impossibile individuare la posizione dell'indirizzo IP "
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Tentativo di localizzare il mittente"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Emirati Arabi Uniti"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afghanistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua e Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Albania"
-
-#~ msgid "Armenia"
-#~ msgstr "Armenia"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Antille Olandesi"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Penisola Antartica"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
-
-#~ msgid "American Samoa"
-#~ msgstr "Samoa Americane"
-
-#~ msgid "Austria"
-#~ msgstr "Austria"
-
-#~ msgid "Australia"
-#~ msgstr "Australia"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaijan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosnia ed Erzegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgio"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgaria"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrein"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivia"
-
-#~ msgid "Brazil"
-#~ msgstr "Brasile"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamas"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Isola Bouvet"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Bielorussia"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Canada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Isole Cocos (Keeling)"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Repubblica Africana Centrale"
-
-#~ msgid "Congo"
-#~ msgstr "Congo"
-
-#~ msgid "Switzerland"
-#~ msgstr "Svizzera"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Costa D'Avorio"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Isole Cook"
-
-#~ msgid "Chile"
-#~ msgstr "Cile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Cameroon"
-
-#~ msgid "China"
-#~ msgstr "Cina"
-
-#~ msgid "Colombia"
-#~ msgstr "Columbia"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
-
-#~ msgid "Cuba"
-#~ msgstr "Cuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Capo Verde"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Isola di Natale"
-
-#~ msgid "Cyprus"
-#~ msgstr "Cipro"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Republica Ceca"
-
-#~ msgid "Germany"
-#~ msgstr "Germania"
-
-#~ msgid "Djibouti"
-#~ msgstr "Gibuti"
-
-#~ msgid "Denmark"
-#~ msgstr "Danimarca"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Repubblica Dominicana"
-
-#~ msgid "Algeria"
-#~ msgstr "Algeria"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ecuador"
-
-#~ msgid "Estonia"
-#~ msgstr "Estonia"
-
-#~ msgid "Egypt"
-#~ msgstr "Egitto"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Sahara Occidentale"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "Spagna"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopia"
-
-#~ msgid "Finland"
-#~ msgstr "Finlandia"
-
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Isole Falkland (Malvine)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Micronesia, Stati Federati di"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Isole Faroe"
-
-#~ msgid "France"
-#~ msgstr "Francia"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Francia, Area metropolitana"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Regno Unito"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Georgia"
-
-#~ msgid "French Guiana"
-#~ msgstr "Guyana francese"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibilterra"
-
-#~ msgid "Greenland"
-#~ msgstr "Groenlandia"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadalupa"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Guinea Equatoriale"
-
-#~ msgid "Greece"
-#~ msgstr "Grecia"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Georgia del Sud ed Isole Sandwich Meridionali"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Isole Heard e McDonald"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Croazia"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Ungheria"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonesia"
-
-#~ msgid "Ireland"
-#~ msgstr "Irlanda"
-
-#~ msgid "Israel"
-#~ msgstr "Israele"
-
-#~ msgid "India"
-#~ msgstr "India"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Territorio britannico dell'Oceano Indiano"
-
-#~ msgid "Iraq"
-#~ msgstr "Iraq"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iran, Repubblica Islamica di"
-
-#~ msgid "Iceland"
-#~ msgstr "Islanda"
-
-#~ msgid "Italy"
-#~ msgstr "Italia"
-
-#~ msgid "Jamaica"
-#~ msgstr "Giamaica"
-
-#~ msgid "Jordan"
-#~ msgstr "Giordania"
-
-#~ msgid "Japan"
-#~ msgstr "Giappone"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirghizistan"
-
-#~ msgid "Cambodia"
-#~ msgstr "Cambogia"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Comore"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts e Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Corea, Repubblica Popolare Democratica di"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Corea, Repubblica di"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Isole Cayman"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakistan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laos, Repubblica Popolare Democratcia"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libano"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Santa Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberia"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Lituania"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Lussemburgo"
-
-#~ msgid "Latvia"
-#~ msgstr "Lettonia"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libia"
-
-#~ msgid "Morocco"
-#~ msgstr "Marocco"
-
-#~ msgid "Monaco"
-#~ msgstr "Monaco, Pricipato di"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldavia, Repubblica di"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagascar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Isole Marshall"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Macedonia, Ex Repubblica Jugoslava di"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Birmania"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolia"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Isole Marianne Settentrionali"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinica"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauritania"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldive"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Messico"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malesia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambico"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Niova Caledonia"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Isola Norfolk"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Paesi Bassi"
-
-#~ msgid "Norway"
-#~ msgstr "Norvegia"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Nuova Zelanda"
-
-#~ msgid "Oman"
-#~ msgstr "Oman"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Per??"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Polinesia Francese"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Nuova Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filippine"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Polonia"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint-Pierre e Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Isole Pitcairn"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Porto Rico"
-
-#~ msgid "Portugal"
-#~ msgstr "Portogallo"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid "Qatar"
-#~ msgstr "Qatar"
-
-#~ msgid "Reunion"
-#~ msgstr "Riunione"
-
-#~ msgid "Romania"
-#~ msgstr "Romania"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Federazione Russa"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Arabia Saudita"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Isole Salomone"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychelles"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Sweden"
-#~ msgstr "Svezia"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapore"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Sant'Elena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovenia"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard e Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovacchia"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
-
-#~ msgid "Suriname"
-#~ msgstr "Suriname"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome e Principe"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Siria"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swaziland"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks e Caicos"
-
-#~ msgid "Chad"
-#~ msgstr "Ciad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Terre australi e antartiche francesi"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thailandia"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tagikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisia"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "Timor Est"
-
-#~ msgid "Turkey"
-#~ msgstr "Turchia"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad e Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan, Repubblica di Cina"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzania, Repubblica Unita di"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ucraina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Isole minori esterne degli Stati Uniti"
-
-#~ msgid "United States"
-#~ msgstr "Stati Uniti"
-
-#~ msgid "Uruguay"
-#~ msgstr "Urugay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Santa Sede (Citt?? del Vaticano)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent e Grenadines"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Isole Vergini Britanniche"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Isole Vergini Statunitensi"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis e Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Yemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Serbia e Montenegro"
-
-#~ msgid "South Africa"
-#~ msgstr "Sud Africa"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Repubblica Democratica del Congo"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbaue"
-
-#~ msgid "GeoLocation"
-#~ msgstr "Geolocalizzazione"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Impossibile inizializzare clutter"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Impossibile creare l'espressione regolare: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Fallito registrare hook di \"messageview_show\" nel plugin "
-#~ "Geolocalizzazione"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Questo plugin offre funzionalit?? di geolocalizzazione per Claws Mail.\n"
-#~ "\n"
-#~ "Avviso: ?? tecnicamente impossibile risalire alla posizione geografica del "
-#~ "mittente, dalle sue E-Mail, con certezza assoluta. I risultati presentati "
-#~ "dal plugin sono solo stime grossolane. In particolare, i responsabili "
-#~ "delle mailing list spesso rimuovono dalle mail le informazioni su chi ha "
-#~ "inviato, per cui alle mail dalle mailing list pu?? essere assegnata la "
-#~ "posizione del server di mailing list invece che la posizione del "
-#~ "mittente.\n"
-#~ "In caso di dubbio, non fidarsi dei risultati del plugin, e non basarsi su "
-#~ "queste informazioni per chidere il divorzio.\n"
-#~ "\n"
-#~ "Commenti a <berndth at gmx.de> sono graditi (ma solo se non si tratta di "
-#~ "litigi matrimoniali)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integrazione di geolocalizzazione"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Plugin di notifica: Fallita la scrittura della configurazione del plugin "
-#~ "su file\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Salva messaggi inviati nella cartella `Iniviati'"
diff --git a/po/ja.po b/po/ja.po
index 4dd1764..188f2ba 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19923,743 +19923,3 @@ msgid ""
 msgstr ""
 "Claws Mail??????????????????????????????\n"
 "??????????????????????????????????????????"
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail???????????????????????????????????????????????????????????????"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "?????????S????????????????????????"
-
-#, fuzzy
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "?????????????????????"
-
-#, fuzzy
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "?????????????????????(_O)"
-
-#, fuzzy
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "?????????????????????(_O)"
-
-#~ msgid "slow"
-#~ msgstr "????????????"
-
-#~ msgid "fast"
-#~ msgstr "??????"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "?????????????????????????????? (0??????????????????)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "%s?????????(????????????????????????)?????????"
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "???????????????????????????????????????????????????"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "libCURL???????????????????????????"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "????????????????????? '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "?????????????????????"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: ???????????????????????????RDF????????????????????????????????????????????????'%s' ????????????"
-#~ "???????????????????????????"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld ?????????"
-
-#~ msgid "size unknown"
-#~ msgstr "???????????????"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: ???????????????????????????????????????????????? %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "???????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "URL '%s' ????????????????????????:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "URL '%s' ????????????????????????:\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "???????????? '%s' ???????????????????????????"
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "URL %s ?????????????????????????????????????????????\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "URL %s ????????????????????????\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "URL %s ??????????????????????????????????????????\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "URL %s ??????????????????????????????????????????????????????\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr ""
-#~ "RSSyl: ????????????????????????????????????????????????????????????????????????????????????????????????\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "???????????? '%s' ???????????????????????????"
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "???????????????????????????????????????(_A)"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "??????????????????????????????...(_U)"
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "??????????????????????????????...(_T)"
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl????????????..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "???????????????????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>????????????????????????????????????????????????:</b>\n"
-#~ "<small>(???????????????????????????????????????????????????-1?????????)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "????????????????????????????????????????????????0??????????????????"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "???????????????????????????????????????????????????"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "??????????????????????????????????????????-1??????????????????"
-
-#~ msgid "Use this"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "???????????????????????????????????????: %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%m/%d/%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Claws Mail???Web?????????????????????????????????????????????????????????"
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "'%c' ??????????????????????????????????????????????????????"
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d ?????????????????????"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "?????????????????????: ????????????????????????"
-
-#~ msgid "Exiting..."
-#~ msgstr "?????????..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail????????????????????????????????????????????????????????????????????????(%s)???"
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "?????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "????????????????????????????????????????????????"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "??????"
-
-#~ msgid "Select ..."
-#~ msgstr "?????? ..."
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "???????????????????????????:\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Printing HTML is only possible if the program 'html2ps' is installed."
-#~ msgstr ""
-#~ "HTML??????????????????????????????'html2ps'?????????????????????????????????????????????????????????"
-#~ "??????"
-
-#~ msgid "Filename is null."
-#~ msgstr "????????????????????????null?????????"
-
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Postscript?????????????????????????????????"
-
-#~ msgid "Printer %s doesn't accept PostScript files."
-#~ msgstr "??????????????? %s ???PostScript???????????????????????????????????????"
-
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "???????????????????????????:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Auto-Load images"
-#~ msgstr "????????????????????????????????????"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "?????????????????????????????????"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "????????????????????? '%s' ??????????????????????????????"
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "???????????? '%s' ??????????????????????????????"
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "???????????? '%s' ???????????????????????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "????????????????????? '%s' ?????????????????????????????? ?\n"
-#~ "(???????????????????????????????????????????????????????????????)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "???????????? '%s' ???????????????????????????"
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "`%s' ?????????????????????????????????????????????:"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (????????????????????????????????????????????????)"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "PDF Viewer???????????????"
-
-#, fuzzy
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Replace"
-#~ msgstr "??????"
-
-#~ msgid "Blink LED"
-#~ msgstr "LED??????"
-
-#~ msgid "Play sound"
-#~ msgstr "???????????????"
-
-#~ msgid "Show info banner"
-#~ msgstr "????????????????????????"
-
-#~ msgid "on external memory card"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "on internal memory card"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">???????????????</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo????????????"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "??????????????????????????????????????????????????????"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Dillo???'--local'????????????????????????"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr ""
-#~ "??????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "???????????????/???????????????????????????????????????????????????"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "????????????????????????????????? (???????????????????????????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Dillo???'--fullwindow'????????????????????????"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Dillo HTML????????????"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr "PATH??????dillo???????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "????????????????????????Dillo web??????????????????????????????HTML???????????????????????????\n"
-#~ "\n"
-#~ "??????????????????/??????/???????????????/???????????????/Dillo Browser ???????????????"
-
-#~ msgid "Trayicon"
-#~ msgstr "?????????????????????"
-
-#, fuzzy
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail????????????"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "?????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "??????????????????????????????????????????????????????"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "????????????????????????????????????????????????????????????"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "?????????????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-#~ "???????????????????????????????????????????????????\n"
-#~ "\n"
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-#~ "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "????????????Claws Mail?????????"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????????????????????????????????\n"
-#~ "Claws Mail??????????????????????????????????????????"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "?????????????????????????????????????????????????????????Claws Mail?????????"
-
-#~ msgid "Failed to register compose create hook int the Python plugin"
-#~ msgstr "Python????????????????????????compose create hook??????????????????????????????"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "????????????????????????Python???????????????????????????????????????\n"
-#~ "\n"
-#~ "<berndth at gmx.de>????????????????????????????????????????????????"
-
-#~ msgid "%d page"
-#~ msgid_plural "%d pages"
-#~ msgstr[0] "%d ?????????"
-
-#~ msgid ""
-#~ "This plugin provides various ways to notify the user of new and unread "
-#~ "email.\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-#~ "?????????\n"
-#~ "<berndth at gmx.de> ????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. %s it anyway?"
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-#~ "?????????????????????????????????%s ???????????????????"
-
-#~ msgid "Unblock links"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Block external links"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????????????????????????????????????????????????????????????????????????????????????\n"
-#~ "%s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "??????: ??????????????????????????????????????????\n"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "?????????????????????????????????..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "????????????????????? %d of %d..."
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "????????????????????? %d of %d..."
-
-#~ msgid "Page %N of %Q"
-#~ msgstr "????????? %N of %Q"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-
-#~ msgid "adds support for a complete print dialog\n"
-#~ msgstr "???????????????????????????????????????????????????????????????\n"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-
-#~ msgid "Change dictionary"
-#~ msgstr "???????????????"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid "Source Buffer"
-#~ msgstr "?????????????????????"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "????????????GtkTextBuffer??????????????????"
-
-#~ msgid "Tabs Width"
-#~ msgstr "????????????"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Highlight"
-#~ msgstr "??????"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "???????????????????????????????????????????????????????????????"
-
-#~ msgid "Font"
-#~ msgstr "????????????"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "?????????????????????????????????????????????GnomeFont???(deprecated)"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr "????????????????????????????????????????????????????????? (????????? \"Monospace 10\")"
-
-#~ msgid "Numbers Font"
-#~ msgstr "??????????????????"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "????????????????????????GnomeFont???(deprecated)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "??????????????????"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr "?????????????????????????????? (0 ??????????????????????????????????????????)"
-
-#~ msgid "Print Header"
-#~ msgstr "??????????????????"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "??????????????????????????????????????????????????????"
-
-#~ msgid "Print Footer"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "?????????????????????????????????????????????????????????"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr "????????????????????????????????????GnomeFont???(deprecated)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr "?????????????????????????????????????????????????????? (????????? \"Monospace 10\")"
-
-#~ msgid " Clear "
-#~ msgstr " ????????? "
-
-#~ msgid " Extended Symbols... "
-#~ msgstr " ????????????..."
-
-#~ msgid "Info"
-#~ msgstr "??????"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "?????????SSL?????????"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "????????????SSL?????????"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "SSL????????????????????????"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "IMAP4????????? %s ????????????...\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail??????????????????????????????????????????????????????GTK+????????????????????????????????????"
-#~ "?????????????????????????????????????????????????????????????????????GTK+????????????????????????????????????"
-#~ "Claws Mail???????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail?????????????????????????????????????????????GTK+?????????????????????????????????????????????"
-#~ "????????????????????????????????????????????????????????????Claws Mail????????????????????????????????????"
-#~ "???????????????"
-
-#~ msgid "Last read message"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "_all"
-#~ msgstr "??????(_A)"
-
-#~ msgid "_sender"
-#~ msgstr "?????????(_S)"
-
-#~ msgid "_Fold all"
-#~ msgstr "?????????????????????(_F)"
-
-#~ msgid "by _Date"
-#~ msgstr "?????????(_D)"
-
-#~ msgid "by _From"
-#~ msgstr "????????????(_F)"
-
-#~ msgid "by _To"
-#~ msgstr "????????????(_T)"
-
-#~ msgid "by S_ubject"
-#~ msgstr "?????????(_U)"
-
-#~ msgid "by Tag"
-#~ msgstr "?????????"
-
-#~ msgid "by _Mark"
-#~ msgstr "????????????(_M)"
-
-#~ msgid "message line"
-#~ msgstr "??????????????????"
-
-#~ msgid ""
-#~ "Enter the print command-line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "?????????????????????????????????????????????:\n"
-#~ "('%s' ?????????????????????????????????????????????)"
-
-#~ msgid ""
-#~ "Print command-line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "?????????????????????????????????????????????:\n"
-#~ "'%s'"
-
-#~ msgid "_Open (l)"
-#~ msgstr "?????? (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "???????????????????????????????????? (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "??????????????????????????? (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "???????????????????????? (y)..."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "%s:%d ?????? NNTP ?????????????????????...\n"
-
-#~ msgid "Trust key"
-#~ msgstr "??????????????????"
-
-#~ msgid "Orientation"
-#~ msgstr "??????"
-
-#~ msgid "Info..."
-#~ msgstr "?????? ..."
-
-#~ msgid "Print command"
-#~ msgstr "??????????????????"
-
-#~ msgid "Test RegExp"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Default To:"
-#~ msgstr "???????????????: "
-
-#~ msgid "Default Cc:"
-#~ msgstr "?????????CC: "
-
-#~ msgid "Default Bcc:"
-#~ msgstr "?????????BCC: "
-
-#~ msgid "Default Reply-to:"
-#~ msgstr "?????????Reply-to: "
-
-#~ msgid "Quotation characters"
-#~ msgstr "????????????"
-
-#~ msgid " Symbols... "
-#~ msgstr " ????????????... "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Description of symbols..."
-#~ msgstr "???????????????..."
-
-#~ msgid " items selected"
-#~ msgstr " ??????????????????????????????"
-
-#~ msgid "'View Log'"
-#~ msgstr "'???????????????'"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr "(???????????????????????????: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr "(???????????????????????????: 'l'), \n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr "(???????????????????????????: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "SMTP ???????????????:\n"
-#~ "<span size=\"small\">(?????????????????????????????????????????????????????????)</span>"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: ???????????????????????????Atom????????????????????????????????????????????????'%s' ????????????"
-#~ "???????????????????????????"
diff --git a/po/ko.po b/po/ko.po
index 754f30d..004dbbe 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -20453,1329 +20453,3 @@ msgstr ""
 "Sylpheed-Claws??? ?????????????????????.\n"
 "\n"
 "??????????????? ????????? ???????????????."
-
-#~ msgid ""
-#~ "New messages will be checked in this order. Check the boxes\n"
-#~ "on the 'G' column to enable message retrieval by 'Get all'."
-#~ msgstr ""
-#~ "??? ???????????? ??? ???????????? ????????? ????????????. `?????? ??????'??? ????????????\n"
-#~ "???????????? `G' ????????? ????????? ???????????????."
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "????????? ????????? ??? ????????????. ????????? ????????? ??????????????????.\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "/_Book/New LDAP _Server"
-#~ msgstr "/?????????(_B)/??? ??????(_S)"
-
-#~ msgid "/_Book/---"
-#~ msgstr "/?????????(_B)/---"
-
-#~ msgid "/_Book/_Save"
-#~ msgstr "/?????????(_B)/??????(_S)"
-
-#~ msgid "/_Book/_Close"
-#~ msgstr "/?????????(_B)/??????(_C)"
-
-#~ msgid "/_Address"
-#~ msgstr "/??????(_A)"
-
-#, fuzzy
-#~ msgid "/_Address/_Select all"
-#~ msgstr "/??????(_A)/?????????(_D)"
-
-#~ msgid "/_Address/---"
-#~ msgstr "/??????(_A)/---"
-
-#~ msgid "/_Address/C_ut"
-#~ msgstr "/??????(_A)/????????????(_U)"
-
-#~ msgid "/_Address/_Copy"
-#~ msgstr "/??????(_A)/??????(_C)"
-
-#~ msgid "/_Address/_Paste"
-#~ msgstr "/??????(_A)/?????? ??????(_P)"
-
-#~ msgid "/_Address/_Edit"
-#~ msgstr "/??????(_A)/??????(_E)"
-
-#~ msgid "/_Address/_Delete"
-#~ msgstr "/??????(_A)/?????????(_D)"
-
-#~ msgid "/_Address/New _Address"
-#~ msgstr "/??????(_A)/??? ??????(_A)"
-
-#~ msgid "/_Address/New _Group"
-#~ msgstr "/??????(_A)/??? ??????(_G)"
-
-#~ msgid "/_Address/_Mail To"
-#~ msgstr "/??????(_A)/Mail To(_M)"
-
-#~ msgid "/_Tools/---"
-#~ msgstr "/??????(_T)/---"
-
-#~ msgid "/_Help/_About"
-#~ msgstr "/?????????(_H)/sylpheed ??????(_A)"
-
-#~ msgid "/---"
-#~ msgstr "/---"
-
-#~ msgid "E-Mail address"
-#~ msgstr "????????? ??????"
-
-#~ msgid "Really delete '%s' ?"
-#~ msgstr "????????? '%s'???(???) ??????????????????????"
-
-#~ msgid "No folder or message was selected."
-#~ msgstr "????????? ????????? ???????????? ????????????."
-
-#~ msgid ""
-#~ "Please select a folder to process from the folder\n"
-#~ "list. Alternatively, select one or messages from\n"
-#~ "the message list."
-#~ msgstr ""
-#~ "?????? ???????????? ????????? ???????????????.\n"
-#~ "????????? ????????? ???????????? ?????? ??????\n"
-#~ "??? ????????? ???????????? ???????????????."
-
-#~ msgid "protocol error\n"
-#~ msgstr "???????????? ??????\n"
-
-#~ msgid "Error occurred while posting\n"
-#~ msgstr "?????? ????????? ?????? ?????? ??????\n"
-
-#~ msgid "Error occurred while sending command\n"
-#~ msgstr "????????? ????????? ?????? ????????? ??????????????????\n"
-
-#~ msgid ""
-#~ "  Owner: %s (%s) in %s\n"
-#~ "  Signed by: %s (%s) in %s\n"
-#~ "  Fingerprint: %s\n"
-#~ "  Signature status: %s"
-#~ msgstr ""
-#~ "  ?????????: %s (%s) in %s\n"
-#~ "  Signed by: %s (%s) in %s\n"
-#~ "  Fingerprint: %s\n"
-#~ "  Signature ??????: %s"
-
-#~ msgid "Can't load X509 default paths"
-#~ msgstr "X509 ?????? ????????? ????????? ??? ????????????"
-
-#~ msgid ""
-#~ "%s presented an unknown SSL certificate:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s???(???) ????????? SSL ???????????????:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Mail won't be retrieved on this account until you save the certificate.\n"
-#~ "(Uncheck the \"%s\" preference).\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "????????? ????????? ????????? ??? ????????? ????????? ?????? ??? ????????????.\n"
-#~ "(\"%s\" ?????? ????????? ???????????????).\n"
-
-#~ msgid ""
-#~ "%s's SSL certificate changed !\n"
-#~ "We have saved this one:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "It is now:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "This could mean the server answering is not the known one."
-#~ msgstr ""
-#~ "%s??? SSL ???????????? ?????????????????? !\n"
-#~ "????????? ?????? ??????????????????:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "????????? ?????? ????????????:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "????????? ????????? ????????? ??? ??? ????????? ?????? ???????????????."
-
-#~ msgid "%.1fKB"
-#~ msgstr "%.1fKB"
-
-#~ msgid "%.2fMB"
-#~ msgstr "%.2fMB"
-
-#~ msgid "/_Message/_Send"
-#~ msgstr "/?????????(_M)/?????????(_S)"
-
-#~ msgid "/_Message/Send _later"
-#~ msgstr "/?????????(_M)/????????? ?????????(_L)"
-
-#~ msgid "/_Message/---"
-#~ msgstr "/?????????(_M)/---"
-
-#~ msgid "/_Message/_Attach file"
-#~ msgstr "/?????????(_M)/?????? ??????(_A)"
-
-#~ msgid "/_Message/_Insert file"
-#~ msgstr "/?????????(_M)/?????? ??????(_I)"
-
-#~ msgid "/_Message/Insert si_gnature"
-#~ msgstr "/?????????(_M)/?????? ??????(_G)"
-
-#~ msgid "/_Message/_Save"
-#~ msgstr "/?????????(_M)/??????(_S)"
-
-#~ msgid "/_Message/_Close"
-#~ msgstr "/?????????(_M)/??????(_C)"
-
-#~ msgid "/_Edit/_Undo"
-#~ msgstr "/??????(_E)/????????????(_U)"
-
-#~ msgid "/_Edit/_Redo"
-#~ msgstr "/??????(_E)/?????? ??????(_R)"
-
-#~ msgid "/_Edit/---"
-#~ msgstr "/??????(_E)/---"
-
-#~ msgid "/_Edit/Cu_t"
-#~ msgstr "/??????(_E)/????????????(_T)"
-
-#~ msgid "/_Edit/_Copy"
-#~ msgstr "/??????(_E)/??????(_C)"
-
-#~ msgid "/_Edit/_Paste"
-#~ msgstr "/??????(_E)/?????? ??????(_P)"
-
-#~ msgid "/_Edit/Special paste/as _quotation"
-#~ msgstr "/??????(_E)/?????? ?????? ??????/quotation?????? ????????????(_Q)"
-
-#~ msgid "/_Edit/Special paste/_wrapped"
-#~ msgstr "/??????(_E)/?????? ?????? ??????/wrapped(_W)"
-
-#~ msgid "/_Edit/Special paste/_unwrapped"
-#~ msgstr "/??????(_E)/?????? ?????? ??????/unwrapped(_U)"
-
-#~ msgid "/_Edit/Select _all"
-#~ msgstr "/??????(_E)/?????? ??????(_A)"
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/??????(_E)/??????(_D)"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/??????(_E)/??????(_D)/?????? ?????????"
-
-#~ msgid "/_Edit/A_dvanced/Delete entire line"
-#~ msgstr "/??????(_E)/??????(_D)/?????? ?????? ?????????"
-
-#~ msgid "/_Edit/Wrap all long _lines"
-#~ msgstr "/??????(_E)/?????? ??? ?????? ?????? ?????????(_L)"
-
-#~ msgid "/_Edit/Edit with e_xternal editor"
-#~ msgstr "/??????(_E)/?????? ???????????? ??????(_X)"
-
-#~ msgid "/_Options/Privacy System/None"
-#~ msgstr "/??????(_O)/??????????????? ?????????/??????"
-
-#~ msgid "/_Options/Si_gn"
-#~ msgstr "/??????(_O)/??????(_G)"
-
-#~ msgid "/_Options/---"
-#~ msgstr "/??????(_O)/---"
-
-#~ msgid "/_Options/Priority/_Highest"
-#~ msgstr "/??????(_O)/????????????(_P)/?????? ??????(_H)"
-
-#~ msgid "/_Options/Priority/Hi_gh"
-#~ msgstr "/??????(_O)/????????????(_P)/??????(_G)"
-
-#~ msgid "/_Options/Priority/_Normal"
-#~ msgstr "/??????(_O)/????????????(_P)/??????(_N)"
-
-#~ msgid "/_Options/Priority/Lo_w"
-#~ msgstr "/??????(_O)/????????????(_P)/??????(_W)"
-
-#~ msgid "/_Options/Priority/_Lowest"
-#~ msgstr "/??????(_O)/????????????(_P)/?????? ??????(_L)"
-
-#~ msgid "/_Options/_Request Return Receipt"
-#~ msgstr "/??????(_O)/?????? ?????? ??????(_R)"
-
-#~ msgid "/_Options/Character _encoding"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)"
-
-#~ msgid "/_Options/Character _encoding/_Automatic"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/??????(_A)"
-
-#~ msgid "/_Options/Character _encoding/---"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/---"
-
-#~ msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/7bit ????????? (US-ASC_II)"
-
-#~ msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/???????????? (_UTF-8)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? ?????? (ISO-8859-_1)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? ?????? (ISO-8859-15)"
-
-#, fuzzy
-#~ msgid "/_Options/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ?????? (Windows-1252)"
-
-#~ msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? ?????? (ISO-8859-_2)"
-
-#~ msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/_Baltic (ISO-8859-13)"
-
-#~ msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Baltic (ISO-8859-_4)"
-
-#~ msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/????????? (ISO-8859-_7)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Hebrew (ISO-8859-_8)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Hebrew (Windows-1255)"
-
-#~ msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? (ISO-8859-_9)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Cyrillic (ISo-8859-_5)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Cyrillic (KOI8-_R)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Cyrillic (KOI8-U)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Cyrillic (Windows-1251)"
-
-#~ msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? (ISO-2022-_JP)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Simplified Chinese (_GB2312)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Simplified Chinese (GBK)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Traditional Chinese (_Big5)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Traditional Chinese (EUC-_TW)"
-
-#~ msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/?????? (EUC-_KR)"
-
-#~ msgid "/_Options/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Thai (TIS-620)"
-
-#~ msgid "/_Options/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/??????(_O)/?????? ?????????(_E)/Thai (Windows-874)"
-
-#~ msgid "/_Tools/_Address book"
-#~ msgstr "/??????(_T)/?????????(_A)"
-
-#~ msgid "/_Tools/_Template"
-#~ msgstr "/??????(_T)/?????????(_T)"
-
-#~ msgid "/_Tools/Actio_ns"
-#~ msgstr "/??????(_T)/??????(_N)"
-
-#~ msgid "No account for posting news available!"
-#~ msgstr "????????? ?????? ??? ?????? ????????? ????????????!"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "??????: ???????????? ??????????????? ????????? ??????\n"
-
-#~ msgid "E-Mail Address"
-#~ msgstr "????????? ??????"
-
-#~ msgid " -> "
-#~ msgstr " -> "
-
-#~ msgid " <- "
-#~ msgstr " <- "
-
-#~ msgid "Export"
-#~ msgstr "????????????"
-
-#~ msgid "Specify target folder and mbox file."
-#~ msgstr "?????? ????????? mbox ????????? ???????????????."
-
-#~ msgid "/------"
-#~ msgstr "/------"
-
-#~ msgid "The Sylpheed-Claws Team\n"
-#~ msgstr "Sylpheed-Claws ???\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Icons\n"
-#~ msgstr ""
-#~ "\n"
-#~ "?????????\n"
-
-#~ msgid ""
-#~ "This product includes software developed by the OpenSSL Project for use "
-#~ "in the OpenSSL Toolkit ("
-#~ msgstr ""
-#~ "??? ??????????????? OpenSSL ????????? ???????????? ?????? OpenSSL ??????????????? ?????? ????????? "
-#~ "?????????????????? ???????????? ???????????? ("
-
-#, fuzzy
-#~ msgid ").\n"
-#~ msgstr ""
-#~ ").\n"
-#~ "\n"
-
-#~ msgid "Set folder sortorder"
-#~ msgstr "?????? ?????? ?????? ??????"
-
-#, fuzzy
-#~ msgid "Configuration options for the print job"
-#~ msgstr "????????? ???????????????"
-
-#, fuzzy
-#~ msgid "Source Buffer"
-#~ msgstr "?????? ????????????:"
-
-#, fuzzy
-#~ msgid "Wrap Mode"
-#~ msgstr "?????? ??????"
-
-#, fuzzy
-#~ msgid "Word wrapping mode"
-#~ msgstr "?????????"
-
-#, fuzzy
-#~ msgid "Font"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Numbers Font"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "?????? ?????? ?????? (????????????)"
-
-#~ msgid "Unknown suggestion mode."
-#~ msgstr "????????? ?????? ??????."
-
-#~ msgid "Change dictionary"
-#~ msgstr "?????? ?????????"
-
-#, fuzzy
-#~ msgid "Has been replied to"
-#~ msgstr "????????? ????????? ?????????"
-
-#~ msgid "Protocol log"
-#~ msgstr "???????????? ??????"
-
-#~ msgid " ... "
-#~ msgstr " ... "
-
-#, fuzzy
-#~ msgid " Extended Symbols... "
-#~ msgstr "?????? ??????"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "????????? SSL ??????"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "SSL ????????? ??????????????????"
-
-#~ msgid "IMAP4 authentication failed.\n"
-#~ msgstr "IMAP4 ????????? ??????????????????.\n"
-
-#~ msgid "iconv cannot convert UTF-7 to %s\n"
-#~ msgstr "iconv??? UTF-7??? %s(???)??? ????????? ??? ????????????\n"
-
-#~ msgid "iconv cannot convert %s to UTF-7\n"
-#~ msgstr "iconv??? %s???(???) UTF-7??? ????????? ??? ????????????\n"
-
-#~ msgid "iconv cannot convert UTF-8 to UTF-7\n"
-#~ msgstr "iconv??? UTF-8??? UTF-7??? ????????? ??? ????????????\n"
-
-#~ msgid "Error occurred while downloading messages in '%s'."
-#~ msgstr "'%s'??? ?????? ???????????? ???????????? ??? ????????? ??????????????????."
-
-#~ msgid "Error reading LDIF fields."
-#~ msgstr "LDIF field??? ????????? ????????? ??????????????????."
-
-#~ msgid "???"
-#~ msgstr "???"
-
-#~ msgid "Some errors occurred while getting mail."
-#~ msgstr "????????? ????????? ????????? ??????????????????."
-
-#~ msgid "Connection failed."
-#~ msgstr "????????? ??????????????????."
-
-#~ msgid "Really quit?"
-#~ msgstr "????????? ????????????????"
-
-#~ msgid "Composing message exists."
-#~ msgstr "???????????? ???????????? ????????????."
-
-#~ msgid "_Save to Draft"
-#~ msgstr "?????? ???????????????(_S)"
-
-#~ msgid "/_File/_Add mailbox"
-#~ msgstr "/??????(_F)/????????? ?????????(_A)"
-
-#~ msgid "/_File/_Add mailbox/MH..."
-#~ msgstr "/??????(_F)/????????? ?????????(_A)/MH..."
-
-#~ msgid "/_File/---"
-#~ msgstr "/??????(_F)/---"
-
-#~ msgid "/_File/Change folder order"
-#~ msgstr "/??????(_F)/?????? ?????? ?????????"
-
-#~ msgid "/_File/_Export to mbox file..."
-#~ msgstr "/??????(_F)/mbox ????????? ??????(_E)..."
-
-#~ msgid "/_File/_Save as..."
-#~ msgstr "/??????(_F)/??? ????????????(_S)..."
-
-#~ msgid "/_File/_Print..."
-#~ msgstr "/??????(_F)/??????(_P)..."
-
-#~ msgid "/_File/_Work offline"
-#~ msgstr "/??????(_F)/?????????????????? ??????(_W)"
-
-#~ msgid "/_File/E_xit"
-#~ msgstr "/??????(_F)/?????????(_X)"
-
-#~ msgid "/_Edit/_Find in current message..."
-#~ msgstr "/??????(_E)/?????? ????????? ??????(_F)..."
-
-#~ msgid "/_Edit/_Search folder..."
-#~ msgstr "/??????(_E)/?????? ??????(_S)..."
-
-#~ msgid "/_View/Show or hi_de/_Folder tree"
-#~ msgstr "/??????(_V)/???????????? ?????????(d)/?????? ??????(_F)"
-
-#~ msgid "/_View/Show or hi_de/_Message view"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/????????? ??????(_M)"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/??????(_T)"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/??????(_T)/???????????? ?????????(_A)"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Icon"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/??????(_T)/?????????(_I)"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Text"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/??????(_T)/?????????(_T)"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_None"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/??????(_T)/??????(_N)"
-
-#~ msgid "/_View/Show or hi_de/Status _bar"
-#~ msgstr "/??????(_V)/???????????? ?????????(_D)/?????????(_B)"
-
-#~ msgid "/_View/---"
-#~ msgstr "/??????(_V)/---"
-
-#~ msgid "/_View/Separate f_older tree"
-#~ msgstr "/??????(_V)/????????? ?????? ?????? ???(_O)"
-
-#~ msgid "/_View/Separate _message view"
-#~ msgstr "/??????(_V)/????????? ????????? ???(_M)"
-
-#~ msgid "/_View/_Sort"
-#~ msgstr "/??????(_V)/??????(_S)"
-
-#~ msgid "/_View/_Sort/by _number"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_N)"
-
-#~ msgid "/_View/_Sort/by S_ize"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_I)"
-
-#~ msgid "/_View/_Sort/by _Date"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_D)"
-
-#~ msgid "/_View/_Sort/by _From"
-#~ msgstr "/??????(_V)/??????(_S)/?????? ??????(_F)"
-
-#~ msgid "/_View/_Sort/by _To"
-#~ msgstr "/??????(_V)/??????(_S)/?????? ??????(_T)"
-
-#~ msgid "/_View/_Sort/by S_ubject"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_U)"
-
-#~ msgid "/_View/_Sort/by _color label"
-#~ msgstr "/??????(_V)/??????(_S)/??? ??????(_C)"
-
-#~ msgid "/_View/_Sort/by _mark"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_M)"
-
-#~ msgid "/_View/_Sort/by _status"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_S)"
-
-#~ msgid "/_View/_Sort/by a_ttachment"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_T)"
-
-#~ msgid "/_View/_Sort/by score"
-#~ msgstr "/??????(_V)/??????(_S)/??????(_I)"
-
-#~ msgid "/_View/_Sort/by locked"
-#~ msgstr "/??????(_V)/??????(_S)/??????"
-
-#~ msgid "/_View/_Sort/D_on't sort"
-#~ msgstr "/??????(_V)/??????(_S)/?????? ??????(_O)"
-
-#~ msgid "/_View/_Sort/---"
-#~ msgstr "/??????(_V)/??????(_S)/---"
-
-#~ msgid "/_View/_Sort/Ascending"
-#~ msgstr "/??????(_V)/??????(_S)/????????????"
-
-#~ msgid "/_View/_Sort/Descending"
-#~ msgstr "/??????(_V)/??????(_S)/????????????"
-
-#~ msgid "/_View/Set displayed _columns"
-#~ msgstr "/??????(_V)/????????? ?????? ??????(_C)"
-
-#~ msgid "/_View/Set displayed _columns/in _Folder list..."
-#~ msgstr "/??????(_V)/????????? ?????? ??????(_C)/?????? ??????(_F)..."
-
-#~ msgid "/_View/Set displayed _columns/in _Message list..."
-#~ msgstr "/??????(_V)/????????? ?????? ??????(_C)/????????? ??????(_M)..."
-
-#~ msgid "/_View/_Go to/_Prev message"
-#~ msgstr "/??????(_S)/??????(_G)/?????? ?????????(_P)"
-
-#~ msgid "/_View/_Go to/_Next message"
-#~ msgstr "/??????(_V)/??????(_G)/?????? ?????????(_N)"
-
-#~ msgid "/_View/_Go to/---"
-#~ msgstr "/??????(_V)/??????(_G)/---"
-
-#~ msgid "/_View/_Go to/P_rev unread message"
-#~ msgstr "/??????(_V)/??????(_G)/????????? ?????? ?????????(_E)"
-
-#~ msgid "/_View/_Go to/N_ext unread message"
-#~ msgstr "/??????(_V)/??????(_G)/????????? ?????? ?????????(_E)"
-
-#~ msgid "/_View/_Go to/Prev ne_w message"
-#~ msgstr "/??????(_V)/??????(_G)/?????? ??? ?????????(_W)"
-
-#~ msgid "/_View/_Go to/Ne_xt new message"
-#~ msgstr "/??????(_V)/??????(_G)/?????? ??? ?????????(_X)"
-
-#~ msgid "/_View/_Go to/Prev _marked message"
-#~ msgstr "/??????(_V)/??????(_G)/????????? ?????? ?????????(_M)"
-
-#~ msgid "/_View/_Go to/Next m_arked message"
-#~ msgstr "/??????(_V)/??????(_G)/????????? ?????? ?????????(_A)"
-
-#~ msgid "/_View/_Go to/Prev _labeled message"
-#~ msgstr "/??????(_V)/??????(_G)/??????????????? ?????? ?????????(_L)"
-
-#~ msgid "/_View/_Go to/Next la_beled message"
-#~ msgstr "/??????(_V)/??????(_G)/??????????????? ?????? ?????????(_B)"
-
-#~ msgid "/_View/_Go to/Other _folder..."
-#~ msgstr "/??????(_V)/??????(_G)/?????? ?????????(_F)..."
-
-#~ msgid "/_View/Character _encoding/---"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/---"
-
-#~ msgid "/_View/Character _encoding/_Auto detect"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ??????(_A)"
-
-#~ msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/7bit ????????? (US-ASC_II)"
-
-#~ msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/???????????? (_UTF-8)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ?????? (ISO-8859-_1)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ?????? (ISO-8859-15)"
-
-#~ msgid "/_View/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ?????? (Windows-1252)"
-
-#~ msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? ?????? (ISO-8859-_2)"
-
-#~ msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/_Baltic (ISO-8859-13)"
-
-#~ msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Baltic (ISO-8859-_4)"
-
-#~ msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/????????? (ISO-8859-_7)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Hebrew (ISO-8859-_8)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Hebrew (Windows-1255)"
-
-#~ msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (ISO-8859-_9)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Cyrillic (ISO-8859-_5)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Cyrillic (KOI8-_R)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Cyrillic (KOI8-U)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Cyrillic (Windows-1251)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (ISO-2022-_JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (ISO-2022-JP-2)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (_EUC-JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (_Shift__JIS)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Simplified Chinese (_GB2312)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Simplified Chinese (GBK)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Traditional Chinese (_Big5)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Traditional Chinese (EUC-_TW)"
-
-#~ msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Chinese (ISO-2022-_CN)"
-
-#~ msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (EUC-_KR)"
-
-#~ msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/?????? (ISO-2022-KR)"
-
-#~ msgid "/_View/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Thai (TIS-620)"
-
-#~ msgid "/_View/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/??????(_V)/?????? ?????????(_E)/Thai (Windows-874)"
-
-#~ msgid "/_View/Decode/---"
-#~ msgstr "/??????(_V)/?????????/---"
-
-#~ msgid "/_View/Decode/_8bit"
-#~ msgstr "/??????(_V)/?????????/8bit(_8)"
-
-#~ msgid "/_View/Decode/_Quoted printable"
-#~ msgstr "/??????(_V)/?????????/Quoted printable(_Q)"
-
-#~ msgid "/_View/Decode/_Base64"
-#~ msgstr "/??????(_V)/?????????/Base64(_B)"
-
-#~ msgid "/_View/Decode/_Uuencode"
-#~ msgstr "/??????(_V)/?????????/Uuencode(_U)"
-
-#~ msgid "/_View/Show all headers"
-#~ msgstr "/??????(_V)/?????? ????????????"
-
-#~ msgid "/_Message/Recei_ve"
-#~ msgstr "/?????????(_M)/??????(_V)"
-
-#~ msgid "/_Message/Recei_ve/---"
-#~ msgstr "/?????????(_M)/??????(_V)/---"
-
-#~ msgid "/_Message/_Send queued messages"
-#~ msgstr "/?????????(_M)/?????? ????????? ????????? ??????(_S)"
-
-#~ msgid "/_Message/Compose a news message"
-#~ msgstr "/?????????(_M)/?????? ?????? ?????????"
-
-#~ msgid "/_Message/_Reply"
-#~ msgstr "/?????????(_M)/??????(_R)"
-
-#~ msgid "/_Message/Repl_y to"
-#~ msgstr "/?????????(_M)/??????(_Y)"
-
-#~ msgid "/_Message/Repl_y to/_all"
-#~ msgstr "/?????????(_M)/??????(_Y)/??????(_A)"
-
-#~ msgid "/_Message/Repl_y to/_sender"
-#~ msgstr "/?????????(_M)/??????(_Y)/?????????(_S)"
-
-#~ msgid "/_Message/Repl_y to/mailing _list"
-#~ msgstr "/?????????(_M)/??????(_Y)/??????????????????(_L)"
-
-#~ msgid "/_Message/_Forward"
-#~ msgstr "/?????????(_M)/??????(_F)"
-
-#~ msgid "/_Message/For_ward as attachment"
-#~ msgstr "/?????????(_M)/??????????????? ??????(_W)"
-
-#~ msgid "/_Message/Redirect"
-#~ msgstr "/?????????(_M)/Redirect"
-
-#~ msgid "/_Message/M_ove..."
-#~ msgstr "/?????????(_M)/??????(_O)..."
-
-#~ msgid "/_Message/_Copy..."
-#~ msgstr "/?????????(_M)/??????(_C)..."
-
-#~ msgid "/_Message/Move to _trash"
-#~ msgstr "/?????????(_M)/?????? ??????????????? ??????(_T)"
-
-#~ msgid "/_Message/_Delete..."
-#~ msgstr "/?????????(_M)/?????????(_D)..."
-
-#~ msgid "/_Message/_Mark"
-#~ msgstr "/?????????(_M)/??????(_M)"
-
-#~ msgid "/_Message/_Mark/_Mark"
-#~ msgstr "/?????????(_M)/??????(_M)/??????(_M)"
-
-#~ msgid "/_Message/_Mark/_Unmark"
-#~ msgstr "/?????????(_M)/??????(_M)/?????? ??????(_U)"
-
-#~ msgid "/_Message/_Mark/---"
-#~ msgstr "/?????????(_M)/??????(_M)/---"
-
-#~ msgid "/_Message/_Mark/Mark as unr_ead"
-#~ msgstr "/?????????(_M)/??????(_M)/???????????? ????????? ??????(_E)"
-
-#~ msgid "/_Message/_Mark/Mark as rea_d"
-#~ msgstr "/?????????(_M)/??????(_M)/?????? ????????? ??????(_D)"
-
-#~ msgid "/_Message/_Mark/Mark all _read"
-#~ msgstr "/?????????(_M)/??????(_M)/?????? ?????? ????????? ??????(_R)"
-
-#~ msgid "/_Tools/_Address book..."
-#~ msgstr "/??????(_T)/?????????(_A)..."
-
-#~ msgid "/_Tools/Add sender to address boo_k"
-#~ msgstr "/??????(_T)/???????????? ????????? ?????????(_K)"
-
-#~ msgid "/_Tools/_Harvest addresses"
-#~ msgstr "/??????(_T)/?????? ??????(_H)"
-
-#~ msgid "/_Tools/_Harvest addresses/from _Folder..."
-#~ msgstr "/??????(_T)/?????? ??????(_H)/????????????(_F)..."
-
-#~ msgid "/_Tools/_Harvest addresses/from _Messages..."
-#~ msgstr "/??????(_T)/?????? ??????(_H)/???????????????(_M)..."
-
-#~ msgid "/_Tools/_Create filter rule"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_C)"
-
-#~ msgid "/_Tools/_Create filter rule/_Automatically"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_C)/??????(_A)"
-
-#~ msgid "/_Tools/_Create filter rule/by _From"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_C)/????????????(_F)"
-
-#~ msgid "/_Tools/_Create filter rule/by _To"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_C)/????????????(_T)"
-
-#~ msgid "/_Tools/_Create filter rule/by _Subject"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_C)/????????????(_S)"
-
-#~ msgid "/_Tools/C_reate processing rule"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_R)"
-
-#~ msgid "/_Tools/C_reate processing rule/_Automatically"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_R)/??????(_A)"
-
-#~ msgid "/_Tools/C_reate processing rule/by _From"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_R)/????????????(_F)"
-
-#~ msgid "/_Tools/C_reate processing rule/by _To"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_R)/????????????(_T)"
-
-#~ msgid "/_Tools/C_reate processing rule/by _Subject"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????(_R)/????????????(_S)"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In selected folder"
-#~ msgstr "/??????(_T)/????????? ????????? ?????????(_P)/????????? ????????????"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In all folders"
-#~ msgstr "/??????(_T)/????????? ????????? ?????????(_P)/?????? ????????????"
-
-#~ msgid "/_Tools/E_xecute"
-#~ msgstr "/??????(_T)/??????(_X)"
-
-#~ msgid "/_Tools/SSL cer_tificates..."
-#~ msgstr "/??????(_T)/SSL ?????????(_T)..."
-
-#~ msgid "/_Tools/_Log window"
-#~ msgstr "/??????(_T)/?????? ???(_L)"
-
-#~ msgid "/_Configuration/_Edit accounts..."
-#~ msgstr "/??????(_C)/?????? ??????(_E)..."
-
-#~ msgid "/_Configuration/---"
-#~ msgstr "/??????(_C)/---"
-
-#~ msgid "/_Configuration/P_references..."
-#~ msgstr "/??????(_C)/??????(_R)..."
-
-#~ msgid "/_Configuration/Pre-pr_ocessing..."
-#~ msgstr "/??????(_C)/?????????(_O)..."
-
-#~ msgid "/_Configuration/Post-pro_cessing..."
-#~ msgstr "/??????(_C)/?????????(_C)..."
-
-#~ msgid "/_Configuration/_Filtering..."
-#~ msgstr "/??????(_C)/??????(_F)..."
-
-#~ msgid "/_Configuration/_Templates..."
-#~ msgstr "/??????(_C)/?????????(_T)..."
-
-#~ msgid "/_Configuration/_Actions..."
-#~ msgstr "/??????(_C)/??????(_A)..."
-
-#~ msgid "/_Configuration/Plu_gins..."
-#~ msgstr "/??????(_C)/????????????(_G)..."
-
-#~ msgid "/_Help/---"
-#~ msgstr "/?????????(_H)/---"
-
-#~ msgid "/_File/_Close"
-#~ msgstr "/??????(_F)/??????(_C)"
-
-#~ msgid "/_Message/Compose _new message"
-#~ msgstr "/?????????(_M)/?????? ?????????(_N)"
-
-#~ msgid "/_Message/Redirec_t"
-#~ msgstr "/?????????(_M)/Redirect(_T)"
-
-#~ msgid "/_Tools/Create processing rule"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????"
-
-#~ msgid "/_Tools/Create processing rule/_Automatically"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????/??????(_A)"
-
-#~ msgid "/_Tools/Create processing rule/by _From"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????/????????????(_F)"
-
-#~ msgid "/_Tools/Create processing rule/by _To"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????/????????????(_T)"
-
-#~ msgid "/_Tools/Create processing rule/by _Subject"
-#~ msgstr "/??????(_T)/?????? ?????? ?????????/????????????(_S)"
-
-#~ msgid "Sylpheed - Message View"
-#~ msgstr "Sylpheed - ????????? ??????"
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "?????? ???????????? ???????????????:\n"
-#~ "('%s'???(???) ?????????????????? ????????? ????????????)"
-
-#~ msgid ""
-#~ "Print command line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "?????? ???????????? ???????????? ????????????:\n"
-#~ "'%s'"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "%s:%d(???)??? NNTP ????????? ???????????????...\n"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "???????????? ????????? ?????? ?????? ????????????\n"
-
-#~ msgid "can't post article.\n"
-#~ msgstr "????????? ?????? ?????? ????????????.\n"
-
-#~ msgid "can't retrieve article %d\n"
-#~ msgstr "?????? %d???(???) ????????? ?????? ????????????\n"
-
-#~ msgid "error occurred while getting xover.\n"
-#~ msgstr "xover??? ?????? ?????? ????????? ??????.\n"
-
-#~ msgid "error occurred while getting xhdr.\n"
-#~ msgstr "xhdr??? ?????? ?????? ????????? ??????.\n"
-
-#~ msgid "Scan archive contents"
-#~ msgstr "???????????? ??????"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo ????????????"
-
-#~ msgid "Do not load remote links in mails"
-#~ msgstr "????????? ?????? ????????? ???????????? ??????"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Dillo??? '--local' ????????? ??????"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "???????????? ??????????????? ?????? ????????? ????????? ??? ????????????"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "?????? ??? ?????? (????????? ??????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Dillo??? '--fullwindow' ????????? ??????"
-
-#~ msgid "This plugin renders HTML mail using the Dillo web browser."
-#~ msgstr "??? ??????????????? HTML ????????? Dillo ??? ??????????????? ???????????? ???????????????."
-
-#~ msgid "Please select key for '%s'"
-#~ msgstr "'%s'??? ?????? ?????? ???????????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "This plugin handles PGP core operations. It is used by other\n"
-#~ "plugins, like PGP/Mime.\n"
-#~ "\n"
-#~ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>\n"
-#~ msgstr ""
-#~ "??? ??????????????? PGP/MIME ??????, ???????????? ???????????? ???????????????. ???????????? ??????"
-#~ "??? ????????? ??? ??????, ????????? ????????? ?????? ?????????, ????????? ????????? ????????? ????????? "
-#~ "???????????? ??? ????????????.\n"
-
-#~ msgid "Maximum size a message is allowed to have to be checked"
-#~ msgstr "????????? ???????????? ?????? ??????"
-
-#~ msgid "kB"
-#~ msgstr "kB"
-
-#, fuzzy
-#~ msgid "Save mails that where identified as spam"
-#~ msgstr "spam?????? ????????? ????????? ????????? ??????"
-
-#~ msgid "/E_xit Sylpheed-Claws"
-#~ msgstr "/Sylpheed-Claws ?????????(_X)"
-
-#~ msgid "/Work Offline"
-#~ msgstr "/?????????????????? ??????"
-
-#~ msgid "Exit this program?"
-#~ msgstr "??? ??????????????? ??????????????????????"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "??????"
-
-#~ msgid "Download all messages on server"
-#~ msgstr "???????????? ?????? ???????????? ??????"
-
-#~ msgid "Add Date"
-#~ msgstr "?????? ?????????"
-
-#~ msgid " Edit... "
-#~ msgstr " ??????..."
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "???????????? ?????? ??????"
-
-#~ msgid "Encrypt message by default"
-#~ msgstr "???????????? ???????????? ?????????"
-
-#~ msgid "Sign message by default"
-#~ msgstr "???????????? ???????????? ????????? ???"
-
-#~ msgid "Unsupported (%s)"
-#~ msgstr "???????????? (%s)"
-
-#, fuzzy
-#~ msgid " Syntax help... "
-#~ msgstr " Syntax ????????? "
-
-#~ msgid "MENU NAME:"
-#~ msgstr "?????? ??????:"
-
-#~ msgid "COMMAND LINE:"
-#~ msgstr "?????????:"
-
-#~ msgid "Use:"
-#~ msgstr "??????:"
-
-#~ msgid "Audio player"
-#~ msgstr "????????? ????????????"
-
-#~ msgid "Info ..."
-#~ msgstr "?????? ..."
-
-#~ msgid "  Replace  "
-#~ msgstr "  ??????  "
-
-#~ msgid "Default To: "
-#~ msgstr "?????? To: "
-
-#~ msgid "Default dictionary: "
-#~ msgstr "?????? ??????: "
-
-#~ msgid "Unread flag"
-#~ msgstr "????????? ?????????"
-
-#~ msgid "Forwarded flag"
-#~ msgstr "?????? ?????????"
-
-#~ msgid "Locked flag"
-#~ msgstr "?????? ?????????"
-
-#~ msgid "Score greater than"
-#~ msgstr "Score greater than"
-
-#~ msgid "Score equal to"
-#~ msgstr "Score equal to"
-
-#~ msgid "Test"
-#~ msgstr "Test"
-
-#~ msgid "or"
-#~ msgstr "or"
-
-#, fuzzy
-#~ msgid " Info... "
-#~ msgstr "?????? ..."
-
-#~ msgid ""
-#~ "The entry was not saved.\n"
-#~ "Have you really finished?"
-#~ msgstr ""
-#~ "????????? ???????????? ???????????????.\n"
-#~ "????????? ?????????????"
-
-#~ msgid "using an external program or script. The program will"
-#~ msgstr "using an external program or script. The program will"
-
-#~ msgid "return either 0 or 1"
-#~ msgstr "return either 0 or 1"
-
-#~ msgid "Quoted Text - First Level"
-#~ msgstr "????????? - ????????? ??????"
-
-#~ msgid "Quoted Text - Second Level"
-#~ msgstr "????????? - ????????? ??????"
-
-#~ msgid "Quoted Text - Third Level"
-#~ msgstr "????????? - ????????? ??????"
-
-#~ msgid "Pick color for quotation level 2"
-#~ msgstr "????????? ?????? ????????? ??? ??????"
-
-#~ msgid "Pick color for quotation level 3"
-#~ msgstr "????????? ?????? ????????? ??? ??????"
-
-#~ msgid "Pick color for URI"
-#~ msgstr "URI ??? ??????"
-
-#~ msgid "Log window length"
-#~ msgstr "?????? ??? ??????"
-
-#~ msgid "Reply format"
-#~ msgstr "?????? ??????"
-
-#~ msgid "Forward format"
-#~ msgstr "?????? ??????"
-
-#, fuzzy
-#~ msgid " Description of symbols... "
-#~ msgstr " ?????? ?????? "
-
-#~ msgid "Quotation characters"
-#~ msgstr "?????? ??????"
-
-#~ msgid "Auto-check new mail"
-#~ msgstr "??? ????????? ?????? ??????"
-
-#~ msgid "every"
-#~ msgstr "every"
-
-#~ msgid "Run command when new mail arrives"
-#~ msgstr "??? ?????? ????????? ?????? ??????"
-
-#~ msgid "Dictionaries path:"
-#~ msgstr "?????? ??????:"
-
-#~ msgid "Key bindings"
-#~ msgstr "??? ?????????"
-
-#~ msgid "Old Sylpheed"
-#~ msgstr "?????? Sylpheed"
-
-#~ msgid "Translate header name (such as 'From:', 'Subject:')"
-#~ msgstr "?????? ????????? ??????('From:', 'Subject:' ??????)"
-
-#~ msgid "Messages will be marked until execution if this is turned off"
-#~ msgstr "????????? ???????????? ?????? ???????????? ????????????????????? ????????? ??? ????????????"
-
-#~ msgid "Select first unread (or new) message"
-#~ msgstr "??? ?????? ??? ?????? (?????? ???) ????????? ??????"
-
-#~ msgid " Set key bindings... "
-#~ msgstr " ??? ????????? ??????... "
-
-#~ msgid "Template name"
-#~ msgstr "????????? ??????"
-
-#, fuzzy
-#~ msgid " Symbols... "
-#~ msgstr " ?????? "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "??? ?????? ??????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "?????? ?????? ??????"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "????????? ?????? ?????? ??????"
-
-#~ msgid "Sylpheed-Claws Action"
-#~ msgstr "Sylpheed-Claws ??????"
-
-#~ msgid "Available toolbar icons"
-#~ msgstr "??????????????? ?????? ?????????"
-
-#~ msgid "Displayed toolbar items"
-#~ msgstr "????????? ?????? ??????"
-
-#~ msgid "Customize Toolbars"
-#~ msgstr "?????? ??????"
-
-#~ msgid "Wrap before sending"
-#~ msgstr "????????? ?????? ??? ??????"
-
-#~ msgid "Insert File"
-#~ msgstr "????????? ??????"
-
-#~ msgid "/Repl_y to/_all"
-#~ msgstr "/??????(_Y)/??????(_A)"
-
-#~ msgid "/Repl_y to/_sender"
-#~ msgstr "/??????(_Y)/?????????(_S)"
-
-#~ msgid "/Redirect"
-#~ msgstr "/Redirect"
-
-#~ msgid "/_Mark/_Mark"
-#~ msgstr "/??????(_M)/??????(_U)"
-
-#~ msgid "/_Mark/_Unmark"
-#~ msgstr "/??????(_M)/?????? ??????(_U)"
-
-#~ msgid "/_Mark/---"
-#~ msgstr "/??????(_M)/---"
-
-#~ msgid "/_Mark/Mark as unr_ead"
-#~ msgstr "/??????(_M)/???????????? ????????? ??????(_E)"
-
-#~ msgid "/_Mark/Mark as rea_d"
-#~ msgstr "/??????(_M)/?????? ????????? ??????(_D)"
-
-#~ msgid "/_Mark/Mark all read"
-#~ msgstr "/??????(_M)/?????? ?????? ????????? ??????"
-
-#~ msgid "/_Mark/Ignore thread"
-#~ msgstr "/??????(_M)/????????? ??????"
-
-#~ msgid "/_Mark/Unignore thread"
-#~ msgstr "/??????(_M)/????????? ????????????"
-
-#~ msgid "/_Mark/Lock"
-#~ msgstr "/??????(_M)/??????"
-
-#~ msgid "/_Mark/Unlock"
-#~ msgstr "/??????(_M)/????????????"
-
-#~ msgid "/Create f_ilter rule/_Automatically"
-#~ msgstr "/?????? ?????? ?????????(_I)/??????(_A)"
-
-#~ msgid "/Create f_ilter rule/by _From"
-#~ msgstr "/?????? ?????? ?????????(_I)/????????????(_F)"
-
-#~ msgid "/Create f_ilter rule/by _To"
-#~ msgstr "/?????? ?????? ?????????(_I)/????????????(_T)"
-
-#~ msgid "/Create f_ilter rule/by _Subject"
-#~ msgstr "/?????? ?????? ?????????(_I)/????????????(_S)"
-
-#~ msgid "/Create processing rule/_Automatically"
-#~ msgstr "/?????? ?????? ?????????/??????(_A)"
-
-#~ msgid "/Create processing rule/by _From"
-#~ msgstr "/?????? ?????? ?????????/From??????(_F)"
-
-#~ msgid "/Create processing rule/by _To"
-#~ msgstr "/?????? ?????? ?????????/To???(_T)"
-
-#~ msgid "/Create processing rule/by _Subject"
-#~ msgstr "/?????? ?????? ?????????/????????????(_S)"
-
-#~ msgid "/_View/_Source"
-#~ msgstr "/??????(_V)/??????(_S)"
-
-#~ msgid "/_View/All _header"
-#~ msgstr "/??????(_V)/?????? ??????(_H)"
-
-#~ msgid "No marked message found. Search from the beginning?"
-#~ msgstr "????????? ???????????? ????????????. ?????? ????????? ??????????"
-
-#~ msgid " items selected"
-#~ msgstr " ????????? ??????"
-
-#~ msgid "Unthreading..."
-#~ msgstr "???????????? ????????????..."
-
-#~ msgid "(Shortcut key: 'l'),\n"
-#~ msgstr "(?????? ???: 'l'),\n"
-
-#~ msgid "Fake URL warning"
-#~ msgstr "?????? URL ??????"
-
-#~ msgid "/Reply to all with _quote"
-#~ msgstr "/???????????? ???????????? ??????(_Q)"
-
-#~ msgid "/_Reply to all without quote"
-#~ msgstr "/???????????? ???????????? ??????(_R)"
-
-#~ msgid "/Reply to list with _quote"
-#~ msgstr "/????????????????????? ???????????? ??????(_Q)"
-
-#~ msgid "/_Reply to list without quote"
-#~ msgstr "/????????????????????? ???????????? ??????(_R)"
-
-#~ msgid "/Reply to sender with _quote"
-#~ msgstr "/??????????????? ???????????? ??????(_Q)"
-
-#~ msgid "/_Reply to sender without quote"
-#~ msgstr "/??????????????? ???????????? ??????(_R)"
-
-#~ msgid "Sylpheed-Claws Team"
-#~ msgstr "Sylpheed-Claws ???"
-
-#~ msgid "Security"
-#~ msgstr "??????"
diff --git a/po/lt.po b/po/lt.po
index 33d62a9..5e735fc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -18566,1183 +18566,3 @@ msgid ""
 msgstr ""
 "Claws Mail programa paruo??ta.\n"
 "Nor??dami prad??ti, spauskite ?????ra??yti???."
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: ne??inomas serveris.\n"
-
-#~ msgid "+_Insert"
-#~ msgstr "+??_terpti"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Si??sti"
-
-#, fuzzy
-#~ msgid "<i>%s</i>"
-#~ msgstr "Nuo: <i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+??_ra??yti kaip juodra??t??"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">???%s??? pakeisti ??: </span>"
-
-#~ msgid "Failed."
-#~ msgstr "Nepavyko."
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "%s IMAP klaida: tapatyb?? patvirtinta\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "%s IMAP klaida: tapatyb?? nepatvirtinta\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "%s IMAP klaida: srauto klaida\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "%s IMAP klaida: ry??ys atmestas\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "%s IMAP klaida: lemtingoji klaida\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "%s IMAP klaida: komandos ???NOOP??? klaida\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "%s IMAP klaida: komandos ???COPY??? klaida\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "%s IMAP klaida: komandos ???LIST??? klaida\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "%s IMAP klaida: komandos ???LSUB??? klaida\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "%s IMAP klaida: komandos ???SASL??? klaida\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "%s IMAP klaida: komandos ???SSL??? klaida\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "%s IMAP: ne??inoma klaida [%d]\n"
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr ""
-#~ "Naujo aplanko pavadinime negali b??ti simboli??, rei??kian??i?? aplank?? "
-#~ "skirtukus"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Atsisakyti prenumeratos"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (arba senesn??)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (arba senesn??)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (arba senesn??)"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "nepavyksta nukopijuoti lai??ko %s ?? %s\n"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Tipas: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Dydis: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Rinkmenos vardas: </b>"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Rasta vieta: (%.2f,%.2f)"
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Nepavyksta nustatyti IP adreso vietos"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Pam??ginti rasti siunt??j??"
-
-#~ msgid "Andorra"
-#~ msgstr "Andora"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Jungtiniai Arab?? Emyratai"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistanas"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antikva ir Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Angilija"
-
-#~ msgid "Albania"
-#~ msgstr "Albanija"
-
-#~ msgid "Armenia"
-#~ msgstr "Arm??nija"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Olandijos Antilai"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarkika"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
-
-#~ msgid "American Samoa"
-#~ msgstr "??iaur??s Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "Austrija"
-
-#~ msgid "Australia"
-#~ msgstr "Australija"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaid??anas"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosnija ir Hercogovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbadosas"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Banglade??as"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgija"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Fasas"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgarija"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahreinas"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundis"
-
-#~ msgid "Benin"
-#~ msgstr "Beninas"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermud??"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brun??jus Darusalamas"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivija"
-
-#~ msgid "Brazil"
-#~ msgstr "Brazilija"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamai"
-
-#~ msgid "Bhutan"
-#~ msgstr "Butanas"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Buv?? sala"
-
-#~ msgid "Botswana"
-#~ msgstr "Botsvana"
-
-#~ msgid "Belarus"
-#~ msgstr "Gudija"
-
-#~ msgid "Belize"
-#~ msgstr "Belizas"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokos?? (Kilingo) salos"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Centrin??s Afrikos Respublika"
-
-#~ msgid "Congo"
-#~ msgstr "Kongas"
-
-#~ msgid "Switzerland"
-#~ msgstr "??veicarija"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Dramblio kaulo krantas"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Kuko salos"
-
-#~ msgid "Chile"
-#~ msgstr "??il??"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamer??nas"
-
-#~ msgid "China"
-#~ msgstr "Kinija"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbija"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kosta Rika"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "??aliasis ky??ulys"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Kal??d?? sala"
-
-#~ msgid "Cyprus"
-#~ msgstr "Kipras"
-
-#~ msgid "Czech Republic"
-#~ msgstr "??ekijos Respublika"
-
-#~ msgid "Germany"
-#~ msgstr "Vokietija"
-
-#~ msgid "Djibouti"
-#~ msgstr "D??ibutis"
-
-#~ msgid "Denmark"
-#~ msgstr "Danija"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominikos respublika"
-
-#~ msgid "Algeria"
-#~ msgstr "Al??yras"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekvadoras"
-
-#~ msgid "Estonia"
-#~ msgstr "Estija"
-
-#~ msgid "Egypt"
-#~ msgstr "Egiptas"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Vakar?? Sachara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritr??ja"
-
-#~ msgid "Spain"
-#~ msgstr "Ispanija"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopija"
-
-#~ msgid "Finland"
-#~ msgstr "Suomija"
-
-#~ msgid "Fiji"
-#~ msgstr "Fid??i"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Folkland?? salos (Malvinai)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikronezijos Federacin??s Valstijos"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Farer?? salos"
-
-#~ msgid "France"
-#~ msgstr "Pranc??zija"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "??emynin?? Pranc??zija"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabonas"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Jungtin?? Karalyst??"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Gruzija"
-
-#~ msgid "French Guiana"
-#~ msgstr "Pranc??z?? Gviana"
-
-#~ msgid "Ghana"
-#~ msgstr "Gana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltaras"
-
-#~ msgid "Greenland"
-#~ msgstr "Grenlandija"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambija"
-
-#~ msgid "Guinea"
-#~ msgstr "Gvin??ja"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Gvadelupa"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Pusiaujo Gvin??ja"
-
-#~ msgid "Greece"
-#~ msgstr "Graikija"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Piet?? D??ord??ija ir Piet?? Sandvi??o salos"
-
-#~ msgid "Guatemala"
-#~ msgstr "Gvatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guamas"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Bisau Gvin??ja"
-
-#~ msgid "Guyana"
-#~ msgstr "Gajana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Honkongas"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Herdo sala ir Makdonaldo salos"
-
-#~ msgid "Honduras"
-#~ msgstr "Hond??ras"
-
-#~ msgid "Croatia"
-#~ msgstr "Kroatija"
-
-#~ msgid "Haiti"
-#~ msgstr "Haitis"
-
-#~ msgid "Hungary"
-#~ msgstr "Vengrija"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonezija"
-
-#~ msgid "Ireland"
-#~ msgstr "Airija"
-
-#~ msgid "Israel"
-#~ msgstr "Izraelis"
-
-#~ msgid "India"
-#~ msgstr "Indija"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britanijos teritorijos Indijos vandenyne"
-
-#~ msgid "Iraq"
-#~ msgstr "Irakas"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "??ekijos Respublika"
-
-#~ msgid "Iceland"
-#~ msgstr "Islandija"
-
-#~ msgid "Italy"
-#~ msgstr "Italija"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaika"
-
-#~ msgid "Jordan"
-#~ msgstr "Jordanija"
-
-#~ msgid "Japan"
-#~ msgstr "Japonija"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenija"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgiztanas"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambod??a"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribatis"
-
-#~ msgid "Comoros"
-#~ msgstr "Komorai"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Sent Kitsas ir Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Laoso Liaudies Demokratin?? Respublika"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "??ekijos Respublika"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuveitas"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Kaiman?? salos"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazachstanas"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laoso Liaudies Demokratin?? Respublika"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanas"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Sent Martinas"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichten??teinas"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "??ri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberija"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotas"
-
-#~ msgid "Lithuania"
-#~ msgstr "Lietuva"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Liuksemburgas"
-
-#~ msgid "Latvia"
-#~ msgstr "Latvija"
-
-#~ msgid "Morocco"
-#~ msgstr "Marokas"
-
-#~ msgid "Monaco"
-#~ msgstr "Monakas"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldovos respublika"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskaras"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Mar??alo salos"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Makedonija, buvusios Jugoslavijos respublikos dalis"
-
-#~ msgid "Mali"
-#~ msgstr "Malis"
-
-#~ msgid "Myanmar"
-#~ msgstr "Mianmaras"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolija"
-
-#~ msgid "Macao"
-#~ msgstr "Makao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "??iaur??s Marian?? salos"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinika"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauritanija"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montseratas"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauricijus"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldyvai"
-
-#~ msgid "Malawi"
-#~ msgstr "Malavis"
-
-#~ msgid "Mexico"
-#~ msgstr "Meksika"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malaizija"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambikas"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibija"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Naujoji Kaledonija"
-
-#~ msgid "Niger"
-#~ msgstr "Nigeris"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolko salos"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigerija"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragva"
-
-#~ msgid "Netherlands"
-#~ msgstr "Olandija"
-
-#~ msgid "Norway"
-#~ msgstr "Norvegija"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepalas"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niuj??"
-
-#~ msgid "New Zealand"
-#~ msgstr "Naujoji Zelandija"
-
-#~ msgid "Oman"
-#~ msgstr "Omanas"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Pranc??z?? Polinezija"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Naujoji Gvin??ja"
-
-#~ msgid "Philippines"
-#~ msgstr "Filipinai"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistanas"
-
-#~ msgid "Poland"
-#~ msgstr "Lenkija"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Sen Pjeras ir Mikelonas"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Riko"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugalija"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paragvajus"
-
-#~ msgid "Qatar"
-#~ msgstr "Kataras"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunionas"
-
-#~ msgid "Romania"
-#~ msgstr "Rumunija"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Rusijos Federacija"
-
-#~ msgid "Rwanda"
-#~ msgstr "Ruanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudo Arabija"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Saliamono salos"
-
-#~ msgid "Seychelles"
-#~ msgstr "Sei??eliai"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudanas"
-
-#~ msgid "Sweden"
-#~ msgstr "??vedija"
-
-#~ msgid "Singapore"
-#~ msgstr "Singap??ras"
-
-#~ msgid "Saint Helena"
-#~ msgstr "??v. Elenos sala"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slov??nija"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbardas ir Jan Mayenas"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovakija"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Siera Leon??"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marinas"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegalas"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalis"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinamas"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "San Tom?? ir Prinsip??"
-
-#~ msgid "El Salvador"
-#~ msgstr "Salvadoras"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sirijos Arab?? Respublika"
-
-#~ msgid "Swaziland"
-#~ msgstr "Svazilandas"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Terkso ir Kaiko salos"
-
-#~ msgid "Chad"
-#~ msgstr "??adas"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Pranc??z?? pietin??s teritorijos"
-
-#~ msgid "Togo"
-#~ msgstr "Togas"
-
-#~ msgid "Thailand"
-#~ msgstr "Tailandas"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tad??ikistanas"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkm??nistanas"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisas"
-
-#~ msgid "Tonga"
-#~ msgstr "Tongas"
-
-#~ msgid "East Timor"
-#~ msgstr "Ryt?? Timoras"
-
-#~ msgid "Turkey"
-#~ msgstr "Turkija"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidadas ir Tobagas"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taivanis. Kinijos provincija"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzanijos Respublika"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukraina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Jungtin??s Valstijos Ma??osios U??j??rio Teritorijos"
-
-#~ msgid "United States"
-#~ msgstr "Jungtin??s Amerikos Valstijos"
-
-#~ msgid "Uruguay"
-#~ msgstr "Urugvajus"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistanas"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "??ventasis Sostas (Vatikano miestas valstyb??)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "??v. Vincentas ir Grenadinai"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venesuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Britanijos Mergeli?? salos"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Britanijos Mergeli?? salos."
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnamas"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Valis ir Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemenas"
-
-#~ msgid "Mayotte"
-#~ msgstr "Majotas"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Serbija ir Montenegras"
-
-#~ msgid "South Africa"
-#~ msgstr "Piet?? Afrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambija"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabv??"
-
-#~ msgid "GeoLocation"
-#~ msgstr "Geografin?? pad??tis:"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Nepavyksta sukurti reguliariojo rei??kinio: %s\n"
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "GeoLocation integracija"
-
-#, fuzzy
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span weight=\"bold\">Elektroninio pa??to adresas:</span>"
-
-#~ msgid "seconds"
-#~ msgstr "sek."
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s??veskite slapt??j?? fraz??, kuri "
-#~ "skirta:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid ???%s??? (patikimumas: %s)\n"
-
-#~ msgid "+Discard"
-#~ msgstr "+Naikinti"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "I??si??stus lai??kus ??ra??yti aplanke ???i??si??stieji???"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Lai??k?? santrauka</b>\n"
-#~ "<b>Nauj??:</b> %d\n"
-#~ "<b>Neskaityt??:</b> %d\n"
-#~ "<b>I?? viso:</b> %d\n"
-#~ "<b>Dydis:</b> %s\n"
-#~ "\n"
-#~ "<b>Pa??ym??t??:</b> %d\n"
-#~ "<b>Atsakyt??:</b> %d\n"
-#~ "<b>Persi??st??:</b> %d\n"
-#~ "<b>U??rakint??:</b> %d\n"
-#~ "<b>Nepaisom??:</b> %d\n"
-#~ "<b>Stebim??:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Nuo: %s, %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Kam: %s, %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Vardas:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Elektroninio pa??to adresas:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Pa??to d????ut??s pavadinimas:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">SMTP serverio adresas:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Serverio adresas:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Vietin?? pa??to d????ut??:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Serverio tipas:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Naudotojo vardas:</span>"
-
-#~ msgid "E-mail client"
-#~ msgstr "Elektroninio pa??to programa"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Greita elektroninio pa??to programa, sukurta GTK+ pagrindu"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "paprasta;greita;grafin?? s??saj??;pl??tiniai;pop;pop3;imap;imap4;nntp;"
-#~ "naujienos;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr ""
-#~ "Claws Mail yra greita, galinga ir praple??iamo funkcionalumo elektroninio "
-#~ "pa??to programa."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "Pasi??ymi didel??mis konfig??ravimo galimyb??mis, geba nestrigdama apdoroti "
-#~ "t??kstan??ius lai??k??. Lai??kai tvarkomi atviru formatu, tad juos lengviau "
-#~ "apdoroti."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "Daug papildom?? galimybi?? suteikia papildiniai, pvz., PGP para??ai ir "
-#~ "??ifravimas, naujien?? skaitytuv??, kalendorius, galingas brukalo filtras, "
-#~ "Perl ir Python interpretatorius, HTML ir PDF ??i??rykl?? ir kt."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr ""
-#~ "Kai kuriuose ne??iojamuosiuose kompiuteriuose ??galina prane??imus "
-#~ "indikacin??mis lemput??mis."
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr ""
-#~ "Leid??ia ??ra??yti adresus, kuriais siun??iami lai??kai, ?? pasirinkt?? adres?? "
-#~ "knygos aplank??"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "Leid??ia sukurti sen?? aplank?? zip arba tar archyvus"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "Leid??ia i?? lai??k?? pa??alinti priedus"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr "??sp??ja apie lai??ke pamin??tus priedus, jei jie neprid??ti"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "??galina POP, IMAP ir LOCAL paskyr?? lai??k?? filtravim?? naudojant Bogofilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "Tikrina visus lai??kus, kurie gauti IMAP, LOCAL ir POP paskyrose, su "
-#~ "Bsfilter"
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "Tikrina visus lai??kus, kurie gauti IMAP, LOCAL ir POP paskyrose, su clamd "
-#~ "(Clam AV)"
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr ""
-#~ "Atvaizduoja HTML formato elektroninius lai??kus pasitelkiant Webkit "
-#~ "bibliotek??"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "??terpia antra??tes: UIDL, Claws paskyros vard??, POP server??, naudotojo "
-#~ "identifikatori?? ir gavimo laik??"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Suteikia s??saj?? su Google paslaugomis"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Suteikia GeoLocation galimybes"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr "Parodo naudotojo paveiksliuk??"
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Tiesioginis pa??to d????u??i?? palaikymas mbox formatu"
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr "Gavus nauj?? lai??k??, lai??ko antra??t?? ??ra??o ?? ??urnal??."
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Suteikia ??vairias galimybes naudotojui prane??ti apie naujus ir "
-#~ "neskaitytus lai??kus"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "??galina PDF ir PS pried?? per??i??r??jim??. Naudojamos Poppler ir GhostScript "
-#~ "bibliotekos."
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr "Leid??ia el.lai??k?? filtravimui naudoti Perl"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "??galina vie????j?? rakt?? funkcijas. Priklauso PGP/Inline ir PGP/MIME "
-#~ "papildiniams."
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Apdoroja PGP/Inline pasira??ytus ir/arba u????ifruotus lai??kus"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Apdoroja PGP/MIME pasira??ytus ir/arba u????ifruotus lai??kus"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Suteikia Python scenarij?? vykdymo galimyb??. Kodas gali b??ti ??terptas ?? "
-#~ "Python konsol??"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "Skaitykite savo m??gstamus naujien?? kanalus"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Apdoroja S/MIME pasira??ytus ir/arba u????ifruotus lai??kus"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Prane??a apie brukal?? ??vairioms tarnyboms"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "??galina POP, IMAP ir LOCAL paskyr?? lai??k?? filtravim?? naudojant "
-#~ "SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "??galina perskaityti application/ms-tnef lai??k?? priedus"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "??galina vCalendar lai??k?? apdorojim?? ir webCal prenumeratas. Leid??ia "
-#~ "importuoti kalendori??"
-
-#~ msgid "_Subject:"
-#~ msgstr "_Tema:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "I??saugoti gav??j?? (???Kam???) adresus"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "I??saugoti slaptos kopijos adresus"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "Stiliaus rinkmena:"
-
-#~ msgid "slow"
-#~ msgstr "l??tas"
-
-#~ msgid "fast"
-#~ msgstr "greitas"
-
-#~ msgid "Enable Popup"
-#~ msgstr "??galinti i??kylant?? lang??"
-
-#~ msgid "Use this"
-#~ msgstr "Naudoti j??"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "lai??kai, kurie turi antra??t?? S"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Geras (bet nepatikimas) ???%s??? para??as"
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Nepavyksta atverti laikinosios rinkmenos"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Gaunama: ???%s???..."
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "??is formatas dar nepalaikomas."
-
-#~ msgid "N/A"
-#~ msgstr "Nepasiekimas"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld baitas"
-#~ msgstr[1] "%ld baitai"
-#~ msgstr[2] "%ld bait??"
-
-#~ msgid "size unknown"
-#~ msgstr "dydis ne??inomas"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nepavyksta atverti URL ???%s???:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Nepavyksta atverti URL ???%s???:\n"
-#~ "%s\n"
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Baig??si laikas jungiantis prie %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Nepavysta atverti URL %s\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Nepavyksta pa??alinti ???%s??? naujien?? kanalo."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Atnaujinti _visus kanalus"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "Atsisakyti p_renumeratos..."
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "??alinti aplank?? _med??..."
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Atsisakyti prenumeratos"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Tikrai pa??alinti ???? kanal???"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "??alinti pod??lio ??ra??us"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
diff --git a/po/nb.po b/po/nb.po
index cff913d..715e937 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19187,1291 +19187,3 @@ msgid ""
 msgstr ""
 "Claws Mail er n?? klar.\n"
 "Klikk Lagre for ?? starte."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Aktiviser sikker tilkobling til LDAP-tjener over SSL. Kontroller "
-#~ "innstillingene i ldap.conf (feltene TLS_CACERTDIR og TLS_REQCERT) hvis "
-#~ "tilkoblingen mislykkes."
-
-#~ msgid "No TLS"
-#~ msgstr "Ingen TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registrer Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Bruk SSL for POP3-tilkoblinger"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Bruk SSL for IMAP4-tilkoblinger"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Bruk SSL for SMTP-tilkoblinger"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Bruk SSL for SMTP-tilkobling"
-
-#~ msgid "Re_move"
-#~ msgstr "_Slett"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Annen mappe..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   N??kkelimport er ikke implementert i Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "minutt(er)"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Signaturen kan ikke verifiseres - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "N??kkeleksport er ikke implementert i Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "dag(er)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Flytt slettede meldinger til papirkurven og rens den med en gang"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Flytter slettede meldinger til papirkurven i stedet for ?? bruke \\Deleted-"
-#~ "flagget uten ?? rense."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatisk (Anbefalt)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Slett melding(er)"
-
-#~ msgid "+_Insert"
-#~ msgstr "+Sett _inn"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Send"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+Lagre i _Utkast"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Erstatt \"%s\" med: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "IMAP-feil ved %s: autentisert\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "IMAP-feil ved %s: ikke autentisert\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "IMAP-feil ved %s: stream error\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "IMAP-feil ved %s: forbindelse nektet\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "IMAP-feil ved %s: fatal feil\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "IMAP-feil ved %s: NOOP-feil\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "IMAP-feil ved %s: COPY-feil\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "IMAP-feil ved %s: LIST-feil\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "IMAP-feil ved %s: LSUB-feil\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "IMAP-feil ved %s: SASL-feil\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "IMAP-feil ved %s: SSL-feil\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "IMAP-feil p?? %s: Ukjent feil [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Stopp abonnement"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (eller eldre)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (eller eldre)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (eller eldre)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Type: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>St??rrelse: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Filnavn: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span color=\"red\">Feil ved lesing av cache-statistikk</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Bruker %s i %d filer, %d kataloger, %d andre og %d "
-#~ "feil</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">Feil ved t??mming av ikon-cache.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)..."
-
-#~ msgid "+_Save"
-#~ msgstr "+_Lagre"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sSkriv adgangsfrasen for: </span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (Gyldighet: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>Hent kommentarer til poster som:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-
-#~ msgid ""
-#~ "<b>Refresh interval in minutes:</b>\n"
-#~ "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
-#~ msgstr ""
-#~ "<b>Antall minutter mellom oppdatering:</b>\n"
-#~ "<small>(Sett til 0 for ?? deaktivere automatiske oppdateringer av denne "
-#~ "kilden)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Hvis en post endres, ikke marker den som ny:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(periodisk begivenhet)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> p??:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Kass??r"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Meldingssammendrag</b>\n"
-#~ "<b>Nye:</b> %d\n"
-#~ "<b>Uleste:</b> %d\n"
-#~ "<b>I alt:</b> %d\n"
-#~ "<b>St??rrelse:</b> %s\n"
-#~ "\n"
-#~ "<b>Markert:</b> %d\n"
-#~ "<b>Besvart:</b> %d\n"
-#~ "<b>Videresendt:</b> %d\n"
-#~ "<b>L??st:</b> %d\n"
-#~ "<b>Ignorert:</b> %d\n"
-#~ "<b>Overv??ket:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Fra: %s, den %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Til: %s, den %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Fullt navn:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Epostadresse:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Navn p?? postkassen:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Utg??ende tjener (SMTP):</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Tjeneradresse:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Lokal postkasse:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Tjenertype:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Brukernavn:</span>"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Kunne ikke registrere haken 'avatars internal rendering'"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: tidsavbrudd ved oppkobling til verten.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: ukjent vert.\n"
-
-#~ msgid "Failed."
-#~ msgstr "Mislyktes."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "Nytt mappenavn kan ikke inneholder sti-separator for navnerommet"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "Kunne ikke registrere haken 'folder item update'"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Kunne ikke registrere haken 'folder update'"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "Kan ikke kopiere %s til %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "Kunne ikke skrive Fetchinfo-oppsetning til fil\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GData-tillegg: Kunne ikke skrive oppsetning til fil\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Plassering funnet: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "Antatt opprinnelsesland:"
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Kunne ikke lokalisere IP-adressen"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Pr??v ?? lokalisere avsenderen"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Forente Arabiske Emirater"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afghanistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua og Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Albania"
-
-#~ msgid "Armenia"
-#~ msgstr "Armenia"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "De nederlandske Antiller"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarktis"
-
-#~ msgid "Argentina"
-#~ msgstr "Argentina"
-
-#~ msgid "American Samoa"
-#~ msgstr "Amerikansk Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "??sterrike"
-
-#~ msgid "Australia"
-#~ msgstr "Australia"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Aserbajdsjan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosnia og Herzegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgia"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgaria"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrain"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivia"
-
-#~ msgid "Brazil"
-#~ msgstr "Brasil"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamas"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet??ya"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Hviterussland"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Canada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokos??ya"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Den sentralafrikanske republikk"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "Sveits"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Elfenbenskysten"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cook??yene"
-
-#~ msgid "Chile"
-#~ msgstr "Chile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "Kina"
-
-#~ msgid "Colombia"
-#~ msgstr "Colombia"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Costa Rica"
-
-#~ msgid "Cuba"
-#~ msgstr "Cuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Kapp Verde"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Christmas??ya"
-
-#~ msgid "Cyprus"
-#~ msgstr "Kypros"
-
-#~ msgid "Czech Republic"
-#~ msgstr "Tsjekkia"
-
-#~ msgid "Germany"
-#~ msgstr "Tyskland"
-
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
-
-#~ msgid "Denmark"
-#~ msgstr "Danmark"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Den dominikanske republikk"
-
-#~ msgid "Algeria"
-#~ msgstr "Algerie"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ecuador"
-
-#~ msgid "Estonia"
-#~ msgstr "Estland"
-
-#~ msgid "Egypt"
-#~ msgstr "Egypt"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Vest-Sahara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "Spania"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopia"
-
-#~ msgid "Finland"
-#~ msgstr "Finland"
-
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklands??yene (Malvinas)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikronesiaf??derasjonen"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "F??r??yene"
-
-#~ msgid "France"
-#~ msgstr "Frankrike"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "France m??tropolitaine"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Storbritannia"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Georgia"
-
-#~ msgid "French Guiana"
-#~ msgstr "Fransk Guiana"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltar"
-
-#~ msgid "Greenland"
-#~ msgstr "Gr??nland"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvatorial-Guinea"
-
-#~ msgid "Greece"
-#~ msgstr "Hellas"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "S??r-Georgia og S??r-Sandwich??yene"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hong Kong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heard- og McDonald??yene"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Kroatia"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Ungarn"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indonesia"
-
-#~ msgid "Ireland"
-#~ msgstr "Irland"
-
-#~ msgid "Israel"
-#~ msgstr "Israel"
-
-#~ msgid "India"
-#~ msgstr "India"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Det britiske territoriet i Indiahavet"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Iran, Den islamske republikk"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "Italy"
-#~ msgstr "Italia"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaica"
-
-#~ msgid "Jordan"
-#~ msgstr "Jordan"
-
-#~ msgid "Japan"
-#~ msgstr "Japan"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgisistan"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambodsja"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komorene"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts og Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Nord-Korea"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "S??r-Korea"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuwait"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Cayman??yene"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kasakhstan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laofolkets demokratiske folkerepublikk"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberia"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litauen"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxembourg"
-
-#~ msgid "Latvia"
-#~ msgstr "Latvia"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libya"
-
-#~ msgid "Morocco"
-#~ msgstr "Marokko"
-
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldova, Republikken"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshall-??yene"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Makedonia, Den tidligere jugoslaviske republikken"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolia"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Nord-Marianene"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
-
-#~ msgid "Mauritania"
-#~ msgstr "Mauritania"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldivene"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexico"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malaysia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mosambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Ny-Caledonia"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk??ya"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nicaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Nederland"
-
-#~ msgid "Norway"
-#~ msgstr "Norge"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "New Zealand"
-
-#~ msgid "Oman"
-#~ msgstr "Oman"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Fransk Polynesia"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Ny Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filippinene"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Polen"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint Pierre og Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn??yene"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Puerto Rico"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugal"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid "Qatar"
-#~ msgstr "Qatar"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
-
-#~ msgid "Romania"
-#~ msgstr "Romania"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Den russiske f??derasjon"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudi-Arabia"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon??yene"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychellene"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Sweden"
-#~ msgstr "Sverige"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapore"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Saint Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovenia"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard og Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovakia"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome og Principe"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Syria, Den arabiske republikk"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swaziland"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks- og Caicos??yene"
-
-#~ msgid "Chad"
-#~ msgstr "Tsjad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "De franske s??rterritorier"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thailand"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tadsjikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisia"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "??st-Timor"
-
-#~ msgid "Turkey"
-#~ msgstr "Turkey"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad og Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzania, Den forente republikken"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukraina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "USAs ytre sm????yer"
-
-#~ msgid "United States"
-#~ msgstr "USA"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Usbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Vatikanstaten"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent og Grenadinene"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Jomfru??yene, De britiske"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Jomfru??yene, De amerikanske"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis- og Futuna??yene"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Serbia og Montenegro"
-
-#~ msgid "South Africa"
-#~ msgstr "S??r-Afrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Kongo, Den demokratiske republikken"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoPosisjonering"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Kunne ikke initialisere clutter"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Kunne ikke opprette regul??rt uttrykk: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "Kunne ikke registrere haken 'messageview_show' i programtillegget "
-#~ "GeoLocation"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Dette programtillegg gir Claws Mail GeoLocation-funksjonalitet.\n"
-#~ "\n"
-#~ "NB: Det er teknisk umulig ?? utlese avsenderens oppholdssted ut fra en "
-#~ "melding med noen sikkerhet. Resultatene som programtillegget presenterer, "
-#~ "er bare grove overslag. S??rlig gjelder dette for postlister, hvor "
-#~ "avsenderinformasjonen ofte fjernes fra meldingene n??r de sendes ut til "
-#~ "listen, s?? meldinger fra postlister ser ut til ?? komme fra "
-#~ "postlistetjenerens og ikke avsenderens oppholdssted.\n"
-#~ "Er du i tvil: stol ikke p?? programtilleggets resultater, og legg dem ikke "
-#~ "til grunn for en skilsmisse!\n"
-#~ "\n"
-#~ "Feedback til <berndth at gmx.de> mottas gjerne (men bare s?? lenge det ikke "
-#~ "handler om ekteskapskrangler)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integrering av GeoPosisjonering"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Varslings-tillegg: Kunne ikke skrive oppsetning til fil\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Lagre sendte meldinger i Sendt-mappen"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail er en rask, kraftfull og meget utbyggbar epostleser."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "Den har mange innstillingsmuligheter og h??ndterer lett hundretusenvis av "
-#~ "epost-beskjeder. Beskjedene behandles enkelt i et ??pent format."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "Tilleggsfunksjoner som PGP-signaturer og -kryptering, RSS-nyhetsleser, "
-#~ "kalender, kraftfull spam-filtrering, interaksjon med Perl og Python, "
-#~ "gjengivelse av HTML og PDF, og mye mer, er tilgjengelige gjennom "
-#~ "programtillegg."
-
-#~ msgid "E-mail client"
-#~ msgstr "Epostleser"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Rask og lite ressurskrevende GTK+-basert epostleser"
-
-#~ msgid "Internal avatars rendering already initialized"
-#~ msgstr "Den innebygde avatar-visningen er allerede initialisert"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "meldinger som inneholder meldingshode S"
-
-#~ msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
-#~ msgstr "ldapsvr_retrieve_item_person->Ukjent status: %d"
-
-#~ msgid "ldapsvr_update_book: Could not clean cache\n"
-#~ msgstr "ldapsvr_update_book: Kunne ikke t??mme cache\n"
-
-#~ msgid "ldapsvr_update_book->Unknown status: %s\n"
-#~ msgstr "ldapsvr_update_book->Ukjent status: %s\n"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Behold 'Til'-adresser"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Behold 'Kopi-til'-adresser"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Behold 'Blind-kopi-til'-adresser"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData-tillegg: Autentisert\n"
-
-#~ msgid "slow"
-#~ msgstr "langsom"
-
-#~ msgid "fast"
-#~ msgstr "rask"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Bannerbredde i piksler (0 betyr hele skjermen)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Aktiver popup"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "God signatur (uten tillit) fra %s."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Kan ikke ??pne midlertidlig fil"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Kan ikke initiere libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Henter '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Misformet kilde"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Kan ikke hente kommentarer ved RDF-kilder. Kan ikke hente "
-#~ "kommentarer til '%s'"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Dette feed-formatet st??ttes ikke enn??."
-
-#~ msgid "N/A"
-#~ msgstr "Ikke tilgjengelig"
-
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld byte"
-#~ msgstr[1] "%ld byte"
-
-#~ msgid "size unknown"
-#~ msgstr "ukjent st??rrelse"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Kan ikke oppdatere kilde %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Du abonnerer allerede p?? denne kilden"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke hente URL '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Kunne ikke hente URL '%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Kan ikke abonnere p?? feeden '%s'."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Tidsavbrudd ved tilkobling til URL %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Kunne ikke hente URL %s\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Feil ved lesning av kilde fra URL %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Ukjent kildetype p?? URL %s\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: Kildeoppdatering avbrutt, programmet lukker ned.\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Kan ikke slette feed '%s'."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "Oppdater _alle kilder"
-
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "_Avbryt abonnement p?? feed... "
-
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Slett mappetre..."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Behold det forvalgte antall utl??pte poster"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Antall utl??pte poster som skal beholdes:</b>\n"
-#~ "<small>(Sett til -1 hvis du vil beholde alle utl??pte poster)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "_Avbryt abonnement p?? feed"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Vil du virkelig fjerne feeden"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Fjern cachede poster"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Forvalgt oppdateringsintervall i minutter"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Forvalgt antall utl??pte poster som skal beholdes"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Sett til -1 for ?? beholde utl??pte poster"
-
-#~ msgid "Use this"
-#~ msgstr "Bruk dette"
diff --git a/po/pl.po b/po/pl.po
index 4f9a222..14e5125 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -20156,797 +20156,3 @@ msgstr ""
 "Program Claws Mail jest gotowy do pracy.\n"
 "Kliknij przycisk Zapisz, aby  zapisa?? konfiguracj?? i rozpocz???? prac?? z "
 "programem."
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail zosta?? zarejestrowany jako klient domyslny."
-
-#~ msgid "messages which contain header S"
-#~ msgstr "wiadomo??ci kt??re zawieraj?? nag????wek S"
-
-#, fuzzy
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Adresy osobiste"
-
-#, fuzzy
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Zbierz adresy"
-
-#, fuzzy
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Zbierz adresy"
-
-#, fuzzy
-#~ msgid "Enable Popup"
-#~ msgstr "Wtyczki"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Poprawny podpis (niski stopie?? zaufania) od %s."
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Nie mo??na otworzy?? pliku tymczasowego"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Inicjalizacja libCURL nie powiod??a si??"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "Pobieranie '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "Niepoprawna wiadomo????"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Pobieranie komentarzy nie jest wspierane dla formatu RDF. Nie "
-#~ "mo??na pobra?? komentarzy z '%s'"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "Ten format wiadomo??ci nie jest obs??ugiwany."
-
-#~ msgid "N/A"
-#~ msgstr "Niedost??pne"
-
-#, fuzzy
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "bajt??w"
-#~ msgstr[1] "bajt??w"
-#~ msgstr[2] "bajt??w"
-
-#, fuzzy
-#~ msgid "size unknown"
-#~ msgstr "nieznana"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: Nie mo??na od??wie??y?? kana??u %s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Pobierasz ju?? wiadomo??ci z tego kana??u"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie mo??na pobra?? '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Nie mo??na pobra?? '%s':\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "Subskrypcja kana??u '%s' nie powiod??a si??."
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Up??yn???? czas po????czenia do %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "Nie mo??na pobra?? '%s'\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "B????d podczas przetwarzania wiadomo??ci z URL %s\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Nieobs??ugiwany typ wiadomo??ci URL %s\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "Nie mog?? usun???? '%s'."
-
-#, fuzzy
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "_Usu?? subskrypcj??..."
-
-#, fuzzy
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Przebudowywanie drzewa katalogu..."
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Liczba zapisanych starych wiadomo??ci:</b>\n"
-#~ "<small>(Ustaw na -1 je??li nie chcesz zapisywa?? starych wiadomo??ci)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Odsubskrybuj kana??"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Na pewno chcesz usun???? ten kana??"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "Usu?? zapisane wiadomo??ci"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "Ustaw na 0 aby wy????czy?? automatyczne od??wie??anie"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Domy??lna liczba przechowywanych starych wiadomo??ci "
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "Ustaw na -1 aby zatrzyma?? przeterminowane wiadomo??ci"
-
-#~ msgid "Use this"
-#~ msgstr "U??yj"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Nie uda??o si?? zaszyfrowa?? wiadomo??ci: %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%m-%d-%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Wi??cej wtyczek jest dost??pnych na stronie Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' nie mo??e wyst??powa?? w nazwie katalogu."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail - %d nowa wiadomo????"
-#~ msgstr[1] "Claws Mail - %d nowe wiadomo??ci"
-#~ msgstr[2] "Claws Mail - %d nowych wiadomo??ci"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr ""
-#~ "Nie mo??na nawi??za?? po????czenia: pracujesz bez po????czenia z sieci?? (offline)"
-
-#~ msgid "Exiting..."
-#~ msgstr "Wychodzenie..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr ""
-#~ "Claws Mail nie mo??e zosta?? uruchomiony bez swojego wolumenu z danymi (%s)."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "Brak zarejstrowanego programu do przegl??danie plik??w tego typu."
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "Opu???? zacytowane linie"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "Nie sprawdzaj wiadomo??ci przekazywanych i przekierunkowanych"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "Podpis"
-
-#~ msgid "Select ..."
-#~ msgstr " Wybierz ..."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "Podpisywanie danych nie powiod??o si??, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "Nazwa pliku:"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Nie uda??o si?? nawi??za?? po????czenia z %s:%d."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Uwierzytelnienie nie powiod??o si??:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "Ustawienia skrzynki"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "??aduj obraz"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "Usu?? zawarto???? wpisu"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "Skrzynka `%s' ju?? istnieje."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "Katalog '%s' ju?? istnieje."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "Nie mo??na utworzy?? katalogu '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Naprawd?? chcesz usun???? skrzynk?? `%s' ?\n"
-#~ "(Wiadomo??ci NIE zostan?? skasowane z dysku)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "Nie mo??na usun???? katalogu `%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Wprowad?? now?? nazw?? dla '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (wtyczka nieza??adowana)"
-
-#, fuzzy
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "Generuj now?? par?? kluczy"
-
-#~ msgid "Replace"
-#~ msgstr "Zamie??"
-
-#~ msgid "Blink LED"
-#~ msgstr "??wiecenie diodami LED"
-
-#~ msgid "Play sound"
-#~ msgstr "Odtw??rz d??wi??k"
-
-#~ msgid "Show info banner"
-#~ msgstr "Pokazuj baner informacyjny"
-
-#~ msgid "on external memory card"
-#~ msgstr "na zewn??trznej karcie pami??ci"
-
-#~ msgid "on internal memory card"
-#~ msgstr "na wewn??trznej karcie pami??ci"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">Przechowywanie danych</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Przegl??darka Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Wczytywanie danych ze zdalnych ????cz"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Odpowiednik opcji '--local' z programu Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "Nadal mo??esz wczytywa?? odno??niki prze??adowuj??c stron??"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Tylko we wiadomo??ciach od os??b z ksi????ki adresowej"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Tryb pe??noekranowy (ukrywa kontrolki)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Odpowiednik opcji '--fullwindow' z programu Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Przegl??darka HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "Nie mo??na odnale???? programu dillo w PATH. Sprawd?? czy dillo jest "
-#~ "zainstalowane."
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Ta wtyczka wy??wietla wiadomo??ci HTML u??ywaj??c przegl??darki Dillo.\n"
-#~ "\n"
-#~ "Opcje mo??na znale???? w /Konfiguracja/Ustawienia... Wtyczki/Przegl??darka "
-#~ "Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Ikonka"
-
-#, fuzzy
-#~ msgid "Claws Mail"
-#~ msgstr "O Claws Mail"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Ta wtyczka umieszcza ikon?? skrzynki pocztowej w systemowym trayu (zwanym "
-#~ "te?? obszarem powiadamiania), kt??ra informuje Ci?? o nowej i "
-#~ "nieprzeczytanej poczcie.\n"
-#~ "\n"
-#~ "Skrzynka jest pusta je??li nie ma nieprzeczytanych wiadomo??ci, w "
-#~ "przeciwnym wypadku widoczny jest list. Opis ikony pokazuje ilo???? nowych, "
-#~ "nieprzeczytanych i wszystkich wiadomo??ci."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Ukryj Claws Mail podczas uruchomienia"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Ukrywa Claws Mail w trayu zamiast go zamkn????\n"
-#~ " w momencie naci??ni??cia przycisku zamykaj??cego okno"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimalizacja okna minimalizuje do ikonki"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "Ukrywa Claws Mail w trayu zamiast go zamkn????\n"
-#~ " w momencie naci??ni??cia przycisku minimalizacji okna"
-
-#~ msgid "%s document, page %d/%d"
-#~ msgstr "Dokument %s, strona %d/%d"
-
-#~ msgid "Prev page"
-#~ msgstr "Poprzednia strona"
-
-#~ msgid ""
-#~ "This plugin enables the viewing of PDF and PostScript attachments using "
-#~ "the Poppler lib."
-#~ msgstr ""
-#~ "Ta wtyczka umo??liwia przegl??danie dokument??w PDF i Postscript przy u??yciu "
-#~ "biblioteki Poppler."
-
-#~ msgid ""
-#~ "Make sure that the kernel module 'acerhk' is loaded.\n"
-#~ "You can get it from http://www.informatik.hu-berlin.de/~tauber/acerhk/"
-#~ msgstr ""
-#~ "Upewnij si??, ??e modu?? j??dra 'acerhk' jest za??adowany.\n"
-#~ "Mo??esz go pobra?? z http://www.informatik.hu-berlin.de/~tauber/acerhk/"
-
-#~ msgid ""
-#~ "Make sure that the kernel module 'acer_acpi' is loaded.\n"
-#~ "You can get it from http://www.archernar.co.uk/acer_acpi/acer_acpi_main."
-#~ "html"
-#~ msgstr ""
-#~ "Upewnij si??, ??e modu?? j??dra 'acer_acpi' jest za??adowany.\n"
-#~ "Mo??esz go pobra?? z http://www.archernar.co.uk/acer_acpi/acer_acpi_main."
-#~ "html"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. Send it anyway?"
-#~ msgstr ""
-#~ "W swojej wysy??anej wiadomo??ci wspomnia??e?? o za????czniku, lecz ??aden plik "
-#~ "nie zosta?? do????czony. Wys??a?? mimo wszystko?"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Pobieranie komentarzy nie jest wspierane dla formatu Atom. Nie "
-#~ "mo??na pobra?? komentarzy z '%s'"
-
-#~ msgid "/_Refresh feed"
-#~ msgstr "/_Od??wie?? kana??"
-
-#~ msgid "/Refresh _all feeds"
-#~ msgstr "/Od??wie?? wszystkie kana??y"
-
-#~ msgid "/Subscribe _new feed..."
-#~ msgstr "/Subskrybuj _nowy kana??..."
-
-#~ msgid "/_Unsubscribe feed..."
-#~ msgstr "/_Odsubskrybuj kana??..."
-
-#~ msgid "/Feed pr_operties..."
-#~ msgstr "/W??a??ciw_o??ci kana??u"
-
-#~ msgid "/Rena_me..."
-#~ msgstr "/Z_mie?? nazw??..."
-
-#~ msgid "/_Create new folder..."
-#~ msgstr "/_Utw??rz nowy katalog"
-
-#~ msgid "/_Delete folder..."
-#~ msgstr "/_Usu?? katalog..."
-
-#~ msgid "/Remove folder _tree..."
-#~ msgstr "/Usu?? _katalog..."
-
-#~ msgid "/Refresh all feeds"
-#~ msgstr "/Od??wie?? wszystkie kana??y"
-
-#~ msgid "/Unsubscribe feed..."
-#~ msgstr "/Odsubskrybuj kana??..."
-
-#~ msgid "/Feed properties..."
-#~ msgstr "/W??a??ciwo??ci kana??u..."
-
-#~ msgid "/Create new folder..."
-#~ msgstr "/Subskrybuj nowy kana??..."
-
-#~ msgid "/Delete folder..."
-#~ msgstr "/Usu?? katalog..."
-
-#~ msgid "/Remove folder tree..."
-#~ msgstr "/Usu?? katalog..."
-
-#~ msgid "/File/Add mailbox/RSSyl..."
-#~ msgstr "/Plik/Dodaj skrzynk??/RSSyl..."
-
-#~ msgid "Use default refresh interval (180 minutes)"
-#~ msgstr "U??yj domy??lnego czasu od??wie??ania (180 minut)"
-
-#~ msgid "Keep default number of expired entries (-1)"
-#~ msgstr "Zapisuj domy??ln?? liczb?? starych wiadomo??ci (-1)"
-
-#~ msgid "Timeout for downloading feeds in seconds"
-#~ msgstr "Czas w sekundach na od??wie??enie kana??u"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Polecenie nie mo??e zosta?? wykonane. Utworzenie potoku\n"
-#~ "nie powiod??o si??.\n"
-#~ "%s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Komponowanie: wej??cie z monitorowanego procesu\n"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "Przygotowywanie stron..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "Renderowanie strony %d z %d"
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "Drukowanie strony %d z %d"
-
-#~ msgid "Page %N of %Q"
-#~ msgstr "Strona %N z %Q"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Prawa autorskie (C) 1999-2008\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "i zesp???? Claws Mail"
-
-#~ msgid "libgnomeprint|adds support for a complete print dialog\n"
-#~ msgstr "dodaje pe??n?? obs??ug?? drukowania\n"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Prawa autorskie (C) 1999-2008\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "i zesp???? Claws Mail"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Zmie?? S??ownik"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "Opcje konfiguracji dla drukowania"
-
-#~ msgid "Source Buffer"
-#~ msgstr "Bufor ??r??d??owy"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "Obiekt GtkTextBuffer do wydrukowania"
-
-#~ msgid "Tabs Width"
-#~ msgstr "Szeroko???? zak??adek"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "Jednakowa szeroko???? odst??pu mi??dzy znakami zak??adek"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "Tryb zawijania"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "Tryb zawijania wyraz??w"
-
-#~ msgid "Highlight"
-#~ msgstr "Pod??wietlenie"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "Gdzie wydrukowa?? dokument z pod??wietlonym b????dem"
-
-#~ msgid "Font"
-#~ msgstr "Czcionka"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "Nazwa GnomeFont do u??ycia dla tekstu dokumentu (niepolecane)"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr "Rodzaj fontu jaka zostanie u??yta (np. \"Monospace 10\")"
-
-#~ msgid "Numbers Font"
-#~ msgstr "Numery czcionki"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "Nazwa GnomeFont do u??ycia dla numer??w linii (niepolecane)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "Opis czcionki do u??ycia dla numer??w linii"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "Poka?? numery linii"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr "Odst??py w drukowanych numerach linii (0 oznacza brak numeracji)"
-
-#~ msgid "Print Header"
-#~ msgstr "Poka?? Nag????wek"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "Gdzie drukowa?? nag????wek na poszczeg??lnych stronach"
-
-#~ msgid "Print Footer"
-#~ msgstr "Drukuj stopk??"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "Gdzie drukowa?? stopk?? na poszczeg??lnych stronach"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "Czcionka nag????wka i stopki"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr "Nazwa GnomeFont do u??ycia w nag????wku i stopce (niepolecane)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "Opis czcionki nag????wka i stopki"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr ""
-#~ "Czcionka kt??ra zostanie u??yta dla nag????wk??w i stopek (np. \"Monospace "
-#~ "10\")"
-
-#~ msgid " Clear "
-#~ msgstr "Wyczy???? "
-
-#~ msgid " Extended Symbols... "
-#~ msgstr "Dost??pne symbole..."
-
-#~ msgid "Info"
-#~ msgstr "_Informacja"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Nieznany certyfikat SSL"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Przedawniony certyfikat SSL"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "Zmieniono certyfikat SSL"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "????czenie z serwerem IMAP4: %s ...\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail zosta?? skompilowany z nowsz?? wersj?? biblioteki GTK+ ni?? jest "
-#~ "obecnie dost??pna. Mo??e to powodowa?? nieprawid??owe dzia??anie programu. "
-#~ "Powiniene?? uaktualni?? GTK lub przekompilowa?? Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail zosta?? skompilowany z starsz?? wersj?? biblioteki GTK+ ni?? jest "
-#~ "obecnie dost??pna. Mo??e to powodowa?? nieprawid??owe dzia??anie programu. "
-#~ "Powiniene?? uaktualni?? GTK lub przekompilowa?? Claws Mail."
-
-#~ msgid "Last read message"
-#~ msgstr "Ostatniej przeczytanej wiadomo??ci"
-
-#~ msgid "_all"
-#~ msgstr "_wszystkie"
-
-#~ msgid "_sender"
-#~ msgstr "nadawca"
-
-#~ msgid "_Fold all"
-#~ msgstr "Zwi?? wszystkie"
-
-#~ msgid "by _Date"
-#~ msgstr "wg daty"
-
-#~ msgid "by _From"
-#~ msgstr "wg _nadawcy"
-
-#~ msgid "by _To"
-#~ msgstr "wg _adresata"
-
-#~ msgid "by S_ubject"
-#~ msgstr "wg _tematu"
-
-#~ msgid "by Tag"
-#~ msgstr "wg Etykiety"
-
-#~ msgid "by _Mark"
-#~ msgstr "wg Znaku"
-
-#~ msgid "message line"
-#~ msgstr "linia wiadomo??ci"
-
-#~ msgid ""
-#~ "Enter the print command-line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Podaj polecenie wydruku:\n"
-#~ "('%s' zostanie zast??pione nazw?? pliku)"
-
-#~ msgid ""
-#~ "Print command-line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "B????dne polecenie wydruku:\n"
-#~ "`%s'"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Otw??rz (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Otw??rz _z (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Wy??wietl jako tekst (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "Zapi_sz jako (y)..."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "tworzenie po????czenia NNTP z %s:%d ...\n"
-
-#~ msgid "Trust key"
-#~ msgstr "Zaufany klucz"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientacja"
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "Automatycznie wstaw podpis"
-
-#~ msgid "Info..."
-#~ msgstr "Informacje..."
-
-#~ msgid "From file..."
-#~ msgstr "Z pliku..."
-
-#~ msgid "Print command"
-#~ msgstr "Polecenie wydruku"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Testowy RegExp"
-
-#~ msgid "Default To:"
-#~ msgstr "Domy??lny odbiorca:"
-
-#~ msgid "Default Cc:"
-#~ msgstr "Domy??lny odbiorca kopii:"
-
-#~ msgid "Default Bcc:"
-#~ msgstr "Domy??lny odbiorca tajnej kopii:"
-
-#~ msgid "Default Reply-to:"
-#~ msgstr "Domy??lny odbiorca odpowiedzi:"
-
-#~ msgid "Quotation characters"
-#~ msgstr "Znaki cytowania"
-
-#~ msgid " Symbols... "
-#~ msgstr " Symbole... "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Konfiguracja g????wnego paska narz??dzi"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Konfiguracja Kompozytora Paska Narz??dzi"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Konfiguracja paska narz??dzi widoku wiadomo??ci"
-
-#~ msgid "Wrap messages at"
-#~ msgstr "Zawijanie wiadomo??ci przy"
-
-#~ msgid "Description of symbols..."
-#~ msgstr " Opis symboli... "
-
-#~ msgid " items selected"
-#~ msgstr " element??w wybrano"
-
-#~ msgid "'View Log'"
-#~ msgstr "'Poka?? dziennik'"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Skr??t klawiszowy: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Skr??t klawiszowy: 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Skr??t klawiszowy: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "SMTP has??o:\n"
-#~ "<span size=\"small\">(pozostaw, to pole puste aby u??y?? tego samego has??a "
-#~ "co przy odbieraniu)</span>"
-
-#~ msgid "/New meeting..."
-#~ msgstr "/Nowe spotkanie..."
-
-#~ msgid "/Export calendar..."
-#~ msgstr "/Eksportuj kalendarz..."
-
-#~ msgid "/Subscribe to webCal..."
-#~ msgstr "/Subskrybuj webCal..."
-
-#~ msgid "/Unsubscribe..."
-#~ msgstr "/Odsubskrybuj..."
-
-#~ msgid "/Rename..."
-#~ msgstr "/Zmie?? nazw??..."
-
-#~ msgid "text/calendar"
-#~ msgstr "tekst/kalendarz"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9b54f97..502c01a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19360,42 +19360,3 @@ msgid ""
 msgstr ""
 "O Claws Mail est?? pronto.\n"
 "Clique em Salvar para iniciar."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Habilitar conex??o segura com o servidor LDAP via SSL. Caso a conex??o n??o "
-#~ "se efetue, certifique-se de verificar a configura????o correta em ldap.conf "
-#~ "(campos TLS_CACERTDIR e TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "Sem TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registrar o Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Utilizar SSL para conex??o POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Utilizar SSL para conex??o IMAP4"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Utilizar SSL para conex??o NNTP"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Utilizar SSL para conex??o SMTP"
-
-#~ msgid "Re_move"
-#~ msgstr "Re_mover"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3ea6865..19db5d5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -20121,498 +20121,3 @@ msgid ""
 msgstr ""
 "O Claws Mail est?? pronto.\n"
 "Clique em Salvar para iniciar."
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "O Claws Mail foi registado como o cliente padr??o."
-
-#~ msgid "messages which contain header S"
-#~ msgstr "mensagens que contenham o cabe??alho S"
-
-#, fuzzy
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Endere??os pessoais"
-
-#, fuzzy
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "_Colectar endere??os"
-
-#, fuzzy
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "_Colectar endere??os"
-
-#, fuzzy
-#~ msgid "Enable Popup"
-#~ msgstr "Plugins"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Assinatura v??lida (n??o confi??vel) de %s."
-
-#, fuzzy
-#~ msgid "Cannot open temporary file"
-#~ msgstr "N??o foi poss??vel abrir o ficheiro tempor??rio."
-
-#, fuzzy
-#~ msgid "Fetching '%s'..."
-#~ msgstr "A obter a mensagem..."
-
-#, fuzzy
-#~ msgid "Malformed feed"
-#~ msgstr "Excluir cabe??alho"
-
-#, fuzzy
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "g_thread n??o ?? suportado pela glib.\n"
-
-#, fuzzy
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "bytes"
-#~ msgstr[1] "bytes"
-
-#, fuzzy
-#~ msgid "size unknown"
-#~ msgstr "desconhecido"
-
-#, fuzzy
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr "N??o foi poss??vel salvar o ficheiro '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr "N??o foi poss??vel salvar o ficheiro '%s'."
-
-#, fuzzy
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "N??o foi poss??vel criar a pasta '%s'."
-
-#, fuzzy
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Ocorreu um erro na liga????o ao servidor LDAP"
-
-#, fuzzy
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "N??o foi poss??vel desencriptar: %s"
-
-#, fuzzy
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "N??o foi poss??vel remover a pasta '%s'."
-
-#, fuzzy
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "_Anular inscri????o..."
-
-#, fuzzy
-#~ msgid "Remove folder _tree..."
-#~ msgstr "A reconstruir a ??rvore de pastas..."
-
-#, fuzzy
-#~ msgid "Unsubscribe feed"
-#~ msgstr "_Desinscrever"
-
-#, fuzzy
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Deseja realmente excluir este cabe??alho?"
-
-#, fuzzy
-#~ msgid "Remove cached entries"
-#~ msgstr "_Remover refer??ncias"
-
-#~ msgid "Use this"
-#~ msgstr "Utilizar este"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "N??o foi poss??vel encriptar a mensagem: %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a-%d/%m/%y %H:%M:%S"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%m/%d/%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "Existem mais plugins dispon??veis no site do Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' n??o pode ser inclu??do no nome do direct??rio."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d nova mensagem"
-#~ msgstr[1] "Claws Mail: %d novas mensagens"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "N??o foi poss??vel estabelecer liga????o: voc?? est?? desligado."
-
-#~ msgid "Exiting..."
-#~ msgstr "Saindo..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "O Claws Mail n??o pode iniciar sem o seu volume de dados (%s)."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "N??o existem visualizadores registados para este tipo de ficheiro."
-
-#, fuzzy
-#~ msgid "Skip quoted lines"
-#~ msgstr "Ignorar essas regras"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "Assinatura"
-
-#~ msgid "Select ..."
-#~ msgstr "Seleccionar ..."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "Erro na assinatura dos dados, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "Nome do ficheiro:"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "Ocorreu uma falha na liga????o com %s:%d."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ocorreu uma falha na autentica????o:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "Configura????o da caixa postal"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "Carregar imagem"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "Remover os conte??dos da entrada"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "A caixa postal '%s' j?? existe."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "A pasta '%s' j?? existe."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "N??o foi poss??vel criar a pasta '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "Deseja realmente excluir a caixa postal '%s'?\n"
-#~ "(As mensagens N??O SER??O apagadas do disco)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "N??o foi poss??vel remover a pasta '%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "Entre com o novo nome para '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (plugin n??o carregado)"
-
-#, fuzzy
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "Gerar um novo par de chaves"
-
-#~ msgid "Replace"
-#~ msgstr "Substituir"
-
-#~ msgid "Blink LED"
-#~ msgstr "Piscar o LED"
-
-#~ msgid "Play sound"
-#~ msgstr "Reproduzir som"
-
-#~ msgid "Show info banner"
-#~ msgstr "Mostrar faixa de informa????es"
-
-#~ msgid "on external memory card"
-#~ msgstr "no cart??o de mem??ria externo"
-
-#~ msgid "on internal memory card"
-#~ msgstr "no cart??o de mem??ria interno"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">Armazenar dados</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Navegador Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "Carregar hiperliga????es remotos nas mensagens"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "Equivalente ?? op????o '--local' do Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr ""
-#~ "Voc?? ainda pode carregar as hiperliga????es remotas actualizando a p??gina"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "Apenas para remetentes presentes no Livro de Endere??os"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "Modo de ecr?? inteiro (esconde os controles)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "Equivalente ?? op????o '--fullwindow' do Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Visualizador HTML Dillo"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "N??o foi poss??vel encontrar o execut??vel dillo no PATH. Ele est?? instalado?"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "Este plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
-#~ "\n"
-#~ "As op????es podem ser encontradas em /Configura????es/Prefer??ncias/Plugins/"
-#~ "Navegador Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
-#, fuzzy
-#~ msgid "Claws Mail"
-#~ msgstr "Sobre o Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "N??o foi poss??vel registar o hook de fim de liga????o"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "N??o foi poss??vel registar o hook modifica????o da lista de contas"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "N??o foi poss??vel registar o hook de encerramento"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "N??o foi poss??vel registar o hook de minimiza????o para o ??cone"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "N??o foi poss??vel registar o hook de modifica????o do tema"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "Este plugin mostra um ??cone de caixa postal na barra de ??cones do "
-#~ "sistema, que indica se voc?? tem mensagens novas ou n??o lidas.\n"
-#~ "\n"
-#~ "A caixa fica vazia quando n??o existem mensagens n??o lidas, caso contr??rio "
-#~ "ela cont??m uma carta. Ao passar o 'rato' sobre o ??cone aparece uma "
-#~ "indica????o do n??mero de mensagens lidas, n??o lidas e do total."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "Esconder o Claws Mail ao iniciar"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "Esconde (ao inv??s de fechar) o Claws Mail na barra de\n"
-#~ "??cones do sistema ao, quando se clica no bot??o de fechar"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "Minimizar para a barra de ??cones do sistema"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "Esconde o Claws Mail na barra de ??cones do sistema ao inv??s de minimiz??-lo"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "O comando n??o pode ser iniciado. Ocorreu uma falha na cria????o da "
-#~ "liga????o.\n"
-#~ "%s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Composi????o: entrada do processo monitorizado\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "e a equipe do Claws Mail"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2010\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2009\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "e a equipa do Claws Mail"
-
-#~ msgid "Change dictionary"
-#~ msgstr "Alterar dicion??rio"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "Certificado SSL desconhecido"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "Certificado SSL expirado"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "O certificado SSL foi alterado"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "A estabelecer liga????o com o servidor IMAP4: %s...\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "O Claws Mail foi compilado com uma biblioteca GTK+ mais recente do que a "
-#~ "dispon??vel actualmente. Isso ir?? provocar erros. ?? necess??rio atualizar a "
-#~ "GTK+ ou recompilar o Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "O Claws Mail foi compilado com uma biblioteca GTK+ mais antiga do que a "
-#~ "dispon??vel actualmente. Isso ir?? provocar erros. ?? necess??rio recompilar "
-#~ "o Claws Mail."
-
-#~ msgid "Last read message"
-#~ msgstr "??lt_ima mensagem lida"
-
-#~ msgid "_all"
-#~ msgstr "_todos"
-
-#~ msgid "_sender"
-#~ msgstr "_remetente"
-
-#~ msgid "_Fold all"
-#~ msgstr "Esconder _todas"
-
-#~ msgid "by _Date"
-#~ msgstr "pela _data"
-
-#~ msgid "by _From"
-#~ msgstr "por _remetente"
-
-#~ msgid "by _To"
-#~ msgstr "por _destinat??rio"
-
-#~ msgid "by S_ubject"
-#~ msgstr "por _assunto"
-
-#~ msgid "by Tag"
-#~ msgstr "por etiqueta"
-
-#~ msgid "by _Mark"
-#~ msgstr "por _marca"
-
-#~ msgid "message line"
-#~ msgstr "linha da mensagem"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_Abrir (l)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "Abrir _com (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_Exibir como texto (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_Salvar como (y)..."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "a estabelecer liga????o NNTP com %s:%d...\n"
-
-#~ msgid "Trust key"
-#~ msgstr "Chave confi??vel"
-
-#~ msgid "Orientation"
-#~ msgstr "Orienta????o"
-
-#~ msgid "Test RegExp"
-#~ msgstr "Testar express??o regular"
-
-#~ msgid "Quotation characters"
-#~ msgstr "Caracteres de cita????o"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "Configura????o da barra de ferramentas principal"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "Configura????o da barra de ferramentas de composi????o"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "Configura????o da barra de ferramentas da janela de mensagem"
-
-#~ msgid " items selected"
-#~ msgstr " itens seleccionados"
-
-#~ msgid "'View Log'"
-#~ msgstr "'Ver relat??rio'"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (Tecla de atalho: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (Tecla de atalho: 'l'),\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (Tecla de atalho: 'o')"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "Senha do SMTP:\n"
-#~ "<span size=\"small\">(em branco para utilizar a mesma da recep????o)</span>"
diff --git a/po/ru.po b/po/ru.po
index 1dacc1d..66249a7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19269,275 +19269,3 @@ msgid ""
 msgstr ""
 "Claws Mail ?????????? ?? ????????????.\n"
 "?????????????? '??????????????????' ?????? ??????????????????????."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "???????????????? ???????????????????? ?????????????????????? ?? ?????????????? LDAP ?????????????????????? SSL. ?????? ???????? "
-#~ "??????????????????????, ?????????????????? ???????????????????????? ?????????? ???????????????? ldap.conf (???????? "
-#~ "TLS_CACERTDIR ?? TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "?????? TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "???????????????????????????????? Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "???????????????????????? SSL ?????? POP3 ????????????????????"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "???????????????????????? SSL ?????? IMAP4 ????????????????????"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "???????????????????????? SSL ?????? NNTP ????????????????????"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "???????????????????????? SSL ?????? SMTP ????????????????????"
-
-#~ msgid "Re_move"
-#~ msgstr "????_??????????"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_???????????? ??????????..."
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   ???????????? ???????????? ???? ???????????????????? ?? ???????????? ?????? Windows.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "??????????(??)"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "?????????????? ???? ?????????? ???????? ?????????????????? - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "?????????????? ???????????? ???? ???????????????????? ?? ???????????? ?????? Windows."
-
-#~ msgid "day(s)"
-#~ msgstr "????????(??????)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "???????????????????? ?????????????????? ?????????????????? ?? ?????????????? ?? ?????????????? ????????????????????"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "???????????????????? ?????????????????? ?????????????????? ?? ?????????????? ???????????? ????????, ?????????? ???????????????? ???? "
-#~ "???????????? \\?????????????? ?????? ????????????????"
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "?????????????????????????? (??????????????????????????)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "???????????????? ??????????????????(??)"
-
-#~ msgid "Refresh interval in minutes:"
-#~ msgstr "???????????? ???????????????????? ?? ??????????????:"
-
-#~ msgid "If an item changes, do not mark it as new:"
-#~ msgstr "???????? ???????????? ????????????????????, ???? ???????????????? ???? ????????????????????????:"
-
-#~ msgid "Lookup name:"
-#~ msgstr "?????????????? ??????:"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>???????????? ??????????????????</b>\n"
-#~ "<b>??????????:</b> %d\n"
-#~ "<b>????????????????????????:</b> %d\n"
-#~ "<b>??????????:</b> %d\n"
-#~ "<b>????????????:</b> %s\n"
-#~ "\n"
-#~ "<b>????????????????:</b> %d\n"
-#~ "<b>???????????????????? ??????????????:</b> %d\n"
-#~ "<b>????????????????????????????:</b> %d\n"
-#~ "<b>??????????????????????????:</b> %d\n"
-#~ "<b>????????????????????????:</b> %d\n"
-#~ "<b>??????????????????????????:</b> %d"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_????????????????"
-
-#~ msgid "+_Send"
-#~ msgstr "+_??????????????????"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "_?????????????????? ?? ??????????????????"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">???????????????? \"%s\" ????: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????????????????????? ????????????????\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "???????????? IMAP ?? %s: ???? ???????????????? ????????????????????????????\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? ????????????\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "???????????? IMAP ?? %s: ?? ???????????????????? ????????????????\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "???????????? IMAP ?? %s: ?????????????????????? ????????????\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? ???????????????????? NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? ???????????????????? COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? ???????????????????? LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? ???????????????????? LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "???????????? IMAP ?? %s: ???????????? SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "???????????? IMAP ?? %s: ?????????????????????? ???????????? [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_????????????????????"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (?????? ?????????? ????????????)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (?????? ?????????? ????????????)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (?????? ?????????? ????????????)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>??????: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>????????????: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>?????? ??????????: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span color=\"red\">???????????? ???????????? ???????????????????? ????????</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">???????????????????????? %s ?? %d ????????????, %d ??????????????????, %d ???????????? "
-#~ "?? %d ????????????</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">???????????? ?????????????? ???????? ??????????????????????.</span>"
-
-#~ msgid "+_Save"
-#~ msgstr "+_??????????????????"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s?????????????? ?????????????????? ?????????? ??????:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (???????????? ????????????????: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>???????????????? ?????????????????????? ?????? ?????????????? ??????????:</b>\n"
-#~ "<small>(?? ????????; ???????????????????? -1, ?????????? ???????????????? ?????? ??????????????????????)</small>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(?????? ???????????????????? ??????????????)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> ??:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+????????????????"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>????: %s, %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>????????: %s, %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">???????? ??????:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">?????? ???????????????? ??????????:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">?????? ?????????????????? ??????????:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? SMTP ??????????????:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">?????????? ??????????????:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">?????????????????? mailbox:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">?????? ??????????????:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">?????? ????????????????????????:</span>"
diff --git a/po/sk.po b/po/sk.po
index 9fa85a2..b56dca4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -19335,1297 +19335,3 @@ msgid ""
 msgstr ""
 "Program Claws Mail je pripraven??.\n"
 "Kliknite na Ulo??i?? a za??nite."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, "
-#~ "be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR "
-#~ "and TLS_REQCERT fields)."
-#~ msgstr ""
-#~ "Zapn???? bezpe??n?? pripojenie k LDAP serveru cez SSL. Ak spojenie zlyh??, "
-#~ "skontrolujte spr??vne nastavenie v ldap.conf (polia TLS_CACERTDIR a "
-#~ "TLS_REQCERT)."
-
-#~ msgid "No TLS"
-#~ msgstr "Bez TLS"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Registrova?? Claws Mail"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "Pou??i?? SSL pre spojenie POP3"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "Pou??i?? SSL pre IMAP4 spojenie"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "Pou??i?? SSL pre NNTP spojenie"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "Pou??i?? SSL pre SMTP spojenie"
-
-#~ msgid "Re_move"
-#~ msgstr "O_dstr??ni??"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_In?? zlo??ka???"
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Import k??????ov nie je v syst??me Windows implementovan??.\n"
-
-#~ msgid "minute(s)"
-#~ msgstr "min??t"
-
-#~ msgid "The signature can't be checked - %s."
-#~ msgstr "Digit??lny podpis nemo??no overi?? - %s."
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Export k??????ov nie je v syst??me Windows implementovan??."
-
-#~ msgid "day(s)"
-#~ msgstr "de??(dn??)"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Presun???? zmazan?? spr??vy do ko??a a ihne?? vymaza??"
-
-#~ msgid ""
-#~ "Moves deleted mails to trash instead of using the \\Deleted flag without "
-#~ "expunging."
-#~ msgstr ""
-#~ "Pres??va zmazan?? emaily do ko??a, namiesto pou??itia pr??znaku Zmazan?? bez "
-#~ "ich zmazania."
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Automatick?? (odpor????an??)"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "Zmaza?? spr??vy"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Vlo??i??"
-
-#~ msgid "+_Send"
-#~ msgstr "+_Odosla??"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+Ulo??i?? medzi _koncepty"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Nahradi?? ???%s??? ????m: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "Chyba IMAP na %s: autentifikovan??\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "Chyba IMAP na %s: neautentifikovan??\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pr??du\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "Chyba IMAP na %s: spojenie odmietnut??\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "Chyba IMAP na %s: fat??lna chyba\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri NOOP\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri COPY\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri LIST\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri LSUB\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri SASL\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "Chyba IMAP na %s: chyba pri SSL\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "Chyba IMAP na %s: nezn??ma chyba [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Odhl??si??"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (alebo star????)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (alebo star????)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (alebo star????)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>Typ: </b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Ve??kos??: </b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Meno s??boru: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\">Chyba ????tania ??tatist??k vyrovn??vacej pam??te:</span>"
-
-#~ msgid ""
-#~ "<span color=\"red\">Using %s in %d files, %d directories, %d others and "
-#~ "%d errors</span>"
-#~ msgstr ""
-#~ "<span color=\"red\">Pou??it?? %s v %d s??boroch, %d zlo??k??ch, %d in??ch a %d "
-#~ "ch??b</span>"
-
-#~ msgid "<span color=\"red\">Error clearing icon cache.</span>"
-#~ msgstr "<span color=\"red\">Chyba mazania vyrovn??vacej pam??te ikon.</span>"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan!)???"
-
-#~ msgid "+_Save"
-#~ msgstr "+_Ulo??i??"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-#~ "span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPros??m zadajte heslo:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                uid ???%s??? (D??veryhodnos??: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>S??ahova?? koment??re pr??spevkov nov????ch ako:</b>\n"
-#~ "<small>(V d??och; nastavte -1 na prij??manie v??etk??ch)</small>"
-
-#~ msgid "<b>If an item changes, do not mark it as new:</b>"
-#~ msgstr "<b>Pri zmene polo??ky neozna??i?? polo??ku ako nov??:</b>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(udalos?? sa opakuje)</span>"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> d??a:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Zmaza??"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>Sum??r spr??v</b>\n"
-#~ "<b>Nov??:</b> %d\n"
-#~ "<b>Ne????tan??:</b> %d\n"
-#~ "<b>Celkom:</b> %d\n"
-#~ "<b>Ve??kos??:</b> %s\n"
-#~ "\n"
-#~ "<b>Ozna??en??:</b> %d\n"
-#~ "<b>Odpovedan??:</b> %d\n"
-#~ "<b>Poslan?? ??alej:</b> %d\n"
-#~ "<b>Zamknut??:</b> %d\n"
-#~ "<b>Ignorovan??:</b> %d\n"
-#~ "<b>Sledovan??:</b> %d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Od: %s, na %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Pre: %s, na %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Va??e meno:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">Va??a emailov?? adresa:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">N??zov schr??nky:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adresa SMTP servera:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Adresa servera:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Lok??lna schr??nka:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Typ servera:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Pou????vate??sk?? meno:</span>"
-
-#~ msgid "Failed to register avatars internal rendering hook"
-#~ msgstr "Zlyhala registra??cia obsluhy udalosti ???avatars internal rendering???"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: uplynul ??asov?? limit h??adania hostite??a.\n"
-
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: nezn??my hostite??.\n"
-
-#~ msgid "Failed."
-#~ msgstr "Zlyhalo."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "N??zov novej zlo??ky nesmie obsahova?? odde??ova?? mena cesty"
-
-#~ msgid "Failed to register folder item update hook"
-#~ msgstr "Zlyhala registr??cia obsluhy udalosti ???folder item update???"
-
-#~ msgid "Failed to register folder update hook"
-#~ msgstr "Zlyhala registr??cia obsluhy udalosti ???folder update???"
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "nemo??no kop??rova?? spr??vu %s do %s\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "zlyhal z??pis nastaven?? Fetchinfo do konfigura??n??ho s??boru\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Z??suvn?? modul GData: Zlyhal z??pis konfigur??cie z??suvn??ho modulu s??boru "
-#~ "do\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "N??jden?? lok??cia: (%.2f,%.2f)"
-
-#~ msgid "Alleged country of origin: "
-#~ msgstr "??dajn?? krajina p??vodu:"
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "Nemo??no zisti?? umiestnenie adresy IP"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "Sk??ste lok??ciu nesk??r"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Spojen?? arabsk?? emir??ty"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua a Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Alb??nsko"
-
-#~ msgid "Armenia"
-#~ msgstr "Arm??nsko"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandsk?? Antily"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antarkt??da"
-
-#~ msgid "Argentina"
-#~ msgstr "Argent??na"
-
-#~ msgid "American Samoa"
-#~ msgstr "Americk?? Samoa"
-
-#~ msgid "Austria"
-#~ msgstr "Rak??sko"
-
-#~ msgid "Australia"
-#~ msgstr "Austr??lia"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajd??an"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosna a Hercegovina"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Banglad????"
-
-#~ msgid "Belgium"
-#~ msgstr "Belgicko"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulharsko"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
-
-#~ msgid "Benin"
-#~ msgstr "Benin"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunejsko-darussalamsk?? ??t??t"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bol??via"
-
-#~ msgid "Brazil"
-#~ msgstr "Braz??lia"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamy"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhut??n"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
-
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
-
-#~ msgid "Belarus"
-#~ msgstr "Bielorusko"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosov?? ostrovy"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrick?? republika"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "??vaj??iarsko"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Pobre??ie Slonoviny"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
-
-#~ msgid "Chile"
-#~ msgstr "??ile"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "????na"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolumbia"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kostarika"
-
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Viano??n?? ostrov"
-
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
-
-#~ msgid "Czech Republic"
-#~ msgstr "??esk?? republika"
-
-#~ msgid "Germany"
-#~ msgstr "Nemecko"
-
-#~ msgid "Djibouti"
-#~ msgstr "D??ibutsko"
-
-#~ msgid "Denmark"
-#~ msgstr "D??nsko"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominik??nska republika"
-
-#~ msgid "Algeria"
-#~ msgstr "Al????rsko"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekv??dor"
-
-#~ msgid "Estonia"
-#~ msgstr "Est??nsko"
-
-#~ msgid "Egypt"
-#~ msgstr "Egypt"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Z??padn?? Sahara"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
-
-#~ msgid "Spain"
-#~ msgstr "??panielsko"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Eti??pia"
-
-#~ msgid "Finland"
-#~ msgstr "F??nsko"
-
-#~ msgid "Fiji"
-#~ msgstr "Fid??i"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malv??ny)"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikron??zske federat??vne ??t??ty"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Faersk?? ostrovy"
-
-#~ msgid "France"
-#~ msgstr "Franc??zsko"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Metropolitn?? Franc??zsko"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Spojen?? kr????ovstvo"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
-
-#~ msgid "Georgia"
-#~ msgstr "Gruz??nsko"
-
-#~ msgid "French Guiana"
-#~ msgstr "Franc??zska Guyana"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Gibralt??r"
-
-#~ msgid "Greenland"
-#~ msgstr "Gr??nsko"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovn??kov?? Guinea"
-
-#~ msgid "Greece"
-#~ msgstr "Gr??cko"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "Ju??n?? Georgia a Ju??n?? Sandwichove ostrovy"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guatemala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hongkong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heardov ostrov"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras"
-
-#~ msgid "Croatia"
-#~ msgstr "Chorv??tsko"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Ma??arsko"
-
-#~ msgid "Indonesia"
-#~ msgstr "Indon??zia"
-
-#~ msgid "Ireland"
-#~ msgstr "??rsko"
-
-#~ msgid "Israel"
-#~ msgstr "Izrael"
-
-#~ msgid "India"
-#~ msgstr "India"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britsk?? indickooce??nske ??zemie"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "Ir??nska islamsk?? republika"
-
-#~ msgid "Iceland"
-#~ msgstr "Island"
-
-#~ msgid "Italy"
-#~ msgstr "Taliansko"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
-
-#~ msgid "Jordan"
-#~ msgstr "Jord??nsko"
-
-#~ msgid "Japan"
-#~ msgstr "Japonsko"
-
-#~ msgid "Kenya"
-#~ msgstr "Ke??a"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambod??a"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komory"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Sv??t?? Kri??tof a Nevis"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "K??rejsk?? ??udovodemokratick?? republika"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "K??rejsk?? republika"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuvajt"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazachstan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Laosk?? ??udovodemokratick?? republika"
-
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Sv??t?? Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichten??tajnsko"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sr?? Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Lib??ria"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litva"
-
-#~ msgid "Luxembourg"
-#~ msgstr "Luxembursko"
-
-#~ msgid "Latvia"
-#~ msgstr "Loty??sko"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "L??bya"
-
-#~ msgid "Morocco"
-#~ msgstr "Maroko"
-
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Moldavsk?? republika"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "B??val?? juhoslovansk?? republika Maced??nsko"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mongolsko"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severn?? Mari??ny"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
-
-#~ msgid "Mauritania"
-#~ msgstr "Maurit??nia"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Maur??cius"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
-
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-
-#~ msgid "Mexico"
-#~ msgstr "Mexiko"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malajzia"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Nam??bia"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Nov?? Kaled??nia"
-
-#~ msgid "Niger"
-#~ msgstr "Niger"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nig??ria"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Holandsko"
-
-#~ msgid "Norway"
-#~ msgstr "N??rsko"
-
-#~ msgid "Nepal"
-#~ msgstr "Nep??l"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Nov?? Z??land"
-
-#~ msgid "Oman"
-#~ msgstr "Om??n"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Franc??zska Polyn??zia"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nov?? Guinea"
-
-#~ msgid "Philippines"
-#~ msgstr "Filip??ny"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Po??sko"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
-
-#~ msgid "Portugal"
-#~ msgstr "Portugalsko"
-
-#~ msgid "Palau"
-#~ msgstr "Palau"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "R??union"
-
-#~ msgid "Romania"
-#~ msgstr "Rumunsko"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Rusk?? feder??cia"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Saudsk?? Ar??bia"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "??alam??nove ostrovy"
-
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
-
-#~ msgid "Sudan"
-#~ msgstr "Sud??n"
-
-#~ msgid "Sweden"
-#~ msgstr "??v??dsko"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Sv??t?? Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovinsko"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovensko"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Mar??no"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Som??lsko"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sv??t?? Tom???? a Princov ostrov"
-
-#~ msgid "El Salvador"
-#~ msgstr "Salv??dor"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "S??rska arabsk?? republika"
-
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
-
-#~ msgid "Chad"
-#~ msgstr "??ad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Franc??zske ju??n?? a antarktick?? ??zemia"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Thajsko"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tad??ikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkm??nsko"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunisko"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
-
-#~ msgid "East Timor"
-#~ msgstr "V??chodn?? Timor"
-
-#~ msgid "Turkey"
-#~ msgstr "Turecko"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad a Tobago"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Taiwan, provincia ????ny"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanz??nijsk?? zjednoten?? republika"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukrajina"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Men??ie od??ahl?? ostrovy Spojen??ch ??t??tov"
-
-#~ msgid "United States"
-#~ msgstr "Spojen?? ??t??ty"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguaj"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "Uzbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Sv??t?? stolica (Vatik??nsky mestsk?? ??t??t)"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Sv??t?? Vincent a Grenad??ny"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venezuela"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Panensk?? ostrovy, Britsk??"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Panensk?? ostrovy, Americk??"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Vietnam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis And Futuna"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
-
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "Srbsko a ??ierna Hora"
-
-#~ msgid "South Africa"
-#~ msgstr "Ju??n?? Afrika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Kon??sk?? demokratick?? republika"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
-
-#~ msgid "GeoLocation"
-#~ msgstr "GeoLocation:"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Nemo??no inicializova?? kontrolu clutter."
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "Nemo??no vytvori?? regul??rny v??raz: %s\n"
-
-#~ msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-#~ msgstr ""
-#~ "V z??suvnom module GeoLocation zlyhala registr??cia obsluhy udalosti "
-#~ "???messageview_show???"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location "
-#~ "of senders from their E-Mails with any amount of certainty. The results "
-#~ "presented by this plugin are only rough estimates. In particular, mailing "
-#~ "list managers often strip sender information from the mails, so mails "
-#~ "from mailing lists may be assigned to the location of the mailing list "
-#~ "server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on "
-#~ "this information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about "
-#~ "marital quarrels)."
-#~ msgstr ""
-#~ "Tento z??suvn?? modul poskytuje funkcie GeoLok??cie pre Claws Mail.\n"
-#~ "\n"
-#~ "Upozornenie: Je technicky nemo??n?? s istotou ur??i?? zemepisn?? umiestnenie "
-#~ "odosielate??a z jeho emailu. V??sledky, prezentovan?? t??mto z??suvn??m "
-#~ "modulom, s?? len hrub?? odhady. Napr??klad, emailov?? konferencie ??asto "
-#~ "odstra??uj?? z emailov inform??cie o odosielate??ovi, preto emaily z "
-#~ "emailovej konferencie m????u by?? priraden?? umiestneniu servera emailovej "
-#~ "konferencie, namiesto odosielate??a emailu.\n"
-#~ "Ak m??te pochybnosti, ned??verujte v??sledkom tohoto z??suvn??ho modulu a "
-#~ "nespoliehajte sa na t??to inform??ciu pri rozvode man??elstva.\n"
-#~ "\n"
-#~ "Sp??tn?? v??zba na <berndth at gmx.de> je v??tan?? (ale len ak nie je o "
-#~ "man??elsk??ch h??dkach)."
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "Integr??cia GeoLocation"
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Z??suvn?? modul Upozornenia: Zlyhal z??pis konfigur??cie modulu do s??boru\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "Ulo??i?? odoslan?? spr??vy do zlo??ky Odoslan??"
-
-#~ msgid "E-mail client"
-#~ msgstr "Po??tov?? klient"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Od??ah??en?? a r??chly po??tov?? klient, postaven?? na GTK+"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "od??ah??en??;r??chly;gui;roz????rite??n??;z??suvn?? modul;pop;pop3;imap;imap4;nntp;"
-#~ "news;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail je r??chly, v??konn?? a ve??mi roz????rite??n?? po??tov?? klient."
-
-#~ msgid ""
-#~ "It is highly configurable and handles hundreds of thousands of emails "
-#~ "easily. Messages are managed in an open format, and are easy to interact "
-#~ "with."
-#~ msgstr ""
-#~ "Je vysoko nastavite??n?? a ??ahko dok????e obsl????i?? st??tis??ce emailov. Spr??vy "
-#~ "s?? spracov??van?? v otvorenom form??te a mo??no s nimi ??ahko pracova??."
-
-#~ msgid ""
-#~ "Lots of extra functionality is provided by plugins, such as PGP "
-#~ "signatures and encryption, an RSS aggregator, a calendar, powerful spam "
-#~ "filtering, Perl and Python interactions, HTML and PDF rendering, and more."
-#~ msgstr ""
-#~ "Ve??a doplnkov??ch mo??nost?? je poskytovan??ch prostredn??ctvom z??suvn??ch "
-#~ "modulov, ako napr. podpisy a ??ifrovanie PGP, ????ta??ka RSS, kalend??r, "
-#~ "v??konn?? filtrovanie spamov, interakcia pomocou Perl a Python, spracovanie "
-#~ "HTML a PD a ??al??ie."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr "Zap??na upozor??ovanie na email pomocou LED na niektor??ch notebookoch"
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr "Umo????uje ukladanie adresy prij??mate??ov do u??enej zlo??ky adres??ra"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "Umo????uje vytvorenie arch??vov TAR alebo ZIP zo star??ch zlo??iek"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "Umo????uje z emailov odstr??ni?? pr??lohy"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr ""
-#~ "Upozor??uje, ke?? spr??va, kde je spom??nan?? pr??loha, nem?? prilo??en?? ??iadne "
-#~ "s??bory"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "Kontroluje v??etky spr??vy prijat?? z ????tov POP, IMAP alebo LOCAL pomocou "
-#~ "Bsfilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "Kontroluje v??etky spr??vy prijat?? z ????tov POP, IMAP alebo LOCAL pomocou "
-#~ "Bsfilter"
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "Kontroluje v??etky spr??vy prijat?? z ????tov POP, IMAP alebo LOCAL pomocou "
-#~ "clamd (Clam AV)"
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr "Sprac??va emaily vo form??te HTML pomocou kni??nice WebKit"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "Prid??va hlavi??ky obsahuj??ce: UIDL, n??zov ????tu Claws, server POP, ID "
-#~ "pou????vate??a a ??as z??skania"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Poskytuje rozhranie k slu??b??m Google"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Poskytuje funkcie GeoLocation"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr ""
-#~ "Zobrazuje obr??zky profilov libravatar/gravatar alebo dynamicky "
-#~ "generovan??, ??i preddefinovan?? alternat??vu"
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Priama podpora schr??nky vo form??te mbox."
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr ""
-#~ "Zapisuje do s??boru z??znamu zhrnutie hlavi??iek spr??vy pri pr??chode novej "
-#~ "spr??vy, po trieden??"
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Poskytuje r??zne sp??soby upozornenia pou????vate??a na nov?? a nepre????tan?? "
-#~ "email"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "Umo????uje zobrazovanie pr??loh PDF a PostScript pomocou kni??nice Poppler a "
-#~ "n??stroja GhostScript"
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr "Umo????uje vo filtroch vyu??i?? pln?? silu Perl"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "Poskytuje z??kladn?? funkcie PGP a je z??vislos??ou oboch z??suvn??ch modulov "
-#~ "PGP/Inline a PGP/MIME."
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Obsluhuje emaily podp??san?? a/alebo ??ifrovan?? pomocou PGP/Inline"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Obsluhuje emaily podp??san?? a/alebo ??ifrovan?? pomocou PGP/MIME"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Pon??ka skritovanie v jazyku Python. K??d m????e by?? zadan?? do zabudovanej "
-#~ "konzoly Python alebo ulo??en??"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "????ta ob????ben?? kan??ly RSS"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Obsluhuje emaily podp??san?? a/alebo ??ifrovan?? pomocou S/MIME"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Hl??si SPAM na r??zne miesta"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "Zap??na kontrolu v??etk??ch spr??v prijat?? z ????tov POP, IMAP alebo LOCAL "
-#~ "pomocou SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "Umo????uje ????tanie pr??loh application/ms-tnef"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "Umo????uje spracov??vanie spr??v vCalendar a obsluhuje prihl??senia webCal. "
-#~ "Poskytuje import kalend??ra"
-
-#~ msgid "_Subject:"
-#~ msgstr "P_redmet:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Uchova?? adresy z ???Komu???"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Uchova?? adresy z ???K??pia???"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Uchova?? adresy zo ???Slep?? k??pia???"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "??t??lopis"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Z??suvn?? modul GData: Autentifikovan??\n"
-
-#~ msgid "slow"
-#~ msgstr "pomaly"
-
-#~ msgid "fast"
-#~ msgstr "r??chlo"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "????rka titulkov??ho pruhu v pixeloch (0 znamen?? ve??kos?? obrazovky)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Zapn???? vyskakovacie okno"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Predvolen?? interval obnovenia v min??tach"
-
-#~ msgid "Use this"
-#~ msgstr "Pou??i?? toto"
diff --git a/po/sr.po b/po/sr.po
index 1117863..3d02dff 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20737,1634 +20737,3 @@ msgid ""
 msgstr ""
 "Claws Mail ???? ???????? ??????????????.\n"
 "???????????????? ???? ???????????????????? ???? ??????????????????."
-
-#~ msgctxt "Accounts List Default Column Name"
-#~ msgid "D"
-#~ msgstr "??"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????? ???? ???????? ???? ???? ??????????????. ???????????? ?? ???????????????? ????????????.\n"
-#~ "%s"
-
-#~ msgid "/_Book/New _Book"
-#~ msgstr "/_??????????????/???????? _??????????????"
-
-#~ msgid "/_Book/New _Folder"
-#~ msgstr "/_??????????????/???????? _????????????????????????"
-
-#~ msgid "/_Book/New LDAP _Server"
-#~ msgstr "/_??????????????/???????? LDAP _????????????"
-
-#~ msgid "/_Book/---"
-#~ msgstr "/_??????????????/---"
-
-#~ msgid "/_Book/_Save"
-#~ msgstr "/_??????????????/_??????????????"
-
-#~ msgid "/_Book/_Close"
-#~ msgstr "/_??????????????/_??????????????"
-
-#~ msgid "/_Address"
-#~ msgstr "/??_??????????"
-
-#~ msgid "/_Address/_Select all"
-#~ msgstr "/??_??????????/_?????????????? ??????"
-
-#~ msgid "/_Address/---"
-#~ msgstr "/??_??????????/---"
-
-#~ msgid "/_Address/C_ut"
-#~ msgstr "/??_??????????/_??????????"
-
-#~ msgid "/_Address/_Copy"
-#~ msgstr "/??_??????????/_????????????"
-
-#~ msgid "/_Address/_Paste"
-#~ msgstr "/??_??????????/_??????????????"
-
-#~ msgid "/_Address/_Edit"
-#~ msgstr "/??_??????????/_????????????"
-
-#~ msgid "/_Address/_Delete"
-#~ msgstr "/??_??????????/_????????????"
-
-#~ msgid "/_Address/New _Address"
-#~ msgstr "/??_??????????/???????? _????????????"
-
-#~ msgid "/_Address/New _Group"
-#~ msgstr "/??_??????????/???????? _??????????"
-
-#~ msgid "/_Address/_Mail To"
-#~ msgstr "/??_??????????/_???????????? ????????????"
-
-#~ msgid "/_Tools/---"
-#~ msgstr "/_??????????/---"
-
-#~ msgid "/_Help/_About"
-#~ msgstr "/????_??????/_?? ????????????????"
-
-#~ msgid "EMail Address"
-#~ msgstr "???????????? ??-??????????"
-
-#~ msgid "No folder or message was selected."
-#~ msgstr "???????????????????????? ?????? ???????????? ???????? ????????????????."
-
-#~ msgid ""
-#~ "Please select a folder to process from the folder\n"
-#~ "list. Alternatively, select one or messages from\n"
-#~ "the message list."
-#~ msgstr ""
-#~ "?????????????????? ???????????????????????? ???? ???????? ???? ???????? ????????????????\n"
-#~ "?????????????????? ????????????. ????????????????????????, ?????????????????? ??????????\n"
-#~ "?????? ???????? ???????????? ???? ?????????? ????????????."
-
-#~ msgid "protocol error\n"
-#~ msgstr "???????????? ?? ??????????????????\n"
-
-#~ msgid "Error occurred while posting\n"
-#~ msgstr "?????????????? ???? ???????????? ?????? ??????????\n"
-
-#~ msgid "Error occurred while sending command\n"
-#~ msgstr "?????????????? ???? ???????????? ?????? ?????????? ??????????????\n"
-
-#~ msgid ""
-#~ "  Owner: %s (%s) in %s\n"
-#~ "  Signed by: %s (%s) in %s\n"
-#~ "  Fingerprint: %s\n"
-#~ "  Signature status: %s"
-#~ msgstr ""
-#~ "  ??????????????: %s (%s) ?? %s\n"
-#~ "  ????????????????: %s (%s) ?? %s\n"
-#~ "  ????????????: %s\n"
-#~ "  ???????????? ??????????????: %s"
-
-#~ msgid "Couldn't load X509 default paths"
-#~ msgstr "???????? ???????????? ?????????????????? ?????????????????????????? ???????????? ???? X509"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a, %d.%m.%Y. %H:%M:%S"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%d.%m.%Y."
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "/_Remove"
-#~ msgstr "/_????????????"
-
-#~ msgid "/_Message/S_end"
-#~ msgstr "/_????????????/_????????????"
-
-#~ msgid "/_Message/Send _later"
-#~ msgstr "/_????????????/???????????? _??????????????"
-
-#~ msgid "/_Message/---"
-#~ msgstr "/_????????????/---"
-
-#~ msgid "/_Message/_Attach file"
-#~ msgstr "/_????????????/??????????_???? ????????????????"
-
-#~ msgid "/_Message/_Insert file"
-#~ msgstr "/_????????????/_???????????? ????????????????"
-
-#~ msgid "/_Message/Insert si_gnature"
-#~ msgstr "/_????????????/_?????????????? ????????????"
-
-#~ msgid "/_Message/_Save"
-#~ msgstr "/_????????????/_??????????????"
-
-#~ msgid "/_Message/_Close"
-#~ msgstr "/_????????????/_??????????????"
-
-#~ msgid "/_Edit/_Undo"
-#~ msgstr "/_??????????????????/_??????????????"
-
-#~ msgid "/_Edit/_Redo"
-#~ msgstr "/_??????????????????/_????????????"
-
-#~ msgid "/_Edit/---"
-#~ msgstr "/_??????????????????/---"
-
-#~ msgid "/_Edit/Cu_t"
-#~ msgstr "/_??????????????????/_??????????"
-
-#~ msgid "/_Edit/_Copy"
-#~ msgstr "/_??????????????????/_????????????"
-
-#~ msgid "/_Edit/_Paste"
-#~ msgstr "/_??????????????????/_??????????????"
-
-#~ msgid "/_Edit/Special paste/as _quotation"
-#~ msgstr "/_??????????????????/???????????????? ??????????????/?????? _??????????"
-
-#~ msgid "/_Edit/Special paste/_wrapped"
-#~ msgstr "/_??????????????????/???????????????? ??????????????/_????????????????????"
-
-#~ msgid "/_Edit/Special paste/_unwrapped"
-#~ msgstr "/_??????????????????/???????????????? ??????????????/_????????????????????????"
-
-#~ msgid "/_Edit/Select _all"
-#~ msgstr "/_??????????????????/?????????????? _??????"
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/_??????????????????/_????????????????"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/_??????????????????/_????????????????/???????????? ????????????"
-
-#~ msgid "/_Edit/A_dvanced/Delete entire line"
-#~ msgstr "/_??????????????????/_????????????????/???????????? ?????????????????? ????????????"
-
-#~ msgid "/_Edit/_Find"
-#~ msgstr "/_??????????????????/_????????????????"
-
-#~ msgid "/_Edit/Wrap all long _lines"
-#~ msgstr "/_??????????????????/???????????? ???????? _?????????? ????????????"
-
-#~ msgid "/_Edit/Aut_o wrapping"
-#~ msgstr "/_??????????????????/??????_?????????????? ???????????? ?????????? ????????????"
-
-#~ msgid "/_Edit/Edit with e_xternal editor"
-#~ msgstr "/_??????????????????/???????????? ?? ?????????????? ????_?????????????? ????????????"
-
-#~ msgid "/_Spelling/---"
-#~ msgstr "/_????????????????/---"
-
-#~ msgid "/_Spelling/Options"
-#~ msgstr "/_????????????????/????????????????"
-
-#~ msgid "/_Options/Reply _mode"
-#~ msgstr "/_????????????????/????_?????? ????????????????"
-
-#~ msgid "/_Options/Reply _mode/_Normal"
-#~ msgstr "/_????????????????/????_?????? ????????????????/_????????????????"
-
-#~ msgid "/_Options/Reply _mode/_All"
-#~ msgstr "/_????????????/????_?????? ????????????????/_??????????"
-
-#~ msgid "/_Options/Reply _mode/_Sender"
-#~ msgstr "/_????????????/????_?????? ????????????????/_????????????"
-
-#~ msgid "/_Options/Reply _mode/_Mailing-list"
-#~ msgstr "/_????????????/????_?????? ????????????????/?????????????? ???? _?????????????? ??????????????"
-
-#~ msgid "/_Options/---"
-#~ msgstr "/_????????????????/---"
-
-#~ msgid "/_Options/Privacy _System/None"
-#~ msgstr "/_????????????????/_???????????? ??????????????????????/??????????????????"
-
-#~ msgid "/_Options/Si_gn"
-#~ msgstr "/_????????????????/_????????????"
-
-#~ msgid "/_Options/Priority/_Highest"
-#~ msgstr "/_????????????????/????????????????_??/??_????????????"
-
-#~ msgid "/_Options/Priority/Hi_gh"
-#~ msgstr "/_????????????????/????????????????_??/_??????????"
-
-#~ msgid "/_Options/Priority/_Normal"
-#~ msgstr "/_????????????????/????????????????_??/_????????????????"
-
-#~ msgid "/_Options/Priority/Lo_w"
-#~ msgstr "/_????????????????/????????????????_??/????_??????"
-
-#~ msgid "/_Options/Priority/_Lowest"
-#~ msgstr "/_????????????????/????????????????_??/????_??????????"
-
-#~ msgid "/_Options/_Request Return Receipt"
-#~ msgstr "/_????????????????/???????????????? ??????????_???? ??????????????"
-
-#~ msgid "/_Options/Character _encoding"
-#~ msgstr "/_????????????????/??_?????? ??????????????"
-
-#~ msgid "/_Options/Character _encoding/_Automatic"
-#~ msgstr "/_????????????????/??_?????? ??????????????/_???????????????????? ????????????????????????"
-
-#~ msgid "/_Options/Character _encoding/---"
-#~ msgstr "/_????????????????/??_?????? ??????????????/---"
-
-#~ msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/7?????? ???????? (US-ASC_II)"
-
-#~ msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????? (_UTF-8)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????? (ISO-8859-_1)"
-
-#~ msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????? (ISO-8859-15)"
-
-#~ msgid "/_Options/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????? (Windows-1252)"
-
-#~ msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????????? (ISO-8859-_2)"
-
-#~ msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (ISO-8858-1_3)"
-
-#~ msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (ISO-8859-_4)"
-
-#~ msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????? (ISO-8859-_7)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????? (ISO-8859-_8)"
-
-#~ msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????? (Windows-1255)"
-
-#~ msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????? (ISO-8859-_6)"
-
-#~ msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????? (Windows-1256)"
-
-#~ msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????? (ISO-8859-_9)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (ISO-8859-_5)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (KOI8-_R)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (KOI8-_U)"
-
-#~ msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (Windows-1251)"
-
-#~ msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (ISO-2022-_JP)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????? ?????????????? (_GB2312)"
-
-#~ msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????????? ?????????????? (GBK)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????? ?????????????? (_Big5)"
-
-#~ msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????????????????????????? ?????????????? (EUC-_??W)"
-
-#~ msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/???????????????? (EUC-_KR)"
-
-#~ msgid "/_Options/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????? (TIS-620)"
-
-#~ msgid "/_Options/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/_????????????????/??_?????? ??????????????/?????? (Windows-874)"
-
-#~ msgid "/_Tools/_Address book"
-#~ msgstr "/_??????????/_??????????????"
-
-#~ msgid "/_Tools/_Template"
-#~ msgstr "/_??????????/_????????????"
-
-#~ msgid "/_Tools/Actio_ns"
-#~ msgstr "/_??????????/????_????????"
-
-#~ msgid "Message reply format error at line %d."
-#~ msgstr "???????????????????? ???????????? ???????? ???? ?????????????? ?? ???????????? %d."
-
-#~ msgid "Message forward format error at line %d."
-#~ msgstr "???????????????????? ???????????? ???????? ???? ???????????????????????? ???????????? ?? ???????????? %d."
-
-#~ msgid "Quote mark format error."
-#~ msgstr "???????????? ?????????????? ???????????? ????????????."
-
-#~ msgid "No account for posting news available!"
-#~ msgstr "???????? ?????????? ???????? ?????????????????? ???? ?????????? ???? ???????????????????? ??????????!"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "????????????????????: ???????? ???? ?????????????????????? ??????????????\n"
-
-#~ msgid "Tags configuration"
-#~ msgstr "???????????????????? ????????????"
-
-#~ msgid "Tag name"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Replace"
-#~ msgstr "????????????"
-
-#~ msgid "Current tags"
-#~ msgstr "?????????????????? ????????????"
-
-#~ msgid "New tag"
-#~ msgstr "???????? ????????????"
-
-#~ msgid "New tag name:"
-#~ msgstr "?????????? ???????? ????????????:"
-
-#~ msgid "Fetching all messages in %s ...\n"
-#~ msgstr "???????????????????? ???????? ???????????? ?? %s ...\n"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "???????????????????? ????????????..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "???????????????? ???????????? %d ???? %d..."
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "???????????????? ???????????? %d ???? %d..."
-
-#~ msgid "Page %N of %Q"
-#~ msgstr "???????????? %N ???? %Q"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2007\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1999-2007\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "?? Claws Mail ??????"
-
-#~ msgctxt "libgnomeprint"
-#~ msgid "adds support for a complete print dialog\n"
-#~ msgstr "?????????????????? ?????????????? ???? ?????????????????? ?????????????? ???? ????????????????\n"
-
-#~ msgid ""
-#~ "This product includes software developed by the OpenSSL Project for use "
-#~ "in the OpenSSL Toolkit ("
-#~ msgstr ""
-#~ "???????? ???????????????? ???????????? ?????????????? ???????????????? ???? ???????????? OpenSSL ???????????????? ???? "
-#~ "???????????????? ?? OpenSSL Toolkit ("
-
-#~ msgid ").\n"
-#~ msgstr ").\n"
-
-#~ msgid ""
-#~ "Copyright (C) 1999-2007\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "and the Claws Mail team"
-#~ msgstr ""
-#~ "Copyright (C) 1999-2007\n"
-#~ "Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>\n"
-#~ "?? Claws Mail ??????"
-
-#~ msgid "Ctrl+%c"
-#~ msgstr "Ctrl+%c"
-
-#~ msgid "Normal Mode"
-#~ msgstr "???????????????? ??????"
-
-#~ msgid "Bad Spellers Mode"
-#~ msgstr "?????? ?????????? ??????????????????"
-
-#~ msgid "Unknown suggestion mode."
-#~ msgstr "?????????????????? ?????????????????????? ??????."
-
-#~ msgid "Change dictionary"
-#~ msgstr "?????????????? ??????????????"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "???????????????????? ???????????? ???? ?????????????? ????????????"
-
-#~ msgid "Source Buffer"
-#~ msgstr "??????????"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "GtkTextBuffer ?????????????? ???? ????????????"
-
-#~ msgid "Tabs Width"
-#~ msgstr "???????????? ????????????????????"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "???????????? ???????????????????? ?? ??????????????????"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "?????????? ??????????????????"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "?????????? ?????????????????? ????????????"
-
-#~ msgid "Highlight"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "???????????????? ?????????????????? ???? ???????????????????? ??????????????????"
-
-#~ msgid "Font"
-#~ msgstr "??????????"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "GnomeFont ?????????? ???????? ???? ?????????????? ???? ?????????? ?????????????????? (??????????????????????) "
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr "?????????? ???????? ???? ?????????????? ???? ?????????? ?????????????????? (??????. ???Monospace 10???)"
-
-#~ msgid "Numbers Font"
-#~ msgstr "?????????? ???? ??????????????"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "GnomeFont ?????????? ???? ???????????? ?????????????????? ?????????????? (??????????????????????)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "?????????? ?????????? ???? ?????????? ?????????? ????????????"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr "???????????? ???????????? ?????????????????? ?????????? ???????????? (0 ?????????? ?????? ??????????????)"
-
-#~ msgid "Print Header"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "???????????????? ???????????????? ???? ???????????? ????????????"
-
-#~ msgid "Print Footer"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "???????????????? ???????????????? ???? ???????????? ????????????"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "?????????? ???? ???????????????? ?? ???????????????? ????????????"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr "GnomeFont ?????????? ???? ?????????? ???????????????? ?? ???????????????? (??????????????????????)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "???????? ?????????? ???? ???????????????? ?? ???????????????? ????????????"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr "?????????? ???? ?????????? ???????????????? ?? ???????????????? (??????. ???Monospace 10???)"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "???????? ???????????????? ???? ???????????????? ???? Claws Mail ?????? ????????????."
-
-#~ msgid "Load Plugin..."
-#~ msgstr "???????????? ??????????????..."
-
-#~ msgid " Clear "
-#~ msgstr " ???????????? "
-
-#~ msgid " Extended Symbols... "
-#~ msgstr " ?????????????? ??????????????... "
-
-#~ msgid "Info"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "?????????????????? SSL ??????????????????????"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "SSL ?????????????????????? ???? ??????????????"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "?????????????????? SSL ????????????????????"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "???????????????????? ???? IMAP4 ???????????? %s...\n"
-
-#~ msgid "iconv cannot convert UTF-7 to %s\n"
-#~ msgstr "iconv ???? ???????? ???? ?????????????? UTF-7 ?? %s\n"
-
-#~ msgid "iconv cannot convert %s to UTF-7\n"
-#~ msgstr "iconv ???? ???????? ???? ?????????????? %s ?? UTF-7\n"
-
-#~ msgid "iconv cannot convert UTF-8 to UTF-7\n"
-#~ msgstr "iconv ???? ???????? ???? ?????????????? UTF-8 ?? UTF-7\n"
-
-#~ msgid "/_Synchronise"
-#~ msgstr "/_??????????????????????"
-
-#~ msgid "/Subscriptions/Show only subscribed _folders"
-#~ msgstr "/??????????????/?????????????? ???????? ?????????????? _??????????????????????????"
-
-#~ msgid "/Subscriptions/---"
-#~ msgstr "/??????????????/---"
-
-#~ msgid "/Subscriptions/_Subscribe..."
-#~ msgstr "/??????????????/_??????????????????..."
-
-#~ msgid "/Subscriptions/_Unsubscribe..."
-#~ msgstr "/??????????????/_????????????..."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "???%c??? ???? ???????? ???? ???? ???????????? ?? ???????????? ??????????????????????????."
-
-#~ msgid "Connection failed."
-#~ msgstr "?????????????????? ????????????????????."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d ???????? ????????????"
-#~ msgstr[1] "Claws Mail: %d ???????? ????????????"
-#~ msgstr[2] "Claws Mail: %d ?????????? ????????????"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "???????? ???????????? ??????????????????????: ?????????????? ???? ?????????? ????????? ???????????."
-
-#~ msgid "Exiting..."
-#~ msgstr "??????????????????..."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ???? ?????????????????????? ???? ?????????????? ???????????????? GTK+ ???????????????????? ???? ?????? ???????? "
-#~ "???? ???????????????? ???????????????? ???? ?????????? ????????????????. ?????? ???? ?????????????? ???? ???????????? "
-#~ "????????????????. ???????????? ?????????????????????? GTK+ ?????? ???????????? ???????????????????????? Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ???? ?????????????????????? ???? ???????????????? ???????????????? GTK+ ???????????????????? ???? ?????? "
-#~ "???????? ???? ???????????????? ???????????????? ???? ?????????? ????????????????. ?????? ???? ?????????????? ???? ???????????? "
-#~ "????????????????. ???????????? ???????????? ???????????????????????? Claws Mail."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail ???? ???????? ???? ???? ?????????????? ?????? ???????????? ???????????????? (%s)."
-
-#~ msgid "/_File/_Add mailbox"
-#~ msgstr "/_????????????????/???????? _??????????????"
-
-#~ msgid "/_File/_Add mailbox/MH..."
-#~ msgstr "/_????????????????/???????? _??????????????/MH..."
-
-#~ msgid "/_File/---"
-#~ msgstr "/_????????????????/---"
-
-#~ msgid "/_File/_Import mbox file..."
-#~ msgstr "/_????????????????/_?????????? mbox ????????????????..."
-
-#~ msgid "/_File/_Export to mbox file..."
-#~ msgstr "/_????????????????/_???????????? ?? mbox ????????????????..."
-
-#~ msgid "/_File/_Save as..."
-#~ msgstr "/_????????????????/?????????????? _??????..."
-
-#~ msgid "/_File/_Print..."
-#~ msgstr "/_????????????????/_????????????..."
-
-#~ msgid "/_File/_Work offline"
-#~ msgstr "/_????????????????/?????????? ????_?? ????????"
-
-#~ msgid "/_File/E_xit"
-#~ msgstr "/_????????????????/??_????????"
-
-#~ msgid "/_Edit/_Delete thread"
-#~ msgstr "/_??????????????????/_???????????? ?????? ????????????????"
-
-#~ msgid "/_Edit/_Find in current message..."
-#~ msgstr "/_??????????????????/?????????????? _?????????? ?? ????????????..."
-
-#~ msgid "/_Edit/_Search folder..."
-#~ msgstr "/_??????????????????/???????????????? _????????????????????????..."
-
-#~ msgid "/_View/Show or hi_de/_Message view"
-#~ msgstr "/??_????????????/_????????????/?????????????? _????????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????/?????????? _?????????? ??????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????/?????????? ??_???? ??????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????/_???????? ??????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Text only"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????/???????? _??????????"
-
-#~ msgid "/_View/Show or hi_de/_Toolbar/_Hide"
-#~ msgstr "/??_????????????/_????????????/_???????????? ??????????/????_??????????????"
-
-#~ msgid "/_View/Show or hi_de/Status _bar"
-#~ msgstr "/??_????????????/_????????????/_???????????????? ????????????"
-
-#~ msgid "/_View/Show or hi_de/Column headers"
-#~ msgstr "/??_????????????/_????????????/_???????????????? ????????????"
-
-#~ msgid "/_View/Set displayed _columns/in _Folder list..."
-#~ msgstr "/??_????????????/_???????????? ???? ????????????/?? ???????????? _??????????????????????????"
-
-#~ msgid "/_View/Set displayed _columns/in _Message list..."
-#~ msgstr "/??_????????????/_???????????? ???? ????????????/?? ???????????? _????????????"
-
-#~ msgid "/_View/---"
-#~ msgstr "/??_????????????/---"
-
-#~ msgid "/_View/Layout/_Standard"
-#~ msgstr "/??_????????????/????????????????/_????????????????????"
-
-#~ msgid "/_View/Layout/_Wide message"
-#~ msgstr "/??_????????????/????????????????/_???????????? ???????????? ????????????"
-
-#~ msgid "/_View/Layout/W_ide message list"
-#~ msgstr "/??_????????????/????????????????/???????????? ???????????? _????????????"
-
-#~ msgid "/_View/_Sort"
-#~ msgstr "/??_????????????/????????_??????"
-
-#~ msgid "/_View/_Sort/by _number"
-#~ msgstr "/??_????????????/????????_??????/???? _??????????"
-
-#~ msgid "/_View/_Sort/by S_ize"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????????"
-
-#~ msgid "/_View/_Sort/by _Date"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????"
-
-#~ msgid "/_View/_Sort/by Thread date"
-#~ msgstr "/??_????????????/????????_??????/???? ???????????? ??????_????????????"
-
-#~ msgid "/_View/_Sort/by _From"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????"
-
-#~ msgid "/_View/_Sort/by _To"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????????"
-
-#~ msgid "/_View/_Sort/by S_ubject"
-#~ msgstr "/??_????????????/????????_??????/???? _????????"
-
-#~ msgid "/_View/_Sort/by _color label"
-#~ msgstr "/??_????????????/????????_??????/???? ????_????"
-
-#~ msgid "/_View/_Sort/by tag"
-#~ msgstr "/??_????????????/????????_??????/???? ??_??????????"
-
-#~ msgid "/_View/_Sort/by _mark"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????????"
-
-#~ msgid "/_View/_Sort/by _status"
-#~ msgstr "/??_????????????/????????_??????/???? _??????????????"
-
-#~ msgid "/_View/_Sort/by a_ttachment"
-#~ msgstr "/??_????????????/????????_??????/???? ??????_????????????"
-
-#~ msgid "/_View/_Sort/by score"
-#~ msgstr "/??_????????????/????????_??????/???? ????????????_????"
-
-#~ msgid "/_View/_Sort/by locked"
-#~ msgstr "/??_????????????/????????_??????/???? _????????????????????????"
-
-#~ msgid "/_View/_Sort/D_on't sort"
-#~ msgstr "/??_????????????/????????_??????/_??????????????????????"
-
-#~ msgid "/_View/_Sort/---"
-#~ msgstr "/??_????????????/????????_??????/---"
-
-#~ msgid "/_View/_Sort/Ascending"
-#~ msgstr "/??_????????????/????????_??????/?????????????? ??????????????????  [??->??]"
-
-#~ msgid "/_View/_Sort/Descending"
-#~ msgstr "/??_????????????/????????_??????/?????????????????? ?????????????????? [??->??]"
-
-#~ msgid "/_View/_Go to/_Previous message"
-#~ msgstr "/??_????????????/_?????? ????/_?????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/_Next message"
-#~ msgstr "/??_????????????/_?????? ????/_?????????????? ????????????"
-
-#~ msgid "/_View/_Go to/---"
-#~ msgstr "/??_????????????/_?????? ????/---"
-
-#~ msgid "/_View/_Go to/P_revious unread message"
-#~ msgstr "/??_????????????/_?????? ????/??_???????????????? ?????????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/N_ext unread message"
-#~ msgstr "/??_????????????/_?????? ????/??_???????????? ?????????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/Ne_xt new message"
-#~ msgstr "/??_????????????/_?????? ????/????_?????????? ???????? ????????????"
-
-#~ msgid "/_View/_Go to/Next m_arked message"
-#~ msgstr "/??_????????????/_?????? ????/?????????????? ??_?????????????? ????????????"
-
-#~ msgid "/_View/_Go to/Next la_beled message"
-#~ msgstr "/??_????????????/_?????? ????/?????????????? ??_???????????? ????????????"
-
-#~ msgid "/_View/_Go to/Last read message"
-#~ msgstr "/??_????????????/_?????? ????/????????????_???? ?????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/Parent message"
-#~ msgstr "/??_????????????/_?????? ????/_???????????????????? ????????????"
-
-#~ msgid "/_View/_Go to/_Other folder..."
-#~ msgstr "/??_????????????/_?????? ????/??????_???? ????????????????????????..."
-
-#~ msgid "/_View/Character _encoding/---"
-#~ msgstr "/??_????????????/??_?????? ??????????????/---"
-
-#~ msgid "/_View/Character _encoding/_Auto detect"
-#~ msgstr "/??_????????????/??_?????? ??????????????/_???????????????????? ????????????????????????"
-
-#~ msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/7?????? ???????? (US-ASC_II)"
-
-#~ msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????? (_UTF-8)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????? (ISO-8859-_1)"
-
-#~ msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????? (ISO-_8859-15)"
-
-#~ msgid "/_View/Character _encoding/Western European (Windows-1252)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????? (Windows-1252)"
-
-#~ msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????????? (ISO-8859-_2)"
-
-#~ msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-8858-1_3)"
-
-#~ msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-8859-_4)"
-
-#~ msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????? (ISO-8859-_7)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????? (ISO-8859-_8)"
-
-#~ msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????? (Windows-1255)"
-
-#~ msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????? (ISO-8859-_6)"
-
-#~ msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????? (Windows-1256)"
-
-#~ msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????? (ISO-8859-_9)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-8859-_5)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (KOI8-_R)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (KOI8-_U)"
-
-#~ msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (Windows-1251)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-2022-_JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-2022-JP-2)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (_EUC-JP)"
-
-#~ msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (_Shift__JIS)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????? ?????????????? (_GB2312)"
-
-#~ msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????????? ?????????????? (GBK)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????? ?????????????? (_Big5)"
-
-#~ msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????????????????? ?????????????? (EUC-_??W)"
-
-#~ msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????????????? (ISO-2022-_CN)"
-
-#~ msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (EUC-_KR)"
-
-#~ msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/???????????????? (ISO-2022-KR)"
-
-#~ msgid "/_View/Character _encoding/Thai (TIS-620)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????? (TIS-620)"
-
-#~ msgid "/_View/Character _encoding/Thai (Windows-874)"
-#~ msgstr "/??_????????????/??_?????? ??????????????/?????? (Windows-874)"
-
-#~ msgid "/_View/Decode/---"
-#~ msgstr "/??_????????????/??????????????????????/---"
-
-#~ msgid "/_View/Decode/_8bit"
-#~ msgstr "/??_????????????/??????????????????????/_8-??????????"
-
-#~ msgid "/_View/Decode/_Quoted printable"
-#~ msgstr "/??_????????????/??????????????????????/?????? ???? _????????????????"
-
-#~ msgid "/_View/Decode/_Base64"
-#~ msgstr "/??_????????????/??????????????????????/_???????? 64"
-
-#~ msgid "/_View/Decode/_Uuencode"
-#~ msgstr "/??_????????????/??????????????????????/_???? ??????????????????"
-
-#~ msgid "/_View/All headers"
-#~ msgstr "/??_????????????/?????????????????? ????????????????"
-
-#~ msgid "/_View/Quotes"
-#~ msgstr "/??_????????????/??????????"
-
-#~ msgid "/_View/Quotes/_Fold all"
-#~ msgstr "/??_????????????/??????????/_?????????? ??????"
-
-#~ msgid "/_View/Quotes/Fold from level _2"
-#~ msgstr "/??_????????????/??????????/?????????? ???? ?????????? _2"
-
-#~ msgid "/_View/Quotes/Fold from level _3"
-#~ msgstr "/??_????????????/??????????/?????????? ???? ?????????? _3"
-
-#~ msgid "/_Message/Recei_ve"
-#~ msgstr "/_????????????/????????_????????????"
-
-#~ msgid "/_Message/Recei_ve/Cancel receivin_g"
-#~ msgstr "/_????????????/????????_????????????/_?????????????????????? ????????????????????"
-
-#~ msgid "/_Message/Recei_ve/---"
-#~ msgstr "/_????????????/????????_????????????/---"
-
-#~ msgid "/_Message/_Send queued messages"
-#~ msgstr "/_????????????/?????????? _???????????????????????? ????????????"
-
-#~ msgid "/_Message/Compose a news message"
-#~ msgstr "/_????????????/???????? _???????????? ???? ???????????????????? ??????????"
-
-#~ msgid "/_Message/_Reply"
-#~ msgstr "/_????????????/_??????????????"
-
-#~ msgid "/_Message/Repl_y to"
-#~ msgstr "/_????????????/??_????????????"
-
-#~ msgid "/_Message/Repl_y to/_all"
-#~ msgstr "/_????????????/??_????????????/_??????????"
-
-#~ msgid "/_Message/Repl_y to/_sender"
-#~ msgstr "/_????????????/??_????????????/_????????????"
-
-#~ msgid "/_Message/Repl_y to/mailing _list"
-#~ msgstr "/_????????????/??_????????????/???? _?????????????? ??????????????"
-
-#~ msgid "/_Message/_Forward"
-#~ msgstr "/_????????????/????????_????????"
-
-#~ msgid "/_Message/For_ward as attachment"
-#~ msgstr "/_????????????/_???????????????? ?????? ????????????"
-
-#~ msgid "/_Message/Redirect"
-#~ msgstr "/_????????????/????????_??????????"
-
-#~ msgid "/_Message/Mailing-_List"
-#~ msgstr "/_????????????/?????????????? _??????????????"
-
-#~ msgid "/_Message/Mailing-_List/Post"
-#~ msgstr "/_????????????/?????????????? _??????????????/???????????? ????????????"
-
-#~ msgid "/_Message/Mailing-_List/Help"
-#~ msgstr "/_????????????/?????????????? _??????????????/??????????"
-
-#~ msgid "/_Message/Mailing-_List/Subscribe"
-#~ msgstr "/_????????????/?????????????? _??????????????/??????????????????"
-
-#~ msgid "/_Message/Mailing-_List/Unsubscribe"
-#~ msgstr "/_????????????/?????????????? _??????????????/????????????"
-
-#~ msgid "/_Message/Mailing-_List/View archive"
-#~ msgstr "/_????????????/?????????????? _??????????????/?????????????? ????????????"
-
-#~ msgid "/_Message/Mailing-_List/Contact owner"
-#~ msgstr "/_????????????/?????????????? _??????????????/?????????????? ???? ??????????????????"
-
-#~ msgid "/_Message/M_ove..."
-#~ msgstr "/_????????????/??????_??????????"
-
-#~ msgid "/_Message/_Copy..."
-#~ msgstr "/_????????????/????????_????"
-
-#~ msgid "/_Message/Move to _trash"
-#~ msgstr "/_????????????/???????????????? ?? _??????????"
-
-#~ msgid "/_Message/_Delete..."
-#~ msgstr "/_????????????/_????????????..."
-
-#~ msgid "/_Message/_Mark"
-#~ msgstr "/_????????????/??????????????????_????"
-
-#~ msgid "/_Message/_Mark/_Mark"
-#~ msgstr "/_????????????/??????????????????_????/_??????????????"
-
-#~ msgid "/_Message/_Mark/_Unmark"
-#~ msgstr "/_????????????/??????????????????_????/???????????? ??_??????????????"
-
-#~ msgid "/_Message/_Mark/---"
-#~ msgstr "/_????????????/??????????????????_????/---"
-
-#~ msgid "/_Message/_Mark/Mark as unr_ead"
-#~ msgstr "/_????????????/??????????????????_????/_??????????????????????"
-
-#~ msgid "/_Message/_Mark/Mark as rea_d"
-#~ msgstr "/_????????????/??????????????????_????/_??????????????????"
-
-#~ msgid "/_Message/_Mark/Mark all _read"
-#~ msgstr "/_????????????/??????????????????_????/_?????? ??????????????????"
-
-#~ msgid "/_Message/_Mark/Ignore thread"
-#~ msgstr "/_????????????/??????????????????_????/_???????????????? ????????????????"
-
-#~ msgid "/_Message/_Mark/Unignore thread"
-#~ msgstr "/_????????????/??????????????????_????/?????????? ??_?????????????????? ??????????????????"
-
-#~ msgid "/_Message/_Mark/Watch thread"
-#~ msgstr "/_????????????/??????????????????_????/_?????????? ????????????????"
-
-#~ msgid "/_Message/_Mark/Unwatch thread"
-#~ msgstr "/_????????????/??????????????????_????/?????????? ??????_???????? ??????????????????"
-
-#~ msgid "/_Message/_Mark/Mark as _spam"
-#~ msgstr "/_????????????/??????????????????_????/????_???????????? ????????????"
-
-#~ msgid "/_Message/_Mark/Mark as _ham"
-#~ msgstr "/_????????????/??????????????????_????/????_???????? ????????????"
-
-#~ msgid "/_Message/_Mark/Lock"
-#~ msgstr "/_????????????/??????????????????_????/??????_????????????"
-
-#~ msgid "/_Message/_Mark/Unlock"
-#~ msgstr "/_????????????/??????????????????_????/??????????_????????"
-
-#~ msgid "/_Message/Color la_bel"
-#~ msgstr "/_????????????/_???????? ????????????"
-
-#~ msgid "/_Message/T_ags"
-#~ msgstr "/_????????????/????_??"
-
-#~ msgid "/_Tools/_Address book..."
-#~ msgstr "/_??????????/_??????????????"
-
-#~ msgid "/_Tools/Add sender to address boo_k"
-#~ msgstr "/_??????????/_?????????? ???????????? ?? ??????????????"
-
-#~ msgid "/_Tools/_Harvest addresses"
-#~ msgstr "/_??????????/?????????????????? ??????????_??"
-
-#~ msgid "/_Tools/_Harvest addresses/from _Folder..."
-#~ msgstr "/_??????????/?????????????????? ??????????_/???? ?????????????????? _??????????????????????????..."
-
-#~ msgid "/_Tools/_Harvest addresses/from _Messages..."
-#~ msgstr "/_??????????/?????????????????? ??????????_??/???? ?????????????????? _????????????..."
-
-#~ msgid "/_Tools/_Create filter rule"
-#~ msgstr "/_??????????/???????? ?????????????? _??????????????"
-
-#~ msgid "/_Tools/_Create filter rule/_Automatically"
-#~ msgstr "/_??????????/???????? ?????????????? _??????????????/????????_????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _From"
-#~ msgstr "/_??????????/???????? ?????????????? _??????????????/???? _????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _To"
-#~ msgstr "/_??????????/???????? ?????????????? _??????????????/???? _????????????????"
-
-#~ msgid "/_Tools/_Create filter rule/by _Subject"
-#~ msgstr "/_??????????/???????? ?????????????? _??????????????/???? _????????"
-
-#~ msgid "/_Tools/C_reate processing rule"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/_Automatically"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/_????????????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _From"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? _????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _To"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? ??_??????????????"
-
-#~ msgid "/_Tools/C_reate processing rule/by _Subject"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? _????????"
-
-#~ msgid "/_Tools/Ch_eck for new messages in all folders"
-#~ msgstr "/_??????????/_?????????????? ???????? ???????????? ?? ???????? ??????????????????????????????"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In selected folder"
-#~ msgstr "/_??????????/_???????????????? ???????????????????? ????????????/?? _?????????????????? ??????????????????????????????"
-
-#~ msgid "/_Tools/Delete du_plicated messages/In all folders"
-#~ msgstr "/_??????????/_???????????????? ???????????????????? ????????????/?? _???????? ??????????????????????????????"
-
-#~ msgid "/_Tools/E_xecute"
-#~ msgstr "/_??????????/_???????????? ???????????????? ????????????"
-
-#~ msgid "/_Tools/SSL cer_tificates..."
-#~ msgstr "/_??????????/SSL ??????????_????????????..."
-
-#~ msgid "/_Tools/Filtering Log"
-#~ msgstr "/_??????????/?????????????? ???????? ??????????????"
-
-#~ msgid "/_Tools/Network _Log"
-#~ msgstr "/_??????????/?????????????? ???????? ??????????"
-
-#~ msgid "/_Configuration/_Edit accounts..."
-#~ msgstr "/????????????_????????/?????????????????? _???????? ????????????..."
-
-#~ msgid "/_Configuration/---"
-#~ msgstr "/????????????_????????/---"
-
-#~ msgid "/_Configuration/P_references..."
-#~ msgstr "/????????????_????????/_????????????????..."
-
-#~ msgid "/_Configuration/Pre-pr_ocessing..."
-#~ msgstr "/????????????_????????/??????????_??????????..."
-
-#~ msgid "/_Configuration/Post-pro_cessing..."
-#~ msgstr "/????????????_????????/????_???????????? ????????????..."
-
-#~ msgid "/_Configuration/_Filtering..."
-#~ msgstr "/????????????_????????/_????????????????????..."
-
-#~ msgid "/_Configuration/_Templates..."
-#~ msgstr "/????????????_????????/_??????????????..."
-
-#~ msgid "/_Configuration/_Actions..."
-#~ msgstr "/????????????_????????/_????????????..."
-
-#~ msgid "/_Configuration/Tag_s..."
-#~ msgstr "/????????????_????????/??_??????????..."
-
-#~ msgid "/_Configuration/Plu_gins..."
-#~ msgstr "/????????????_????????/_????????????..."
-
-#~ msgid "/_Help/Icon _Legend"
-#~ msgstr "/????_??????/?????????????? _??????????"
-
-#~ msgid "/_Help/---"
-#~ msgstr "/????_??????/---"
-
-#~ msgid "headers line"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid "message line"
-#~ msgstr "???????????? ????????????"
-
-#~ msgid "/_File/_Close"
-#~ msgstr "/_????????????????/_??????????????"
-
-#~ msgid "/_Message/Compose _new message"
-#~ msgstr "/_????????????/???????????? ???????? ???????????? ???? _???????????????????? ??????????"
-
-#~ msgid "/_Message/Redirec_t"
-#~ msgstr "/_????????????/??????_????????????"
-
-#~ msgid "/_Tools/Create processing rule"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????"
-
-#~ msgid "/_Tools/Create processing rule/_Automatically"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/_????????????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _From"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? _????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _To"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? ??_??????????????"
-
-#~ msgid "/_Tools/Create processing rule/by _Subject"
-#~ msgstr "/_??????????/_???????????????? ?????????????? ???? ????????????/???? _????????"
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "('%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "?????????????? ?????????????? ???? ????????????????:\n"
-#~ "(???%s??? ???? ???????? ???????????????? ?????????????? ????????????????)"
-
-#~ msgid ""
-#~ "Print command line is invalid:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "?????????????? ???? ???????????????? ???? ????????????????????:\n"
-#~ "???%s???"
-
-#~ msgid "/_Open (l)"
-#~ msgstr "/_???????????? (??)"
-
-#~ msgid "/Open _with (o)..."
-#~ msgstr "/???????????? _???? (??)..."
-
-#~ msgid "/_Display as text (t)"
-#~ msgstr "/?????????????? ?????? _?????????? (??)"
-
-#~ msgid "/_Save as (y)..."
-#~ msgstr "/?????????????? _?????? (??)..."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "???????? ?????????????????????????? ?????????????????????? ???? ?????? ?????????? ????????????????."
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "???????????????????????? NNTP ???????? ???? %s:%d ...\n"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "?????? ?????????????? ???????????????????? ?????????? ?????????????????????? ??????????\n"
-
-#~ msgid "couldn't post article.\n"
-#~ msgstr "???????? ???????????? ?????????? ????????????.\n"
-
-#~ msgid "couldn't retrieve article %d\n"
-#~ msgstr "???????? ???????????? ???????????????????? ???????????? %d\n"
-
-#~ msgid "getting xover %d in %s...\n"
-#~ msgstr "???????????????????? XOVER %d ?? %s...\n"
-
-#~ msgid "error occurred while getting xover.\n"
-#~ msgstr "?????????????? ???? ???????????? ?????? ???????????????????? XOVER.\n"
-
-#~ msgid "error occurred while getting xhdr.\n"
-#~ msgstr "?????????????? ???? ???????????? ?????? ???????????????????? XHDR.\n"
-
-#~ msgid "kB"
-#~ msgstr "kB"
-
-#~ msgid ""
-#~ "This plugin uses Clam AntiVirus to scan all messages that are received "
-#~ "from an IMAP, LOCAL or POP account.\n"
-#~ "\n"
-#~ "When a message attachment is found to contain a virus it can be deleted "
-#~ "or saved in a specially designated folder.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
-#~ msgstr ""
-#~ "???????? ?????????????? ?????????????? Clam ?????????????????? ???? ?????????????? ???????? ???????????? ???????? ???? "
-#~ "???????????????????? ???? IMAP, ???????????????? ?????? POP ????????????.\n"
-#~ "\n"
-#~ "???????? ???? ?? ???????????? ?????????????? ???????????? ???? ??????????????, ???????? ???????? ???????? ???????????????? ?????? "
-#~ "???????????????? ?? ???????????????????? ???????????????? ????????????????????????.\n"
-#~ "\n"
-#~ "???????????? ???????????? ???? ?????????????????? ?? /????????????????????/????????????????/????????????/Clam ??????????????????"
-
-#~ msgid "Scan archive contents"
-#~ msgstr "?????????????? ???????????????? ????????????"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "???????? ?????????????????? ??????????????????"
-
-#~ msgid "Do not load remote links in mails"
-#~ msgstr "?????? ?????????????????? ???????????????? ???????? ?? ????????????????."
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "???????????????????? ???????? ???????????? ???--local???"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "?????????????? ???????? ???? ???????? ???????? ?????????????? ???????????????? ???????????????????? ????????????"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "?????????? ???????????????? ?????????????? (???????????????? ????????????????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "???????????????????? ???????? ???????????? ???--fullwindow???"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "???? ???????? ???? ???????????????? dillo ?????????????? ???????????????? ?? PATH-??. ???? ???? ???? ?????????????????????"
-
-#~ msgid "text/html"
-#~ msgstr "text/html"
-
-#~ msgid "Orientation"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "???????? ?????????????? ???????????????? ?????????? ???????????????????? ?????????????????? ?? ?????????????????? ??????, "
-#~ "???????????????????? ???? ???? ?????????? ???????? ?????? ?????????????????????? ????????????.\n"
-#~ "\n"
-#~ "?????????????????? ?????????????? ???? ???????????? ?????? ???????????? ???????????????????????? ????????????, ?? ?????????????????? "
-#~ "?????? ???????????? ??????????. ???????????????? ???????????? ?????????????????? ????????, ?????????????????????? ?? ???????????? "
-#~ "???????? ???????? ????????????."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "???????????? Claws Mail ?????? ?????????????????? ?? ?????????????????? ??????"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "?????????????? Claws Mail ?????????????????? ?????????????? ?? ???????????????????? ???????? ???????????? ????\n"
-#~ "?????????????? ?????????????? ???????? ???? ???????????? ???? ?????????? ?????????????? ???? ??????????????????."
-
-#~ msgid "Minimize to tray"
-#~ msgstr "???????????? ?? ?????????????????? ????????????"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "?????????????? Claws Mail ?????????????????? ?????????????? ?? ???????????????????? ???????????? ???????????? ???? ???? "
-#~ "????????????????????"
-
-#~ msgid "Bandwidth-efficient mode"
-#~ msgstr "?????????? ???????????? ??????????????"
-
-#~ msgid "Insert signature automatically"
-#~ msgstr "???????????????????? ?????????????????? ??????????????"
-
-#~ msgid "Use a specific format for new messages"
-#~ msgstr "?????????????? ?????????????????????????? ???????????? ?????????? ????????????"
-
-#~ msgid "Use a specific reply quote format"
-#~ msgstr "?????????????? ?????????????????????????? ???????????? ???????????? ????????????????"
-
-#~ msgid "Use a specific forward quote format"
-#~ msgstr "?????????????? ?????????????????????????? ???????????? ???????????? ???????????????????? ????????????"
-
-#~ msgid "Command line"
-#~ msgstr "???????????????? ????????????"
-
-#~ msgid "Info..."
-#~ msgstr "??????????????????????..."
-
-#~ msgid "Quotation characters"
-#~ msgstr "?????????????????? ???? ??????????"
-
-#~ msgid "Print command"
-#~ msgstr "?????????????? ???? ????????????????"
-
-#~ msgid "Filtering action configuration"
-#~ msgstr "???????????????????? ???????????? ???? ????????????????????"
-
-#~ msgid "Test RegExp"
-#~ msgstr "?????????? ???????????????????? ????????????"
-
-#~ msgid "Default To:"
-#~ msgstr "?????????????????????????? ????????????????:"
-
-#~ msgid "Age greater than (days)"
-#~ msgstr "?????????????? ???? (????????)"
-
-#~ msgid "Unread flag"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Marked flag"
-#~ msgstr "?????????????????? ????????????"
-
-#~ msgid "Deleted flag"
-#~ msgstr "????????????????"
-
-#~ msgid "Forwarded flag"
-#~ msgstr "????????????????????"
-
-#~ msgid "Locked flag"
-#~ msgstr "??????????????????"
-
-#~ msgid "Spam flag"
-#~ msgstr "???????????? ???????????????? ????????????"
-
-#~ msgid "Score equal to"
-#~ msgstr "???????? ???????????? ????"
-
-#~ msgid "Test"
-#~ msgstr "??????????????"
-
-#~ msgid "Size greater than (bytes)"
-#~ msgstr "???????????????? ???????? ???? (??????????????)"
-
-#~ msgid "Size exactly (bytes)"
-#~ msgstr "???????????????? ?????????? (??????????????)"
-
-#~ msgid "Found in addressbook"
-#~ msgstr "?????????????????? ?? ????????????????"
-
-#~ msgid "Tagged"
-#~ msgstr "????????????????"
-
-#~ msgid "or"
-#~ msgstr "??????"
-
-#~ msgid "and"
-#~ msgstr "??"
-
-#~ msgid "Predicate"
-#~ msgstr "????????????"
-
-#~ msgid "Boolean Op"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Value is not set."
-#~ msgstr "???????????????? ???????? ????????????????."
-
-#~ msgid "Select key bindings"
-#~ msgstr "?????????????????? ?????????????????? ??????????????"
-
-#~ msgid "Old Sylpheed"
-#~ msgstr "?????????? Sylpheed"
-
-#~ msgid " Set key bindings... "
-#~ msgstr " ?????????????????? ?????????????????????????? ???????? ???????????????????? ??????????????... "
-
-#~ msgid "New message format"
-#~ msgstr "???????????? ???????? ????????????"
-
-#~ msgid "Play sound"
-#~ msgstr "???????????????????? ????????"
-
-#~ msgid "Do nothing"
-#~ msgstr "???? ???????? ??????????"
-
-#~ msgid " Symbols... "
-#~ msgstr " ??????????????... "
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "???????????????????? ???????????? ?????????? ?????????????? ??????????????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "???????????????????? ???????????? ?????????? ?????????????????? ????????????"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "???????????????????? ???????????? ?????????? ?????????????? ???? ?????????????? ????????????"
-
-#~ msgid "Available toolbar icons"
-#~ msgstr "???????????????? ?????????? ???? ???????????? ??????????"
-
-#~ msgid "Displayed toolbar items"
-#~ msgstr "?????????????????? ???????????? ???? ???????????? ??????????"
-
-#~ msgid "Customize Toolbars"
-#~ msgstr "???????????? ??????????"
-
-#~ msgid "Wrap messages at"
-#~ msgstr "???????????? ???????????? ????"
-
-#~ msgid "Reply format"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid "Forward format"
-#~ msgstr "???????????? ????????????????????????"
-
-#~ msgid "Description of symbols..."
-#~ msgstr "???????? ??????????????..."
-
-#~ msgid "Message reply quotation mark format error."
-#~ msgstr "???????????? ?? ?????????????? ???????????? ???????????? ???? ?????????????? ????????????."
-
-#~ msgid "Message forward quotation mark format error."
-#~ msgstr "???????????? ?? ?????????????? ???????????? ???????????? ???? ???????????????????? ????????????."
-
-#~ msgid "/Repl_y to/_all"
-#~ msgstr "/??_????????????/_??????????"
-
-#~ msgid "/Repl_y to/_sender"
-#~ msgstr "/??_????????????/_????????????"
-
-#~ msgid "/Repl_y to/mailing _list"
-#~ msgstr "/??_????????????/???? _?????????????? ??????????????"
-
-#~ msgid "/Redirect"
-#~ msgstr "/????????_??????????"
-
-#~ msgid "/_Mark/_Mark"
-#~ msgstr "/??????????????????_????/_??????????????"
-
-#~ msgid "/_Mark/_Unmark"
-#~ msgstr "/??????????????????_????/???????????? ??_??????????????"
-
-#~ msgid "/_Mark/---"
-#~ msgstr "/??????????????????_????/---"
-
-#~ msgid "/_Mark/Mark as unr_ead"
-#~ msgstr "/??????????????????_????/_??????????????????????"
-
-#~ msgid "/_Mark/Mark as rea_d"
-#~ msgstr "/??????????????????_????/_??????????????????"
-
-#~ msgid "/_Mark/Mark all read"
-#~ msgstr "/??????????????????_????/_?????? ??????????????????"
-
-#~ msgid "/_Mark/Ignore thread"
-#~ msgstr "/??????????????????_????/_???????????????? ????????????????"
-
-#~ msgid "/_Mark/Unignore thread"
-#~ msgstr "/??????????????????_????/?????????? ??_?????????????????? ??????????????????"
-
-#~ msgid "/_Mark/Watch thread"
-#~ msgstr "/??????????????????_????/_?????????? ????????????????"
-
-#~ msgid "/_Mark/Unwatch thread"
-#~ msgstr "/??????????????????_????/?????????? ??????_???????? ??????????????????"
-
-#~ msgid "/_Mark/Mark as _spam"
-#~ msgstr "/??????????????????_????/????_???????????? ????????????"
-
-#~ msgid "/_Mark/Mark as _ham"
-#~ msgstr "/??????????????????_????/????_???????? ????????????"
-
-#~ msgid "/_Mark/Lock"
-#~ msgstr "/??????????????????_????/????_??????????????"
-
-#~ msgid "/_Mark/Unlock"
-#~ msgstr "/??????????????????_????/??????_????????????"
-
-#~ msgid "/Create f_ilter rule/_Automatically"
-#~ msgstr "/???????? ?????????????? _??????????????/????????_????????????"
-
-#~ msgid "/Create f_ilter rule/by _From"
-#~ msgstr "/???????? ?????????????? _??????????????/???? _????????????"
-
-#~ msgid "/Create f_ilter rule/by _To"
-#~ msgstr "/???????? ?????????????? _??????????????/???? _????????????????"
-
-#~ msgid "/Create f_ilter rule/by _Subject"
-#~ msgstr "/???????? ?????????????? _??????????????/???? _????????"
-
-#~ msgid "/Create processing rule/_Automatically"
-#~ msgstr "/???????? ?????????????? ???? ????_????????/????????_????????????"
-
-#~ msgid "/Create processing rule/by _From"
-#~ msgstr "/???????? ?????????????? ???? ????_????????/???? _????????????"
-
-#~ msgid "/Create processing rule/by _To"
-#~ msgstr "/???????? ?????????????? ???? ????_????????/???? _????????????????"
-
-#~ msgid "/Create processing rule/by _Subject"
-#~ msgstr "/???????? ?????????????? ???? ????_????????/???? _????????"
-
-#~ msgid "/_View/Message _source"
-#~ msgstr "/??_????????????/??_???????????? ????????????"
-
-#~ msgid "/_View/All _headers"
-#~ msgstr "/??_????????????/?????????????????? _????????????????"
-
-#~ msgid " items selected"
-#~ msgstr " ?????????????????? ????????????"
-
-#~ msgid "Do you really want to delete the %d selected messages?"
-#~ msgstr "???? ???? ???????????? ???????????? ???? %d ?????????????????? ???????????? ???????? ?????????????????"
-
-#~ msgid "'View Log'"
-#~ msgstr "????????????????? ???????????????? ???????????"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (??????????????: ????????)"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (??????????????: ????????)\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " ???? ?????????? ?????????????? ???????????????? (??????????????: ????????)"
-
-#~ msgid "/Reply to all with _quote"
-#~ msgstr "/?????????????? ?????????? _???? ??????????????"
-
-#~ msgid "/_Reply to all without quote"
-#~ msgstr "/?????????????? ?????????? _?????? ????????????"
-
-#~ msgid "/Reply to list with _quote"
-#~ msgstr "/?????????????? ???? ?????????????? ?????????????? _???? ??????????????"
-
-#~ msgid "/_Reply to list without quote"
-#~ msgstr "/?????????????? ???? ?????????????? ?????????????? _?????? ????????????"
-
-#~ msgid "/Reply to sender with _quote"
-#~ msgstr "/?????????????? ???????????? _???? ??????????????"
-
-#~ msgid "/_Reply to sender without quote"
-#~ msgstr "/?????????????? ???????????? _?????? ????????????"
-
-#~ msgid "on /media/mmc1"
-#~ msgstr "???? /media/mmc1"
-
-#~ msgid "on /media/mmc2"
-#~ msgstr "???? /media/mmc2"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">???????????? ????????????????</span>"
-
-#~ msgid ""
-#~ "SMTP password:\n"
-#~ "<span size=\"small\">(empty to use the same as receive)</span>"
-#~ msgstr ""
-#~ "SMTP ??????????????:\n"
-#~ "<span size=\"small\">(???????????????? ???????????? ?????? ???? ???????? ?????? ?? ???? ????????????????????)</"
-#~ "span>"
-
-#~ msgid "Error %d"
-#~ msgstr "???????????? %d"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: ?????????????????? ?????????????????? ???????? ???????????????? ???? Atom ????????????. ???????? ???????????? "
-#~ "?????????????????? ?????????????????? ???? ???%s???"
-
-#~ msgid "/Subscribe new feed..."
-#~ msgstr "/?????????????? ???? ???????? ??????????..."
-
-#~ msgid "/Unsubscribe feed..."
-#~ msgstr "/???????????? ???? ????????????..."
-
-#~ msgid "/Feed properties..."
-#~ msgstr "/???????????????? ????????????..."
-
-#~ msgid "/Create new folder..."
-#~ msgstr "/?????????????? ???????? ????????????????????????..."
-
-#~ msgid "/Delete folder..."
-#~ msgstr "/???????????? ????????????????????????..."
-
-#~ msgid "/Remove folder tree..."
-#~ msgstr "/???????????? RSS ??????????????..."
-
-#~ msgid "/File/Add mailbox/RSSyl..."
-#~ msgstr "/????????????????/???????? ??????????????/RSSyl..."
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "???????????????? ???????????????? ??????????"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "???????????????? ?????? ???????????????????????? ?? ??????????????????????????"
-
-#~ msgid "PDF Viewer Plugin"
-#~ msgstr "?????????????? ???? ?????????????? PDF-??????"
-
-#~ msgid "/New meeting..."
-#~ msgstr "/???????? ????????????????..."
-
-#~ msgid "/Export calendar..."
-#~ msgstr "/???????????? ????????????????..."
-
-#~ msgid "/Subscribe to webCal..."
-#~ msgstr "/?????????????? ???? webCal..."
-
-#~ msgid "/Unsubscribe..."
-#~ msgstr "/????????????..."
-
-#~ msgid "/Rename..."
-#~ msgstr "/??????????????????..."
diff --git a/po/tr.po b/po/tr.po
index 8081188..bf1086d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -18839,1063 +18839,3 @@ msgid ""
 msgstr ""
 "Claws Mail hizmete haz??r.\n"
 "Ba??lamak i??in Kaydet tu??una bas??n."
-
-#~ msgid "TLS"
-#~ msgstr "TLS"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
-
-#~ msgid ""
-#~ "Enable secure connection to the LDAP server via SSL. If connection fails, be sure "
-#~ "to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT "
-#~ "fields)."
-#~ msgstr ""
-#~ "SSL ??zerinden LDAP sunucusuna g??venli ba??lant??y?? a??. E??er ba??lant?? ba??ar??s??z "
-#~ "olursa, ldap.conf ayarlar??n??n (TLS_CACERTDIR VE TLS_REQCERT) do??rulu??undan emin "
-#~ "olun."
-
-#~ msgid "No TLS"
-#~ msgstr "TLS yok"
-
-#~ msgid "IMAP4"
-#~ msgstr "IMAP4"
-
-#~ msgid "Use SSL for POP3 connection"
-#~ msgstr "POP3 ba??lant??s?? i??in SSL kullan"
-
-#~ msgid "Use SSL for IMAP4 connection"
-#~ msgstr "IMAP4 ba??lant??s?? i??in SSL kullan"
-
-#~ msgid "Use SSL for NNTP connection"
-#~ msgstr "NNTP ba??lant??s?? i??in SSL kullan"
-
-#~ msgid "Use SSL for SMTP connection"
-#~ msgstr "SMTP ba??lant??s?? i??in SSL kullan"
-
-#~ msgid "Register Claws Mail"
-#~ msgstr "Claws Mail'i Kayda Ge??ir"
-
-#~ msgid "Re_move"
-#~ msgstr "????_kar"
-
-#~ msgid "_Other folder..."
-#~ msgstr "_Di??er dizin..."
-
-#~ msgid "minute(s)"
-#~ msgstr "dakikada"
-
-#~ msgid "Key export isn't implemented in Windows."
-#~ msgstr "Anahtar y??kleme ??zelli??i Windows'ta yok."
-
-#~ msgid "day(s)"
-#~ msgstr "g??n(ler)"
-
-#~ msgid "Automatic (Recommended)"
-#~ msgstr "Do??rudan (??nerilen)"
-
-#~ msgid "   Key import isn't implemented in Windows.\n"
-#~ msgstr "   Anahtar ekleme ??zelli??i Windows'ta yok.\n"
-
-#~ msgid "Move deleted mails to trash and expunge immediately"
-#~ msgstr "Silinen postalar?? ????pe ta???? ve derhal kald??r"
-
-#~ msgid "Delete message(s)"
-#~ msgstr "??leti(leri)  sil"
-
-#~ msgid "Lookup name:"
-#~ msgstr "Aranacak isim:"
-
-#~ msgid "Refresh interval in minutes:"
-#~ msgstr "Ge??ici bellek yineleme s??kl??????"
-
-#~ msgid "If an item changes, do not mark it as new:"
-#~ msgstr "Bir ??ge de??i??irse, yeni olarak i??aretleme:"
-
-#~ msgid ""
-#~ "<b>Message summary</b>\n"
-#~ "<b>New:</b> %d\n"
-#~ "<b>Unread:</b> %d\n"
-#~ "<b>Total:</b> %d\n"
-#~ "<b>Size:</b> %s\n"
-#~ "\n"
-#~ "<b>Marked:</b> %d\n"
-#~ "<b>Replied:</b> %d\n"
-#~ "<b>Forwarded:</b> %d\n"
-#~ "<b>Locked:</b> %d\n"
-#~ "<b>Ignored:</b> %d\n"
-#~ "<b>Watched:</b> %d"
-#~ msgstr ""
-#~ "<b>??leti ??zeti</b>\n"
-#~ "<b>Yeni:</b> %d\n"
-#~ "<b>Okunmayna:</b> %d\n"
-#~ "<b>Toplam:</b> %d\n"
-#~ "<b>Boyut:</b> %s\n"
-#~ "\n"
-#~ "<b>????aretlenen:</b> %d\n"
-#~ "<b>Cevaplanan:</b> %d\n"
-#~ "<b>Y??nlendirilen:</b> %d\n"
-#~ "<b>Kilitlenen:</b> %d\n"
-#~ "<b>Dikkate al??nmayan:</b> %d\n"
-#~ "<b>Takip edilen:</b> %d"
-
-#~ msgid "+_Insert"
-#~ msgstr "+_Ekle"
-
-#~ msgid "+_Send"
-#~ msgstr "+_G??nder"
-
-#~ msgid "<i>%s</i>"
-#~ msgstr "<i>%s</i>"
-
-#~ msgid "+_Save to Drafts"
-#~ msgstr "+Taslaklara _Kaydet"
-
-#~ msgid ""
-#~ ">. \n"
-#~ "\n"
-#~ msgstr ""
-#~ ">. \n"
-#~ "\n"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">\"%s\" ??ununla de??i??tir: </span>"
-
-#~ msgid "IMAP error on %s: authenticated\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: onaylanm????\n"
-
-#~ msgid "IMAP error on %s: not authenticated\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: onaylanmam????\n"
-
-#~ msgid "IMAP error on %s: stream error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: ak???? hatas??\n"
-
-#~ msgid "IMAP error on %s: connection refused\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: ba??lant?? reddedildi\n"
-
-#~ msgid "IMAP error on %s: fatal error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: ??l??mc??l hata\n"
-
-#~ msgid "IMAP error on %s: NOOP error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: NOOP hatas??\n"
-
-#~ msgid "IMAP error on %s: COPY error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: COPY hatas??\n"
-
-#~ msgid "IMAP error on %s: LIST error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: LIST hatas??\n"
-
-#~ msgid "IMAP error on %s: LSUB error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: LSUB hatas??\n"
-
-#~ msgid "IMAP error on %s: SASL error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: SASL hatas??\n"
-
-#~ msgid "IMAP error on %s: SSL error\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: SSL hatas??\n"
-
-#~ msgid "IMAP error on %s: Unknown error [%d]\n"
-#~ msgstr "%s ??zerinde IMAP hatas??: Bilinmeyen hata [%d]\n"
-
-#~ msgid "+_Unsubscribe"
-#~ msgstr "+_Abonelikten ????k"
-
-#~ msgid "Sylpheed-Claws 2.6.0 (or older)"
-#~ msgstr "Sylpheed-Claws 2.6.0 (ya da daha eski)"
-
-#~ msgid "Sylpheed-Claws 1.9.15 (or older)"
-#~ msgstr "Sylpheed-Claws 1.9.15 (ya da daha eski)"
-
-#~ msgid "Sylpheed-Claws 1.0.5 (or older)"
-#~ msgstr "Sylpheed-Claws 1.0.5 (ya da daha eski)"
-
-#~ msgid "<b>Type: </b>"
-#~ msgstr "<b>T??r: <b>"
-
-#~ msgid "<b>Size: </b>"
-#~ msgstr "<b>Boyut: <b>"
-
-#~ msgid "<b>Filename: </b>"
-#~ msgstr "<b>Dosya ad??: </b>"
-
-#~ msgid "<span color=\"red\">Error reading cache stats</span>"
-#~ msgstr "<span weight=\"red\">Ge??ici bellek istatistikleri okunurken hata</span>"
-
-#~ msgid "+_Save"
-#~ msgstr "+_Kaydet"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%sL??tfen parolay?? girin:</span>\n"
-#~ "\n"
-#~ "%.*s\n"
-
-#~ msgid "                    uid \"%s\" (Validity: %s)\n"
-#~ msgstr "                    uid \"%s\" (Ge??erlilik: %s)\n"
-
-#~ msgid ""
-#~ "<b>Fetch comments on posts aged less than:</b>\n"
-#~ "<small>(In days; set to -1 to fetch all comments)</small>"
-#~ msgstr ""
-#~ "<b>??u s??reden daha ??nce g??nderilmi?? yorumlar?? al:</b>\n"
-#~ "<small>(G??n biriminden; hepsini almak i??in -1 yaz)</small>"
-
-#~ msgid "%s <span weight=\"bold\">(this event recurs)</span>"
-#~ msgstr "%s <span weight=\"bold\">(tekrarlayan etkinlik)</span"
-
-#~ msgid "<b> on:</b>"
-#~ msgstr "<b> g??n:</b>"
-
-#~ msgid "+Discard"
-#~ msgstr "+Vaz ge??"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>From: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>G??nderen: %s, ??zerinde %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>To: %s, on %s</span>"
-#~ msgstr ""
-#~ "%s\n"
-#~ "<span color='%s' style='italic'>Al??c??: %s, ??zerinde %s</span>"
-
-#~ msgid "<span weight=\"bold\">Your name:</span>"
-#~ msgstr "<span weight=\"bold\">Ad??n??z:</span>"
-
-#~ msgid "<span weight=\"bold\">Your email address:</span>"
-#~ msgstr "<span weight=\"bold\">E-posta adresiniz:</span>"
-
-#~ msgid "<span weight=\"bold\">Mailbox name:</span>"
-#~ msgstr "<span weight=\"bold\">Posta kutusu ad??:</span>"
-
-#~ msgid "<span weight=\"bold\">SMTP server address:</span>"
-#~ msgstr "<span weight=\"bold\">SMTP sunucu adresi:</span>"
-
-#~ msgid "<span weight=\"bold\">Server address:</span>"
-#~ msgstr "<span weight=\"bold\">Sunucu adresi:</span>"
-
-#~ msgid "<span weight=\"bold\">Local mailbox:</span>"
-#~ msgstr "<span weight=\"bold\">Yerel posta kutusu:</span>"
-
-#~ msgid "<span weight=\"bold\">Server type:</span>"
-#~ msgstr "<span weight=\"bold\">Sunucu t??r??:</span>"
-
-#~ msgid "<span weight=\"bold\">Username:</span>"
-#~ msgstr "<span weight=\"bold\">Kullan??c?? ad??:</span>"
-
-#~ msgid "%s: host lookup timed out.\n"
-#~ msgstr "%s: sunucu ba??lant??s?? zaman a????m??na u??rad??.\n"
-
-# tekrar bak!
-#~ msgid "%s: unknown host.\n"
-#~ msgstr "%s: bilinmeyen sunucu.\n"
-
-#~ msgid "Failed."
-#~ msgstr "Ba??ar??s??z oldu."
-
-#~ msgid "New folder name must not contain the namespace path separator"
-#~ msgstr "Yeni dizin ismi dizin yolu ayrac?? i??ermemelidir."
-
-#~ msgid "can't copy message %s to %s\n"
-#~ msgstr "%s iletisi %s ??zerine kopyalanamad??\n"
-
-#~ msgid "failed to write Fetchinfo configuration to file\n"
-#~ msgstr "Fetchinfo yap??land??r??lmas?? dosyaya yazd??r??lamad??\n"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData eklentisi: Kimlik denetimi\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "GData Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GData Eklentisi: Eklenti yap??land??rmas?? dosyaya yazd??r??lamad??\n"
-
-#~ msgid "Found location: (%.2f,%.2f)"
-#~ msgstr "Konum bulundu: (%.2f,%.2f)"
-
-#~ msgid "Could not resolve location of IP address "
-#~ msgstr "IP adresinin konumu ????z??lemedi"
-
-#~ msgid "Try to locate sender"
-#~ msgstr "G??nderen konumunu bulmaya ??al????"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "Birle??ik Arab Emirlikleri"
-
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua ve Barbuda"
-
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
-
-#~ msgid "Albania"
-#~ msgstr "Arnavutluk"
-
-#~ msgid "Armenia"
-#~ msgstr "Ermenistan"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Hollanda Antilleri"
-
-#~ msgid "Angola"
-#~ msgstr "Angola"
-
-#~ msgid "Antarctica"
-#~ msgstr "Antartika"
-
-#~ msgid "Argentina"
-#~ msgstr "Arjantin"
-
-#~ msgid "American Samoa"
-#~ msgstr "Amerikan Samoas??"
-
-#~ msgid "Austria"
-#~ msgstr "Avusturya"
-
-#~ msgid "Australia"
-#~ msgstr "Avustralya"
-
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbaycan"
-
-#~ msgid "Bosnia And Herzegovina"
-#~ msgstr "Bosna Hersek"
-
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Banglade??"
-
-#~ msgid "Belgium"
-#~ msgstr "Bel??ika"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
-
-#~ msgid "Bulgaria"
-#~ msgstr "Bulgaristan"
-
-#~ msgid "Bahrain"
-#~ msgstr "Bahreyn"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundi Cumhuriyeti"
-
-#~ msgid "Benin"
-#~ msgstr "Benin Cumhuriyeti"
-
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda Adalar??"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Dar??'s Selam Devleti"
-
-#~ msgid "Bolivia"
-#~ msgstr "Bolivya"
-
-#~ msgid "Brazil"
-#~ msgstr "Brezilya"
-
-#~ msgid "Bahamas"
-#~ msgstr "Bahamalar"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet Adas??"
-
-#~ msgid "Botswana"
-#~ msgstr "Botsvana Cumhuriyeti"
-
-#~ msgid "Belarus"
-#~ msgstr "Belarus Cumhuriyeti"
-
-#~ msgid "Belize"
-#~ msgstr "Belize"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Cocos (Keeling) Adalar??"
-
-#~ msgid "Central African Republic"
-#~ msgstr "Orta Afrika Cumhuriyeti"
-
-#~ msgid "Congo"
-#~ msgstr "Kongo"
-
-#~ msgid "Switzerland"
-#~ msgstr "??svi??re"
-
-#~ msgid "Cote D'Ivoire"
-#~ msgstr "Fildi??i Sahili Cumhuriyeti"
-
-#~ msgid "Cook Islands"
-#~ msgstr "Cook Adalar??"
-
-#~ msgid "Chile"
-#~ msgstr "??ili"
-
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
-
-#~ msgid "China"
-#~ msgstr "??in"
-
-#~ msgid "Colombia"
-#~ msgstr "Kolombiya"
-
-#~ msgid "Costa Rica"
-#~ msgstr "Kosta Rika"
-
-#~ msgid "Cuba"
-#~ msgstr "K??ba"
-
-#~ msgid "Cape Verde"
-#~ msgstr "Ye??il Burun Adalar??"
-
-#~ msgid "Christmas Island"
-#~ msgstr "Christmas Adas??"
-
-#~ msgid "Cyprus"
-#~ msgstr "K??br??s"
-
-#~ msgid "Czech Republic"
-#~ msgstr "??ek Cumhuriyeti"
-
-#~ msgid "Germany"
-#~ msgstr "Almanya"
-
-#~ msgid "Djibouti"
-#~ msgstr "Cibuti"
-
-#~ msgid "Denmark"
-#~ msgstr "Danimarka"
-
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "Dominik Cumhuriyeti"
-
-#~ msgid "Algeria"
-#~ msgstr "Cezayir"
-
-#~ msgid "Ecuador"
-#~ msgstr "Ekvador"
-
-#~ msgid "Estonia"
-#~ msgstr "Estonay"
-
-#~ msgid "Egypt"
-#~ msgstr "M??s??r"
-
-#~ msgid "Western Sahara"
-#~ msgstr "Bat?? Sahra"
-
-#~ msgid "Eritrea"
-#~ msgstr "Eritre"
-
-#~ msgid "Spain"
-#~ msgstr "??spanya"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Etiyopya"
-
-#~ msgid "Finland"
-#~ msgstr "Finlandiya"
-
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
-
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falkland (Malvinas) Adalar??"
-
-#~ msgid "Micronesia, Federated States Of"
-#~ msgstr "Mikronezya Federal Devletleri"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "Faroe Adalar??"
-
-#~ msgid "France"
-#~ msgstr "Fransa"
-
-#~ msgid "France, Metropolitan"
-#~ msgstr "Fransa"
-
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Birle??ik Krall??k"
-
-#~ msgid "Grenada"
-#~ msgstr "Grenade"
-
-#~ msgid "Georgia"
-#~ msgstr "G??rcistan"
-
-#~ msgid "French Guiana"
-#~ msgstr "Frans??z Guyanas??"
-
-#~ msgid "Ghana"
-#~ msgstr "Gana"
-
-#~ msgid "Gibraltar"
-#~ msgstr "Cebelitar??k"
-
-#~ msgid "Greenland"
-#~ msgstr "Gr??nland"
-
-#~ msgid "Gambia"
-#~ msgstr "Gambiya"
-
-#~ msgid "Guinea"
-#~ msgstr "Gine"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvator Ginesi"
-
-#~ msgid "Greece"
-#~ msgstr "Yunanistan"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "G??ney Georgia ve G??ney Sandwich Adalar??"
-
-#~ msgid "Guatemala"
-#~ msgstr "Guetamala"
-
-#~ msgid "Guam"
-#~ msgstr "Guam Topra????"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Gine Bissau Cumhuriyeti"
-
-#~ msgid "Guyana"
-#~ msgstr "Guyana Kooperatif Cumhuriyeti"
-
-#~ msgid "Hong Kong"
-#~ msgstr "Hon Kong"
-
-#~ msgid "Heard Island And Mcdonald Islands"
-#~ msgstr "Heard ve McDonald adalar??"
-
-#~ msgid "Honduras"
-#~ msgstr "Honduras Cumhuriyeti"
-
-#~ msgid "Croatia"
-#~ msgstr "H??rvatistan"
-
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-
-#~ msgid "Hungary"
-#~ msgstr "Macaristan"
-
-#~ msgid "Indonesia"
-#~ msgstr "Endonezya"
-
-#~ msgid "Ireland"
-#~ msgstr "??rlanda"
-
-#~ msgid "Israel"
-#~ msgstr "??srail"
-
-#~ msgid "India"
-#~ msgstr "Hindistan"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britanya Hint Okyanusu Topraklar??"
-
-#~ msgid "Iraq"
-#~ msgstr "Irak"
-
-#~ msgid "Iran, Islamic Republic Of"
-#~ msgstr "??ran ??sl??m Cumhuriyeti"
-
-#~ msgid "Iceland"
-#~ msgstr "??zlanda"
-
-#~ msgid "Italy"
-#~ msgstr "??talya"
-
-#~ msgid "Jamaica"
-#~ msgstr "Jamaika"
-
-#~ msgid "Jordan"
-#~ msgstr "??rd??n"
-
-#~ msgid "Japan"
-#~ msgstr "Japonya"
-
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "K??rg??zistan"
-
-#~ msgid "Cambodia"
-#~ msgstr "Kambo??ya"
-
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-
-#~ msgid "Comoros"
-#~ msgstr "Komorlar Birli??i"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts ve Nevis Federasyonu"
-
-#~ msgid "Korea, Democratic People'S Republic Of"
-#~ msgstr "Kore Demokratik Halk Cumhuriyeti"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "Kore Cumhuriyeti"
-
-#~ msgid "Kuwait"
-#~ msgstr "Kuveyt"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "Cayman Adalar??"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "Kazakistan"
-
-#~ msgid "Lao People'S Democratic Republic"
-#~ msgstr "Lao Demokratik Halk Cumhuriyeti"
-
-#~ msgid "Lebanon"
-#~ msgstr "L??bnan"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "Lihte??tayn"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Liberia"
-#~ msgstr "Liberya Cumhuriyeti"
-
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho Krall??????"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litvanya"
-
-#~ msgid "Luxembourg"
-#~ msgstr "L??ksemburg"
-
-#~ msgid "Latvia"
-#~ msgstr "Letonya Cumhuriyeti"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libya Devleti"
-
-#~ msgid "Morocco"
-#~ msgstr "Fas"
-
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "Modova Cumhuriyeti"
-
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "Mar??al Adalar??"
-
-#~ msgid "Macedonia, The Former Yugoslav Republic Of"
-#~ msgstr "Makedonya Eski Yugoslav Cumhuriyeti"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Mongolia"
-#~ msgstr "Mo??olistan"
-
-#~ msgid "Macao"
-#~ msgstr "Macao"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Kuzey Mariana Adalar??"
-
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
-
-#~ msgid "Mauritania"
-#~ msgstr "Moritanya ??sl??m Cumhuriyeti"
-
-#~ msgid "Montserrat"
-#~ msgstr "Montserat"
-
-#~ msgid "Malta"
-#~ msgstr "Malta"
-
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius Cumhuriyeti"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldivler"
-
-#~ msgid "Malawi"
-#~ msgstr "Malavi"
-
-#~ msgid "Mexico"
-#~ msgstr "Maksika"
-
-#~ msgid "Malaysia"
-#~ msgstr "Malezya"
-
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-
-#~ msgid "Namibia"
-#~ msgstr "Namibya"
-
-#~ msgid "New Caledonia"
-#~ msgstr "Yeni Kaledonya"
-
-#~ msgid "Niger"
-#~ msgstr "Nijer"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk Adas??"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nijerya"
-
-#~ msgid "Nicaragua"
-#~ msgstr "Nikaragua"
-
-#~ msgid "Netherlands"
-#~ msgstr "Hollanda"
-
-#~ msgid "Norway"
-#~ msgstr "Norve??"
-
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru Cumhuriyeti"
-
-#~ msgid "Niue"
-#~ msgstr "Niue"
-
-#~ msgid "New Zealand"
-#~ msgstr "Yeni Zelanda"
-
-#~ msgid "Oman"
-#~ msgstr "Umman"
-
-#~ msgid "Panama"
-#~ msgstr "Panama"
-
-#~ msgid "Peru"
-#~ msgstr "Peru"
-
-#~ msgid "French Polynesia"
-#~ msgstr "Frans??z Polinezyas??"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua Yeni Gine"
-
-#~ msgid "Philippines"
-#~ msgstr "Filipinler"
-
-#~ msgid "Pakistan"
-#~ msgstr "Pakistan"
-
-#~ msgid "Poland"
-#~ msgstr "Polonya"
-
-#~ msgid "Saint Pierre And Miquelon"
-#~ msgstr "Saint Pierre ve Miquelon"
-
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "Porto Riko"
-
-#~ msgid "Portugal"
-#~ msgstr "Portekiz"
-
-#~ msgid "Palau"
-#~ msgstr "Palau Cumhuriyeti"
-
-#~ msgid "Paraguay"
-#~ msgstr "Paraguay"
-
-#~ msgid "Qatar"
-#~ msgstr "Katar"
-
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
-
-#~ msgid "Romania"
-#~ msgstr "Romanya"
-
-#~ msgid "Russian Federation"
-#~ msgstr "Rusya Federasyonu"
-
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "Suudi Arabistan"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon Adalar??"
-
-#~ msgid "Seychelles"
-#~ msgstr "Sey??eller"
-
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
-
-#~ msgid "Sweden"
-#~ msgstr "??sve?? Krall??????"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapur"
-
-#~ msgid "Saint Helena"
-#~ msgstr "Saint Helena"
-
-#~ msgid "Slovenia"
-#~ msgstr "Slovenya"
-
-#~ msgid "Svalbard And Jan Mayen"
-#~ msgstr "Svalbard ve Jan Mayen"
-
-#~ msgid "Slovakia"
-#~ msgstr "Slovakya"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
-
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
-
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
-
-#~ msgid "Somalia"
-#~ msgstr "Somali"
-
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "S??o Tom?? ve Pr??ncipe Demokratik Cumhuriyeti"
-
-#~ msgid "El Salvador"
-#~ msgstr "El Salvador"
-
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Suriye Arab Cumhuriyeti"
-
-#~ msgid "Swaziland"
-#~ msgstr "Swaziland Krall??????"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks ve Caicos Adalar??"
-
-#~ msgid "Chad"
-#~ msgstr "??ad"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "Frans??z G??ney Topraklar??"
-
-#~ msgid "Togo"
-#~ msgstr "Togo"
-
-#~ msgid "Thailand"
-#~ msgstr "Tayland"
-
-#~ msgid "Tajikistan"
-#~ msgstr "Tacikistan"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "T??rkmenistan"
-
-#~ msgid "Tunisia"
-#~ msgstr "Tunus"
-
-#~ msgid "Tonga"
-#~ msgstr "Tonga Krall??????"
-
-#~ msgid "East Timor"
-#~ msgstr "Do??u Timor Demokratik Cumhuriyeti"
-
-#~ msgid "Turkey"
-#~ msgstr "T??rkiye"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad And Tobago Cumhuriyeti"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Taiwan, Province Of China"
-#~ msgstr "Tayvan"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "Tanzanya Birle??ik Cumhuriyeti"
-
-#~ msgid "Ukraine"
-#~ msgstr "Ukrayna"
-
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "ABD K??????k D???? Adalar??"
-
-#~ msgid "United States"
-#~ msgstr "Birleik Eyaletler"
-
-#~ msgid "Uruguay"
-#~ msgstr "Uruguay"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "??zbekistan"
-
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Vatikan ??ehir Devleti"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "Saint Vincent ve Grenadinler"
-
-#~ msgid "Venezuela"
-#~ msgstr "Venez??ella"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Britanya Virgin Adalar??"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "ABD Virgin Adalar??"
-
-#~ msgid "Viet Nam"
-#~ msgstr "Viet Nam"
-
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu Cumhuriyeti"
-
-#~ msgid "Wallis And Futuna"
-#~ msgstr "Wallis ve Futuna Adalar??"
-
-#~ msgid "Samoa"
-#~ msgstr "Samoa Ba????ms??z Devleti"
-
-#~ msgid "Yemen"
-#~ msgstr "Yemen"
-
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "S??rbistan ve Karada??"
-
-#~ msgid "South Africa"
-#~ msgstr "G??ney Afika"
-
-#~ msgid "Zambia"
-#~ msgstr "Zambiya"
-
-#~ msgid "Democratic Republic Of The Congo"
-#~ msgstr "Kongo Demokratik Cumhuriyeti"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabve"
-
-#~ msgid "GeoLocation"
-#~ msgstr "Co??rafik Yer"
-
-#~ msgid "Could not initialize clutter"
-#~ msgstr "Sunucuya ba??lanamad??"
-
-#~ msgid "Could not create regular expression: %s\n"
-#~ msgstr "D??zzenli ifade olu??turulamad??: %s\n"
-
-#~ msgid ""
-#~ "This plugin provides GeoLocation functionality for Claws Mail.\n"
-#~ "\n"
-#~ "Warning: It is technically impossible to derive the geographic location of "
-#~ "senders from their E-Mails with any amount of certainty. The results presented by "
-#~ "this plugin are only rough estimates. In particular, mailing list managers often "
-#~ "strip sender information from the mails, so mails from mailing lists may be "
-#~ "assigned to the location of the mailing list server instead of the mail sender.\n"
-#~ "When in doubt, don't trust the results of this plugin, and don't rely on this "
-#~ "information to divorce your spouse.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
-#~ "quarrels)."
-#~ msgstr ""
-#~ "Bu eklenti Claws Mail i??in GeoLocation ??zelli??ini sa??lamakta.\n"
-#~ "\n"
-#~ "Uyar??: G??nderenin konumunu E-Posta adresinden kesin olarak tesbit etmek teknik "
-#~ "olarak m??mk??n de??ildir. Bu eklenti arac??l??????yla g??sterilen sonu??lar yakla????k "
-#~ "tahminlerdir. ??zellikle, posta listesi y??neticileri g??nderen bilgisini s??k??a "
-#~ "postalardan silmektedir, dolay??s??yla posta listesindeki postalar g??nderenin "
-#~ "adresi yerine posta listesi sunucusunun konumunu g??sterebilir.\n"
-#~ "Emin olmad??????n??zda, bu eklentinin sa??lad?????? sonu??lara g??venmeyin ve bu bilgiye "
-#~ "g??venip e??inizi bo??amay??n.\n"
-#~ "\n"
-#~ "<berndth at gmx.de> adresine geri bildirim yapabilirsiniz (evlilik kavgalar??yla "
-#~ "ilgili olmad??ktan sonra.)"
-
-#~ msgid "GeoLocation integration"
-#~ msgstr "GeoLocation entegrasyonu"
-
-#~ msgid "mbox (etPan!)..."
-#~ msgstr "mbox (etPan')..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Notification Plugin: Failed to write plugin configuration to file\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Bildirim Eklentisi: Eklenti yap??land??rmas?? dosyaya yaz??lamad??\n"
-
-#~ msgid "Save sent messages to Sent folder"
-#~ msgstr "G??nderilen iletileri G??nderilen dizinine kaydet"
-
-#~ msgid "Use this"
-#~ msgstr "Bunu kullan"
diff --git a/po/uk.po b/po/uk.po
index 8780d79..5d10aca 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -20032,520 +20032,3 @@ msgid ""
 msgstr ""
 "Claws Mail ?????????????? ???? ????????????.\n"
 "???????????????? '????????????????', ?????? ?????????????????? ????????????."
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail ???????????????????????? ???? ?????????????? ???????????????? ????????????"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "????????????????????????, ???? ?????????????? ?????????????????? S"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "?????????????????? ???????????? '????'"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "?????????????????? ???????????? '??????????'"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "?????????????????? ???????????? '?????????????????? ??????????'"
-
-#, fuzzy
-#~ msgid "Enable Popup"
-#~ msgstr "??????????????"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "???????????? ???????????? (??????????????????????????) ?????? %s"
-
-#, fuzzy
-#~ msgid "Cannot open temporary file"
-#~ msgstr "???? ???????? ???????????????? ???????????????????? ????????"
-
-#, fuzzy
-#~ msgid "Fetching '%s'..."
-#~ msgstr "?????????????????? ????????????????????????..."
-
-#, fuzzy
-#~ msgid "Malformed feed"
-#~ msgstr "?????????????????????? ??????????????????\n"
-
-#, fuzzy
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "g_thread ???? ?????????????????????????? glib.\n"
-
-#, fuzzy
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "??????????"
-#~ msgstr[1] "??????????"
-#~ msgstr[2] "??????????"
-
-#, fuzzy
-#~ msgid "size unknown"
-#~ msgstr "????????????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "?????????????? ??????????????? ?? LDAP ????????????????"
-
-#, fuzzy
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "???? ???????? ????????????????????????: %s"
-
-#, fuzzy
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "????_??????????????????..."
-
-#, fuzzy
-#~ msgid "Remove folder _tree..."
-#~ msgstr "?????????????????????? ???????????? ??????????????????..."
-
-#, fuzzy
-#~ msgid "Unsubscribe feed"
-#~ msgstr "??????????????????????"
-
-#, fuzzy
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "???? ???????????? ?????????????? ???????????????? ?????? ???????????????????"
-
-#, fuzzy
-#~ msgid "Remove cached entries"
-#~ msgstr "???????????????? ??_????????????"
-
-#~ msgid "Use this"
-#~ msgstr "?????????????????????????????? ????"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "???? ???????? ?????????????????????? ???? ????????????????????????: %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%m/%d/%y"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "???????????? ???????????????? ???????????????? ???? ???????????????? Claws Mail."
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "`%c' ???? ???????? ???????? ???????????????? ?? ?????????? ????????."
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d ???????? ????????????????????????"
-#~ msgstr[1] "Claws Mail: %d ???????? ????????????????????????"
-#~ msgstr[2] "Claws Mail: %d ?????????? ??????????????????????"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "???? ???????? ?????????????????????: ???? ?? ?????????????????????? ????????????."
-
-#~ msgid "Exiting..."
-#~ msgstr "??????????????..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail ???? ???????? ???????? ?????????????????? ?????? ?????????????? ?? ???????? ???????????? (%s)."
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "???? ?????????????????????????? ???????????????????? ?????? ?????????? ???????? ??????????."
-
-#~ msgid "Skip quoted lines"
-#~ msgstr "???? ???????????????????? ????????????"
-
-#~ msgid "Skip forwards and redirections"
-#~ msgstr "???? ???????????????????? ?????? ?????????????????????? ?????? ??????????????????????????"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "????????????"
-
-#~ msgid "Select ..."
-#~ msgstr "?????????? ..."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "???? ?????????????? ?????????????????? ????????, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "?????????? ??????????:"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "??????????????? ?? %s:%d ???? ????????????."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????????????? ???? ??????????????:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "???????????????????????? ???????????????? ????????????????"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "?????????????????????? ????????????????????"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "???????????????? ?????????? ????????????????"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "?????????????? ???????????????? '%s' ?????? ??????????."
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "???????? '%s' ?????? ??????????."
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "???????????? ???????????????? ?????????????? ???????????????? '%s' ?\n"
-#~ "(???????????????????????? ???? ???????????? ???????????????? ?? ??????????)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "???? ???????? ???????????????? ???????? '%s'."
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "?????????????? ???????? ?????????? ?????? '%s':"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (?????????????? ???? ??????????????????????)"
-
-#~ msgid ""
-#~ "This plugin provides Python integration features.\n"
-#~ "\n"
-#~ "For the most up-to-date API documentation, type\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "in the interactive Python console under Tools -> Show Python console.\n"
-#~ "\n"
-#~ "The source distribution of this plugin comes with various example scripts "
-#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
-#~ "interested in sharing, feel free to send it to me to have it considered "
-#~ "for inclusion in the examples.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "?????? ?????????????? ???????????????????? ???????????????????? ???????????????????? ?? Python.\n"
-#~ "\n"
-#~ "For the most up-to-date API documentation, type\n"
-#~ "\n"
-#~ " help(clawsmail)\n"
-#~ "\n"
-#~ "in the interactive Python console under Tools -> Show Python console.\n"
-#~ "\n"
-#~ "The source distribution of this plugin comes with various example scripts "
-#~ "in the \"examples\" subdirectory. If you wrote a script that you would be "
-#~ "interested in sharing, feel free to send it to me to have it considered "
-#~ "for inclusion in the examples.\n"
-#~ "\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "???????????????????? ?????????????????? X-Mailer"
-
-#~ msgid "Replace"
-#~ msgstr "????????????"
-
-#~ msgid "Blink LED"
-#~ msgstr "???????????? ????????????????????????"
-
-#~ msgid "Play sound"
-#~ msgstr "???????????????????? ????????"
-
-#~ msgid "Show info banner"
-#~ msgstr "???????????????? ?????????? ????????????????????"
-
-#~ msgid "on external memory card"
-#~ msgstr "???? ?????????????????? ?????????? ???????????????"
-
-#~ msgid "on internal memory card"
-#~ msgstr "???? ???????????????????? ?????????? ???????????????"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">?????????????????? ????????</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "??????-???????????????????? Dillo"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "?????????????????????? ?????????????????? ?????????????????? ?? ????????????"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "???????????????????? ?????????? '--local' ?? Dillo"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr ""
-#~ "???? ?????? ???? ???????????? ?????????????????????????? ???????????????? ?????????????????? ???????????? ???????????????????????????????? "
-#~ "????????????????"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "???????????? ?????? ????????????????????????, ?????????????????? ?? ???????????????? ????????????/????????"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "?????????????????????????? ?????????? (?????????????? ????????????????????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "???????????????????? ?????????? '--fullwindow' ?? Dillo"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Dillo ???????????????????? HTML"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr ""
-#~ "???? ???????? ???????????? ?????????????????????????? ???????? dillo ?? PATH. ???? Dillo ???????????? "
-#~ "?????????????????????????"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "?????? ?????????????? ???????????????????? HTML ???????????????????????? ???? ?????????????????? ??????-?????????????????????? "
-#~ "Dillo.\n"
-#~ "???????????????????????? ?????????? ???????????? ?? /????????????????????????/??????????????????/??????????????/??????-"
-#~ "???????????????????? Dillo"
-
-#~ msgid "Trayicon"
-#~ msgstr "???????????? ???????????????????? ??????????"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "???? ?????????????? ?????????????????????????? hook ???? 'offline switch'"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "???? ?????????????? ?????????????????????????? hook ???? 'account list'"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "???? ?????????????? ?????????????????????????? hook ???? 'close'"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "???? ?????????????? ?????????????????????????? hook ???? 'got iconified'"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "???? ?????????????? ?????????????????????????? hook ???? 'theme change'"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "?????????? ?????????????? ?????????????? ???????????? ?? ?????????????????? ????????, ???????? ?????????????? ?????????????????? "
-#~ "?????????? ?????? ???????????????????????? ??????????????????????.\n"
-#~ "\n"
-#~ "???????????? ?????????????? ?????????????? ?????????? ?????? ?????????????????? ???????????????????????? ????????????. "
-#~ "???????????????????? ???????????????? ?????????????? ?????????? ??????????, ???????????????????????? ??????????????????????, ?? ???? "
-#~ "???????????????? ??????????????????."
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "?????????????????? Claws Mail ?????? ??????????????"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "???????????? Claws Mail ?? ???????????? ?? ?????????????? ?????????????????????? ?????????????? ????????????????????\n"
-#~ "?????? ???????????????????? ???????????? ???????????????? ??????????."
-
-#~ msgid "Minimize to tray"
-#~ msgstr "?????????????????????? ???? ???????????????????? ??????????"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr ""
-#~ "?????????????????????? Claws Mail ?? ???????????? ?? ?????????????? ?????????????????????? ?????????????? ?????????????????? "
-#~ "??????????"
-
-#~ msgid ""
-#~ "An attachment is mentioned in the mail you're sending, but no file was "
-#~ "attached. %s it anyway?"
-#~ msgstr ""
-#~ "???? ?????????????? ?????????????????? ???? ???????????? ??????????, ?????? ???? ???????????????? ?????????????? ??????????. %s "
-#~ "?????? ?????????"
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "???? ???????? ???????????????? ??????????????. ???????????????? ?????????? ???? ??????????????. \n"
-#~ "%s"
-
-#~ msgid "Charset"
-#~ msgstr "??????????????????"
-
-#~ msgid "Change dictionary"
-#~ msgstr "?????????????? ??????????????"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "?????????????????? SSL ????????????????????"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "???????????????????? SSL ????????????????????"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "???????????????? ???????????????????? SSL"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "??????????????????? ?? IMAP4 ????????????????: %s...\n"
-
-#~ msgid "Last read message"
-#~ msgstr "?????????????? ?????????????????? ????????????????????????"
-
-#~ msgid "_all"
-#~ msgstr "??_??????"
-
-#~ msgid "_sender"
-#~ msgstr "??_????????????????????"
-
-#~ msgid "by _Date"
-#~ msgstr "???? _????????"
-
-#~ msgid "by _From"
-#~ msgstr "???? _??????"
-
-#~ msgid "by _To"
-#~ msgstr "???? _????"
-
-#~ msgid "by S_ubject"
-#~ msgstr "???? ????????"
-
-#~ msgid "by Tag"
-#~ msgstr "???? ????????????"
-
-#~ msgid "by _Mark"
-#~ msgstr "???? _????????????????"
-
-#~ msgid "_Open (l)"
-#~ msgstr "_???????????????? (I)"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "???????????????? ?? ?????????????????? (o)..."
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "_???????????????? ???? ?????????? (t)"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "_???????????????? ???? (y)..."
-
-#~ msgid "Trust key"
-#~ msgstr "???????? ????????????"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "???????????????????????? ???????????????? ???????????? ????????????????????????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "???????????????? ???????????????????????? ???????????? ????????????????????????"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "???????????????????????? ???????????? ???????????????????????? ?????????????????? ??????????????????????"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (?????? ?????????????? 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (?????? ?????????????? 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr "  (?????? ?????????????? 'o')"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "??????????????????: ???????? ?? ?????????????? ??????????????????????\n"
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with a more recent GTK+ library than is "
-#~ "currently available. This will cause crashes. You need to upgrade GTK+ or "
-#~ "recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ?????? ???????????????????????????? ?? ?????????? ???????????????? ?????????????????????? GTK+, ?????? "
-#~ "???????????????? ??????????. ???? ???????? ?????????????????? ????????. ???? ?????????????? ?????????????? GTK+ ?????? "
-#~ "?????????????????????? Claws Mail."
-
-#~ msgid ""
-#~ "Claws Mail has been compiled with an older GTK+ library than is currently "
-#~ "available. This will cause crashes. You need to recompile Claws Mail."
-#~ msgstr ""
-#~ "Claws Mail ?????? ???????????????????????????? ?? ?????????????? ?????????????????????? GTK+, ?????? ???????????????? "
-#~ "??????????. ???? ???????? ?????????????????? ????????. ???? ?????????????? ?????????????????????? Claws Mail."
-
-#~ msgid "  --search folder type request [recursive]"
-#~ msgstr "  --search ?????? ???????? - ???????????????? ?????????? ???????? [????????????????????]"
-
-#~ msgid "                         searches mail"
-#~ msgstr "                         ?????????? ????????"
-
-#~ msgid ""
-#~ "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""
-#~ msgstr ""
-#~ "                         ???????? ??????????????: \"#mh/Mailbox/inbox\" ?????? \"Mail\""
-
-#~ msgid ""
-#~ "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] "
-#~ "or g: tag"
-#~ msgstr ""
-#~ "                         ??????: s[????????],f[??????],t[????],e[??????????????????],"
-#~ "m[??????????????] ?????? g: ??????????"
-
-#~ msgid "                         request: search string"
-#~ msgstr "                         ??????????: ?????????? ??????????????"
-
-#~ msgid ""
-#~ "                         recursive: false if arg. starts with 0, n, N, f "
-#~ "or F"
-#~ msgstr ""
-#~ "                         ????????????????????: ????????????????, ???????? ???????????????? ??????. ?? 0, n, "
-#~ "N, f ?????? F"
-
-#~ msgid "_Fold all"
-#~ msgstr "_???????????????? ??????"
-
-#~ msgid "creating NNTP connection to %s:%d ...\n"
-#~ msgstr "?????????????????? NNTP ?????????????????????? ???? %s:%d ...\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1194336..3645c8f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19662,552 +19662,3 @@ msgid ""
 msgstr ""
 "Claws Mail???????????????\n"
 "??????[??????]???????????????"
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail?????????????????????????????????"
-
-#~ msgid "messages which contain header S"
-#~ msgstr "??????????????????S?????????"
-
-#, fuzzy
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "??????????????????"
-
-#, fuzzy
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "??????????????????(_o)"
-
-#, fuzzy
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "??????????????????(_o)"
-
-#~ msgid "slow"
-#~ msgstr "??????"
-
-#~ msgid "fast"
-#~ msgstr "??????"
-
-#~ msgid "Enable Popup"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "?????? \"%s\" ???????????????(??????????????????)???"
-
-#~ msgid "Cannot open temporary file"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "???????????????libCURL"
-
-#~ msgid "Fetching '%s'..."
-#~ msgstr "???????????? '%s'..."
-
-#~ msgid "Malformed feed"
-#~ msgstr "???????????????????????????"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr "RSSyl: ????????????RDF????????????????????????????????????'%s'?????????"
-
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "N/A"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "?????????"
-
-#~ msgid "size unknown"
-#~ msgstr "????????????"
-
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: ?????????????????????%s:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????????????'%s'?????????:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "?????????????????????'%s'?????????:\n"
-#~ "%s\n"
-
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "?????????????????????'%s'???"
-
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "????????????%s??????\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "?????????????????????'%s'?????????\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "?????????%s???????????????????????????\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "??????????????????????????????: %s\n"
-
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "????????????????????? '%s'???"
-
-#, fuzzy
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "??????...(_U)"
-
-#, fuzzy
-#~ msgid "Remove folder _tree..."
-#~ msgstr " ????????????????????? ..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "???????????????????????????: ???????????????"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>??????????????????????????????</b>\n"
-#~ "<small>(?????????-1??????????????????????????????)</small>"
-
-#~ msgid "Unsubscribe feed"
-#~ msgstr "????????????"
-
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Remove cached entries"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "????????????(180??????????????????)"
-
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "?????????0????????????????????????"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "???????????????????????????????????????"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "?????????-1??????????????????????????????"
-
-#~ msgid "Use this"
-#~ msgstr "???????????????"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "??????????????????: %s"
-
-#~ msgctxt "For use by strftime (default date+time format)"
-#~ msgid "%a %b %e %H:%M:%S %Y"
-#~ msgstr "%a %b %e %H:%M:%S %Y"
-
-#~ msgctxt "For use by strftime (default date format)"
-#~ msgid "%m/%d/%y"
-#~ msgstr "%y-%m-%d"
-
-#~ msgctxt "For use by strftime (default time format)"
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgctxt "For use by strftime (default 12-hour time format)"
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "More plugins are available from the Claws Mail website."
-#~ msgstr "??????Claws Mail???????????????????????????"
-
-#~ msgid "`%c' can't be included in folder name."
-#~ msgstr "????????????????????????`%c'???"
-
-#~ msgid "Claws Mail: %d new message"
-#~ msgid_plural "Claws Mail: %d new messages"
-#~ msgstr[0] "Claws Mail: %d????????????"
-
-#~ msgid "Unable to connect: you are offline."
-#~ msgstr "????????????: ???????????????????????????"
-
-#~ msgid "Exiting..."
-#~ msgstr "????????????..."
-
-#~ msgid "Claws Mail can not start without its data volume (%s)."
-#~ msgstr "Claws Mail????????????????????????(%s)??????????????????"
-
-#~ msgid "No registered viewer for this file type."
-#~ msgstr "??????????????????????????????????????????????????????"
-
-#, fuzzy
-#~ msgid "Skip quoted lines"
-#~ msgstr "??????????????????"
-
-#, fuzzy
-#~ msgid "Skip signature"
-#~ msgstr "??????"
-
-#~ msgid "Select ..."
-#~ msgstr "??????..."
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ " %s"
-#~ msgstr "??????????????????, %s"
-
-#, fuzzy
-#~ msgid "Filename is null."
-#~ msgstr "?????????"
-
-#, fuzzy
-#~ msgid "Conversion to postscript failed."
-#~ msgstr "????????? %s:%d ?????????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Printing failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??????????????????:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Proxy Setting"
-#~ msgstr "????????????"
-
-#, fuzzy
-#~ msgid "Auto-Load images"
-#~ msgstr "????????????"
-
-#, fuzzy
-#~ msgid "Block external content"
-#~ msgstr "????????????????????????"
-
-#, fuzzy
-#~ msgid "The mailbox `%s' already exists."
-#~ msgstr "?????? `%s' ???????????????"
-
-#, fuzzy
-#~ msgid "The folder `%s' already exists."
-#~ msgstr "??????'%s'????????????"
-
-#, fuzzy
-#~ msgid "Can't create the folder `%s'."
-#~ msgstr "??????????????????'%s'???"
-
-#, fuzzy
-#~ msgid ""
-#~ "Really remove the mailbox `%s' ?\n"
-#~ "(The messages are NOT deleted from the disk)"
-#~ msgstr ""
-#~ "?????????????????????'%s'???\n"
-#~ "(??????????????????????????????????????????)"
-
-#, fuzzy
-#~ msgid "Can't remove the folder `%s'."
-#~ msgstr "??????????????????'%s'???"
-
-#, fuzzy
-#~ msgid "Input new name for `%s':"
-#~ msgstr "?????????'%s'????????????:"
-
-#, fuzzy
-#~ msgid "Newmail plugin unloaded\n"
-#~ msgstr "%s (???????????????)"
-
-#~ msgid "Generate X-Mailer header"
-#~ msgstr "?????? X-Mail ??????"
-
-#~ msgid "Replace"
-#~ msgstr "??????"
-
-#~ msgid "Blink LED"
-#~ msgstr "??????LED???"
-
-#~ msgid "Play sound"
-#~ msgstr "????????????"
-
-#~ msgid "Show info banner"
-#~ msgstr "??????????????????"
-
-#~ msgid "on external memory card"
-#~ msgstr "???????????????"
-
-#~ msgid "on internal memory card"
-#~ msgstr "?????????????????????"
-
-#~ msgid "<span weight=\"bold\">Store data</span>"
-#~ msgstr "<span weight=\"bold\">????????????</span>"
-
-#~ msgid "Dillo Browser"
-#~ msgstr "Dillo???????????????"
-
-#~ msgid "Load remote links in mails"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Equivalent to Dillo's '--local' option"
-#~ msgstr "?????????Dillo???'--local'??????"
-
-#~ msgid "You can still load remote links by reloading the page"
-#~ msgstr "??????????????????????????????????????????????????????????????????"
-
-#~ msgid "Only for senders found in address book/folder"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Full window mode (hide controls)"
-#~ msgstr "???????????????(???????????????)"
-
-#~ msgid "Equivalent to Dillo's '--fullwindow' option"
-#~ msgstr "?????????Dillo???'--fullwindow'??????"
-
-#~ msgid "Dillo HTML Viewer"
-#~ msgstr "Dillo???????????????"
-
-#~ msgid "Can't find the dillo executable in PATH. Is it installed?"
-#~ msgstr "?????????PATH?????????dillo??????????????????????????????????"
-
-#~ msgid ""
-#~ "This plugin renders HTML mail using the Dillo web browser.\n"
-#~ "\n"
-#~ "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
-#~ msgstr ""
-#~ "???????????????Dillo????????????????????????HTML?????????\n"
-#~ "\n"
-#~ "?????????'/??????/??????/??????/Dillo?????????'??????????????????"
-
-#~ msgid "Trayicon"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Claws Mail"
-#~ msgstr "Claws Mail"
-
-#~ msgid "Failed to register offline switch hook"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Failed to register account list changed hook"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Failed to register close hook"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Failed to register got iconified hook"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Failed to register theme change hook"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid ""
-#~ "This plugin places a mailbox icon in the system tray that indicates if "
-#~ "you have new or unread mail.\n"
-#~ "\n"
-#~ "The mailbox is empty if you have no unread mail, otherwise it contains a "
-#~ "letter. A tooltip shows new, unread and total number of messages."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????\n"
-#~ "\n"
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-#~ "??????????????????????????????????????????????????????????????????"
-
-#~ msgid "Hide Claws Mail at start-up"
-#~ msgstr "???????????????Claws Mail?????????"
-
-#~ msgid ""
-#~ "Hide Claws Mail using the tray icon instead of closing it\n"
-#~ "when the window close button is clicked"
-#~ msgstr ""
-#~ "???????????????????????????????????????Claws Mail????????????\n"
-#~ "(?????????????????????)"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hide Claws Mail using the tray icon instead of minimizing it"
-#~ msgstr "???????????????????????????Claws Mail(????????????????????????)"
-
-#~ msgid ""
-#~ "This plugin provides various ways to notify the user of new and unread "
-#~ "email.\n"
-#~ "Feedback to <berndth at gmx.de> is welcome."
-#~ msgstr ""
-#~ "?????????????????????????????????????????????????????????????????????\n"
-#~ "?????????????????????????????? <berndth at gmx.de> "
-
-#~ msgid ""
-#~ "Make sure that the kernel module 'acerhk' is loaded.\n"
-#~ "You can get it from http://www.informatik.hu-berlin.de/~tauber/acerhk/"
-#~ msgstr ""
-#~ "?????????????????????'acerhk'?????????????????????\n"
-#~ "???????????? http://www.informatik.hu-berlin.de/~tauber/acerhk/ ???????????????"
-
-#~ msgid ""
-#~ "Make sure that the kernel module 'acer_acpi' is loaded.\n"
-#~ "You can get it from http://www.archernar.co.uk/acer_acpi/acer_acpi_main."
-#~ "html"
-#~ msgstr ""
-#~ "?????????????????????'acer_acpi'?????????????????????\n"
-#~ "???????????? http://www.archernar.co.uk/acer_acpi/acer_acpi_main.html ????????????"
-#~ "??????"
-
-#~ msgid ""
-#~ "Your Sylpheed-Claws version is newer than the version AcpiNotifier was "
-#~ "built with"
-#~ msgstr "??????Sylpheed-Claws???AcpiNotifier????????????????????????????????????"
-
-#~ msgid "Your Sylpheed-Claws version is too old for AcpiNotifier"
-#~ msgstr "??????Sylpheed-Claws??????????????????????????????AcpiNotifier??????"
-
-#~ msgid "Acpi notifier"
-#~ msgstr "Acpi??????"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for Atom feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr "RSSyl: Atom?????????????????????????????????????????????'%s'????????????"
-
-#~ msgid "/_Refresh feed"
-#~ msgstr "/??????(_R)"
-
-#~ msgid "/Refresh _all feeds"
-#~ msgstr "/????????????(_a)"
-
-#~ msgid "/Subscribe _new feed..."
-#~ msgstr "/??????????????????(_n)..."
-
-#~ msgid "/_Unsubscribe feed..."
-#~ msgstr "/????????????(_U)..."
-
-#~ msgid "/Feed pr_operties..."
-#~ msgstr "/??????(_o)..."
-
-#~ msgid "/Import feed list..."
-#~ msgstr "/?????????????????????..."
-
-#~ msgid "/Rena_me..."
-#~ msgstr "/?????????(_m)..."
-
-#~ msgid "/_Create new folder..."
-#~ msgstr "/??????????????????(_C)..."
-
-#~ msgid "/_Delete folder..."
-#~ msgstr "/???????????????(_D)..."
-
-#~ msgid "/Remove folder _tree..."
-#~ msgstr "/???????????????(_t)..."
-
-#~ msgid "/Refresh all feeds"
-#~ msgstr "/????????????"
-
-#~ msgid "/Unsubscribe feed..."
-#~ msgstr "/????????????..."
-
-#~ msgid "/Feed properties..."
-#~ msgstr "/??????..."
-
-#~ msgid "/Rename..."
-#~ msgstr "/?????????..."
-
-#~ msgid "/Create new folder..."
-#~ msgstr "/??????????????????..."
-
-#~ msgid "/Delete folder..."
-#~ msgstr "/???????????????..."
-
-#~ msgid "/Remove folder tree..."
-#~ msgstr "/??????????????????..."
-
-#~ msgid "/File/Add mailbox/RSSyl..."
-#~ msgstr "/??????/????????????/RSSyl..."
-
-#~ msgid ""
-#~ "Command could not be started. Pipe creation failed.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??????????????????????????????????????????\n"
-#~ "%s"
-
-#~ msgid "Charset"
-#~ msgstr "??????"
-
-#~ msgid "Change dictionary"
-#~ msgstr "????????????"
-
-#~ msgid "Unknown SSL Certificate"
-#~ msgstr "?????????SSL????????????"
-
-#~ msgid "Expired SSL Certificate"
-#~ msgstr "????????????SSL????????????"
-
-#~ msgid "Changed SSL Certificate"
-#~ msgstr "??????SSL????????????"
-
-#~ msgid "Connecting to IMAP4 server %s...\n"
-#~ msgstr "???????????? IMAP4 ????????? %s...\n"
-
-#~ msgid "_Open (l)"
-#~ msgstr "??????(_O)           l"
-
-#~ msgid "Open _with (o)..."
-#~ msgstr "????????????(_w)...    o"
-
-#~ msgid "_Display as text (t)"
-#~ msgstr "?????????????????????(_D) t"
-
-#~ msgid "_Save as (y)..."
-#~ msgstr "?????????(_S)...      y"
-
-#~ msgid "Trust key"
-#~ msgstr "????????????"
-
-#~ msgid "Main toolbar configuration"
-#~ msgstr "??????????????????"
-
-#~ msgid "Compose toolbar configuration"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Message view toolbar configuration"
-#~ msgstr "???????????????????????????"
-
-#~ msgid " (Shortcut key: 't')"
-#~ msgstr " (?????????: 't')"
-
-#~ msgid " (Shortcut key: 'l')\n"
-#~ msgstr " (?????????: 'l')\n"
-
-#~ msgid " (Shortcut key: 'o')"
-#~ msgstr " (?????????: 'o')"
-
-#~ msgid "_all"
-#~ msgstr "??????(_a)"
-
-#~ msgid "_sender"
-#~ msgstr "?????????(_s)"
-
-#~ msgid "by _Date"
-#~ msgstr "?????????(_D)"
-
-#~ msgid "by _From"
-#~ msgstr "????????????(_F)"
-
-#~ msgid "by _To"
-#~ msgstr "????????????(_T)"
-
-#~ msgid "by S_ubject"
-#~ msgstr "?????????(_u)"
-
-#~ msgid "by Tag"
-#~ msgstr "?????????"
-
-#~ msgid "by _Mark"
-#~ msgstr "?????????(_M)"

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 12:17:49 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 12:17:49 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-75-g9737584
Message-ID: <20161227111749.3427036A4502@mx.colino.net>

The branch, master has been updated
       via  97375848763a70b58b3a01a26f1488940e6ec341 (commit)
      from  f5ea218791a8368ef2f903cdf480dca53662eed0 (commit)

Summary of changes:
 src/messageview.c                                 |    3 ++-
 src/plugins/address_keeper/address_keeper_prefs.c |    9 ++++++---
 src/prefs_folder_item.c                           |   15 ++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 97375848763a70b58b3a01a26f1488940e6ec341
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 12:16:56 2016 +0100

    Add translation context helper text where some %s' are used and
    their meaning is not obvious.

diff --git a/src/messageview.c b/src/messageview.c
index b07813e..a62b863 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,7 +866,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		AlertValue val;
 		gchar *text;
 		text = g_strdup_printf(
-		  _("This message is asking for a return receipt notification\n"
+		  C_("'%s' stands for 'To' then 'Cc'",
+		    "This message is asking for a return receipt notification\n"
 		    "but according to its '%s' and '%s' headers it was not\n"
 		    "officially addressed to you.\n"
 		    "It is advised to not send the return receipt."),
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 93a39f1..358ab3a 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -142,7 +142,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_to_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("To"));
 	CLAWS_SET_TIP(keep_to_checkbox, text);
 	g_free(text);
@@ -154,7 +155,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_cc_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Cc"));
 	CLAWS_SET_TIP(keep_cc_checkbox, text);
 	g_free(text);
@@ -166,7 +168,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_bcc_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",,
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Bcc"));
 	CLAWS_SET_TIP(keep_bcc_checkbox, text);
 	g_free(text);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index dab8eb3..cc3905d 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -942,7 +943,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strdup_printf(_("Default %s for replies"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s for replies"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -965,7 +967,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -988,7 +991,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Bcc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Bcc:"));
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1011,7 +1015,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 12:58:27 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 12:58:27 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-76-g834ee30
Message-ID: <20161227115827.ABC0336A4502@mx.colino.net>

The branch, master has been updated
       via  834ee304372a9b2409207567bd0a0d911ffa7c01 (commit)
      from  97375848763a70b58b3a01a26f1488940e6ec341 (commit)

Summary of changes:
 src/messageview.c                                 |    3 +--
 src/plugins/address_keeper/address_keeper_prefs.c |    9 +++------
 src/prefs_folder_item.c                           |   15 +++++----------
 3 files changed, 9 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit 834ee304372a9b2409207567bd0a0d911ffa7c01
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 12:57:37 2016 +0100

    Revert g9737584.

diff --git a/src/messageview.c b/src/messageview.c
index a62b863..b07813e 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,8 +866,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		AlertValue val;
 		gchar *text;
 		text = g_strdup_printf(
-		  C_("'%s' stands for 'To' then 'Cc'",
-		    "This message is asking for a return receipt notification\n"
+		  _("This message is asking for a return receipt notification\n"
 		    "but according to its '%s' and '%s' headers it was not\n"
 		    "officially addressed to you.\n"
 		    "It is advised to not send the return receipt."),
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 358ab3a..93a39f1 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -142,8 +142,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_to_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
-			"Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("To"));
 	CLAWS_SET_TIP(keep_to_checkbox, text);
 	g_free(text);
@@ -155,8 +154,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_cc_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
-			"Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Cc"));
 	CLAWS_SET_TIP(keep_cc_checkbox, text);
 	g_free(text);
@@ -168,8 +166,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_bcc_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",,
-			"Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Bcc"));
 	CLAWS_SET_TIP(keep_bcc_checkbox, text);
 	g_free(text);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index cc3905d..dab8eb3 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,8 +919,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -943,8 +942,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s for replies"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(_("Default %s for replies"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -967,8 +965,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Cc:"));
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -991,8 +988,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Bcc */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Bcc:"));
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1015,8 +1011,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Reply-To:"));
+		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Tue Dec 27 13:10:12 2016
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Tue, 27 Dec 2016 13:10:12 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-77-gec9e88d
Message-ID: <20161227121012.4C66036A4504@mx.colino.net>

The branch, master has been updated
       via  ec9e88d3df187d7d10bd2212a48f9e01e72cb205 (commit)
      from  834ee304372a9b2409207567bd0a0d911ffa7c01 (commit)

Summary of changes:
 src/messageview.c                                 |    3 ++-
 src/plugins/address_keeper/address_keeper_prefs.c |    9 ++++++---
 src/prefs_folder_item.c                           |   15 ++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit ec9e88d3df187d7d10bd2212a48f9e01e72cb205
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Dec 27 13:06:51 2016 +0100

    Revert "Revert g9737584." and fix it ;)
    
    This reverts commit 834ee304 which was reverting a previous
    commit which broke build because of an extra comma. This
    reverts the revert and removes the comma.

diff --git a/src/messageview.c b/src/messageview.c
index b07813e..a62b863 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -866,7 +866,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		AlertValue val;
 		gchar *text;
 		text = g_strdup_printf(
-		  _("This message is asking for a return receipt notification\n"
+		  C_("'%s' stands for 'To' then 'Cc'",
+		    "This message is asking for a return receipt notification\n"
 		    "but according to its '%s' and '%s' headers it was not\n"
 		    "officially addressed to you.\n"
 		    "It is advised to not send the return receipt."),
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 93a39f1..118899c 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -142,7 +142,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_to_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("To"));
 	CLAWS_SET_TIP(keep_to_checkbox, text);
 	g_free(text);
@@ -154,7 +155,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_cc_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Cc"));
 	CLAWS_SET_TIP(keep_cc_checkbox, text);
 	g_free(text);
@@ -166,7 +168,8 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_bcc_checkbox);
-	text = g_strdup_printf(_("Keep addresses which appear in '%s' headers"),
+	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"),
 			prefs_common_translated_header_name("Bcc"));
 	CLAWS_SET_TIP(keep_bcc_checkbox, text);
 	g_free(text);
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index dab8eb3..cc3905d 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -919,7 +919,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -942,7 +943,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strdup_printf(_("Default %s for replies"), prefs_common_translated_header_name("To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s for replies"), prefs_common_translated_header_name("To:"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -965,7 +967,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Cc:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -988,7 +991,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Bcc */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Bcc:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Bcc:"));
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1011,7 +1015,8 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(_("Default %s"), prefs_common_translated_header_name("Reply-To:"));
+		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
+				 "Default %s"), prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 13:12:28 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 13:12:28 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-78-g6b68aee
Message-ID: <20161227121228.2FBCF36A4504@mx.colino.net>

The branch, master has been updated
       via  6b68aee40d2e09580518069ad0f2ad5ac6f5bfbc (commit)
      from  ec9e88d3df187d7d10bd2212a48f9e01e72cb205 (commit)

Summary of changes:
 src/messageview.c |    1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit 6b68aee40d2e09580518069ad0f2ad5ac6f5bfbc
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 13:12:22 2016 +0100

    Fix a leak.

diff --git a/src/messageview.c b/src/messageview.c
index a62b863..f4ff324 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -877,6 +877,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		  text,
 		  _("_Don't Send"), _("_Send"), NULL, FALSE,
 		  NULL, ALERT_WARNING, G_ALERTDEFAULT);
+		g_free(text);
 		if (val != G_ALERTALTERNATE)
 			return -1;
 	}

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 15:14:31 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 15:14:31 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-79-g571de7f
Message-ID: <20161227141431.747E336A4502@mx.colino.net>

The branch, master has been updated
       via  571de7f50975c43f35cb6fc49b34856558b16d05 (commit)
      from  6b68aee40d2e09580518069ad0f2ad5ac6f5bfbc (commit)

Summary of changes:
 src/compose.c                                     |   26 +++++++++++++----
 src/messageview.c                                 |    8 ++++--
 src/plugins/address_keeper/address_keeper_prefs.c |    8 ++++--
 src/prefs_folder_item.c                           |   31 ++++++++++++++-------
 4 files changed, 51 insertions(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit 571de7f50975c43f35cb6fc49b34856558b16d05
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 15:11:00 2016 +0100

    Revert "Revert "Revert g9737584."" (but the fix) by reimplementing
    the thing differently: don't mix printf() and C_() as it messes the
    compiler up.
    Factorize a bit format errors in compose.c.
    Make some header names translatable following prefs in the
    address keeper plugin.

diff --git a/src/compose.c b/src/compose.c
index 0be7a59..d300cd6 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -8661,6 +8661,20 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
 #endif
 }
 
+static void compose_template_apply_fields_error(const gchar *header)
+{
+	gchar *tr;
+	gchar *text;
+
+	tr = g_strdup(C_("'%s' stands for a header name",
+				  "Template '%s' format error."));
+	text = g_strdup_printf(tr, prefs_common_translated_header_name(header));
+	alertpanel_error(text);
+
+	g_free(text);
+	g_free(tr);
+}
+
 static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 {
 	MsgInfo* dummyinfo = NULL;
@@ -8688,7 +8702,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template From format error."));
+			compose_template_apply_fields_error("From");
 		} else {
 			gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
 		}
@@ -8706,7 +8720,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template To format error."));
+			compose_template_apply_fields_error("To");
 		} else {
 			compose_entry_append(compose, buf, COMPOSE_TO, PREF_TEMPLATE);
 		}
@@ -8724,7 +8738,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template Cc format error."));
+			compose_template_apply_fields_error("Cc");
 		} else {
 			compose_entry_append(compose, buf, COMPOSE_CC, PREF_TEMPLATE);
 		}
@@ -8742,7 +8756,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template Bcc format error."));
+			compose_template_apply_fields_error("Bcc");
 		} else {
 			compose_entry_append(compose, buf, COMPOSE_BCC, PREF_TEMPLATE);
 		}
@@ -8760,7 +8774,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template Reply-To format error."));
+			compose_template_apply_fields_error("Reply-To");
 		} else {
 			compose_entry_append(compose, buf, COMPOSE_REPLYTO, PREF_TEMPLATE);
 		}
@@ -8779,7 +8793,7 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
 		buf = quote_fmt_get_buffer();
 		if (buf == NULL) {
-			alertpanel_error(_("Template subject format error."));
+			compose_template_apply_fields_error("Subject");
 		} else {
 			gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
 		}
diff --git a/src/messageview.c b/src/messageview.c
index f4ff324..7c83afb 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -864,13 +864,14 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
 	if (ac_list == NULL) {
 		AlertValue val;
+		gchar *tr;
 		gchar *text;
-		text = g_strdup_printf(
-		  C_("'%s' stands for 'To' then 'Cc'",
+		tr = g_strdup(C_("'%s' stands for 'To' then 'Cc'",
 		    "This message is asking for a return receipt notification\n"
 		    "but according to its '%s' and '%s' headers it was not\n"
 		    "officially addressed to you.\n"
-		    "It is advised to not send the return receipt."),
+		    "It is advised to not send the return receipt."));
+		text = g_strdup_printf(tr,
 		  prefs_common_translated_header_name("To"),
 		  prefs_common_translated_header_name("Cc"));
 		val = alertpanel_full(_("Warning"),
@@ -878,6 +879,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		  _("_Don't Send"), _("_Send"), NULL, FALSE,
 		  NULL, ALERT_WARNING, G_ALERTDEFAULT);
 		g_free(text);
+		g_free(tr);
 		if (val != G_ALERTALTERNATE)
 			return -1;
 	}
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 118899c..ae5b9bd 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -100,6 +100,7 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	GtkWidget *vbox;
 	GtkTextBuffer *buffer;
 	gchar *text;
+	gchar *tr;
 
 	vbox = gtk_vbox_new(FALSE, 6);
 
@@ -168,11 +169,12 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_bcc_checkbox), addkeeperprefs.keep_bcc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_bcc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_bcc_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
-			"Keep addresses which appear in '%s' headers"),
-			prefs_common_translated_header_name("Bcc"));
+	tr = g_strdup(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"));
+	text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc"));
 	CLAWS_SET_TIP(keep_bcc_checkbox, text);
 	g_free(text);
+	g_free(tr);
 	gtk_widget_show(keep_bcc_checkbox);
 
 	page->keep_bcc_addrs_check = keep_bcc_checkbox;
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index cc3905d..0da2f87 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -816,6 +816,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 	FolderItem *item = (FolderItem *) data;
 	guint rowcount;
 	gchar *text = NULL;
+	gchar *tr = NULL;
 
 	GtkWidget *table;
 	GtkWidget *label;
@@ -919,14 +920,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default To */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("To:"));
+		tr = g_strdup(C_("folder properties: %s stands for a header name",
+				 	  "Default %s"));
+		text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
 		checkbtn_default_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
 					     item->prefs->enable_default_to);
 		g_free(text);
+		g_free(tr);
 
 		entry_default_to = gtk_entry_new();
 		gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
@@ -943,14 +946,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default address to reply to */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s for replies"), prefs_common_translated_header_name("To:"));
+		tr = g_strdup(C_("folder properties: %s stands for a header name",
+				 	  "Default %s for replies"));
+		text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
 		checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
 					     item->prefs->enable_default_reply_to);
 		g_free(text);
+		g_free(tr);
 
 		entry_default_reply_to = gtk_entry_new();
 		gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
@@ -967,14 +972,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Cc */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Cc:"));
+		tr = g_strdup(C_("folder properties: %s stands for a header name",
+				 	  "Default %s"));
+		text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc:"));
 		checkbtn_default_cc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_cc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc), 
 					     item->prefs->enable_default_cc);
 		g_free(text);
+		g_free(tr);
 
 		entry_default_cc = gtk_entry_new();
 		gtk_table_attach(GTK_TABLE(table), entry_default_cc, 1, 2,
@@ -991,14 +998,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Bcc */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Bcc:"));
+		tr = g_strdup(C_("folder properties: %s stands for a header name",
+				 	  "Default %s"));
+		text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc:"));
 		checkbtn_default_bcc = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_bcc, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc), 
 					     item->prefs->enable_default_bcc);
 		g_free(text);
+		g_free(tr);
 
 		entry_default_bcc = gtk_entry_new();
 		gtk_table_attach(GTK_TABLE(table), entry_default_bcc, 1, 2,
@@ -1015,14 +1024,16 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 		rowcount++;
 
 		/* Default Reply-to */
-		text = g_strdup_printf(C_("folder properties: %s stands for a header name",
-				 "Default %s"), prefs_common_translated_header_name("Reply-To:"));
+		tr = g_strdup(C_("folder properties: %s stands for a header name",
+				 	  "Default %s"));
+		text = g_strdup_printf(tr, prefs_common_translated_header_name("Reply-To:"));
 		checkbtn_default_replyto = gtk_check_button_new_with_label(text);
 		gtk_table_attach(GTK_TABLE(table), checkbtn_default_replyto, 0, 1, 
 				 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto), 
 					     item->prefs->enable_default_replyto);
 		g_free(text);
+		g_free(tr);
 
 		entry_default_replyto = gtk_entry_new();
 		gtk_table_attach(GTK_TABLE(table), entry_default_replyto, 1, 2,

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 15:15:16 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 15:15:16 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-80-gaed88af
Message-ID: <20161227141516.3D85736A4504@mx.colino.net>

The branch, master has been updated
       via  aed88afd6410fbb6508b64628571ac8cb47f9690 (commit)
      from  571de7f50975c43f35cb6fc49b34856558b16d05 (commit)

Summary of changes:
 po/fr.po |  231 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 118 insertions(+), 113 deletions(-)


- Log -----------------------------------------------------------------
commit aed88afd6410fbb6508b64628571ac8cb47f9690
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 15:15:03 2016 +0100

    Update French translation.

diff --git a/po/fr.po b/po/fr.po
index 7f94b06..7cabdb7 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: 2016-12-21 19:15+0100\n"
-"PO-Revision-Date: 2016-12-23 11:22+0100\n"
+"POT-Creation-Date: 2016-12-27 13:18+0100\n"
+"PO-Revision-Date: 2016-12-27 12:31+0100\n"
 "Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
 "Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
 "MIME-Version: 1.0\n"
@@ -975,13 +975,13 @@ msgstr ""
 "La mise ? jour a ?chou?. Les modifications ne seront pas appliqu?es au "
 "r?pertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9505
+#: src/alertpanel.c:146 src/compose.c:9523
 msgid "Notice"
 msgstr "Information"
 
 #: src/alertpanel.c:159 src/compose.c:5695 src/compose.c:6218
-#: src/compose.c:11926 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:875
+#: src/compose.c:11944 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:854 src/messageview.c:877
 #: src/plugins/pgpcore/sgpgme.c:788 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
 msgid "Warning"
@@ -1936,7 +1936,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?tes-vous s?r ?"
 
-#: src/compose.c:3624 src/compose.c:10531 src/compose.c:11407
+#: src/compose.c:3624 src/compose.c:10549 src/compose.c:11425
 msgid "_Insert"
 msgstr "_Ins?rer"
 
@@ -1982,7 +1982,7 @@ msgstr "[Pas de sujet] - Composition d'un message%s"
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4818 src/messageview.c:894
+#: src/compose.c:4818 src/messageview.c:898
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2003,7 +2003,7 @@ msgid "Send"
 msgstr "Envoyer"
 
 #: src/compose.c:5043 src/compose.c:5079 src/compose.c:5113 src/compose.c:5633
-#: src/folderview.c:2548 src/messageview.c:855 src/messageview.c:877
+#: src/folderview.c:2548 src/messageview.c:855 src/messageview.c:879
 #: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2907
 msgid "_Send"
 msgstr "_Envoyer"
@@ -2033,7 +2033,7 @@ msgstr "Voulez-vous quand m?me le mettre en file d'attente d'envoi ?"
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5173 src/compose.c:10003
+#: src/compose.c:5173 src/compose.c:10021
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2043,7 +2043,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caract?res a ?chou?."
 
-#: src/compose.c:5176 src/compose.c:10006
+#: src/compose.c:5176 src/compose.c:10024
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2053,7 +2053,7 @@ msgstr ""
 "\n"
 "La cl? de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5182 src/compose.c:10000
+#: src/compose.c:5182 src/compose.c:10018
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2256,41 +2256,42 @@ msgstr "_Aucun"
 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:8692 src/compose.c:8714 src/compose.c:8736 src/compose.c:8758
-#: src/compose.c:8780 src/compose.c:8803
+#: src/compose.c:8694 src/compose.c:8719 src/compose.c:8744 src/compose.c:8769
+#: src/compose.c:8794 src/compose.c:8820
 #, 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:9075
+#: src/compose.c:9093
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9090
+#: src/compose.c:9108
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9164
+#: src/compose.c:9182
 msgid "Properties"
 msgstr "Propri?t?s"
 
-#: src/compose.c:9181
+#: src/compose.c:9199
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9222
+#: src/compose.c:9240
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9242
+#: src/compose.c:9260
 msgid "Path"
 msgstr "Chemin d'acc?s"
 
-#: src/compose.c:9243
+#: src/compose.c:9261
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9502
+#: src/compose.c:9520
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2301,15 +2302,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9969 src/messageview.c:1088
+#: src/compose.c:9987 src/messageview.c:1092
 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:9995
+#: src/compose.c:10013
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9997
+#: src/compose.c:10015
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2320,15 +2321,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10175
+#: src/compose.c:10193
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10179
+#: src/compose.c:10197
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10180
+#: src/compose.c:10198
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2337,24 +2338,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'?dition de ce message ?"
 
-#: src/compose.c:10182
+#: src/compose.c:10200
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10182
+#: src/compose.c:10200
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10342 src/compose.c:10356
+#: src/compose.c:10360 src/compose.c:10374
 msgid "Select file"
 msgstr "Veuillez s?lectionner un fichier"
 
-#: src/compose.c:10370
+#: src/compose.c:10388
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "?chec lors de la lecture de ? %s ?."
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2363,54 +2364,54 @@ msgstr ""
 "Le fichier ? %s ? contient des caract?res n'appartenant pas\n"
 "? l'encodage courant : l'insertion peut ?tre incorrecte."
 
-#: src/compose.c:10451
+#: src/compose.c:10469
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10452
+#: src/compose.c:10470
 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:10453 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10471 src/plugins/managesieve/sieve_editor.c:433
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10453 src/compose.c:10457
+#: src/compose.c:10471 src/compose.c:10475
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10455 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10473 src/plugins/managesieve/sieve_editor.c:431
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10456
+#: src/compose.c:10474
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
 "modifications ?"
 
-#: src/compose.c:10457
+#: src/compose.c:10475
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10528
+#: src/compose.c:10546
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le mod?le ? %s ? ?"
 
-#: src/compose.c:10530
+#: src/compose.c:10548
 msgid "Apply template"
 msgstr "Utiliser le mod?le"
 
-#: src/compose.c:10531 src/prefs_actions.c:329
+#: src/compose.c:10549 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:773 src/prefs_template.c:311 src/prefs_toolbar.c:1060
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11400
+#: src/compose.c:11418
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2425,20 +2426,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:11406
+#: src/compose.c:11424
 msgid "Insert or attach?"
 msgstr "Ins?rer ou adjoindre ?"
 
-#: src/compose.c:11407
+#: src/compose.c:11425
 msgid "_Attach"
 msgstr "_Adjoindre"
 
-#: src/compose.c:11625
+#: src/compose.c:11643
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation ? la ligne %d."
 
-#: src/compose.c:11920
+#: src/compose.c:11938
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2550,7 +2551,7 @@ msgstr "L'adresse email est requise."
 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:1678
+#: src/editaddress.c:675 src/prefs_folder_item.c:1694
 msgid "Discard"
 msgstr "Annuler"
 
@@ -5091,7 +5092,7 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:266
+#: src/plugins/address_keeper/address_keeper_prefs.c:271
 #: src/plugins/archive/archiver_prefs.c:90
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
 #: src/plugins/bogofilter/bogofilter_gtk.c:498
@@ -6205,8 +6206,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "d?sinscrire du"
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1431
-#: src/prefs_folder_item.c:1459 src/prefs_folder_item.c:1487
+#: src/imap_gtk.c:560 src/prefs_folder_item.c:1447
+#: src/prefs_folder_item.c:1475 src/prefs_folder_item.c:1503
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
@@ -7779,7 +7780,7 @@ msgstr "Le tra?age du filtrage est d?sactiv?.\n"
 #: src/mainwindow.c:2490 src/mainwindow.c:2497 src/mainwindow.c:2540
 #: src/mainwindow.c:2573 src/mainwindow.c:2605 src/mainwindow.c:2650
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1061
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -7987,7 +7988,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:1847 src/mimeview.c:1842
+#: src/mbox.c:551 src/messageview.c:1851 src/mimeview.c:1842
 #: src/prefs_themes.c:533 src/textview.c:3085
 msgid "Overwrite"
 msgstr "?craser"
@@ -8037,7 +8038,7 @@ msgstr "Recherche termin?e"
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/messageview.c:713 src/messageview.c:1438 src/messageview.c:1589
+#: src/messageview.c:713 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Message"
 
@@ -8060,12 +8061,13 @@ msgstr ""
 "Return-Path : %s\n"
 "Il est conseill? de ne pas envoyer cet accus? de r?ception."
 
-#: src/messageview.c:855 src/messageview.c:877
+#: src/messageview.c:855 src/messageview.c:879
 msgid "_Don't Send"
 msgstr "_Ne pas envoyer"
 
-#: src/messageview.c:869
+#: src/messageview.c:870
 #, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its '%s' and '%s' headers it was not\n"
@@ -8077,47 +8079,47 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseill? de ne pas envoyer cet accus? de r?ception."
 
-#: src/messageview.c:1368
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Lecture du message (%s) en cours.."
 
-#: src/messageview.c:1404 src/procmime.c:1008
+#: src/messageview.c:1408 src/procmime.c:1008
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "D?chiffrement impossible : %s"
 
-#: src/messageview.c:1485 src/messageview.c:1493
+#: src/messageview.c:1489 src/messageview.c:1497
 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:1839 src/messageview.c:1842 src/mimeview.c:1995
+#: src/messageview.c:1843 src/messageview.c:1846 src/mimeview.c:1995
 #: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4816
 #: src/summaryview.c:4819 src/textview.c:3073
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:1848
+#: src/messageview.c:1852
 msgid "Overwrite existing file?"
 msgstr "?craser le fichier existant ?"
 
-#: src/messageview.c:1856 src/summaryview.c:4836 src/summaryview.c:4839
+#: src/messageview.c:1860 src/summaryview.c:4836 src/summaryview.c:4839
 #: src/summaryview.c:4854
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier ? %s ?."
 
-#: src/messageview.c:1909
+#: src/messageview.c:1913
 #, c-format
 msgid "Show all %s."
 msgstr "Afficher l'ensemble des %s."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1915
 msgid "Only the first megabyte of text is shown."
 msgstr "Seul le premier m?ga-octet de texte est affich?."
 
-#: src/messageview.c:1942
+#: src/messageview.c:1946
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8125,19 +8127,19 @@ msgstr ""
 "Vous avez demand? un accus? de r?ception pour ce message : cela a ?t? mis en "
 "?vidence pour le destinataire."
 
-#: src/messageview.c:1945
+#: src/messageview.c:1949
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demand? un accus? de r?ception pour ce message."
 
-#: src/messageview.c:1951
+#: src/messageview.c:1955
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accus? de r?ception."
 
-#: src/messageview.c:1952
+#: src/messageview.c:1956
 msgid "Send receipt"
 msgstr "Envoyer"
 
-#: src/messageview.c:1995
+#: src/messageview.c:1999
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8145,7 +8147,7 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r?,\n"
 "et a ?t? supprim? du serveur."
 
-#: src/messageview.c:2001
+#: src/messageview.c:2005
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8154,16 +8156,16 @@ msgstr "Ce message a ?t? partiellement r?cup?r? ; il fait %s au total."
 
 # NDT : probl?me de longueur de la cha?ne "Marquer pour t?l?chargement" :
 # la cha?ne est coup?e des 2 c?t?s (bouton trop petit) -> id?e : tooltips
-#: src/messageview.c:2005 src/messageview.c:2027
+#: src/messageview.c:2009 src/messageview.c:2031
 msgid "Mark for download"
 msgstr "T?l?charger"
 
 # NDT : m?me pb qu'avec "Mark for download" pr cha?ne "Marquer pour suppression"
-#: src/messageview.c:2006 src/messageview.c:2018
+#: src/messageview.c:2010 src/messageview.c:2022
 msgid "Mark for deletion"
 msgstr "Supprimer"
 
-#: src/messageview.c:2011
+#: src/messageview.c:2015
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8172,12 +8174,12 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r? ;\n"
 "il fait %s au total et est marqu? pour ?tre t?l?charg? ult?rieurement."
 
-#: src/messageview.c:2016 src/messageview.c:2029
+#: src/messageview.c:2020 src/messageview.c:2033
 #: src/prefs_filtering_action.c:180 src/toolbar.c:487
 msgid "Unmark"
 msgstr "D?marquer"
 
-#: src/messageview.c:2022
+#: src/messageview.c:2026
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8186,11 +8188,11 @@ msgstr ""
 "Ce message a ?t? partiellement r?cup?r? ;\n"
 "il fait %s au total et est marqu? pour ?tre supprim? ult?rieurement."
 
-#: src/messageview.c:2095
+#: src/messageview.c:2099
 msgid "Return Receipt Notification"
 msgstr "Accus? de r?ception."
 
-#: src/messageview.c:2096
+#: src/messageview.c:2100
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8202,19 +8204,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accus? "
 "de r?ception :"
 
-#: src/messageview.c:2100 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2104 src/plugins/rssyl/rssyl_feed_props.c:508
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: src/messageview.c:2100
+#: src/messageview.c:2104
 msgid "_Send Notification"
 msgstr "_Envoyer"
 
-#: src/messageview.c:2189
+#: src/messageview.c:2193
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
-#: src/messageview.c:2949
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8222,7 +8224,7 @@ msgstr ""
 "\n"
 " Il n'y a pas de messages dans ce dossier"
 
-#: src/messageview.c:2957
+#: src/messageview.c:2961
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8230,7 +8232,7 @@ msgstr ""
 "\n"
 " Le message a ?t? supprim?"
 
-#: src/messageview.c:2958
+#: src/messageview.c:2962
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8238,7 +8240,7 @@ msgstr ""
 "\n"
 " Le message a ?t? supprim? ou d?plac? vers un autre dossier"
 
-#: src/messageview.c:2991 src/messageview.c:2997 src/summaryview.c:4239
+#: src/messageview.c:2995 src/messageview.c:3001 src/summaryview.c:4239
 #: src/summaryview.c:6988
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'op?ration d'apprentissage du module SpamAssassin.\n"
@@ -8711,23 +8713,23 @@ msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:267
+#: src/plugins/address_keeper/address_keeper_prefs.c:272
 msgid "Address Keeper"
 msgstr "Collecteur d'adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:107
+#: src/plugins/address_keeper/address_keeper_prefs.c:108
 msgid "Address book location"
 msgstr "Chemin du carnet d'adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:112
+#: src/plugins/address_keeper/address_keeper_prefs.c:113
 msgid "Keep to folder"
 msgstr "Dossier o? conserver les adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:120
+#: src/plugins/address_keeper/address_keeper_prefs.c:121
 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:122
+#: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
 #: src/plugins/spamassassin/spamassassin_gtk.c:446
@@ -8736,18 +8738,19 @@ msgstr "Dossier du carnet d'adresses o? conserver les adresses"
 msgid "Select..."
 msgstr "S?lectionner.."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:138
+#: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
 msgstr "En-t?te ? partir desquels r?cup?rer les adresses"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:145
-#: src/plugins/address_keeper/address_keeper_prefs.c:157
-#: src/plugins/address_keeper/address_keeper_prefs.c:169
+#: src/plugins/address_keeper/address_keeper_prefs.c:147
+#: src/plugins/address_keeper/address_keeper_prefs.c:160
+#: src/plugins/address_keeper/address_keeper_prefs.c:173
 #, c-format
+msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr "Collecter les adresses pr?sentes dans les en-t?tes ? %s ?"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:178
+#: src/plugins/address_keeper/address_keeper_prefs.c:183
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
@@ -14667,30 +14670,30 @@ msgstr "D?finition automatique des adresses suivantes"
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1088
+#: src/prefs_account.c:2082 src/prefs_folder_item.c:1104
 #: src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Dictionnaire par d?faut"
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1122
+#: src/prefs_account.c:2095 src/prefs_folder_item.c:1138
 #: src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par d?faut"
 
 #: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1433
-#: src/prefs_folder_item.c:1823 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_compose_writing.c:373 src/prefs_folder_item.c:1449
+#: src/prefs_folder_item.c:1839 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Composition"
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1461 src/prefs_quote.c:134
+#: src/prefs_account.c:2196 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
 #: src/toolbar.c:472
 msgid "Reply"
 msgstr "R?pondre"
 
 #: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1489 src/prefs_quote.c:149 src/toolbar.c:477
+#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:477
 msgid "Forward"
 msgstr "Transf?rer"
 
@@ -14870,7 +14873,7 @@ msgstr "La commande externe d'envoi est non sp?cifi?e."
 msgid "Receive"
 msgstr "R?ception"
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1839 src/prefs_quote.c:238
+#: src/prefs_account.c:3359 src/prefs_folder_item.c:1855 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mod?les"
 
@@ -15793,7 +15796,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:885
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15833,7 +15836,7 @@ msgstr "Permissions chmod du dossier"
 msgid "Folder color"
 msgstr "Couleur du dossier"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1662
+#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
 msgid "Pick color for folder"
 msgstr "S?lection de la couleur pour le(s) dossier(s)"
 
@@ -15889,46 +15892,48 @@ msgstr "Supprimer les corps de message plus vieux"
 msgid "Discard folder cache"
 msgstr "Supprimer le cache du dossier"
 
-#: src/prefs_folder_item.c:894
+#: src/prefs_folder_item.c:895
 msgid "Request Return Receipt"
 msgstr "Demander un accus? de r?ception"
 
-#: src/prefs_folder_item.c:909
+#: src/prefs_folder_item.c:910
 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:922 src/prefs_folder_item.c:968
-#: src/prefs_folder_item.c:991 src/prefs_folder_item.c:1014
+#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
+#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
 #, c-format
+msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "%s par d?faut"
 
-#: src/prefs_folder_item.c:945
+#: src/prefs_folder_item.c:950
 #, 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:1037
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr "Compte par d?faut"
 
-#: src/prefs_folder_item.c:1675
+#: src/prefs_folder_item.c:1691
 msgid "Discard cache"
 msgstr "Suppression du cache"
 
-#: src/prefs_folder_item.c:1676
+#: src/prefs_folder_item.c:1692
 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:1806
+#: src/prefs_folder_item.c:1822
 msgid "General"
 msgstr "G?n?ral"
 
-#: src/prefs_folder_item.c:1885
+#: src/prefs_folder_item.c:1901
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 15:22:56 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 15:22:56 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-81-g66d2176
Message-ID: <20161227142256.69E8F36A4504@mx.colino.net>

The branch, master has been updated
       via  66d2176e8bbc847dfc498236173293472eb50aeb (commit)
      from  aed88afd6410fbb6508b64628571ac8cb47f9690 (commit)

Summary of changes:
 src/compose.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 66d2176e8bbc847dfc498236173293472eb50aeb
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 15:20:53 2016 +0100

    Silent up a compiler warning by making the ComposeCallAdvancedAction
    enum a real integer-scope ([-1 .. n] instead of [0 .. n]), swallowing
    the -1 value check.

diff --git a/src/compose.c b/src/compose.c
index d300cd6..024bfca 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -122,7 +122,8 @@ enum
 
 typedef enum
 {
-	COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE,
+	COMPOSE_CALL_ADVANCED_ACTION_UNDEFINED = -1,
+	COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE = 0,
 	COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
 	COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
 	COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD,
@@ -11059,14 +11060,14 @@ static ComposeCallAdvancedAction compose_call_advanced_action_from_path(GtkActio
 	DO_ACTION("Edit/Advanced/DelForwWord", COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD);
 	DO_ACTION("Edit/Advanced/DelLine", COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE);
 	DO_ACTION("Edit/Advanced/DelEndLine", COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END);
-	return -1;
+	return COMPOSE_CALL_ADVANCED_ACTION_UNDEFINED;
 }
 
 static void compose_advanced_action_cb(GtkAction *gaction, gpointer data)
 {
 	Compose *compose = (Compose *)data;
 	GtkTextView *text = GTK_TEXT_VIEW(compose->text);
-	ComposeCallAdvancedAction action = -1;
+	ComposeCallAdvancedAction action = COMPOSE_CALL_ADVANCED_ACTION_UNDEFINED;
 	
 	action = compose_call_advanced_action_from_path(gaction);
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 16:03:13 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 16:03:13 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-82-g0372b28
Message-ID: <20161227150313.4491E36A4502@mx.colino.net>

The branch, master has been updated
       via  0372b283a84f6cd5288f34f79249e826fcbcb00f (commit)
      from  66d2176e8bbc847dfc498236173293472eb50aeb (commit)

Summary of changes:
 src/compose.c |  272 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 136 insertions(+), 136 deletions(-)


- Log -----------------------------------------------------------------
commit 0372b283a84f6cd5288f34f79249e826fcbcb00f
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 16:02:27 2016 +0100

    Line-up arrays (w/ space chars only).
    Fix missing array initializers.

diff --git a/src/compose.c b/src/compose.c
index 024bfca..7f37dd6 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -586,156 +586,154 @@ static void from_name_activate_cb(GtkWidget *widget, gpointer data);
 
 static GtkActionEntry compose_popup_entries[] =
 {
-	{"Compose",			NULL, "Compose" },
-	{"Compose/Add",			NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
-	{"Compose/Remove",			NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
-	{"Compose/---",			NULL, "---", NULL, NULL, NULL },
-	{"Compose/Properties",		NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
+	{"Compose",            NULL, "Compose", NULL, NULL, NULL },
+	{"Compose/Add",        NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
+	{"Compose/Remove",     NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
+	{"Compose/---",        NULL, "---", NULL, NULL, NULL },
+	{"Compose/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
 };
 
 static GtkActionEntry compose_entries[] =
 {
-	{"Menu",				NULL, "Menu" },
+	{"Menu",                          NULL, "Menu", NULL, NULL, NULL },
 /* menus */
-	{"Message",			NULL, N_("_Message") },
-	{"Edit",			NULL, N_("_Edit") },
+	{"Message",                       NULL, N_("_Message"), NULL, NULL, NULL },
+	{"Edit",                          NULL, N_("_Edit"), NULL, NULL, NULL },
 #if USE_ENCHANT
-	{"Spelling",			NULL, N_("_Spelling") },
+	{"Spelling",                      NULL, N_("_Spelling"), NULL, NULL, NULL },
 #endif
-	{"Options",			NULL, N_("_Options") },
-	{"Tools",			NULL, N_("_Tools") },
-	{"Help",			NULL, N_("_Help") },
+	{"Options",                       NULL, N_("_Options"), NULL, NULL, NULL },
+	{"Tools",                         NULL, N_("_Tools"), NULL, NULL, NULL },
+	{"Help",                          NULL, N_("_Help"), NULL, NULL, NULL },
 /* Message menu */
-	{"Message/Send",		NULL, N_("S_end"), "<control>Return", NULL, G_CALLBACK(compose_send_cb) },
-	{"Message/SendLater",		NULL, N_("Send _later"), "<shift><control>S", NULL, G_CALLBACK(compose_send_later_cb) },
-	{"Message/---",			NULL, "---" },
-
-	{"Message/AttachFile",		NULL, N_("_Attach file"), "<control>M", NULL, G_CALLBACK(compose_attach_cb) },
-	{"Message/InsertFile",		NULL, N_("_Insert file"), "<control>I", NULL, G_CALLBACK(compose_insert_file_cb) },
-	{"Message/InsertSig",		NULL, N_("Insert si_gnature"), "<control>G", NULL, G_CALLBACK(compose_insert_sig_cb) },
-	{"Message/ReplaceSig",		NULL, N_("_Replace signature"), NULL, NULL, G_CALLBACK(compose_replace_sig_cb) },
-	/* {"Message/---",		NULL, "---" }, */
-	{"Message/Save",		NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(compose_save_cb) }, /*COMPOSE_KEEP_EDITING*/
-	/* {"Message/---",		NULL, "---" }, */
-	{"Message/Print",		NULL, N_("_Print"), NULL, NULL, G_CALLBACK(compose_print_cb) },
-	/* {"Message/---",		NULL, "---" }, */
-	{"Message/Close",		NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(compose_close_cb) },
+	{"Message/Send",                  NULL, N_("S_end"), "<control>Return", NULL, G_CALLBACK(compose_send_cb) },
+	{"Message/SendLater",             NULL, N_("Send _later"), "<shift><control>S", NULL, G_CALLBACK(compose_send_later_cb) },
+	{"Message/---",                   NULL, "---", NULL, NULL, NULL },
+
+	{"Message/AttachFile",            NULL, N_("_Attach file"), "<control>M", NULL, G_CALLBACK(compose_attach_cb) },
+	{"Message/InsertFile",            NULL, N_("_Insert file"), "<control>I", NULL, G_CALLBACK(compose_insert_file_cb) },
+	{"Message/InsertSig",             NULL, N_("Insert si_gnature"), "<control>G", NULL, G_CALLBACK(compose_insert_sig_cb) },
+	{"Message/ReplaceSig",            NULL, N_("_Replace signature"), NULL, NULL, G_CALLBACK(compose_replace_sig_cb) },
+	/* {"Message/---",                NULL, "---", NULL, NULL, NULL }, */
+	{"Message/Save",                  NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(compose_save_cb) }, /*COMPOSE_KEEP_EDITING*/
+	/* {"Message/---",                NULL, "---", NULL, NULL, NULL }, */
+	{"Message/Print",                 NULL, N_("_Print"), NULL, NULL, G_CALLBACK(compose_print_cb) },
+	/* {"Message/---",                NULL, "---", NULL, NULL, NULL }, */
+	{"Message/Close",                 NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(compose_close_cb) },
 
 /* Edit menu */
-	{"Edit/Undo",			NULL, N_("_Undo"), "<control>Z", NULL, G_CALLBACK(compose_undo_cb) },
-	{"Edit/Redo",			NULL, N_("_Redo"), "<control>Y", NULL, G_CALLBACK(compose_redo_cb) },
-	{"Edit/---",			NULL, "---" },
-
-	{"Edit/Cut",			NULL, N_("Cu_t"), "<control>X", NULL, G_CALLBACK(compose_cut_cb) },
-	{"Edit/Copy",			NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(compose_copy_cb) },
-	{"Edit/Paste",			NULL, N_("_Paste"), "<control>V", NULL, G_CALLBACK(compose_paste_cb) },
-
-	{"Edit/SpecialPaste",		NULL, N_("_Special paste") },
-	{"Edit/SpecialPaste/AsQuotation",	NULL, N_("As _quotation"), NULL, NULL, G_CALLBACK(compose_paste_as_quote_cb) },
-	{"Edit/SpecialPaste/Wrapped",	NULL, N_("_Wrapped"), NULL, NULL, G_CALLBACK(compose_paste_wrap_cb) },
-	{"Edit/SpecialPaste/Unwrapped",	NULL, N_("_Unwrapped"), NULL, NULL, G_CALLBACK(compose_paste_no_wrap_cb) },
-
-	{"Edit/SelectAll",		NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(compose_allsel_cb) },
-
-	{"Edit/Advanced",		NULL, N_("A_dvanced") },
-	{"Edit/Advanced/BackChar",	NULL, N_("Move a character backward"), "<shift><control>B", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER*/
-	{"Edit/Advanced/ForwChar",	NULL, N_("Move a character forward"), "<shift><control>F", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER*/
-	{"Edit/Advanced/BackWord",	NULL, N_("Move a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD*/
-	{"Edit/Advanced/ForwWord",	NULL, N_("Move a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD*/
-	{"Edit/Advanced/BegLine",	NULL, N_("Move to beginning of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE*/
-	{"Edit/Advanced/EndLine",	NULL, N_("Move to end of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE*/
-	{"Edit/Advanced/PrevLine",	NULL, N_("Move to previous line"), "<control>P", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE*/
-	{"Edit/Advanced/NextLine",	NULL, N_("Move to next line"), "<control>N", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE*/
-	{"Edit/Advanced/DelBackChar",	NULL, N_("Delete a character backward"), "<control>H", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER*/
-	{"Edit/Advanced/DelForwChar",	NULL, N_("Delete a character forward"), "<control>D", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER*/
-	{"Edit/Advanced/DelBackWord",	NULL, N_("Delete a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD*/
-	{"Edit/Advanced/DelForwWord",	NULL, N_("Delete a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD*/
-	{"Edit/Advanced/DelLine",	NULL, N_("Delete line"), "<control>U", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE*/
-	{"Edit/Advanced/DelEndLine",	NULL, N_("Delete to end of line"), "<control>K", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END*/
-
-	/* {"Edit/---",			NULL, "---" }, */
-	{"Edit/Find",		NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(compose_find_cb) },
-
-	/* {"Edit/---",			NULL, "---" }, */
-	{"Edit/WrapPara",		NULL, N_("_Wrap current paragraph"), "<control>L", NULL, G_CALLBACK(compose_wrap_cb) }, /* 0 */
-	{"Edit/WrapAllLines",		NULL, N_("Wrap all long _lines"), "<control><alt>L", NULL, G_CALLBACK(compose_wrap_all_cb) }, /* 1 */
-	/* {"Edit/---",			NULL, "---" }, */
-	{"Edit/ExtEditor",		NULL, N_("Edit with e_xternal editor"), "<shift><control>X", NULL, G_CALLBACK(compose_ext_editor_cb) },
+	{"Edit/Undo",                     NULL, N_("_Undo"), "<control>Z", NULL, G_CALLBACK(compose_undo_cb) },
+	{"Edit/Redo",                     NULL, N_("_Redo"), "<control>Y", NULL, G_CALLBACK(compose_redo_cb) },
+	{"Edit/---",                      NULL, "---", NULL, NULL, NULL },
+
+	{"Edit/Cut",                      NULL, N_("Cu_t"), "<control>X", NULL, G_CALLBACK(compose_cut_cb) },
+	{"Edit/Copy",                     NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(compose_copy_cb) },
+	{"Edit/Paste",                    NULL, N_("_Paste"), "<control>V", NULL, G_CALLBACK(compose_paste_cb) },
+
+	{"Edit/SpecialPaste",             NULL, N_("_Special paste"), NULL, NULL, NULL },
+	{"Edit/SpecialPaste/AsQuotation", NULL, N_("As _quotation"), NULL, NULL, G_CALLBACK(compose_paste_as_quote_cb) },
+	{"Edit/SpecialPaste/Wrapped",     NULL, N_("_Wrapped"), NULL, NULL, G_CALLBACK(compose_paste_wrap_cb) },
+	{"Edit/SpecialPaste/Unwrapped",   NULL, N_("_Unwrapped"), NULL, NULL, G_CALLBACK(compose_paste_no_wrap_cb) },
+
+	{"Edit/SelectAll",                NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(compose_allsel_cb) },
+
+	{"Edit/Advanced",                 NULL, N_("A_dvanced"), NULL, NULL, NULL },
+	{"Edit/Advanced/BackChar",        NULL, N_("Move a character backward"), "<shift><control>B", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER*/
+	{"Edit/Advanced/ForwChar",        NULL, N_("Move a character forward"), "<shift><control>F", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER*/
+	{"Edit/Advanced/BackWord",        NULL, N_("Move a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD*/
+	{"Edit/Advanced/ForwWord",        NULL, N_("Move a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD*/
+	{"Edit/Advanced/BegLine",         NULL, N_("Move to beginning of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE*/
+	{"Edit/Advanced/EndLine",         NULL, N_("Move to end of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE*/
+	{"Edit/Advanced/PrevLine",        NULL, N_("Move to previous line"), "<control>P", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE*/
+	{"Edit/Advanced/NextLine",        NULL, N_("Move to next line"), "<control>N", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE*/
+	{"Edit/Advanced/DelBackChar",     NULL, N_("Delete a character backward"), "<control>H", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER*/
+	{"Edit/Advanced/DelForwChar",     NULL, N_("Delete a character forward"), "<control>D", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER*/
+	{"Edit/Advanced/DelBackWord",     NULL, N_("Delete a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD*/
+	{"Edit/Advanced/DelForwWord",     NULL, N_("Delete a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD*/
+	{"Edit/Advanced/DelLine",         NULL, N_("Delete line"), "<control>U", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE*/
+	{"Edit/Advanced/DelEndLine",      NULL, N_("Delete to end of line"), "<control>K", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END*/
+
+	/* {"Edit/---",                   NULL, "---", NULL, NULL, NULL }, */
+	{"Edit/Find",                     NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(compose_find_cb) },
+
+	/* {"Edit/---",                   NULL, "---", NULL, NULL, NULL }, */
+	{"Edit/WrapPara",                 NULL, N_("_Wrap current paragraph"), "<control>L", NULL, G_CALLBACK(compose_wrap_cb) }, /* 0 */
+	{"Edit/WrapAllLines",             NULL, N_("Wrap all long _lines"), "<control><alt>L", NULL, G_CALLBACK(compose_wrap_all_cb) }, /* 1 */
+	/* {"Edit/---",                   NULL, "---", NULL, NULL, NULL }, */
+	{"Edit/ExtEditor",                NULL, N_("Edit with e_xternal editor"), "<shift><control>X", NULL, G_CALLBACK(compose_ext_editor_cb) },
 #if USE_ENCHANT
 /* Spelling menu */
-	{"Spelling/CheckAllSel",	NULL, N_("_Check all or check selection"), NULL, NULL, G_CALLBACK(compose_check_all) },
-	{"Spelling/HighlightAll",	NULL, N_("_Highlight all misspelled words"), NULL, NULL, G_CALLBACK(compose_highlight_all) },
-	{"Spelling/CheckBackwards",	NULL, N_("Check _backwards misspelled word"), NULL, NULL, G_CALLBACK(compose_check_backwards) },
-	{"Spelling/ForwardNext",	NULL, N_("_Forward to next misspelled word"), NULL, NULL, G_CALLBACK(compose_check_forwards_go) },
+	{"Spelling/CheckAllSel",          NULL, N_("_Check all or check selection"), NULL, NULL, G_CALLBACK(compose_check_all) },
+	{"Spelling/HighlightAll",         NULL, N_("_Highlight all misspelled words"), NULL, NULL, G_CALLBACK(compose_highlight_all) },
+	{"Spelling/CheckBackwards",       NULL, N_("Check _backwards misspelled word"), NULL, NULL, G_CALLBACK(compose_check_backwards) },
+	{"Spelling/ForwardNext",          NULL, N_("_Forward to next misspelled word"), NULL, NULL, G_CALLBACK(compose_check_forwards_go) },
 
-	{"Spelling/---",		NULL, "---" },
-	{"Spelling/Options",		NULL, N_("_Options") },
+	{"Spelling/---",                  NULL, "---", NULL, NULL, NULL },
+	{"Spelling/Options",              NULL, N_("_Options"), NULL, NULL, NULL },
 #endif
 
 /* Options menu */
+	{"Options/ReplyMode",                 NULL, N_("Reply _mode"), NULL, NULL, NULL },
+	{"Options/---",                       NULL, "---", NULL, NULL, NULL },
+	{"Options/PrivacySystem",             NULL, N_("Privacy _System"), NULL, NULL, NULL },
+	{"Options/PrivacySystem/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
 
-	{"Options/ReplyMode",		NULL, N_("Reply _mode") },
-	{"Options/---",			NULL, "---" },
-	{"Options/PrivacySystem",	NULL, N_("Privacy _System") },
-	{"Options/PrivacySystem/PlaceHolder",	NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+	/* {"Options/---",                NULL, "---", NULL, NULL, NULL }, */
+	{"Options/Priority",              NULL, N_("_Priority"), NULL, NULL, NULL },
 
-	/* {"Options/---",		NULL, "---" }, */
-
-	{"Options/Priority",		NULL, N_("_Priority") },
-
-	{"Options/Encoding",		NULL, N_("Character _encoding") },
-	{"Options/Encoding/---",	NULL, "---" },
+	{"Options/Encoding",              NULL, N_("Character _encoding"), NULL, NULL, NULL },
+	{"Options/Encoding/---",          NULL, "---", NULL, NULL, NULL },
 #define ENC_ACTION(cs_char,c_char,string) \
-	{ "Options/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
-
-	{"Options/Encoding/Western",	NULL, N_("Western European") },
-	{"Options/Encoding/Baltic",	NULL, N_("Baltic") },
-	{"Options/Encoding/Hebrew",	NULL, N_("Hebrew") },
-	{"Options/Encoding/Arabic",	NULL, N_("Arabic") },
-	{"Options/Encoding/Cyrillic",	NULL, N_("Cyrillic") },
-	{"Options/Encoding/Japanese",	NULL, N_("Japanese") },
-	{"Options/Encoding/Chinese",	NULL, N_("Chinese") },
-	{"Options/Encoding/Korean",	NULL, N_("Korean") },
-	{"Options/Encoding/Thai",	NULL, N_("Thai") },
+	{"Options/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
+
+	{"Options/Encoding/Western",      NULL, N_("Western European"), NULL, NULL, NULL },
+	{"Options/Encoding/Baltic",       NULL, N_("Baltic"), NULL, NULL, NULL },
+	{"Options/Encoding/Hebrew",       NULL, N_("Hebrew"), NULL, NULL, NULL },
+	{"Options/Encoding/Arabic",       NULL, N_("Arabic"), NULL, NULL, NULL },
+	{"Options/Encoding/Cyrillic",     NULL, N_("Cyrillic"), NULL, NULL, NULL },
+	{"Options/Encoding/Japanese",     NULL, N_("Japanese"), NULL, NULL, NULL },
+	{"Options/Encoding/Chinese",      NULL, N_("Chinese"), NULL, NULL, NULL },
+	{"Options/Encoding/Korean",       NULL, N_("Korean"), NULL, NULL, NULL },
+	{"Options/Encoding/Thai",         NULL, N_("Thai"), NULL, NULL, NULL },
 
 /* Tools menu */
-	{"Tools/AddressBook",		NULL, N_("_Address book"), NULL, NULL, G_CALLBACK(compose_address_cb) }, 
+	{"Tools/AddressBook",             NULL, N_("_Address book"), NULL, NULL, G_CALLBACK(compose_address_cb) }, 
 
-	{"Tools/Template",	NULL, N_("_Template") },
-	{"Tools/Template/PlaceHolder",	NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
-	{"Tools/Actions",	NULL, N_("Actio_ns") },
-	{"Tools/Actions/PlaceHolder",	NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+	{"Tools/Template",                NULL, N_("_Template"), NULL, NULL, NULL },
+	{"Tools/Template/PlaceHolder",    NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+	{"Tools/Actions",                 NULL, N_("Actio_ns"), NULL, NULL, NULL },
+	{"Tools/Actions/PlaceHolder",     NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
 
 /* Help menu */
-	{"Help/About",		NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_show_cb) }, 
+	{"Help/About",                    NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_show_cb) }, 
 };
 
 static GtkToggleActionEntry compose_toggle_entries[] =
 {
-	{"Edit/AutoWrap",		NULL, N_("Aut_o wrapping"), "<shift><control>L", NULL, G_CALLBACK(compose_toggle_autowrap_cb) }, /* TOGGLE */
-	{"Edit/AutoIndent",		NULL, N_("Auto _indent"), NULL, NULL, G_CALLBACK(compose_toggle_autoindent_cb) }, /* TOGGLE */
-	{"Options/Sign",		NULL, N_("Si_gn"), NULL, NULL, G_CALLBACK(compose_toggle_sign_cb) }, /* Toggle */
-	{"Options/Encrypt",		NULL, N_("_Encrypt"), NULL, NULL, G_CALLBACK(compose_toggle_encrypt_cb) }, /* Toggle */
-	{"Options/RequestRetRcpt",	NULL, N_("_Request Return Receipt"), NULL, NULL, G_CALLBACK(compose_toggle_return_receipt_cb) }, /* TOGGLE */
-	{"Options/RemoveReferences",	NULL, N_("Remo_ve references"), NULL, NULL, G_CALLBACK(compose_toggle_remove_refs_cb) }, /* TOGGLE */
-	{"Tools/ShowRuler",		NULL, N_("Show _ruler"), NULL, NULL, G_CALLBACK(compose_toggle_ruler_cb) }, /* Toggle */
+	{"Edit/AutoWrap",            NULL, N_("Aut_o wrapping"), "<shift><control>L", NULL, G_CALLBACK(compose_toggle_autowrap_cb), FALSE }, /* Toggle */
+	{"Edit/AutoIndent",          NULL, N_("Auto _indent"), NULL, NULL, G_CALLBACK(compose_toggle_autoindent_cb), FALSE }, /* Toggle */
+	{"Options/Sign",             NULL, N_("Si_gn"), NULL, NULL, G_CALLBACK(compose_toggle_sign_cb), FALSE }, /* Toggle */
+	{"Options/Encrypt",          NULL, N_("_Encrypt"), NULL, NULL, G_CALLBACK(compose_toggle_encrypt_cb), FALSE }, /* Toggle */
+	{"Options/RequestRetRcpt",   NULL, N_("_Request Return Receipt"), NULL, NULL, G_CALLBACK(compose_toggle_return_receipt_cb), FALSE }, /* Toggle */
+	{"Options/RemoveReferences", NULL, N_("Remo_ve references"), NULL, NULL, G_CALLBACK(compose_toggle_remove_refs_cb), FALSE }, /* Toggle */
+	{"Tools/ShowRuler",          NULL, N_("Show _ruler"), NULL, NULL, G_CALLBACK(compose_toggle_ruler_cb), FALSE }, /* Toggle */
 };
 
 static GtkRadioActionEntry compose_radio_rm_entries[] =
 {
-	{"Options/ReplyMode/Normal",	NULL, N_("_Normal"), NULL, NULL, COMPOSE_REPLY }, /* RADIO compose_reply_change_mode_cb */
-	{"Options/ReplyMode/All",	NULL, N_("_All"), NULL, NULL, COMPOSE_REPLY_TO_ALL }, /* RADIO compose_reply_change_mode_cb */
-	{"Options/ReplyMode/Sender",	NULL, N_("_Sender"), NULL, NULL, COMPOSE_REPLY_TO_SENDER }, /* RADIO compose_reply_change_mode_cb */
-	{"Options/ReplyMode/List",	NULL, N_("_Mailing-list"), NULL, NULL, COMPOSE_REPLY_TO_LIST }, /* RADIO compose_reply_change_mode_cb */
+	{"Options/ReplyMode/Normal", NULL, N_("_Normal"), NULL, NULL, COMPOSE_REPLY }, /* RADIO compose_reply_change_mode_cb */
+	{"Options/ReplyMode/All",    NULL, N_("_All"), NULL, NULL, COMPOSE_REPLY_TO_ALL }, /* RADIO compose_reply_change_mode_cb */
+	{"Options/ReplyMode/Sender", NULL, N_("_Sender"), NULL, NULL, COMPOSE_REPLY_TO_SENDER }, /* RADIO compose_reply_change_mode_cb */
+	{"Options/ReplyMode/List",   NULL, N_("_Mailing-list"), NULL, NULL, COMPOSE_REPLY_TO_LIST }, /* RADIO compose_reply_change_mode_cb */
 };
 
 static GtkRadioActionEntry compose_radio_prio_entries[] =
 {
-	{"Options/Priority/Highest",	NULL, N_("_Highest"), NULL, NULL, PRIORITY_HIGHEST }, /* RADIO compose_set_priority_cb */
-	{"Options/Priority/High",	NULL, N_("Hi_gh"), NULL, NULL, PRIORITY_HIGH }, /* RADIO compose_set_priority_cb */
-	{"Options/Priority/Normal",	NULL, N_("_Normal"), NULL, NULL, PRIORITY_NORMAL }, /* RADIO compose_set_priority_cb */
-	{"Options/Priority/Low",	NULL, N_("Lo_w"), NULL, NULL, PRIORITY_LOW }, /* RADIO compose_set_priority_cb */
-	{"Options/Priority/Lowest",	NULL, N_("_Lowest"), NULL, NULL, PRIORITY_LOWEST }, /* RADIO compose_set_priority_cb */
+	{"Options/Priority/Highest", NULL, N_("_Highest"), NULL, NULL, PRIORITY_HIGHEST }, /* RADIO compose_set_priority_cb */
+	{"Options/Priority/High",    NULL, N_("Hi_gh"), NULL, NULL, PRIORITY_HIGH }, /* RADIO compose_set_priority_cb */
+	{"Options/Priority/Normal",  NULL, N_("_Normal"), NULL, NULL, PRIORITY_NORMAL }, /* RADIO compose_set_priority_cb */
+	{"Options/Priority/Low",     NULL, N_("Lo_w"), NULL, NULL, PRIORITY_LOW }, /* RADIO compose_set_priority_cb */
+	{"Options/Priority/Lowest",  NULL, N_("_Lowest"), NULL, NULL, PRIORITY_LOWEST }, /* RADIO compose_set_priority_cb */
 };
 
 static GtkRadioActionEntry compose_radio_enc_entries[] =
@@ -2847,26 +2845,28 @@ static MailField compose_entries_set(Compose *compose, const gchar *mailto, Comp
 
 static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 {
-	static HeaderEntry hentry[] = {{"Reply-To:",	NULL, TRUE},
-				       {"Cc:",		NULL, TRUE},
-				       {"References:",	NULL, FALSE},
-				       {"Bcc:",		NULL, TRUE},
-				       {"Newsgroups:",  NULL, TRUE},
-				       {"Followup-To:", NULL, TRUE},
-				       {"List-Post:",	NULL, FALSE},
-				       {"X-Priority:",	NULL, FALSE},
-				       {NULL,		NULL, FALSE}};
+	static HeaderEntry hentry[] = {
+				       {"Reply-To:",    NULL, TRUE },
+				       {"Cc:",          NULL, TRUE },
+				       {"References:",  NULL, FALSE },
+				       {"Bcc:",         NULL, TRUE },
+				       {"Newsgroups:",  NULL, TRUE },
+				       {"Followup-To:", NULL, TRUE },
+				       {"List-Post:",   NULL, FALSE },
+				       {"X-Priority:",  NULL, FALSE },
+				       {NULL,           NULL, FALSE }
+	};
 
 	enum
 	{
-		H_REPLY_TO	= 0,
-		H_CC		= 1,
-		H_REFERENCES	= 2,
-		H_BCC		= 3,
-		H_NEWSGROUPS	= 4,
-		H_FOLLOWUP_TO	= 5,
-		H_LIST_POST	= 6,
- 		H_X_PRIORITY	= 7
+		H_REPLY_TO    = 0,
+		H_CC          = 1,
+		H_REFERENCES  = 2,
+		H_BCC         = 3,
+		H_NEWSGROUPS  = 4,
+		H_FOLLOWUP_TO = 5,
+		H_LIST_POST   = 6,
+ 		H_X_PRIORITY  = 7
 	};
 
 	FILE *fp;
@@ -4233,7 +4233,7 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
 		can_break = TRUE;
 	}
 
-//	debug_print("compose_get_line_break_pos(): do_break = %d, pos = %d, col = %d\n", do_break, pos, col);
+/*	debug_print("compose_get_line_break_pos(): do_break = %d, pos = %d, col = %d\n", do_break, pos, col); */
 
 	g_free(attrs);
 	g_free(str);
@@ -4479,7 +4479,7 @@ static gboolean compose_beautify_paragraph(Compose *compose, GtkTextIter *par_it
 		quote_str = compose_get_quote_str(buffer, &iter, &quote_len);
 
 		if (quote_str) {
-//			debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
+/*			debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str); */
 			if (startq_offset == -1) 
 				startq_offset = gtk_text_iter_get_offset(&iter);
 			quotelevel = get_quote_level(quote_str, prefs_common.quote_chars);
@@ -4725,11 +4725,11 @@ colorize:
 			}
 		}
 		if (!modified) {
-//			debug_print("not modified, out after %d lines\n", lines);
+/*			debug_print("not modified, out after %d lines\n", lines); */
 			goto end;
 		}
 	}
-//	debug_print("modified, out after %d lines\n", lines);
+/*	debug_print("modified, out after %d lines\n", lines); */
 end:
 	g_free(itemized_chars);
 	if (par_iter)
@@ -11186,7 +11186,7 @@ static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
 {
 	compose->modified = TRUE;
-//	compose_beautify_paragraph(compose, NULL, TRUE);
+/*	compose_beautify_paragraph(compose, NULL, TRUE); */
 #ifndef GENERIC_UMPC
 	compose_set_title(compose);
 #endif

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 18:00:18 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 18:00:18 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-83-g878b6d7
Message-ID: <20161227170018.5810836A4502@mx.colino.net>

The branch, master has been updated
       via  878b6d7a2037c66041f02f641270a02e1db7d1d3 (commit)
      from  0372b283a84f6cd5288f34f79249e826fcbcb00f (commit)

Summary of changes:
 src/plugins/address_keeper/address_keeper_prefs.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 878b6d7a2037c66041f02f641270a02e1db7d1d3
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 17:58:47 2016 +0100

    More places where printf() and C_() have to be separated.

diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index ae5b9bd..12ba15e 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -143,10 +143,11 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_to_checkbox), addkeeperprefs.keep_to_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_to_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_to_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
-			"Keep addresses which appear in '%s' headers"),
-			prefs_common_translated_header_name("To"));
+	tr = g_strdup(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"));
+	text = g_strdup_printf(tr, prefs_common_translated_header_name("To"));
 	CLAWS_SET_TIP(keep_to_checkbox, text);
+	g_free(tr);
 	g_free(text);
 	gtk_widget_show(keep_to_checkbox);
 
@@ -156,11 +157,12 @@ static void addkeeper_prefs_create_widget_func(PrefsPage * _page,
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_cc_checkbox), addkeeperprefs.keep_cc_addrs);
 	gtk_box_pack_start(GTK_BOX(keep_hbox), keep_cc_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(keep_cc_checkbox);
-	text = g_strdup_printf(C_("address keeper: %s stands for a header name",
-			"Keep addresses which appear in '%s' headers"),
-			prefs_common_translated_header_name("Cc"));
+	tr = g_strdup(C_("address keeper: %s stands for a header name",
+			"Keep addresses which appear in '%s' headers"));
+	text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc"));
 	CLAWS_SET_TIP(keep_cc_checkbox, text);
 	g_free(text);
+	g_free(tr);
 	gtk_widget_show(keep_cc_checkbox);
 
 	page->keep_cc_addrs_check = keep_cc_checkbox;

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 18:04:29 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 18:04:29 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-84-g30a1c08
Message-ID: <20161227170429.EE01636A44FC@mx.colino.net>

The branch, master has been updated
       via  30a1c0875f4ac72c1609c7beb0497d20ef789f64 (commit)
      from  878b6d7a2037c66041f02f641270a02e1db7d1d3 (commit)

Summary of changes:
 src/prefs_toolbar.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 30a1c0875f4ac72c1609c7beb0497d20ef789f64
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 18:02:55 2016 +0100

    Fix enum boundaries we check in func_selection_changed (when
    changing the internal function assigned to a toolbar item).
    Just a theoretical issue here apparently, or we would have had
    problems since ages.

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 24efd93..b86835b 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -861,15 +861,18 @@ static void func_selection_changed(GtkComboBox *action_combo,
 			   prefs_toolbar->item_func_combo));
 
 	if(text != NULL) { /* action */
-		int action = -1;
+		int action;
+
 		action = toolbar_ret_val_from_descr(text);
-		if (action >= 0)
+		g_free(text);
+		if (action > -1) {
+			gint icon;
+
 			gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry),
 					toolbar_get_short_text(action));
-		g_free(text);
-		if (action >= 0) {
-			StockPixmap stockp = toolbar_get_icon(action);
-			if (stockp >= 0)  {
+			icon = toolbar_get_icon(action);
+			if (icon > -1)  {
+				StockPixmap stockp = (StockPixmap)icon;
 				g_free(prefs_toolbar->item_icon_file);
 				prefs_toolbar->item_icon_file = g_strdup(stock_pixmap_get_name(stockp));
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 18:06:04 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 18:06:04 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-85-gf69f158
Message-ID: <20161227170604.3267336A44FC@mx.colino.net>

The branch, master has been updated
       via  f69f1588a93e4988990617bba6ec03933b081693 (commit)
      from  30a1c0875f4ac72c1609c7beb0497d20ef789f64 (commit)

Summary of changes:
 src/toolbar.c |  167 ++++++++++++++++++---------------------------------------
 1 file changed, 53 insertions(+), 114 deletions(-)


- Log -----------------------------------------------------------------
commit f69f1588a93e4988990617bba6ec03933b081693
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 18:04:42 2016 +0100

    Factorize toolbar reset code, and don't compute array sizes using
    unsafe calculations.

diff --git a/src/toolbar.c b/src/toolbar.c
index 7b7aaae..6819586 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -84,9 +84,12 @@ static void   toolbar_parse_item		(XMLFile        *file,
 static gint   toolbar_ret_val_from_text		(const gchar	*text);
 static gchar *toolbar_ret_text_from_val		(gint           val);
 
-static void   toolbar_set_default_main		(void);
-static void   toolbar_set_default_compose	(void);
-static void   toolbar_set_default_msgview	(void);
+typedef struct _DefaultToolbar DefaultToolbar;
+struct _DefaultToolbar {
+	gint action;
+};
+static void toolbar_set_default_generic(ToolbarType toolbar_type,
+						 DefaultToolbar *default_toolbar);
 
 static void	toolbar_style			(ToolbarType 	 type, 
 						 guint 		 action, 
@@ -578,11 +581,43 @@ gint toolbar_get_icon(int action) {
 	}
 }
 
-static void toolbar_set_default_main(void) 
+static void toolbar_set_default_generic(ToolbarType toolbar_type, DefaultToolbar *default_toolbar)
 {
-	struct {
-		gint action;
-	} default_toolbar[] = {
+	gint i;
+
+	g_return_if_fail(default_toolbar != NULL);
+
+	for (i = 0; default_toolbar[i].action != N_ACTION_VAL; i++) {
+		
+		ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
+		
+		if (default_toolbar[i].action != A_SEPARATOR) {
+			gchar *file = NULL;
+			gint icon;
+
+			icon = toolbar_get_icon(default_toolbar[i].action);
+			if (icon > -1) {
+				file = stock_pixmap_get_name((StockPixmap)icon);
+			}
+			toolbar_item->file  = g_strdup(file);
+			toolbar_item->index = default_toolbar[i].action;
+			toolbar_item->text  = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
+		} else {
+			toolbar_item->file  = g_strdup(TOOLBAR_TAG_SEPARATOR);
+			toolbar_item->index = A_SEPARATOR;
+		}
+
+		if (toolbar_item->index != -1) {
+			if (!toolbar_is_duplicate(toolbar_item->index, toolbar_type)) 
+				toolbar_config[toolbar_type].item_list = 
+					g_slist_append(toolbar_config[toolbar_type].item_list, toolbar_item);
+		}	
+	}
+}
+
+void toolbar_set_default(ToolbarType source)
+{
+	DefaultToolbar default_toolbar_main[] = {
 #ifdef GENERIC_UMPC
 		{ A_GO_FOLDERS},
 		{ A_OPEN_MAIL},		
@@ -605,44 +640,10 @@ static void toolbar_set_default_main(void)
 		{ A_LEARN_SPAM},
 #endif
 		{ A_SEPARATOR},
-		{ A_GOTO_NEXT}
+		{ A_GOTO_NEXT},
+		{ N_ACTION_VAL}
 	};
-	
-	gint i;
-	
-	for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-		
-		ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-		
-		if (default_toolbar[i].action != A_SEPARATOR) {
-			
-			gchar *file = NULL;
-			if (toolbar_get_icon(default_toolbar[i].action) > -1) {
-				file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
-			}
-			
-			toolbar_item->file  = g_strdup(file);
-			toolbar_item->index = default_toolbar[i].action;
-			toolbar_item->text  = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
-		} else {
-
-			toolbar_item->file  = g_strdup(TOOLBAR_TAG_SEPARATOR);
-			toolbar_item->index = A_SEPARATOR;
-		}
-		
-		if (toolbar_item->index != -1) {
-			if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_MAIN)) 
-				toolbar_config[TOOLBAR_MAIN].item_list = 
-					g_slist_append(toolbar_config[TOOLBAR_MAIN].item_list, toolbar_item);
-		}	
-	}
-}
-
-static void toolbar_set_default_compose(void)
-{
-	struct {
-		gint action;
-	} default_toolbar[] = {
+	DefaultToolbar default_toolbar_compose[] = {
 #ifdef GENERIC_UMPC
 		{ A_CLOSE},
 		{ A_SEPARATOR}, 
@@ -656,43 +657,11 @@ static void toolbar_set_default_compose(void)
 #endif
 		{ A_ATTACH},
 		{ A_SEPARATOR},
-		{ A_ADDRBOOK}
+		{ A_ADDRBOOK},
+		{ N_ACTION_VAL}
 	};
-	
-	gint i;
-
-	for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-		
-		ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-		
-		if (default_toolbar[i].action != A_SEPARATOR) {
-			
-			gchar *file = NULL;
-			if (toolbar_get_icon(default_toolbar[i].action) > -1) {
-				file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
-			}
-			toolbar_item->file  = g_strdup(file);
-			toolbar_item->index = default_toolbar[i].action;
-			toolbar_item->text  = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
-		} else {
 
-			toolbar_item->file  = g_strdup(TOOLBAR_TAG_SEPARATOR);
-			toolbar_item->index = A_SEPARATOR;
-		}
-		
-		if (toolbar_item->index != -1) {
-			if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_COMPOSE)) 
-				toolbar_config[TOOLBAR_COMPOSE].item_list = 
-					g_slist_append(toolbar_config[TOOLBAR_COMPOSE].item_list, toolbar_item);
-		}	
-	}
-}
-
-static void toolbar_set_default_msgview(void)
-{
-	struct {
-		gint action;
-	} default_toolbar[] = {
+	DefaultToolbar default_toolbar_msgview[] = {
 #ifdef GENERIC_UMPC
 		{ A_CLOSE},
 		{ A_SEPARATOR}, 
@@ -706,46 +675,16 @@ static void toolbar_set_default_msgview(void)
 #ifndef GENERIC_UMPC
 		{ A_LEARN_SPAM},
 #endif
-		{ A_GOTO_NEXT}
+		{ A_GOTO_NEXT},
+		{ N_ACTION_VAL}
 	};
 	
-	gint i;
-
-	for (i = 0; i < sizeof(default_toolbar) / sizeof(default_toolbar[0]); i++) {
-		
-		ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
-		
-		if (default_toolbar[i].action != A_SEPARATOR) {
-			gchar *file = NULL;
-			if (toolbar_get_icon(default_toolbar[i].action) > -1) {
-				file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
-			}
-			
-			toolbar_item->file  = g_strdup(file);
-			toolbar_item->index = default_toolbar[i].action;
-			toolbar_item->text  = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
-		} else {
-
-			toolbar_item->file  = g_strdup(TOOLBAR_TAG_SEPARATOR);
-			toolbar_item->index = A_SEPARATOR;
-		}
-		
-		if (toolbar_item->index != -1) {
-			if ( !toolbar_is_duplicate(toolbar_item->index, TOOLBAR_MSGVIEW)) 
-				toolbar_config[TOOLBAR_MSGVIEW].item_list = 
-					g_slist_append(toolbar_config[TOOLBAR_MSGVIEW].item_list, toolbar_item);
-		}	
-	}
-}
-
-void toolbar_set_default(ToolbarType source)
-{
 	if (source == TOOLBAR_MAIN)
-		toolbar_set_default_main();
+		toolbar_set_default_generic(TOOLBAR_MAIN, default_toolbar_main);
 	else if  (source == TOOLBAR_COMPOSE)
-		toolbar_set_default_compose();
+		toolbar_set_default_generic(TOOLBAR_COMPOSE, default_toolbar_compose);
 	else if  (source == TOOLBAR_MSGVIEW)
-		toolbar_set_default_msgview();
+		toolbar_set_default_generic(TOOLBAR_MSGVIEW, default_toolbar_msgview);
 }
 
 void toolbar_save_config_file(ToolbarType source)

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Tue Dec 27 18:07:46 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Tue, 27 Dec 2016 18:07:46 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-86-gb2b913e
Message-ID: <20161227170747.0742836A44FC@mx.colino.net>

The branch, master has been updated
       via  b2b913e310f2876e5e4686ff5746be8e3c79d455 (commit)
      from  f69f1588a93e4988990617bba6ec03933b081693 (commit)

Summary of changes:
 src/gtk/gtkunit.c   |    3 +--
 src/passwordstore.c |   33 ++++++++++++++-------------------
 src/stock_pixmap.c  |    6 +++---
 3 files changed, 18 insertions(+), 24 deletions(-)


- Log -----------------------------------------------------------------
commit b2b913e310f2876e5e4686ff5746be8e3c79d455
Author: wwp <wwp at free.fr>
Date:   Tue Dec 27 18:06:11 2016 +0100

    Fix compiler warnings when we test enum-based variables for impossible
    <0 values.

diff --git a/src/gtk/gtkunit.c b/src/gtk/gtkunit.c
index 5652610..4c0f47a 100644
--- a/src/gtk/gtkunit.c
+++ b/src/gtk/gtkunit.c
@@ -436,8 +436,7 @@ gtk_unit_format_string (const gchar *format,
 
   g_return_val_if_fail (format != NULL, NULL);
   g_return_val_if_fail (unit == CM_UNIT_PERCENT ||
-                        (unit >= CM_UNIT_PIXEL &&
-                         unit < gtk_unit_get_number_of_units ()), NULL);
+                        (unit < gtk_unit_get_number_of_units ()), NULL);
 
   while (i < (sizeof (buffer) - 1) && *format)
     {
diff --git a/src/passwordstore.c b/src/passwordstore.c
index 95946ef..68f4b51 100644
--- a/src/passwordstore.c
+++ b/src/passwordstore.c
@@ -45,8 +45,7 @@ static PasswordBlock *_get_block(PasswordBlockType block_type,
 	GSList *item;
 	PasswordBlock *block;
 
-	g_return_val_if_fail(block_type >= 0 && block_type < NUM_PWS_TYPES,
-			NULL);
+	g_return_val_if_fail(block_type < NUM_PWS_TYPES, NULL);
 	g_return_val_if_fail(block_name != NULL, NULL);
 
 	for (item = _password_store; item != NULL; item = item->next) {
@@ -72,8 +71,7 @@ static PasswordBlock *_new_block(PasswordBlockType block_type,
 {
 	PasswordBlock *block;
 
-	g_return_val_if_fail(block_type >= 0 && block_type < NUM_PWS_TYPES,
-			NULL);
+	g_return_val_if_fail(block_type < NUM_PWS_TYPES, NULL);
 	g_return_val_if_fail(block_name != NULL, NULL);
 
 	/* First check to see if the block doesn't already exist. */
@@ -98,7 +96,7 @@ static PasswordBlock *_new_block(PasswordBlockType block_type,
 	return block;
 }
 
-///////////////////////////////////////////////////////////////
+/*************************************************************/
 
 /* Stores a password. */
 gboolean passwd_store_set(PasswordBlockType block_type,
@@ -111,8 +109,7 @@ gboolean passwd_store_set(PasswordBlockType block_type,
 	PasswordBlock *block;
 	gchar *encrypted_password;
 
-	g_return_val_if_fail(block_type >= 0 && block_type < NUM_PWS_TYPES,
-			FALSE);
+	g_return_val_if_fail(block_type < NUM_PWS_TYPES, FALSE);
 	g_return_val_if_fail(block_name != NULL, FALSE);
 	g_return_val_if_fail(password_id != NULL, FALSE);
 
@@ -127,7 +124,7 @@ gboolean passwd_store_set(PasswordBlockType block_type,
 			password_id, block_type, block_name,
 			(encrypted ? ", already encrypted" : "") );
 
-	// find correct block (create if needed)
+	/* find correct block (create if needed) */
 	if ((block = _get_block(block_type, block_name)) == NULL) {
 		/* If caller wants to delete a password, and even its block
 		 * doesn't exist, we're done. */
@@ -159,7 +156,7 @@ gboolean passwd_store_set(PasswordBlockType block_type,
 			encrypted_password = g_strdup(p);
 		}
 
-		// add encrypted password to the block
+		/* add encrypted password to the block */
 		g_hash_table_insert(block->entries,
 				g_strdup(password_id),
 				encrypted_password);
@@ -176,21 +173,20 @@ gchar *passwd_store_get(PasswordBlockType block_type,
 	PasswordBlock *block;
 	gchar *encrypted_password, *password;
 
-	g_return_val_if_fail(block_type >= 0 && block_type < NUM_PWS_TYPES,
-			NULL);
+	g_return_val_if_fail(block_type < NUM_PWS_TYPES, NULL);
 	g_return_val_if_fail(block_name != NULL, NULL);
 	g_return_val_if_fail(password_id != NULL, NULL);
 
 	debug_print("Getting password '%s' from block (%d/%s)\n",
 			password_id, block_type, block_name);
 
-	// find correct block
+	/* find correct block */
 	if ((block = _get_block(block_type, block_name)) == NULL) {
 		debug_print("Block (%d/%s) not found.\n", block_type, block_name);
 		return NULL;
 	}
 
-	// grab pointer to encrypted password
+	/* grab pointer to encrypted password */
 	if ((encrypted_password =
 				g_hash_table_lookup(block->entries, password_id)) == NULL) {
 		debug_print("Password '%s' in block (%d/%s) not found.\n",
@@ -198,7 +194,7 @@ gchar *passwd_store_get(PasswordBlockType block_type,
 		return NULL;
 	}
 
-	// decrypt password
+	/* decrypt password */
 	if ((password =
 				password_decrypt(encrypted_password, NULL)) == NULL) {
 		debug_print("Could not decrypt password '%s' for block (%d/%s).\n",
@@ -206,7 +202,7 @@ gchar *passwd_store_get(PasswordBlockType block_type,
 		return NULL;
 	}
 
-	// return decrypted password
+	/* return decrypted password */
 	return password;
 }
 
@@ -215,13 +211,12 @@ gboolean passwd_store_delete_block(PasswordBlockType block_type,
 {
 	PasswordBlock *block;
 
-	g_return_val_if_fail(block_type >= 0 && block_type < NUM_PWS_TYPES,
-			FALSE);
+	g_return_val_if_fail(block_type < NUM_PWS_TYPES, FALSE);
 	g_return_val_if_fail(block_name != NULL, FALSE);
 
 	debug_print("Deleting block (%d/%s)\n", block_type, block_name);
 
-	// find correct block
+	/* find correct block */
 	if ((block = _get_block(block_type, block_name)) == NULL) {
 		debug_print("Block (%d/%s) not found.\n", block_type, block_name);
 		return FALSE;
@@ -401,7 +396,7 @@ void passwd_store_read_config(void)
 	PasswordBlock *block = NULL;
 	PasswordBlockType type;
 
-	// TODO: passwd_store_clear();
+	/* TODO: passwd_store_clear(); */
 
 	debug_print("Reading password store from file...\n");
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 702b45c..b73ebc2 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -464,7 +464,7 @@ GtkWidget *stock_pixmap_widget(StockPixmap icon)
 {
 	GdkPixbuf *pixbuf;
 
-	cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
+	cm_return_val_if_fail(icon < N_STOCK_PIXMAPS, NULL);
 
 	if (stock_pixbuf_gdk(icon, &pixbuf) != -1)
 		return gtk_image_new_from_pixbuf(pixbuf);
@@ -485,7 +485,7 @@ gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 	if (pixbuf)
 		*pixbuf = NULL;
 
-	cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
+	cm_return_val_if_fail(icon < N_STOCK_PIXMAPS, -1);
 
 	pix_d = &pixmaps[icon];
 
@@ -635,7 +635,7 @@ void stock_pixmap_themes_list_free(GList *list)
 
 gchar *stock_pixmap_get_name (StockPixmap icon)
 {
-	if (icon < 0 || icon >= N_STOCK_PIXMAPS)
+	if (icon >= N_STOCK_PIXMAPS)
 		return NULL;
 
 	return pixmaps[icon].file;

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Wed Dec 28 13:55:09 2016
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Wed, 28 Dec 2016 13:55:09 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-87-g38af4d7
Message-ID: <20161228125509.8D6D236A44F7@mx.colino.net>

The branch, master has been updated
       via  38af4d7654547396808189ad2a46560ef7d10d1f (commit)
      from  b2b913e310f2876e5e4686ff5746be8e3c79d455 (commit)

Summary of changes:
 src/summaryview.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 38af4d7654547396808189ad2a46560ef7d10d1f
Author: Paul <paul at claws-mail.org>
Date:   Wed Dec 28 12:55:04 2016 +0000

    make Go to/[Next|Prev] sort order aware

diff --git a/src/summaryview.c b/src/summaryview.c
index c2a9362..2bf5399 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1814,7 +1814,10 @@ void summary_select_prev(SummaryView *summaryview)
 	GtkCMCTreeNode *node = summaryview->selected;
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
-	node = gtkut_ctree_node_prev(ctree, node);
+	if (summaryview->sort_type == SORT_ASCENDING)
+		node = gtkut_ctree_node_prev(ctree, node);
+	else
+		node = gtkut_ctree_node_next(ctree, node);
 
 	if (node && node != summaryview->selected)
 		summary_select_node(summaryview, node, -1);
@@ -1825,7 +1828,10 @@ void summary_select_next(SummaryView *summaryview)
 	GtkCMCTreeNode *node = summaryview->selected;
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
-	node = gtkut_ctree_node_next(ctree, node);
+	if (summaryview->sort_type == SORT_ASCENDING)
+		node = gtkut_ctree_node_next(ctree, node);
+	else
+		node = gtkut_ctree_node_prev(ctree, node);
 
 	if (node && node != summaryview->selected)
 		summary_select_node(summaryview, node, -1);

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Thu Dec 29 13:45:22 2016
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Thu, 29 Dec 2016 13:45:22 +0100 (CET)
Subject: [Commits] [SCM] claws branch, master, updated. 3.14.1-88-ga0fbaac
Message-ID: <20161229124522.2BD0236A451E@mx.colino.net>

The branch, master has been updated
       via  a0fbaacf1748f052cedcf34b213e1bad005ac213 (commit)
      from  38af4d7654547396808189ad2a46560ef7d10d1f (commit)

Summary of changes:
 src/summary_search.c |    1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit a0fbaacf1748f052cedcf34b213e1bad005ac213
Author: wwp <wwp at free.fr>
Date:   Thu Dec 29 13:42:46 2016 +0100

    Fix 'search folder' not working in some cases (it needs a 'clear' click to
    work or to manually clear search fields).
    Fix provided by Paul, the be(a)st.

diff --git a/src/summary_search.c b/src/summary_search.c
index 67d22a4..e56557d 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -731,6 +731,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
 	}
 	summary_lock(summaryview);
 
+	search_window.matcher_is_outdated = TRUE;
 	search_window.is_searching = TRUE;
 	main_window_cursor_wait(summaryview->mainwin);
 	summary_show_stop_button();

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


hooks/post-receive
-- 
Claws Mail