From ticho at claws-mail.org  Wed Jul  1 12:26:07 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 12:26:07 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-184-g198db03
Message-ID: <20150701102607.3876A36A4321@mx.colino.net>

The branch, master has been updated
       via  198db03ee8b70159f27f1b3033b2ad1802a138ed (commit)
      from  4b955c34ba07d0c520da37fc1d201de732302a71 (commit)

Summary of changes:
 src/plugins/managesieve/claws.def      |    2 +-
 src/plugins/managesieve/sieve_editor.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 198db03ee8b70159f27f1b3033b2ad1802a138ed
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 12:25:32 2015 +0200

    Managesieve: use accessor for common preferences
    
    Fixes crash on Windows when opening the script editor window.

diff --git a/src/plugins/managesieve/claws.def b/src/plugins/managesieve/claws.def
index 43b1e89..cb8ffc2 100644
--- a/src/plugins/managesieve/claws.def
+++ b/src/plugins/managesieve/claws.def
@@ -39,7 +39,7 @@ prefs_account_register_page
 prefs_account_set_privacy_prefs
 prefs_account_unregister_page
 prefs_button_toggled
-prefs_common
+prefs_common_get_prefs
 session_connect
 session_destroy
 session_disconnect
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 28f75f5..7dc9577 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -578,11 +578,11 @@ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Filter", "Revert", "Filter/Revert", GT
 			 G_CALLBACK(sieve_editor_changed_cb), page);
 
 	/* set text font */
-	if (prefs_common.textfont) {
+	if (prefs_common_get_prefs()->textfont) {
 		PangoFontDescription *font_desc;
 
 		font_desc = pango_font_description_from_string
-			(prefs_common.textfont);
+			(prefs_common_get_prefs()->textfont);
 		if (font_desc) {
 			gtk_widget_modify_font(text, font_desc);
 			pango_font_description_free(font_desc);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Jul  1 18:48:07 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 18:48:07 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-185-ge184b18
Message-ID: <20150701164807.25BC736A433E@mx.colino.net>

The branch, master has been updated
       via  e184b18f5796f9fd5d23410b7dc68d298e609933 (commit)
      from  198db03ee8b70159f27f1b3033b2ad1802a138ed (commit)

Summary of changes:
 src/plugins/managesieve/sieve_prefs.c |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit e184b18f5796f9fd5d23410b7dc68d298e609933
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 18:45:36 2015 +0200

    Managesieve: Fix parsing config string on Windows
    
    Windows sscanf() does not understand the %ms format yet, so we
    have to do the allocation of target buffer ourselves before
    calling sscanf(), and copy the host string to config->host.
    
    Also fix some off-by-one bugs in other sscanf() parameters - the
    field width format modifier does not include trailing NUL byte,
    which is added.

diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index 69d8aa4..0bd3e41 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -151,6 +151,7 @@ static void sieve_prefs_account_create_widget_func(PrefsPage *_page,
 	gtk_size_group_add_widget(size_group, host_checkbtn);
 
 	host_entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(host_entry), 255);
 	gtk_widget_show (host_entry);
 	gtk_box_pack_start (GTK_BOX (hbox), host_entry, TRUE, TRUE, 0);
 	SET_TOGGLE_SENSITIVITY (host_checkbtn, host_entry);
@@ -419,6 +420,13 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
 	gchar enc_userid[256], enc_passwd[256];
 	gchar enable, use_host, use_port;
 	gsize len;
+#ifdef G_OS_WIN32
+	/* Windows sscanf() does not understand the %ms format yet, so we
+	 * have to do the allocation of target buffer ourselves before
+	 * calling sscanf(), and copy the host string to config->host.
+	 */
+	gchar tmphost[256];
+#endif
 
 	config = g_new0(SieveAccountConfig, 1);
 
@@ -437,10 +445,17 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
 	if (confstr == NULL)
 		return config;
 
-
-	sscanf(confstr, "%c%c %ms %c%hu %hhu %hhu %hhu %256s %256s",
+#ifdef G_OS_WIN32
+	sscanf(confstr, "%c%c %255s %c%hu %hhu %hhu %hhu %255s %255s",
+#else
+	sscanf(confstr, "%c%c %ms %c%hu %hhu %hhu %hhu %255s %255s",
+#endif
 			&enable, &use_host,
+#ifdef G_OS_WIN32
+			tmphost,
+#else
 			&config->host,
+#endif
 			&use_port, &config->port,
 			(char *)&config->tls_type,
 			(char *)&config->auth,
@@ -448,6 +463,10 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
 			enc_userid,
 			enc_passwd);
 
+#ifdef G_OS_WIN32
+	config->host = g_strndup(tmphost, 255);
+#endif
+
 	config->enable = enable == 'y';
 	config->use_host = use_host == 'y';
 	config->use_port = use_port == 'y';

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Jul  1 19:03:21 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 19:03:21 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-186-g95c770f
Message-ID: <20150701170321.40CBB36A433C@mx.colino.net>

The branch, master has been updated
       via  95c770f2fdf65e0506333e2dd00f8855a2c4ae65 (commit)
      from  e184b18f5796f9fd5d23410b7dc68d298e609933 (commit)

Summary of changes:
 src/gtk/manage_window.c |    2 --
 1 file changed, 2 deletions(-)


- Log -----------------------------------------------------------------
commit 95c770f2fdf65e0506333e2dd00f8855a2c4ae65
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 19:00:02 2015 +0200

    Reenable transient windows for win32. Fixes bug #2866.
    
    This effectively reverts older commit ed483d5f.

diff --git a/src/gtk/manage_window.c b/src/gtk/manage_window.c
index a1100ec..47f786a 100644
--- a/src/gtk/manage_window.c
+++ b/src/gtk/manage_window.c
@@ -85,8 +85,6 @@ void manage_window_destroy(GtkWidget *widget, gpointer data)
 
 void manage_window_set_transient(GtkWindow *window)
 {
-#ifndef G_OS_WIN32
 	if (window && focus_window)
 		gtk_window_set_transient_for(window, GTK_WINDOW(focus_window));
-#endif
 }

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Jul  1 20:38:02 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 20:38:02 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-187-g567b040
Message-ID: <20150701183803.04F2D36A433E@mx.colino.net>

The branch, master has been updated
       via  567b040b6b814b6d6f01bf1a59adb1865f623511 (commit)
      from  95c770f2fdf65e0506333e2dd00f8855a2c4ae65 (commit)

Summary of changes:
 src/alertpanel.h                    |    1 +
 src/folder.c                        |   13 +++++++++++++
 src/folder.h                        |    2 ++
 src/foldersel.c                     |    5 +++++
 src/mh_gtk.c                        |    6 ++++++
 src/plugins/mailmbox/plugin_gtk.c   |   16 ++++++++++++++--
 src/plugins/rssyl/rssyl_cb_menu.c   |   15 ++++++++++++++-
 src/plugins/rssyl/rssyl_subscribe.c |    9 +++++++++
 8 files changed, 64 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 567b040b6b814b6d6f01bf1a59adb1865f623511
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 20:37:00 2015 +0200

    Disallow folder names to begin or end with a dot on Windows.
    
    I fixed the most obvious locations - MH, RSSyl, mbox. There
    may be more.

diff --git a/src/alertpanel.h b/src/alertpanel.h
index 800c48e..4a461ad 100644
--- a/src/alertpanel.h
+++ b/src/alertpanel.h
@@ -21,6 +21,7 @@
 #define __ALERTPANEL_H__
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 typedef enum
 {
diff --git a/src/folder.c b/src/folder.c
index 4bd2447..06f12cb 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -36,6 +36,7 @@
 #include <w32lib.h>
 #endif
 
+#include "alertpanel.h"
 #include "folder.h"
 #include "session.h"
 #include "inc.h"
@@ -4811,3 +4812,15 @@ gint folder_item_search_msgs_local	(Folder			*folder,
 	return matched_count;
 }
 
+/* Tests if a local (on disk) folder name is acceptable. */
+gboolean folder_local_name_ok(const gchar *name)
+{
+#ifdef G_OS_WIN32
+	if (name[0] == '.' || new_folder[strlen(name) - 1]) {
+		alertpanel_error(_("A folder name cannot begin or end with a dot.");
+		return FALSE;
+	}
+#endif
+
+	return TRUE;
+}
diff --git a/src/folder.h b/src/folder.h
index e0ad21a..69c0538 100644
--- a/src/folder.h
+++ b/src/folder.h
@@ -1005,4 +1005,6 @@ gint folder_item_search_msgs_local	(Folder			*folder,
 					 gpointer		progress_data);
 
 gchar *folder_get_list_path	(void);
+gboolean folder_local_name_ok(const gchar *name);
+
 #endif /* __FOLDER_H__ */
diff --git a/src/foldersel.c b/src/foldersel.c
index ac3cdf1..e618d41 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -597,6 +597,11 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
 		return;
 	}
 
+	if (FOLDER_TYPE(selected_item->folder) != F_IMAP &&
+			FOLDER_TYPE(selected_item->folder) != F_NEWS &&
+			!folder_local_name_ok(new_folder))
+		return;
+
 	disp_name = trim_string(new_folder, 32);
 	AUTORELEASE_STR(disp_name, {g_free(disp_name); return;});
 
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 2995f01..d5f0fd5 100644
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -157,6 +157,9 @@ static void new_folder_cb(GtkAction *action, gpointer data)
 		return;
 	}
 
+	if (!folder_local_name_ok(new_folder))
+		return;
+
 	name = trim_string(new_folder, 32);
 	AUTORELEASE_STR(name, {g_free(name); return;});
 
@@ -263,6 +266,9 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
 		return;
 	}
 
+	if (!folder_local_name_ok(new_folder))
+		return;
+
 	if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
 		name = trim_string(new_folder, 32);
 		alertpanel_error(_("The folder '%s' already exists."), name);
diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index e6b30f5..0ca7336 100644
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -198,13 +198,19 @@ static void add_mailbox(GtkAction *action, gpointer callback_data)
 		return;
 	}
 	basename = g_path_get_basename(path);
+
+	if (!folder_local_name_ok(basename)) {
+		g_free(path);
+		g_free(basename);
+		return;
+	}
+
 	folder = folder_new(folder_get_class_from_string("mailmbox"), 
 			    !strcmp(path, "Mail") ? _("Mailbox") : basename,
 			    path);
-	g_free(basename);			    
+	g_free(basename);
 	g_free(path);
 
-
 	if (folder->klass->create_tree(folder) < 0) {
 		alertpanel_error(_("Creation of the mailbox failed.\n"
 				   "Maybe some files already exist, or you don't have the permission to write there."));
@@ -251,6 +257,9 @@ static void new_folder_cb(GtkAction *action, gpointer data)
 		return;
 	}
 
+	if (!folder_local_name_ok(new_folder))
+		return;
+
 	name = trim_string(new_folder, 32);
 	AUTORELEASE_STR(name, {g_free(name); return;});
 
@@ -418,6 +427,9 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
 		return;
 	}
 
+	if (!folder_local_name_ok(new_folder))
+		return;
+
 	parent = folder_item_parent(item);
 	p = g_strconcat(parent->path ? parent->path : "", ".", new_folder, NULL);
 	if (folder_find_child_item_by_name(parent, p)) {
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 1a30f04..771791b 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -103,6 +103,11 @@ void rssyl_new_folder_cb(GtkAction *action,
 		return;
 	}
 
+	if (!folder_local_name_ok(new_folder)) {
+		g_free(new_folder);
+		return;
+	}
+
 	/* Find an unused name for new folder */
 	/* TODO: Perhaps stop after X attempts? */
 	tmp = g_strdup(new_folder);
@@ -198,11 +203,16 @@ void rssyl_rename_cb(GtkAction *action,
 	g_free(message);
 	g_free(name);
 	if (!new_folder) return;
-	AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
 
 	if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
 		alertpanel_error(_("'%c' can't be included in folder name."),
 				 G_DIR_SEPARATOR);
+		g_free(new_folder);
+		return;
+	}
+
+	if (!folder_local_name_ok(new_folder)) {
+		g_free(new_folder);
 		return;
 	}
 
@@ -210,14 +220,17 @@ void rssyl_rename_cb(GtkAction *action,
 		name = trim_string(new_folder, 32);
 		alertpanel_error(_("The folder '%s' already exists."), name);
 		g_free(name);
+		g_free(new_folder);
 		return;
 	}
 
 	if (folder_item_rename(item, new_folder) < 0) {
 		alertpanel_error(_("The folder could not be renamed.\n"
 				   "The new folder name is not allowed."));
+		g_free(new_folder);
 		return;
 	}
+	g_free(new_folder);
 
 	folder_item_prefs_save_config(item);
 	folder_write_list();
diff --git a/src/plugins/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index 7cc30e9..b9dbc43 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -127,6 +127,15 @@ gboolean rssyl_subscribe(FolderItem *parent, const gchar *url,
 	/* Create a folder for it. */
 	tmpname = rssyl_format_string(ctx->feed->title, TRUE, TRUE);
 	tmpname2 = g_strdup(tmpname);
+
+#ifdef G_OS_WIN32
+	/* Windows does not allow its filenames to start or end with a dot. */
+	if (tmpname2[0] == '.')
+		tmpname2[0] = "_";
+	if (tmpname2[strlen(tmpname2) - 1] == '.')
+		tmpname2[strlen(tmpname2) - 1] == '_';
+#endif
+
 	while (folder_find_child_item_by_name(parent, tmpname2) != 0 && i < 20) {
 		debug_print("RSSyl: Folder '%s' already exists, trying another name\n",
 				tmpname2);

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


hooks/post-receive
-- 
Claws Mail

From mir at datanom.net  Wed Jul  1 21:10:16 2015
From: mir at datanom.net (Michael Rasmussen)
Date: Wed, 1 Jul 2015 21:10:16 +0200
Subject: [Commits] [SCM] claws branch, master,
 updated. 3.11.1-187-g567b040
In-Reply-To: <20150701183803.04F2D36A433E@mx.colino.net>
References: <20150701183803.04F2D36A433E@mx.colino.net>
Message-ID: <20150701211016.2125acdf@sleipner.datanom.net>

On Wed,  1 Jul 2015 20:38:02 +0200 (CEST)
ticho at claws-mail.org wrote:

> +#ifdef G_OS_WIN32
> +	if (name[0] == '.' || new_folder[strlen(name) - 1]) {
> +		alertpanel_error(_("A folder name cannot begin or end with a dot.");
> +		return FALSE;
> +	}
> +#endif
Should this not have been:
if (name[0] == '.' || new_folder[strlen(name) - 1] == '.') {

-- 
Hilsen/Regards
Michael Rasmussen

Get my public GnuPG keys:
michael <at> rasmussen <dot> cc
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xD3C9A00E
mir <at> datanom <dot> net
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE501F51C
mir <at> miras <dot> org
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE3E80917
--------------------------------------------------------------
/usr/games/fortune -es says:
What we do not understand we do not possess.
		-- Goethe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.claws-mail.org/pipermail/commits/attachments/20150701/bc37239f/attachment.sig>

From andrej at kacian.sk  Wed Jul  1 21:29:28 2015
From: andrej at kacian.sk (Andrej Kacian)
Date: Wed, 1 Jul 2015 21:29:28 +0200
Subject: [Commits] [SCM] claws branch, master,
 updated. 3.11.1-187-g567b040
In-Reply-To: <20150701211016.2125acdf@sleipner.datanom.net>
References: <20150701183803.04F2D36A433E@mx.colino.net>
 <20150701211016.2125acdf@sleipner.datanom.net>
Message-ID: <20150701212928.73ac427d@penny>

On Wed, 1 Jul 2015 21:10:16 +0200
Michael Rasmussen <mir at datanom.net> wrote:

> Should this not have been:
> if (name[0] == '.' || new_folder[strlen(name) - 1] == '.') {

Aargh, of course! Thanks, I was being too hasty. :)

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

From ticho at claws-mail.org  Wed Jul  1 21:31:33 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 21:31:33 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-188-g226efcb
Message-ID: <20150701193133.4AB1836A4344@mx.colino.net>

The branch, master has been updated
       via  226efcbfa441f121d1b12a2ad43d830865e50e2d (commit)
      from  567b040b6b814b6d6f01bf1a59adb1865f623511 (commit)

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


- Log -----------------------------------------------------------------
commit 226efcbfa441f121d1b12a2ad43d830865e50e2d
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 21:30:50 2015 +0200

    Fix a logic error introduced in previous commit.

diff --git a/src/folder.c b/src/folder.c
index 06f12cb..081c4b1 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -4816,7 +4816,7 @@ gint folder_item_search_msgs_local	(Folder			*folder,
 gboolean folder_local_name_ok(const gchar *name)
 {
 #ifdef G_OS_WIN32
-	if (name[0] == '.' || new_folder[strlen(name) - 1]) {
+	if (name[0] == '.' || new_folder[strlen(name) - 1] == '.') {
 		alertpanel_error(_("A folder name cannot begin or end with a dot.");
 		return FALSE;
 	}

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Jul  1 21:48:19 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  1 Jul 2015 21:48:19 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-189-g13198cd
Message-ID: <20150701194819.3136636A4346@mx.colino.net>

The branch, master has been updated
       via  13198cd1802012dec7e8c87a6185b4f8c11f63ae (commit)
      from  226efcbfa441f121d1b12a2ad43d830865e50e2d (commit)

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


- Log -----------------------------------------------------------------
commit 13198cd1802012dec7e8c87a6185b4f8c11f63ae
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 1 21:47:57 2015 +0200

    Fix a Win32-specific syntax error.

diff --git a/src/folder.c b/src/folder.c
index 081c4b1..b0ae336 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -4817,7 +4817,7 @@ gboolean folder_local_name_ok(const gchar *name)
 {
 #ifdef G_OS_WIN32
 	if (name[0] == '.' || new_folder[strlen(name) - 1] == '.') {
-		alertpanel_error(_("A folder name cannot begin or end with a dot.");
+		alertpanel_error(_("A folder name cannot begin or end with a dot."));
 		return FALSE;
 	}
 #endif

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Jul  7 18:47:29 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue,  7 Jul 2015 18:47:29 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-191-g90d8c2d
Message-ID: <20150707164729.6A59536A439C@mx.colino.net>

The branch, master has been updated
       via  90d8c2dc5a38de2bb992826583c8f20dac2f1ba4 (commit)
       via  33fd5d6227e037fa5ff50ed5e1a07db8630e7f8e (commit)
      from  13198cd1802012dec7e8c87a6185b4f8c11f63ae (commit)

Summary of changes:
 src/folderview.c                             |    5 +++++
 src/plugins/att_remover/att_remover.c        |    2 +-
 src/plugins/att_remover/claws.def            |    1 -
 src/plugins/bogofilter/bogofilter.c          |    2 +-
 src/plugins/bsfilter/bsfilter.c              |    2 +-
 src/plugins/bsfilter/claws.def               |    1 -
 src/plugins/clamd/clamav_plugin.c            |    4 ++--
 src/plugins/gdata/cm_gdata_contacts.c        |    2 +-
 src/plugins/geolocation/geolocation_plugin.c |    2 +-
 src/plugins/python/clawsmailmodule.c         |    4 ++--
 src/plugins/rssyl/claws.def                  |    1 -
 src/plugins/rssyl/rssyl_cb_menu.c            |    2 +-
 src/plugins/rssyl/rssyl_feed.c               |    2 +-
 src/plugins/rssyl/rssyl_update_feed.c        |    6 +++---
 src/plugins/spamassassin/spamassassin.c      |    8 ++++----
 15 files changed, 23 insertions(+), 21 deletions(-)


- Log -----------------------------------------------------------------
commit 90d8c2dc5a38de2bb992826583c8f20dac2f1ba4
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Jul 7 18:45:55 2015 +0200

    Avoid some unnecessary foldertree redraws.
    
    In particular, there were some redraws before moving a folder
    and before moving to a next unread message in different folder.
    This slowed these actions perceptibly on Windows.

diff --git a/src/folderview.c b/src/folderview.c
index c9b3f24..45e6537 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -877,11 +877,13 @@ static void folderview_select_node(FolderView *folderview, GtkCMCTreeNode *node)
 		return;
 	}
 
+	gtk_cmclist_freeze(GTK_CMCLIST(ctree));
 	gtkut_ctree_expand_parent_all(ctree, node);
 
 	folderview->open_folder = TRUE;
 	gtkut_ctree_set_focus_row(ctree, node);
 	gtk_cmctree_select(ctree, node);
+	gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 	if ((folderview->summaryview->folder_item &&
 	    folderview->summaryview->folder_item->total_msgs > 0) ||
 	     prefs_common.layout_mode == SMALL_LAYOUT)
@@ -2496,6 +2498,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
 
 	statusbar_verbosity_set(FALSE);
 	folder_item_update_freeze();
+	gtk_cmclist_freeze(GTK_CMCLIST(folderview->ctree));
 	if ((status = folder_item_move_to(from_folder, to_folder, &new_folder, copy)) == F_MOVE_OK) {
 		statusbar_verbosity_set(FALSE);
 		main_window_cursor_normal(folderview->mainwin);
@@ -2507,10 +2510,12 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
 			gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), 
 				NULL, to_folder), new_folder->folder);
 		folderview_select(folderview, new_folder);
+		gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree));
 	} else {
 		statusbar_verbosity_set(FALSE);		
 		main_window_cursor_normal(folderview->mainwin);
 		STATUSBAR_POP(folderview->mainwin);
+		gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree));
 		folder_item_update_thaw();
 		switch (status) {
 		case F_MOVE_FAILED_DEST_IS_PARENT:

commit 33fd5d6227e037fa5ff50ed5e1a07db8630e7f8e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Jul 7 18:44:34 2015 +0200

    Use accessor for common preferences in all plugins.

diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index a60c1ef..a629515 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -349,7 +349,7 @@ static void remove_attachments_dialog(AttRemover *attremover)
 				  -1));
 	list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
 	g_object_unref(model);	
-	gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+	gtk_tree_view_set_rules_hint(list_view, prefs_common_get_prefs()->use_stripes_everywhere);
 	
 	renderer = gtk_cell_renderer_toggle_new();
 	g_signal_connect(renderer, "toggled", G_CALLBACK(remove_toggled_cb), model);
diff --git a/src/plugins/att_remover/claws.def b/src/plugins/att_remover/claws.def
index 2c69e2c..6b2cf4e 100644
--- a/src/plugins/att_remover/claws.def
+++ b/src/plugins/att_remover/claws.def
@@ -35,7 +35,6 @@ matcherlist_new
 matcherprop_new
 pref_get_escaped_pref
 pref_get_unescaped_pref
-prefs_common
 prefs_common_get_prefs
 prefs_file_close
 prefs_file_close_revert
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 66bd311..45ef823 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -619,7 +619,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 			msg =  g_strdup_printf(_("The Bogofilter plugin couldn't filter "
 					   "a message. The command `%s %s %s` couldn't be run."), 
 					   bogo_args[0], bogo_args[1], bogo_args[2]);
-		if (!prefs_common.no_recv_err_panel) {
+		if (!prefs_common_get_prefs()->no_recv_err_panel) {
 			if (!warned_error) {
 				alertpanel_error("%s", msg);
 			}
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index 8484b2c..ac051e5 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -400,7 +400,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 			msg =  g_strdup_printf(_("The Bsfilter plugin couldn't filter "
 					   "a message. The command `%s` couldn't be run."), 
 					   bs_exec);
-		if (!prefs_common.no_recv_err_panel) {
+		if (!prefs_common_get_prefs()->no_recv_err_panel) {
 			if (!warned_error) {
 				alertpanel_error("%s", msg);
 			}
diff --git a/src/plugins/bsfilter/claws.def b/src/plugins/bsfilter/claws.def
index 2c39c40..602907b 100644
--- a/src/plugins/bsfilter/claws.def
+++ b/src/plugins/bsfilter/claws.def
@@ -17,7 +17,6 @@ matcherlist_new
 matcherprop_new
 pref_get_escaped_pref
 pref_get_unescaped_pref
-prefs_common
 prefs_file_close
 prefs_file_close_revert
 prefs_gtk_register_page
diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index c363e95..42f60bf 100644
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -119,8 +119,8 @@ static gboolean scan_func(GNode *node, gpointer data)
 						msg = g_strconcat(_("Detected %s virus."),
 							clamd_get_virus_name(buf.msg), NULL);
 						g_warning("%s\n", msg);
-						debug_print("no_recv: %d\n", prefs_common.no_recv_err_panel);
-						if (prefs_common.no_recv_err_panel) {
+						debug_print("no_recv: %d\n", prefs_common_get_prefs()->no_recv_err_panel);
+						if (prefs_common_get_prefs()->no_recv_err_panel) {
 						    statusbar_print_all("%s", msg);
 						}
 						else {
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index b6f39ff..20ae00d 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -603,7 +603,7 @@ void cm_gdata_add_contacts(GList **address_list)
 
 gboolean cm_gdata_update_contacts_cache(void)
 {
-  if(prefs_common.work_offline)
+  if(prefs_common_get_prefs()->work_offline)
   {
     debug_print("GData plugin: Offline mode\n");
   }
diff --git a/src/plugins/geolocation/geolocation_plugin.c b/src/plugins/geolocation/geolocation_plugin.c
index ed5fc87..158d825 100644
--- a/src/plugins/geolocation/geolocation_plugin.c
+++ b/src/plugins/geolocation/geolocation_plugin.c
@@ -488,7 +488,7 @@ static gboolean my_messageview_show_hook(gpointer source, gpointer data)
   }
 
   /* do nothing except hiding the button if claws mail is in offline mode */
-  if(prefs_common.work_offline) {
+  if(prefs_common_get_prefs()->work_offline) {
     gtk_widget_hide(container);
     return FALSE;
   }
diff --git a/src/plugins/python/clawsmailmodule.c b/src/plugins/python/clawsmailmodule.c
index c573aaf..5ce3b95 100644
--- a/src/plugins/python/clawsmailmodule.c
+++ b/src/plugins/python/clawsmailmodule.c
@@ -353,7 +353,7 @@ static PyObject* quicksearch_search(PyObject *self, PyObject *args)
   MainWindow *mainwin;
 
   /* must be given exactly one argument, which is a string */
-  searchtype = prefs_common.summary_quicksearch_type;
+  searchtype = prefs_common_get_prefs()->summary_quicksearch_type;
   if(!PyArg_ParseTuple(args, "s|i", &string, &searchtype))
     return NULL;
 
@@ -382,7 +382,7 @@ static PyObject* quicksearch_clear(PyObject *self, PyObject *args)
   }
 
   qs = mainwin->summaryview->quicksearch;
-  quicksearch_set(qs, prefs_common.summary_quicksearch_type, "");
+  quicksearch_set(qs, prefs_common_get_prefs()->summary_quicksearch_type, "");
 
   Py_INCREF(Py_None);
   return Py_None;
diff --git a/src/plugins/rssyl/claws.def b/src/plugins/rssyl/claws.def
index d819bed..ad106c9 100644
--- a/src/plugins/rssyl/claws.def
+++ b/src/plugins/rssyl/claws.def
@@ -89,7 +89,6 @@ make_dir_hier
 mh_get_class
 move_file
 msgcache_destroy
-prefs_common
 prefs_common_get_prefs
 prefs_file_close
 prefs_file_close_revert
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 771791b..2d31a88 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -250,7 +250,7 @@ void rssyl_refresh_feed_cb(GtkAction *action,
 	ritem = (RFolderItem *)item;
 
 	/* Offline check */
-	if( prefs_common.work_offline &&
+	if( prefs_common_get_prefs()->work_offline &&
 			!inc_offline_should_override(TRUE,
 					ngettext("Claws Mail needs network access in order "
 					"to update the feed.",
diff --git a/src/plugins/rssyl/rssyl_feed.c b/src/plugins/rssyl/rssyl_feed.c
index 46edc01..302ddc0 100644
--- a/src/plugins/rssyl/rssyl_feed.c
+++ b/src/plugins/rssyl/rssyl_feed.c
@@ -128,7 +128,7 @@ gboolean rssyl_refresh_timeout_cb(gpointer data)
 
 	g_return_val_if_fail(ctx != NULL, FALSE);
 
-	if( prefs_common.work_offline)
+	if( prefs_common_get_prefs()->work_offline)
 		return TRUE;
 
 	if( ctx->ritem == NULL || ctx->ritem->url == NULL ) {
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index 284b548..8e8b964 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -165,7 +165,7 @@ RFetchCtx *rssyl_prep_fetchctx_from_item(RFolderItem *ritem)
 	ctx->success = TRUE;
 	ctx->ready = FALSE;
 
-	feed_set_timeout(ctx->feed, prefs_common.io_timeout_secs);
+	feed_set_timeout(ctx->feed, prefs_common_get_prefs()->io_timeout_secs);
 	feed_set_cookies_path(ctx->feed, rssyl_prefs_get()->cookies_path);
 	feed_set_ssl_verify_peer(ctx->feed, ritem->ssl_verify_peer);
 	feed_set_auth(ctx->feed, ritem->auth);
@@ -191,7 +191,7 @@ RFetchCtx *rssyl_prep_fetchctx_from_url(gchar *url)
 	ctx->success = TRUE;
 	ctx->ready = FALSE;
 
-	feed_set_timeout(ctx->feed, prefs_common.io_timeout_secs);
+	feed_set_timeout(ctx->feed, prefs_common_get_prefs()->io_timeout_secs);
 	feed_set_cookies_path(ctx->feed, rssyl_prefs_get()->cookies_path);
 	feed_set_ssl_verify_peer(ctx->feed, rssyl_prefs_get()->ssl_verify_peer);
 #ifdef G_OS_WIN32
@@ -325,7 +325,7 @@ void rssyl_update_all_func(FolderItem *item, gpointer data)
 
 void rssyl_update_all_feeds(void)
 {
-	if (prefs_common.work_offline &&
+	if (prefs_common_get_prefs()->work_offline &&
 			!inc_offline_should_override(TRUE,
 				_("Claws Mail needs network access in order to update your feeds.")) ) {
 		return;
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 41753d9..98dd1ad 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -373,7 +373,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
 					   "a message. The probable cause of the error "
 					   "is an unreachable spamd daemon. Please make "
 					   "sure spamd is running and accessible.");
-		if (!prefs_common.no_recv_err_panel) {
+		if (!prefs_common_get_prefs()->no_recv_err_panel) {
 			if (!warned_error) {
 				alertpanel_error("%s", msg);
 			}
@@ -424,7 +424,7 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
 	}
 
 	if (config.transport == SPAMASSASSIN_TRANSPORT_TCP
-	&&  prefs_common.work_offline
+	&&  prefs_common_get_prefs()->work_offline
 	&&  !inc_offline_should_override(TRUE,
 		_("Claws Mail needs network access in order "
 		  "to feed this mail(s) to the remote learner."))) {
@@ -445,7 +445,7 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
 		} else {
 			cmd = g_strdup_printf("sa-learn -u %s%s %s %s",
 							config.username,
-							prefs_common.work_offline?" -L":"",
+							prefs_common_get_prefs()->work_offline?" -L":"",
 							spam?"--spam":"--ham", file);
 		}
 	}
@@ -479,7 +479,7 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
 		} else {
 			cmd = g_strdup_printf("sa-learn -u %s%s %s",
 					config.username,
-					prefs_common.work_offline?" -L":"",
+					prefs_common_get_prefs()->work_offline?" -L":"",
 					spam?"--spam":"--ham");
 
 			/* concatenate all message tmpfiles to the sa-learn command-line */

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Jul  7 21:50:25 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue,  7 Jul 2015 21:50:25 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-193-gffd3698
Message-ID: <20150707195025.2A64D36A439C@mx.colino.net>

The branch, master has been updated
       via  ffd36983385969ebd6d6f2ee0ac5a272d7523a7b (commit)
      from  704598e1e4fc3e0c070f8f393e3dfe067455e799 (commit)

Summary of changes:
 src/plugins/rssyl/claws.def |    1 +
 1 file changed, 1 insertion(+)


- Log -----------------------------------------------------------------
commit ffd36983385969ebd6d6f2ee0ac5a272d7523a7b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Jul 7 21:47:52 2015 +0200

    RSSyl: add a missing symbol to claws.def for Windows build.

diff --git a/src/plugins/rssyl/claws.def b/src/plugins/rssyl/claws.def
index ad106c9..d157eb2 100644
--- a/src/plugins/rssyl/claws.def
+++ b/src/plugins/rssyl/claws.def
@@ -49,6 +49,7 @@ folder_item_set_xml
 folder_item_update_freeze
 folder_item_update_thaw
 folder_local_folder_destroy
+folder_local_name_ok
 folder_new
 folder_register_class
 folder_scan_tree

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Wed Jul  8 06:13:02 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Wed,  8 Jul 2015 06:13:02 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-195-gd094dae
Message-ID: <20150708041302.4D0EE36A0194@mx.colino.net>

The branch, master has been updated
       via  d094dae1240af8aac8266abbbc597f790142cd1f (commit)
       via  ba83c690aa9f3341634234a45c922cab888f4867 (commit)
      from  ffd36983385969ebd6d6f2ee0ac5a272d7523a7b (commit)

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


- Log -----------------------------------------------------------------
commit d094dae1240af8aac8266abbbc597f790142cd1f
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 8 05:12:55 2015 +0100

    make 'mark all as read' dialogue button style match that in folderview

diff --git a/src/summaryview.c b/src/summaryview.c
index 01d284a..1f6308c 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4126,7 +4126,7 @@ void summary_mark_all_read(SummaryView *summaryview)
 	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, _("Mark all as read"), NULL,
+			  "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)

commit ba83c690aa9f3341634234a45c922cab888f4867
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 8 05:11:43 2015 +0100

    fix dialogue question when recursively marking all as read

diff --git a/src/folderview.c b/src/folderview.c
index 45e6537..c7dcd80 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -830,16 +830,20 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 	FolderView *folderview = (FolderView *)data;
 	FolderItem *item;
 	AlertValue val;
+	gchar *message;
 	
 	item = folderview_get_selected_item(folderview);
 	if (item == NULL)
 		return;
 
-	if (folderview->summaryview->folder_item != item
-	&&  prefs_common.ask_mark_all_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?");
+	if (folderview->summaryview->folder_item != item &&
+	    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,
+			  message, GTK_STOCK_NO, GTK_STOCK_YES, NULL,
 			  TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -847,7 +851,7 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 		else if (val & G_ALERTDISABLE)
 			prefs_common.ask_mark_all_read = FALSE;
 	}
-
+	g_free(message);
 	
 	folder_item_update_freeze();
 	if (folderview->summaryview->folder_item != item && !recursive)

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Wed Jul  8 17:40:11 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Wed,  8 Jul 2015 17:40:11 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-196-g951a0fe
Message-ID: <20150708154011.2A01936A0197@mx.colino.net>

The branch, master has been updated
       via  951a0fe24cfbc9be5f7c31ec0eee09a58759409a (commit)
      from  d094dae1240af8aac8266abbbc597f790142cd1f (commit)

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


- Log -----------------------------------------------------------------
commit 951a0fe24cfbc9be5f7c31ec0eee09a58759409a
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 8 17:37:44 2015 +0200

    Fix filtering action configuration dialog modality on Windows.
    
    First set transient_for, then show dialog, then set modal,
    just like other dialogs.

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 92bc5b5..3481776 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -300,6 +300,7 @@ void prefs_filtering_action_open(GSList *action_list,
 	prefs_filtering_action_set_dialog(action_list);
 
 	gtk_widget_show(filtering_action.window);
+	gtk_window_set_modal(GTK_WINDOW(filtering_action.window), TRUE);
 }
 
 /*!
@@ -393,7 +394,6 @@ static void prefs_filtering_action_create(void)
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_filtering_action");
 	gtk_container_set_border_width(GTK_CONTAINER(window), VBOX_BORDER);
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
 	vbox = gtk_vbox_new(FALSE, 6);

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Thu Jul  9 03:19:02 2015
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Thu,  9 Jul 2015 03:19:02 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-197-gf3d8486
Message-ID: <20150709011902.B0C8336A01AA@mx.colino.net>

The branch, master has been updated
       via  f3d84861e4d64dcb7453f9f827883a33e764e6bc (commit)
      from  951a0fe24cfbc9be5f7c31ec0eee09a58759409a (commit)

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


- Log -----------------------------------------------------------------
commit f3d84861e4d64dcb7453f9f827883a33e764e6bc
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Jul 9 03:14:56 2015 +0200

    Fix build with hardened compiler flags
    
    Error was:
    compose.c: In function 'compose_write_to_file':
    compose.c:5782:5: error: format not a string literal and no format
    arguments [-Werror=format-security]
         alertpanel_error(msg);
         ^
    cc1: some warnings being treated as errors
    Makefile:1430: recipe for target 'compose.o' failed
    make[6]: *** [compose.o] Error 1

diff --git a/src/compose.c b/src/compose.c
index 149eae9..4a6b5c0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5777,10 +5777,8 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gbool
 			if (!privacy_encrypt(compose->privacy_system, mimemsg, compose->encdata)) {
 				debug_print("Couldn't encrypt mime structure: %s.\n",
 						privacy_get_error());
-				msg = g_strdup_printf("Couldn't encrypt the email: %s",
+				alertpanel_error(_("Couldn't encrypt the email: %s"),
 						privacy_get_error());
-				alertpanel_error(msg);
-				g_free(msg);
 			}
 		}
 	}

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul  9 07:59:37 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu,  9 Jul 2015 07:59:37 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-198-gf4181ae
Message-ID: <20150709055938.2392336A01AA@mx.colino.net>

The branch, master has been updated
       via  f4181ae244124a3131eddff547614f5b58384c32 (commit)
      from  f3d84861e4d64dcb7453f9f827883a33e764e6bc (commit)

Summary of changes:
 po/POTFILES.in |    5 +++++
 1 file changed, 5 insertions(+)


- Log -----------------------------------------------------------------
commit f4181ae244124a3131eddff547614f5b58384c32
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 9 06:59:31 2015 +0100

    add managesieve plugin files

diff --git a/po/POTFILES.in b/po/POTFILES.in
index abbdf77..bea9815 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -115,6 +115,11 @@ src/plugins/libravatar/libravatar_prefs.c
 src/plugins/mailmbox/mailmbox_folder.c
 src/plugins/mailmbox/plugin.c
 src/plugins/mailmbox/plugin_gtk.c
+src/plugins/managesieve/managesieve.c
+src/plugins/managesieve/sieve_editor.c
+src/plugins/managesieve/sieve_manager.c
+src/plugins/managesieve/sieve_plugin.c
+src/plugins/managesieve/sieve_prefs.c
 src/plugins/newmail/newmail.c
 src/plugins/notification/notification_banner.c
 src/plugins/notification/notification_foldercheck.c

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul  9 08:13:01 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu,  9 Jul 2015 08:13:01 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-200-gc9593c3
Message-ID: <20150709061301.74DB036A01AA@mx.colino.net>

The branch, master has been updated
       via  c9593c34c33233c82c859f12884e59cc8ed9ce97 (commit)
       via  650714d6de5e2ccb22fd9b2f8280e526801efd19 (commit)
      from  f4181ae244124a3131eddff547614f5b58384c32 (commit)

Summary of changes:
 src/folderview.c                      |    1 -
 src/plugins/managesieve/managesieve.c |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit c9593c34c33233c82c859f12884e59cc8ed9ce97
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 9 07:12:55 2015 +0100

    remove unneeded and crash-causing g_free()

diff --git a/src/folderview.c b/src/folderview.c
index c7dcd80..16a58bf 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -851,7 +851,6 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
 		else if (val & G_ALERTDISABLE)
 			prefs_common.ask_mark_all_read = FALSE;
 	}
-	g_free(message);
 	
 	folder_item_update_freeze();
 	if (folderview->summaryview->folder_item != item && !recursive)

commit 650714d6de5e2ccb22fd9b2f8280e526801efd19
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 9 07:12:24 2015 +0100

    don't offer an empty string for translation

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 14f89db..4c67904 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -597,7 +597,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			ret = SE_AUTHFAIL;
 		} else if (response_is_ok(msg)) {
 			log_print(LOG_PROTOCOL, "Sieve auth completed\n");
-			sieve_error(sieve_session, _(""));
+			sieve_error(sieve_session, "");
 			sieve_session->authenticated = TRUE;
 			sieve_session->state = SIEVE_READY;
 			sieve_connected(sieve_session, TRUE);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Thu Jul  9 12:32:06 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Thu,  9 Jul 2015 12:32:06 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-201-g0158a51
Message-ID: <20150709103206.BAF2636A4276@mx.colino.net>

The branch, master has been updated
       via  0158a5105c5c4eb3c0239be2fa2bcc0461c760aa (commit)
      from  c9593c34c33233c82c859f12884e59cc8ed9ce97 (commit)

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


- Log -----------------------------------------------------------------
commit 0158a5105c5c4eb3c0239be2fa2bcc0461c760aa
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Jul 8 21:32:07 2015 +0200

    Make right-click behavior more intuitive in compose attachment list.

diff --git a/src/compose.c b/src/compose.c
index 4a6b5c0..959f6fc 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9746,15 +9746,35 @@ static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
 	Compose *compose = (Compose *)data;
 	GtkTreeSelection *attach_selection;
 	gint attach_nr_selected;
+	GtkTreePath *path;
 	
 	if (!event) return FALSE;
 
 	if (event->button == 3) {
 		attach_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
 		attach_nr_selected = gtk_tree_selection_count_selected_rows(attach_selection);
-			
+
+		/* If no rows, or just one row is selected, right-click should
+		 * open menu relevant to the row being right-clicked on. We
+		 * achieve that by selecting the clicked row first. If more
+		 * than one row is selected, we shouldn't modify the selection,
+		 * as user may want to remove selected rows (attachments). */
+		if (attach_nr_selected < 2) {
+			gtk_tree_selection_unselect_all(attach_selection);
+			attach_nr_selected = 0;
+			gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
+					event->x, event->y, &path, NULL, NULL, NULL);
+			if (path != NULL) {
+				gtk_tree_selection_select_path(attach_selection, path);
+				gtk_tree_path_free(path);
+				attach_nr_selected++;
+			}
+		}
+
 		cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", (attach_nr_selected > 0));
-		cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", (attach_nr_selected > 0));
+		/* Properties menu item makes no sense with more than one row
+		 * selected, the properties dialog can only edit one attachment. */
+		cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", (attach_nr_selected == 1));
 			
 		gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
 			       NULL, NULL, event->button, event->time);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Thu Jul  9 12:41:25 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Thu,  9 Jul 2015 12:41:25 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-202-ga3ee5ba
Message-ID: <20150709104126.0B4E936A4276@mx.colino.net>

The branch, master has been updated
       via  a3ee5bae26abfaf557ac0e1dbe798ed0e68dd956 (commit)
      from  0158a5105c5c4eb3c0239be2fa2bcc0461c760aa (commit)

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


- Log -----------------------------------------------------------------
commit a3ee5bae26abfaf557ac0e1dbe798ed0e68dd956
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Jul 9 12:38:50 2015 +0200

    Use g_win32_getlocale() in manual availability detection on Windows.

diff --git a/src/manual.c b/src/manual.c
index 94c26ac..6620720 100644
--- a/src/manual.c
+++ b/src/manual.c
@@ -47,17 +47,13 @@ static gchar *get_language()
 	gchar *c;
 
 #ifdef G_OS_WIN32
-	language = g_strdup(gtk_set_locale());
+	language = g_win32_getlocale();
 #else
-        /* FIXME: Why not using gtk_set_locale here too? -wk */
 	language = g_strdup(setlocale(LC_MESSAGES, NULL));
 #endif
-        /* At least under W32 it is possible that gtk_set_locate
-           returns NULL.  This is not documented but well, it happens
-           and g_strdup is happy with a NULL argument.  We return a
-           standard language string in this case. */
-        if (!language)
-                return g_strdup("en");
+	if (!language)
+		return g_strdup("en");
+
 	if((c = strchr(language, ',')) != NULL)
 		*c = '\0';
 	if((c = strchr(language, '_')) != NULL)

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Thu Jul  9 21:59:01 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Thu,  9 Jul 2015 21:59:01 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-203-gbd1465d
Message-ID: <20150709195902.3927636A01B0@mx.colino.net>

The branch, master has been updated
       via  bd1465de2b07f802bad434659257963fd833daa2 (commit)
      from  a3ee5bae26abfaf557ac0e1dbe798ed0e68dd956 (commit)

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


- Log -----------------------------------------------------------------
commit bd1465de2b07f802bad434659257963fd833daa2
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Jul 9 21:58:25 2015 +0200

    Fix folder selection dialog modality and focus on Windows.
    
    Again, first set transient_for, then modal.

diff --git a/src/foldersel.c b/src/foldersel.c
index e618d41..0b77f15 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -179,8 +179,8 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
 	gtk_widget_grab_focus(treeview);
 
 	gtk_window_present(GTK_WINDOW(window));
-	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	manage_window_set_transient(GTK_WINDOW(window));
+	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 
 	cancelled = finished = FALSE;
 

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Fri Jul 10 10:48:58 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Fri, 10 Jul 2015 10:48:58 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-204-g005c378
Message-ID: <20150710084859.27E6A36A01A7@mx.colino.net>

The branch, master has been updated
       via  005c378d7bfd868de3f64063b4fe13d144d235aa (commit)
      from  bd1465de2b07f802bad434659257963fd833daa2 (commit)

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


- Log -----------------------------------------------------------------
commit 005c378d7bfd868de3f64063b4fe13d144d235aa
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Jul 10 10:44:13 2015 +0200

    Fix Escape key closing color dialogs in /Display/Color common prefs.

diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index bd1c82b..4593055 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -746,7 +746,7 @@ static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
 	if (event) {
 		switch (event->keyval) {
 			case GDK_KEY_Escape:
-				gtk_button_clicked(GTK_BUTTON(&button_cancel));
+				gtk_button_clicked(GTK_BUTTON(button_cancel));
 				return TRUE;
 			case GDK_KEY_Return: 
 			case GDK_KEY_KP_Enter:

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Fri Jul 10 11:18:51 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Fri, 10 Jul 2015 11:18:51 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-205-g52551ae
Message-ID: <20150710091851.D89CE36A01A7@mx.colino.net>

The branch, master has been updated
       via  52551ae80da337c0d266374b154b118d535befd7 (commit)
      from  005c378d7bfd868de3f64063b4fe13d144d235aa (commit)

Summary of changes:
 src/prefs_summaries.c |    2 +-
 src/prefs_toolbar.c   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 52551ae80da337c0d266374b154b118d535befd7
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Jul 10 11:15:11 2015 +0200

    Fix two more issues with modal dialog focus on Windows.
    
    Date format information dialog in /Display/Summaries.
    Icon chooser dialog in /Toolbars/*.

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 4951101..69d7a8f 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -297,10 +297,10 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
 			 label3);
 
 	gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
-	gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
 	gtk_widget_show(datefmt_win);
 	manage_window_set_transient(GTK_WINDOW(datefmt_win));
+	gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
 	gtk_widget_grab_focus(ok_btn);
 
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 63cad57..a990ee5 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1752,6 +1752,7 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
 
 	gtk_widget_show_all(icon_chooser_win);
 	gtk_widget_grab_focus(GTK_WIDGET(icon_view));
+	manage_window_set_transient(GTK_WINDOW(icon_chooser_win));
 	gtk_window_set_modal(GTK_WINDOW(icon_chooser_win), TRUE);
 
 	prefs_toolbar->icon_chooser_win		= icon_chooser_win;

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


hooks/post-receive
-- 
Claws Mail

From miras at claws-mail.org  Tue Jul 14 20:57:11 2015
From: miras at claws-mail.org (miras at claws-mail.org)
Date: Tue, 14 Jul 2015 20:57:11 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-206-g463abe4
Message-ID: <20150714185711.959C936A42A4@mx.colino.net>

The branch, master has been updated
       via  463abe4effd5dedc7e41332a6f9cbe185f0bb738 (commit)
      from  52551ae80da337c0d266374b154b118d535befd7 (commit)

Summary of changes:
 src/plugins/tnef_parse/ytnef.c |    9 +++++++++
 1 file changed, 9 insertions(+)


- Log -----------------------------------------------------------------
commit 463abe4effd5dedc7e41332a6f9cbe185f0bb738
Author: Michael Rasmussen <mir at datanom.net>
Date:   Tue Jul 14 20:57:00 2015 +0200

    Added FreeBSD patch, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167460. Fixes claws-mail bug #3457

diff --git a/src/plugins/tnef_parse/ytnef.c b/src/plugins/tnef_parse/ytnef.c
index 9184836..df8da3a 100644
--- a/src/plugins/tnef_parse/ytnef.c
+++ b/src/plugins/tnef_parse/ytnef.c
@@ -444,6 +444,13 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p) {
                 d += num + ((num % 4) ? (4 - num%4) : 0);
                 break;
 
+	    case PT_CLSID:
+		vl->size = 16; /* Size of struct GUID */
+		vl->data = calloc(vl->size, sizeof(WORD));
+		memcpy(vl->data, &d, vl->size);
+		d += 16; /* Size of struct GUID */
+		break;
+
             case PT_I2:
                 // Read in 2 bytes, but proceed by 4 bytes
                 vl->size = 2;
@@ -473,6 +480,8 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p) {
                 memcpy(vl->data, &temp_ddword, vl->size);
                 d+=8;
                 break;
+	    default:
+		fprintf(stderr, "%s: Fatal BUG: unknown MAPI ID type (%u), (%u)\n", __func__, PROP_TYPE(mp->id), mp->id);
         }
         if (count == (mp->count-1)) {
             count = -1;

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Wed Jul 15 20:23:10 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Wed, 15 Jul 2015 20:23:10 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-207-geee39d7
Message-ID: <20150715182310.AECC636A43D2@mx.colino.net>

The branch, master has been updated
       via  eee39d758fa409d1c5ebce06228184023f0b86b5 (commit)
      from  463abe4effd5dedc7e41332a6f9cbe185f0bb738 (commit)

Summary of changes:
 AUTHORS           |    1 +
 src/gtk/authors.h |    1 +
 src/imap.c        |    4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit eee39d758fa409d1c5ebce06228184023f0b86b5
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 15 19:23:05 2015 +0100

    fix bug 2435, ' Infinite loop+crash when refreshing folders from dovecot mbox based mailbox'
    
    Patch by Oliver Schneider

diff --git a/AUTHORS b/AUTHORS
index 6803548..cf309b8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -314,3 +314,4 @@ contributors (in addition to the above; based on Changelog)
 	Johan Vromans
 	Charles Lehner
 	Robert David
+	Oliver Schneider
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 8a77633..f719e4b 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -249,6 +249,7 @@ static char *CONTRIBS_LIST[] = {
 "Mohammed Sameer",
 "Tobias Sandhaas",
 "Peter Sarvas",
+"Oliver Schneider",
 "Torsten Schoenfeld",
 "Simon 'corecode' Schubert",
 "Kim Schulz",
diff --git a/src/imap.c b/src/imap.c
index 45acb6a..9f53354 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -5644,7 +5644,9 @@ static GSList * imap_list_from_lep(IMAPFolder * folder,
 			}
 
 			if (!all && dup_name[strlen(dup_name)-1] == '/') {
-				dup_name[strlen(dup_name)-1] = '\0';
+				g_free(base);
+				free(dup_name);
+				continue;
 			}
 
 			loc_name = imap_modified_utf7_to_utf8(base, FALSE);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Thu Jul 16 13:37:24 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Thu, 16 Jul 2015 13:37:24 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-214-g988ae8b
Message-ID: <20150716113724.DF19136A43DC@mx.colino.net>

The branch, master has been updated
       via  988ae8b83fbba2968b327a57baa148113ba69233 (commit)
      from  e2d116a25f8aa0105c1319b7669af7e9723eff16 (commit)

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


- Log -----------------------------------------------------------------
commit 988ae8b83fbba2968b327a57baa148113ba69233
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Jul 16 13:36:26 2015 +0200

    Fix address autocompletion popup not displaying on Plasma5.
    
    Closes bug #3466.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 4ca55d5..c3ffefb 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -950,14 +950,7 @@ static void addrcompl_resize_window( CompletionWindow *cw ) {
 	gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height );
 #endif
 
-	/* simple _hide breaks size requisition !? */
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	gtk_widget_hide_all( cw->window );
-	gtk_widget_show_all( cw->window );
-#else
-	gtk_widget_hide( cw->window );
-	gtk_widget_show( cw->window );
-#endif
+	gtk_widget_queue_resize_no_redraw(cw->list_view);
 	gtk_widget_size_request( cw->list_view, &r );
 
 	/* Adjust window height to available screen space */
@@ -1595,7 +1588,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
 			(GTK_TREE_VIEW(list_view),
 			 event->keyval == GDK_KEY_Down ||
 			 event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
-		return FALSE;
+		return TRUE;
 	}		
 
 	/* make tab move to next field */

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul 16 13:53:28 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu, 16 Jul 2015 13:53:28 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-215-g65f1e6e
Message-ID: <20150716115328.26B2336A43E1@mx.colino.net>

The branch, master has been updated
       via  65f1e6e443997d3b1345f4707d2daa51703d1bf5 (commit)
      from  988ae8b83fbba2968b327a57baa148113ba69233 (commit)

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


- Log -----------------------------------------------------------------
commit 65f1e6e443997d3b1345f4707d2daa51703d1bf5
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 16 12:53:23 2015 +0100

    revert, it's string-freeze right now

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index a6be14f..332ca9f 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -664,7 +664,7 @@ static void sieve_editor_set_modified(SieveEditorPage *page,
 			modified);
 
 	title = g_strdup_printf(_("%s - Sieve Filter%s"), page->script_name,
-			modified ? _(" [Edited]") : "");
+			modified ? " [Edited]") : "");
 	gtk_window_set_title (GTK_WINDOW (page->window), title);
 	g_free(title);
 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul 16 13:55:27 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu, 16 Jul 2015 13:55:27 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-216-g4e7ed5b
Message-ID: <20150716115528.13A7B36A43E1@mx.colino.net>

The branch, master has been updated
       via  4e7ed5bd3886c7e13d082cbf6ec7fb09bfa7d1bb (commit)
      from  65f1e6e443997d3b1345f4707d2daa51703d1bf5 (commit)

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


- Log -----------------------------------------------------------------
commit 4e7ed5bd3886c7e13d082cbf6ec7fb09bfa7d1bb
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 16 12:55:24 2015 +0100

    revert without breaking stuff
    
    (fix for last commit)

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 332ca9f..7dc9577 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -664,7 +664,7 @@ static void sieve_editor_set_modified(SieveEditorPage *page,
 			modified);
 
 	title = g_strdup_printf(_("%s - Sieve Filter%s"), page->script_name,
-			modified ? " [Edited]") : "");
+			modified ? " [Edited]" : "");
 	gtk_window_set_title (GTK_WINDOW (page->window), title);
 	g_free(title);
 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul 16 19:46:54 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu, 16 Jul 2015 19:46:54 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-218-g8e72324
Message-ID: <20150716174654.920E836A440B@mx.colino.net>

The branch, master has been updated
       via  8e72324cbcafe6bdbe04edd83dacc4f99636d3e1 (commit)
      from  7d58732990e79242f2003aa4a230cdd5144c597c (commit)

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


- Log -----------------------------------------------------------------
commit 8e72324cbcafe6bdbe04edd83dacc4f99636d3e1
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 16 18:46:49 2015 +0100

    revert the revert
    
    because, as Charles pointed out, this string is already present in
    compose.c, therefore, technically, it's not a new string

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 7dc9577..a6be14f 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -664,7 +664,7 @@ static void sieve_editor_set_modified(SieveEditorPage *page,
 			modified);
 
 	title = g_strdup_printf(_("%s - Sieve Filter%s"), page->script_name,
-			modified ? " [Edited]" : "");
+			modified ? _(" [Edited]") : "");
 	gtk_window_set_title (GTK_WINDOW (page->window), title);
 	g_free(title);
 

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Fri Jul 17 04:36:32 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Fri, 17 Jul 2015 04:36:32 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-220-g99738a9
Message-ID: <20150717023632.9127636A43FA@mx.colino.net>

The branch, master has been updated
       via  99738a91f6c2ca14fb8feeef9be42904556cf97f (commit)
       via  cf75891c808c2c9052a05776917eae0ef429ce8b (commit)
      from  8e72324cbcafe6bdbe04edd83dacc4f99636d3e1 (commit)

Summary of changes:
 src/plugins/managesieve/managesieve.c   |   41 ++++++++++++++++++-------------
 src/plugins/managesieve/managesieve.h   |    1 +
 src/plugins/managesieve/sieve_manager.c |   34 ++++++++++++++-----------
 3 files changed, 44 insertions(+), 32 deletions(-)


- Log -----------------------------------------------------------------
commit 99738a91f6c2ca14fb8feeef9be42904556cf97f
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 18:55:12 2015 -0400

    managesieve: Fix string memory leaks

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 199dbba..9e89bad 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -171,6 +171,7 @@ static void filter_got_data(SieveSession *session, gchar *contents,
 	SieveEditorPage *editor;
 
 	if (!contents) {
+		g_free(cmd_data->filter_name);
 		g_free(cmd_data);
 		return;
 	} else if (contents == (void *)-1) {
@@ -222,12 +223,14 @@ static void filter_renamed(SieveSession *session, gboolean success,
 
 	if (!success) {
 		got_session_error(session, "Unable to rename script", page);
-		return;
-	}
-
-	manager_sessions_foreach(cur, session, page) {
-		filters_list_rename_filter(page, data->name_old, data->name_new);
+	} else {
+		manager_sessions_foreach(cur, session, page) {
+			filters_list_rename_filter(page, data->name_old,
+					data->name_new);
+		}
 	}
+	g_free(data->name_old);
+	g_free(data->name_new);
 	g_free(data);
 }
 
@@ -266,12 +269,12 @@ static void filter_activated(SieveSession *session, gboolean success,
 
 	if (!success) {
 		got_session_error(session, "Unable to set active script", page);
-		return;
-	}
-
-	manager_sessions_foreach(cur, session, page) {
-		filter_set_active(page, cmd_data->filter_name);
+	} else {
+		manager_sessions_foreach(cur, session, page) {
+			filter_set_active(page, cmd_data->filter_name);
+		}
 	}
+	g_free(cmd_data->filter_name);
 	g_free(cmd_data);
 }
 
@@ -297,12 +300,13 @@ static void filter_deleted(SieveSession *session, const gchar *err_msg,
 
 	if (err_msg) {
 		got_session_error(session, err_msg, page);
-		return;
-	}
-
-	manager_sessions_foreach(cur, session, page) {
-		filters_list_delete_filter(page, cmd_data->filter_name);
+	} else {
+		manager_sessions_foreach(cur, session, page) {
+			filters_list_delete_filter(page,
+					cmd_data->filter_name);
+		}
 	}
+	g_free(cmd_data->filter_name);
 	g_free(cmd_data);
 }
 

commit cf75891c808c2c9052a05776917eae0ef429ce8b
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 17:58:47 2015 -0400

    managesieve: handle lines starting with "OK"
    
    Count octets instead of waiting for OK

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 4c67904..a6d7bbb 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -20,6 +20,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <ctype.h>
 
 #include "claws.h"
 #include "account.h"
@@ -439,22 +440,22 @@ static void unquote_inplace(gchar *str)
 
 static void parse_response(gchar *msg, SieveResult *result)
 {
+	gchar *end;
+
 	/* response status */
-	gchar *end = strchr(msg, ' ');
-	if (end)
-		*end++ = '\0';
-	result->success = strcmp(msg, "OK") == 0;
-	result->has_status = TRUE;
-	if (!end) {
-		result->code = SIEVE_CODE_NONE;
-		result->description = NULL;
-		result->has_octets = FALSE;
-		result->octets = 0;
-		return;
+	if (isalpha(msg[0])) {
+		end = strchr(msg, ' ');
+		if (end) {
+			*end++ = '\0';
+			while (*end == ' ')
+				end++;
+		}
+		result->success = strcmp(msg, "OK") == 0;
+		result->has_status = TRUE;
+		msg = end;
+	} else {
+		result->has_status = FALSE;
 	}
-	while (*end == ' ')
-		end++;
-	msg = end;
 
 	/* response code */
 	if (msg[0] == '(' && (end = strchr(msg, ')'))) {
@@ -673,17 +674,23 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		} else {
 			parse_response((gchar *)msg, &result);
 			sieve_session->state = SIEVE_GETSCRIPT_DATA;
+			/* account for newline */
+			sieve_session->octets_remaining = result.octets + 1;
 		}
 		ret = SE_OK;
 		break;
 	case SIEVE_GETSCRIPT_DATA:
-		if (response_is_ok(msg)) {
+		if (sieve_session->octets_remaining > 0) {
+			sieve_session->current_cmd->cb(sieve_session,
+					(gchar *)msg,
+					sieve_session->current_cmd->data);
+			sieve_session->octets_remaining -= strlen(msg) + 1;
+		} else if (response_is_ok(msg)) {
 			sieve_session->state = SIEVE_READY;
 			sieve_session->current_cmd->cb(sieve_session, NULL,
 					sieve_session->current_cmd->data);
 		} else {
-			sieve_session->current_cmd->cb(sieve_session, (gchar *)msg,
-					sieve_session->current_cmd->data);
+			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
 		ret = SE_OK;
 		break;
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index b775f90..c150d4a 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -114,6 +114,7 @@ struct SieveSession
 	GSList *send_queue;
 	SieveErrorValue error;
 	SieveCommand *current_cmd;
+	guint octets_remaining;
 
 	gboolean use_auth;
 	SieveAuthType avail_auth_type;

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Fri Jul 17 07:22:49 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Fri, 17 Jul 2015 07:22:49 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-230-g53c39d9
Message-ID: <20150717052249.A59A736A43FA@mx.colino.net>

The branch, master has been updated
       via  53c39d90ebd1dbe46677c6edd14809b157a87f9a (commit)
       via  7af42c87bcc37e66ca181a969b3ba113d1267059 (commit)
       via  ec59ae0c2ec01bd13082d5f210924164aa9240bc (commit)
       via  f6bce6ab85f6285550894ccd30b1cba412e0c6e7 (commit)
       via  81acf6b893d9889646b7161a39a549c323d137d9 (commit)
       via  367d6a780ea707df1ab4ce9da7201598bc1718ad (commit)
       via  dde1c4531b1dd320bc893c5af2d9f7cc20308879 (commit)
       via  ee7810602425708a35aaab44e973ba9f12538573 (commit)
       via  dc1d2b4ed5c5c7582275a5b4addbd894ef8a856c (commit)
       via  32924ce7e82afbe83ffa9087fa56694825c6d0ef (commit)
      from  99738a91f6c2ca14fb8feeef9be42904556cf97f (commit)

Summary of changes:
 src/plugins/managesieve/managesieve.c   |  139 ++++++++++++++++---------------
 src/plugins/managesieve/managesieve.h   |    5 +-
 src/plugins/managesieve/sieve_editor.c  |   90 +++++++++++++++++---
 src/plugins/managesieve/sieve_editor.h  |    8 ++
 src/plugins/managesieve/sieve_manager.c |  129 +++++++++++++++-------------
 src/plugins/managesieve/sieve_manager.h |    2 +
 6 files changed, 235 insertions(+), 138 deletions(-)


- Log -----------------------------------------------------------------
commit 53c39d90ebd1dbe46677c6edd14809b157a87f9a
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 01:04:38 2015 -0400

    managesieve: add newly created scripts to manager window list

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index dc89f7f..e085dcb 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -41,6 +41,7 @@
 #include "mainwindow.h"
 #include "message_search.h"
 #include "managesieve.h"
+#include "sieve_manager.h"
 #include "sieve_editor.h"
 
 GSList *editors = NULL;
@@ -348,6 +349,13 @@ static void got_data_saved(SieveSession *session, gboolean abort,
 		if (result->code == SIEVE_CODE_NONE) {
 			result->description = _("Script saved successfully.");
 		}
+
+		if (page->is_new) {
+			/* notify manager windows of newly created script */
+			page->is_new = FALSE;
+			sieve_manager_script_created(session,
+					page->script_name);
+		}
 	}
 	sieve_editor_update_status(page, result);
 }
diff --git a/src/plugins/managesieve/sieve_editor.h b/src/plugins/managesieve/sieve_editor.h
index bac8eea..60d3d86 100644
--- a/src/plugins/managesieve/sieve_editor.h
+++ b/src/plugins/managesieve/sieve_editor.h
@@ -38,6 +38,7 @@ struct SieveEditorPage
 	gboolean	first_line;
 	gboolean	modified;
 	gboolean	closing;
+	gboolean	is_new;
 
 	/* callback for failure to load the script */
 	sieve_session_cb_fn on_load_error;
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 65e6dbf..8a786e0 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -163,6 +163,7 @@ static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 			(sieve_session_cb_fn)filter_got_load_error, page);
 	} else {
 		editor = sieve_editor_new(session, filter_name);
+		editor->is_new = TRUE;
 		sieve_editor_show(editor);
 	}
 }
@@ -808,3 +809,14 @@ void sieve_manager_show()
 	manager_pages = g_slist_prepend(manager_pages, page);
 	gtk_widget_show_all(page->window);
 }
+
+void sieve_manager_script_created(SieveSession *session, const gchar *name)
+{
+	SieveManagerPage *page;
+	SieveScript script = {.name = (gchar *)name};
+	GSList *cur;
+
+	manager_sessions_foreach(cur, session, page) {
+		filters_list_insert_filter(page, &script);
+	}
+}
diff --git a/src/plugins/managesieve/sieve_manager.h b/src/plugins/managesieve/sieve_manager.h
index 9665bb8..58f08f0 100644
--- a/src/plugins/managesieve/sieve_manager.h
+++ b/src/plugins/managesieve/sieve_manager.h
@@ -38,5 +38,7 @@ struct SieveManagerPage
 
 void sieve_manager_show(void);
 void sieve_manager_done(SieveManagerPage *page);
+void sieve_manager_script_created(SieveSession *session,
+		const gchar *filter_name);
 
 #endif /* SIEVE_MANAGER_H */

commit 7af42c87bcc37e66ca181a969b3ba113d1267059
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 00:01:15 2015 -0400

    managesieve: if new script name is in use, open existing script
    
    This is better than opening a blank script which will overwrite the existing
    one when it is saved

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index b6d92c1..65e6dbf 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -59,6 +59,7 @@ typedef struct {
 	gchar *filter_name;
 } CommandDataName;
 
+static void filter_got_load_error(SieveSession *session, gpointer data);
 static void account_changed(GtkWidget *widget, SieveManagerPage *page);
 static void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page);
 static gboolean sieve_manager_deleted(GtkWidget *widget, GdkEvent *event,
@@ -145,6 +146,7 @@ static gchar *filters_list_get_selected_filter(GtkWidget *list_view)
 static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 {
 	SieveSession *session = page->active_session;
+	SieveEditorPage *editor;
 	if (!session)
 		return;
 	gchar *filter_name = input_dialog(_("Add Sieve script"),
@@ -152,7 +154,17 @@ static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 	if (!filter_name || !filter_name[0])
 		return;
 
-	sieve_editor_show(sieve_editor_new(session, filter_name));
+	editor = sieve_editor_get(session, filter_name);
+	if (editor) {
+		/* TODO: show error that filter already exists */
+		sieve_editor_present(editor);
+		g_free(filter_name);
+		sieve_editor_load(editor,
+			(sieve_session_cb_fn)filter_got_load_error, page);
+	} else {
+		editor = sieve_editor_new(session, filter_name);
+		sieve_editor_show(editor);
+	}
 }
 
 static void filter_got_load_error(SieveSession *session, gpointer data)

commit ec59ae0c2ec01bd13082d5f210924164aa9240bc
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 00:41:00 2015 -0400

    managesieve: let refresh button always be sensitive
    
    When the session is disconnected, refresh can be clicked to try to reconnect.
    
    This partially reverts commit 7c2dd3d976388c353632ea0c3199ccdd3e214530.

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index fab6703..b6d92c1 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -603,7 +603,7 @@ static SieveManagerPage *sieve_manager_page_new()
 {
 	SieveManagerPage *page;
 	GtkWidget *window;
-	GtkWidget *hbox, *vbox, *vbox_buttons;
+	GtkWidget *hbox, *vbox, *vbox_allbuttons, *vbox_buttons;
 	GtkWidget *accounts_menu;
 	GtkWidget *label;
 	GtkWidget *scrolledwin;
@@ -702,9 +702,13 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	/* Buttons */
 
+	vbox_allbuttons = gtk_vbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), vbox_allbuttons, FALSE, FALSE, 0);
+
+	/* buttons that depend on there being a connection */
 	vbox_buttons = gtk_vbox_new (FALSE, 8);
 	gtk_widget_set_sensitive(vbox_buttons, FALSE);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox_buttons, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox_allbuttons), vbox_buttons, FALSE, FALSE, 0);
 
 	/* new */
 	btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
@@ -732,7 +736,7 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	/* refresh */
 	btn = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
-	gtk_box_pack_end (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (vbox_allbuttons), btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT(btn), "clicked",
 			G_CALLBACK (account_changed), page);
 

commit f6bce6ab85f6285550894ccd30b1cba412e0c6e7
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 00:00:53 2015 -0400

    managesieve: remove unused function sieve_session_add_script

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 5042328..9170c05 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -976,15 +976,6 @@ void sieve_session_list_scripts(SieveSession *session,
 	sieve_queue_send(session, SIEVE_LISTSCRIPTS, msg, cb, data);
 }
 
-void sieve_session_add_script(SieveSession *session, const gchar *filter_name,
-		sieve_session_data_cb_fn cb, gpointer data)
-{
-/*
-	gchar *msg = g_strdup("LISTSCRIPTS");
-	sieve_queue_send(session, SIEVE_LISTSCRIPTS, msg, cb, data);
-*/
-}
-
 void sieve_session_set_active_script(SieveSession *session,
 		const gchar *filter_name,
 		sieve_session_data_cb_fn cb, gpointer data)
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index 068f8bb..908ffa4 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -172,8 +172,6 @@ void sieve_session_handle_status(SieveSession *session,
 		gpointer data);
 void sieve_session_list_scripts(SieveSession *session,
 		sieve_session_data_cb_fn got_script_name_cb, gpointer data);
-void sieve_session_add_script(SieveSession *session, const gchar *filter_name,
-		sieve_session_data_cb_fn cb, gpointer data);
 void sieve_session_set_active_script(SieveSession *session,
 		const gchar *filter_name,
 		sieve_session_data_cb_fn cb, gpointer data);
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 9d49d4f..fab6703 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -153,10 +153,6 @@ static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 		return;
 
 	sieve_editor_show(sieve_editor_new(session, filter_name));
-	/*
-	sieve_session_add_script(session, filter_name
-			(sieve_session_data_cb_fn)filter_added, (gpointer)page);
-			*/
 }
 
 static void filter_got_load_error(SieveSession *session, gpointer data)

commit 81acf6b893d9889646b7161a39a549c323d137d9
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 23:51:00 2015 -0400

    managesieve: don't reset status while appending text

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 66dd6ea..dc89f7f 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -54,6 +54,7 @@ gboolean sieve_editor_search_string_backward(void *obj,
 	const gchar *str, gboolean case_sens);
 static void sieve_editor_save_cb(GtkAction *action, SieveEditorPage *page);
 static void sieve_editor_check_cb(GtkAction *action, SieveEditorPage *page);
+static void sieve_editor_changed_cb(GtkTextBuffer *, SieveEditorPage *page);
 static void sieve_editor_revert_cb(GtkAction *action, SieveEditorPage *page);
 static void sieve_editor_close_cb(GtkAction *action, SieveEditorPage *page);
 static void sieve_editor_undo_cb(GtkAction *action, SieveEditorPage *page);
@@ -113,14 +114,19 @@ void sieve_editor_append_text(SieveEditorPage *page, gchar *text, gint len)
 {
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
-	gboolean was_modified = page->modified;
 
-	undo_block(page->undostruct);
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(page->text));
+
+	g_signal_handlers_block_by_func(G_OBJECT(buffer),
+			 G_CALLBACK(sieve_editor_changed_cb), page);
+
+	undo_block(page->undostruct);
 	gtk_text_buffer_get_end_iter(buffer, &iter);
 	gtk_text_buffer_insert(buffer, &iter, text, len);
 	undo_unblock(page->undostruct);
-	sieve_editor_set_modified(page, was_modified);
+
+	g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+			 G_CALLBACK(sieve_editor_changed_cb), page);
 }
 
 static gint sieve_editor_get_text(SieveEditorPage *page, gchar **text)

commit 367d6a780ea707df1ab4ce9da7201598bc1718ad
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 21:34:02 2015 -0400

    managesieve: discard manager window's callbacks when it closes

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 42e7911..9d49d4f 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -60,7 +60,9 @@ typedef struct {
 } CommandDataName;
 
 static void account_changed(GtkWidget *widget, SieveManagerPage *page);
-void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page);
+static void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page);
+static gboolean sieve_manager_deleted(GtkWidget *widget, GdkEvent *event,
+		SieveManagerPage *page);
 static void filter_set_active(SieveManagerPage *page, gchar *filter_name);
 gboolean filter_find_by_name (GtkTreeModel *model, GtkTreeIter *iter,
 		gchar *filter_name);
@@ -634,6 +636,8 @@ static SieveManagerPage *sieve_manager_page_new()
 			G_CALLBACK (manager_key_pressed), page);
 	g_signal_connect (G_OBJECT(window), "size_allocate",
 			 G_CALLBACK (size_allocate_cb), NULL);
+	g_signal_connect (G_OBJECT(window), "delete_event",
+			 G_CALLBACK (sieve_manager_deleted), page);
 
 	if (!geometry.min_height) {
 		geometry.min_width = 350;
@@ -766,7 +770,14 @@ static SieveManagerPage *sieve_manager_page_new()
 	return page;
 }
 
-void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page)
+static gboolean sieve_manager_deleted(GtkWidget *widget, GdkEvent *event,
+		SieveManagerPage *page)
+{
+	sieve_manager_done(page);
+	return FALSE;
+}
+
+static void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page)
 {
 	sieve_manager_done(page);
 }
@@ -774,6 +785,7 @@ void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page)
 void sieve_manager_done(SieveManagerPage *page)
 {
 	manager_pages = g_slist_remove(manager_pages, page);
+	sieve_sessions_discard_callbacks(page);
 	gtk_widget_destroy(page->window);
 	g_free(page);
 }

commit dde1c4531b1dd320bc893c5af2d9f7cc20308879
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 21:16:26 2015 -0400

    managesieve: consolidate popping send queue
    
    - send a queued command when the ready state is entered
    - always free a command when it is done

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 111e4a0..5042328 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -296,7 +296,7 @@ static gint sieve_auth(SieveSession *session)
 	if (!session->use_auth) {
 		session->state = SIEVE_READY;
 		sieve_connected(session, TRUE);
-		return sieve_pop_send_queue(session);
+		return SE_OK;
 	}
 
 	session->state = SIEVE_AUTH;
@@ -403,6 +403,11 @@ static gint sieve_pop_send_queue(SieveSession *session)
 	SieveCommand *cmd;
 	GSList *send_queue = session->send_queue;
 
+	if (session->current_cmd) {
+		command_free(session->current_cmd);
+		session->current_cmd = NULL;
+	}
+
 	if (!send_queue)
 		return SE_OK;
 
@@ -412,8 +417,6 @@ static gint sieve_pop_send_queue(SieveSession *session)
 
 	log_send(session, cmd);
 	session->state = cmd->next_state;
-	if (session->current_cmd)
-		command_free(session->current_cmd);
 	session->current_cmd = cmd;
 	if (session_send_msg(SESSION(session), SESSION_SEND, cmd->msg) < 0)
 		return SE_ERROR;
@@ -528,7 +531,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 {
 	SieveSession *sieve_session = SIEVE_SESSION(session);
 	SieveResult result;
-	gint ret = 0;
+	gint ret = SE_OK;
 
 	switch (sieve_session->state) {
 	case SIEVE_GETSCRIPT_DATA:
@@ -581,7 +584,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			} else {
 				sieve_session->state = SIEVE_READY;
 				sieve_connected(sieve_session, TRUE);
-				ret = sieve_pop_send_queue(sieve_session);
 			}
 		} else {
 			/* got a capability */
@@ -604,7 +606,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		}
 		sieve_session->tls_init_done = TRUE;
 		sieve_session->state = SIEVE_CAPABILITIES;
-		ret = SE_OK;
 #endif
 		break;
 	case SIEVE_AUTH:
@@ -626,7 +627,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			sieve_session->authenticated = TRUE;
 			sieve_session->state = SIEVE_READY;
 			sieve_connected(sieve_session, TRUE);
-			ret = sieve_pop_send_queue(sieve_session);
 		}
 		break;
 	case SIEVE_NOOP:
@@ -640,14 +640,12 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			/* got an error. probably not authenticated. */
 			command_cb(sieve_session->current_cmd, NULL);
 			sieve_session->state = SIEVE_READY;
-			ret = sieve_pop_send_queue(sieve_session);
 		} else if (response_is_ok(msg)) {
 			/* end of list */
 			sieve_session->state = SIEVE_READY;
 			sieve_session->error = SE_OK;
 			command_cb(sieve_session->current_cmd,
 					(gpointer)&(SieveScript){0});
-			ret = sieve_pop_send_queue(sieve_session);
 		} else {
 			/* got a script name */
 			SieveScript script;
@@ -659,7 +657,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 
 			command_cb(sieve_session->current_cmd,
 					(gpointer)&script);
-			ret = SE_OK;
 		}
 		break;
 	case SIEVE_RENAMESCRIPT:
@@ -694,7 +691,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			/* account for newline */
 			sieve_session->octets_remaining = result.octets + 1;
 		}
-		ret = SE_OK;
 		break;
 	case SIEVE_GETSCRIPT_DATA:
 		if (sieve_session->octets_remaining > 0) {
@@ -706,7 +702,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		} else {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
-		ret = SE_OK;
 		break;
 	case SIEVE_PUTSCRIPT:
 		parse_response((gchar *)msg, &result);
@@ -716,7 +711,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			sieve_session->state = SIEVE_READY;
 		}
 		sieve_session_putscript_cb(sieve_session, &result);
-		ret = SE_OK;
 		break;
 	case SIEVE_PUTSCRIPT_DATA:
 		if (!msg[0]) {
@@ -729,7 +723,6 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			result.description = (gchar *)msg;
 			sieve_session_putscript_cb(sieve_session, &result);
 		}
-		ret = SE_OK;
 		break;
 	case SIEVE_DELETESCRIPT:
 		parse_response((gchar *)msg, &result);
@@ -757,9 +750,12 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		return -1;
 	}
 
-	if (ret == SE_OK)
+	if (ret == SE_OK && sieve_session->state == SIEVE_READY)
+		ret = sieve_pop_send_queue(sieve_session);
+
+	if (ret == SE_OK) {
 		return session_recv_msg(session);
-	else if (ret == SE_AUTHFAIL) {
+	} else if (ret == SE_AUTHFAIL) {
 		sieve_error(sieve_session, _("Auth failed"));
 		sieve_session->state = SIEVE_ERROR;
 		sieve_session->error = SE_ERROR;

commit ee7810602425708a35aaab44e973ba9f12538573
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 21:15:45 2015 -0400

    managesieve: fix connecting with TLS not available

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 323c52d..111e4a0 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -570,7 +570,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 					sieve_session->state = SIEVE_ERROR;
 				} else {
 					log_warning(LOG_PROTOCOL, "Sieve: continuing without TLS\n");
-					sieve_session->state = SIEVE_CAPABILITIES;
+					sieve_session->state = SIEVE_READY;
 				}
 				break;
 			}

commit dc1d2b4ed5c5c7582275a5b4addbd894ef8a856c
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 9 03:24:02 2015 -0400

    managesieve: allow script loading to be interrupted
    
    Prevent use after free when an editor window is closed while loading
    
    Uses string "Loading..." which is already translated

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index eedd3e7..66dd6ea 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -625,8 +625,6 @@ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Filter", "Revert", "Filter/Revert", GT
 	undo_set_change_state_func(undostruct, &sieve_editor_undo_state_changed,
 			page);
 
-	gtk_widget_show_all(window);
-
 	page->window = window;
 	page->ui_manager = ui_manager;
 	page->text = text;
@@ -661,6 +659,11 @@ void sieve_editor_present(SieveEditorPage *page)
 	gtk_window_present(GTK_WINDOW(page->window));
 }
 
+void sieve_editor_show(SieveEditorPage *page)
+{
+	gtk_widget_show_all(GTK_WIDGET(page->window));
+}
+
 static void sieve_editor_set_modified(SieveEditorPage *page,
 		gboolean modified)
 {
@@ -680,3 +683,49 @@ static void sieve_editor_set_modified(SieveEditorPage *page,
 		sieve_editor_set_status_icon(page, NULL);
 	}
 }
+
+static void got_data_loading(SieveSession *session, gboolean aborted,
+		gchar *contents, SieveEditorPage *page)
+{
+	if (aborted)
+		return;
+	if (contents == NULL) {
+		/* end of data */
+		sieve_editor_set_status(page, "");
+		return;
+	}
+	if (contents == (void *)-1) {
+		/* error */
+		if (page->first_line) {
+			/* no data. show error in manager window */
+			if (page->on_load_error)
+				page->on_load_error(session, page->on_load_error_data);
+		} else {
+			/* partial failure. show error in editor window */
+			sieve_editor_set_status(page, _("Unable to get script contents"));
+			sieve_editor_set_status_icon(page, GTK_STOCK_DIALOG_ERROR);
+		}
+		return;
+	}
+
+	if (page->first_line) {
+		page->first_line = FALSE;
+		sieve_editor_show(page);
+	} else {
+		sieve_editor_append_text(page, "\n", 1);
+	}
+	sieve_editor_append_text(page, contents, strlen(contents));
+}
+
+/* load the script for this editor */
+void sieve_editor_load(SieveEditorPage *page,
+		sieve_session_cb_fn on_load_error, gpointer load_error_data)
+{
+	page->first_line = TRUE;
+	page->on_load_error = on_load_error;
+	page->on_load_error_data = load_error_data;
+	sieve_editor_set_status(page, _("Loading..."));
+	sieve_editor_set_status_icon(page, NULL);
+	sieve_session_get_script(page->session, page->script_name,
+			(sieve_session_data_cb_fn)got_data_loading, page);
+}
diff --git a/src/plugins/managesieve/sieve_editor.h b/src/plugins/managesieve/sieve_editor.h
index 4925a54..bac8eea 100644
--- a/src/plugins/managesieve/sieve_editor.h
+++ b/src/plugins/managesieve/sieve_editor.h
@@ -38,12 +38,19 @@ struct SieveEditorPage
 	gboolean	first_line;
 	gboolean	modified;
 	gboolean	closing;
+
+	/* callback for failure to load the script */
+	sieve_session_cb_fn on_load_error;
+	gpointer on_load_error_data;
 };
 
 SieveEditorPage *sieve_editor_new(SieveSession *session, gchar *script_name);
 SieveEditorPage *sieve_editor_get(SieveSession *session, gchar *script_name);
+void sieve_editor_load(SieveEditorPage *page,
+		sieve_session_cb_fn on_load_error, gpointer load_error_data);
 void sieve_editor_append_text(SieveEditorPage *page, gchar *text, gint len);
 void sieve_editor_close(SieveEditorPage *page);
+void sieve_editor_show(SieveEditorPage *page);
 void sieve_editor_present(SieveEditorPage *page);
 
 #endif /* SIEVE_EDITOR_H */
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 400a671..42e7911 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -59,13 +59,6 @@ typedef struct {
 	gchar *filter_name;
 } CommandDataName;
 
-typedef struct {
-	SieveManagerPage *page;
-	gchar *filter_name;
-	SieveEditorPage *editor_page;
-	gboolean first_line;
-} CommandDataGetScript;
-
 static void account_changed(GtkWidget *widget, SieveManagerPage *page);
 void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page);
 static void filter_set_active(SieveManagerPage *page, gchar *filter_name);
@@ -157,46 +150,28 @@ static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 	if (!filter_name || !filter_name[0])
 		return;
 
-	sieve_editor_new(session, filter_name);
+	sieve_editor_show(sieve_editor_new(session, filter_name));
 	/*
 	sieve_session_add_script(session, filter_name
 			(sieve_session_data_cb_fn)filter_added, (gpointer)page);
 			*/
 }
 
-static void filter_got_data(SieveSession *session, gboolean abort,
-		gchar *contents, CommandDataGetScript *cmd_data)
+static void filter_got_load_error(SieveSession *session, gpointer data)
 {
-	SieveManagerPage *page = cmd_data->page;
-	SieveEditorPage *editor;
+	SieveManagerPage *page = data;
 
-	if (abort || !contents) {
-		g_free(cmd_data->filter_name);
-		g_free(cmd_data);
-		return;
-	} else if (contents == (void *)-1) {
-		got_session_error(session, _("Unable to get script contents"), page);
-		return;
-	}
-
-	if (cmd_data->first_line) {
-		cmd_data->first_line = FALSE;
-		editor = sieve_editor_new(session, cmd_data->filter_name);
-		cmd_data->editor_page = editor;
-	} else {
-		editor = cmd_data->editor_page;
-		sieve_editor_append_text(editor, "\n", 1);
-	}
-	sieve_editor_append_text(editor, contents, strlen(contents));
+	got_session_error(session, _("Unable to get script contents"), page);
 }
 
 static void filter_edit(GtkWidget *widget, SieveManagerPage *page)
 {
 	SieveEditorPage *editor;
-	CommandDataGetScript *cmd_data;
 	SieveSession *session = page->active_session;
+
 	if (!session)
 		return;
+
 	gchar *filter_name = filters_list_get_selected_filter(page->filters_list);
 	if (!filter_name)
 		return;
@@ -205,13 +180,9 @@ static void filter_edit(GtkWidget *widget, SieveManagerPage *page)
 	if (editor) {
 		sieve_editor_present(editor);
 	} else {
-		cmd_data = g_new0(CommandDataGetScript, 1);
-		cmd_data->first_line = TRUE;
-		cmd_data->filter_name = filter_name;
-		cmd_data->page = page;
-
-		sieve_session_get_script(session, filter_name,
-			(sieve_session_data_cb_fn)filter_got_data, cmd_data);
+		editor = sieve_editor_new(session, filter_name);
+		sieve_editor_load(editor,
+			(sieve_session_cb_fn)filter_got_load_error, page);
 	}
 }
 

commit 32924ce7e82afbe83ffa9087fa56694825c6d0ef
Author: Charles Lehner <cel at celehner.com>
Date:   Thu Jul 16 20:06:47 2015 -0400

    managesieve: fix command aborting and discarding
    
    - Add "aborted" callback argument to indicate command is cancelled
    - Add helper function for issuing command callbacks

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index a6d7bbb..323c52d 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -39,6 +39,9 @@ GSList *sessions = NULL;
 static void sieve_session_destroy(Session *session);
 static gint sieve_pop_send_queue(SieveSession *session);
 static void sieve_session_reset(SieveSession *session);
+static void command_free(SieveCommand *cmd);
+static void command_abort(SieveCommand *cmd);
+static void command_cb(SieveCommand *cmd, gpointer result);
 
 void sieve_sessions_close()
 {
@@ -48,34 +51,55 @@ void sieve_sessions_close()
 	}
 }
 
-void noop_data_cb_fn(SieveSession *session, gpointer cb_data,
-		gpointer user_data)
-{
-	/* noop */
-}
-
 /* remove all command callbacks with a given data pointer */
 void sieve_sessions_discard_callbacks(gpointer user_data)
 {
 	GSList *item;
 	GSList *queue;
+	GSList *prev = NULL;
 	SieveSession *session;
 	SieveCommand *cmd;
 
 	for (item = sessions; item; item = item->next) {
 		session = (SieveSession *)item->data;
 		cmd = session->current_cmd;
-		if (cmd && cmd->data == user_data)
-			cmd->cb = noop_data_cb_fn;
+		/* abort current command handler */
+		if (cmd && cmd->data == user_data) {
+			command_abort(cmd);
+			session->current_cmd = NULL;
+		}
+		/* abort queued command handlers */
 		for (queue = session->send_queue; queue; queue = queue->next) {
-			cmd = (SieveCommand *)item->data;
-			if (cmd && cmd->data == user_data)
-				cmd->cb = noop_data_cb_fn;
+			cmd = (SieveCommand *)queue->data;
+			if (cmd && cmd->data == user_data) {
+				if (prev)
+					prev->next = queue->next;
+				else
+					session->send_queue = NULL;
+				command_abort(cmd);
+				g_slist_free_1(queue);
+			} else {
+				prev = queue;
+			}
 		}
 	}
 }
 
-void command_free(SieveCommand *cmd) {
+static void command_cb(SieveCommand *cmd, gpointer result)
+{
+	if (cmd)
+		cmd->cb(cmd->session, FALSE, result, cmd->data);
+}
+
+static void command_abort(SieveCommand *cmd)
+{
+	cmd->cb(cmd->session, TRUE, NULL, cmd->data);
+	g_free(cmd->msg);
+	g_free(cmd);
+}
+
+static void command_free(SieveCommand *cmd)
+{
 	g_free(cmd->msg);
 	g_free(cmd);
 }
@@ -319,7 +343,7 @@ static void sieve_session_putscript_cb(SieveSession *session, SieveResult *resul
 		result->description = desc;
 	}
 	/* pass along the callback */
-	session->current_cmd->cb(session, result, session->current_cmd->data);
+	command_cb(session->current_cmd, result);
 }
 
 static inline gboolean response_is_ok(const char *msg)
@@ -614,17 +638,15 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 	case SIEVE_LISTSCRIPTS:
 		if (response_is_no(msg)) {
 			/* got an error. probably not authenticated. */
-			sieve_session->current_cmd->cb(sieve_session, NULL,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, NULL);
 			sieve_session->state = SIEVE_READY;
 			ret = sieve_pop_send_queue(sieve_session);
 		} else if (response_is_ok(msg)) {
 			/* end of list */
 			sieve_session->state = SIEVE_READY;
 			sieve_session->error = SE_OK;
-			sieve_session->current_cmd->cb(sieve_session,
-					(gpointer)&(SieveScript){0},
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd,
+					(gpointer)&(SieveScript){0});
 			ret = sieve_pop_send_queue(sieve_session);
 		} else {
 			/* got a script name */
@@ -635,19 +657,17 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			script.active = (script_status &&
 					strcasecmp(script_status, "active") == 0);
 
-			sieve_session->current_cmd->cb(sieve_session, (gpointer)&script,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd,
+					(gpointer)&script);
 			ret = SE_OK;
 		}
 		break;
 	case SIEVE_RENAMESCRIPT:
 		if (response_is_no(msg)) {
 			/* error */
-			sieve_session->current_cmd->cb(sieve_session, NULL,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, NULL);
 		} else if (response_is_ok(msg)) {
-			sieve_session->current_cmd->cb(sieve_session, (void*)TRUE,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, (void*)TRUE);
 		} else {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
@@ -656,11 +676,9 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 	case SIEVE_SETACTIVE:
 		if (response_is_no(msg)) {
 			/* error */
-			sieve_session->current_cmd->cb(sieve_session, NULL,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, NULL);
 		} else if (response_is_ok(msg)) {
-			sieve_session->current_cmd->cb(sieve_session, (void*)TRUE,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, (void*)TRUE);
 		} else {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
@@ -668,8 +686,7 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		break;
 	case SIEVE_GETSCRIPT:
 		if (response_is_no(msg)) {
-			sieve_session->current_cmd->cb(sieve_session, (void *)-1,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, (void *)-1);
 			sieve_session->state = SIEVE_READY;
 		} else {
 			parse_response((gchar *)msg, &result);
@@ -681,14 +698,11 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		break;
 	case SIEVE_GETSCRIPT_DATA:
 		if (sieve_session->octets_remaining > 0) {
-			sieve_session->current_cmd->cb(sieve_session,
-					(gchar *)msg,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, (gchar *)msg);
 			sieve_session->octets_remaining -= strlen(msg) + 1;
 		} else if (response_is_ok(msg)) {
 			sieve_session->state = SIEVE_READY;
-			sieve_session->current_cmd->cb(sieve_session, NULL,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, NULL);
 		} else {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
@@ -720,11 +734,10 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 	case SIEVE_DELETESCRIPT:
 		parse_response((gchar *)msg, &result);
 		if (!result.success) {
-			sieve_session->current_cmd->cb(sieve_session, result.description,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd,
+					result.description);
 		} else {
-			sieve_session->current_cmd->cb(sieve_session, NULL,
-					sieve_session->current_cmd->data);
+			command_cb(sieve_session->current_cmd, NULL);
 		}
 		sieve_session->state = SIEVE_READY;
 		break;
@@ -791,8 +804,10 @@ static void sieve_session_destroy(Session *session)
 	SieveSession *sieve_session = SIEVE_SESSION(session);
 	g_free(sieve_session->pass);
 	if (sieve_session->current_cmd)
-		command_free(sieve_session->current_cmd);
+		command_abort(sieve_session->current_cmd);
 	sessions = g_slist_remove(sessions, (gconstpointer)session);
+	g_slist_free_full(sieve_session->send_queue,
+			(GDestroyNotify)command_abort);
 }
 
 static void sieve_connect_finished(Session *session, gboolean success)
@@ -834,7 +849,7 @@ static void sieve_session_reset(SieveSession *session)
 	SieveAccountConfig *config = sieve_prefs_account_get_config(account);
 	gboolean reuse_auth = (config->auth == SIEVEAUTH_REUSE);
 
-	g_slist_free_full(session->send_queue, (GDestroyNotify)command_free);
+	g_slist_free_full(session->send_queue, (GDestroyNotify)command_abort);
 
 	session_disconnect(SESSION(session));
 
@@ -921,6 +936,7 @@ static void sieve_queue_send(SieveSession *session, SieveState next_state,
 {
 	gboolean queue = FALSE;
 	SieveCommand *cmd = g_new0(SieveCommand, 1);
+	cmd->session = session;
 	cmd->next_state = next_state;
 	cmd->msg = msg;
 	cmd->data = data;
@@ -980,7 +996,7 @@ void sieve_session_set_active_script(SieveSession *session,
 	gchar *msg = g_strdup_printf("SETACTIVE \"%s\"",
 			filter_name ? filter_name : "");
 	if (!msg) {
-		cb(session, (void*)FALSE, data);
+		cb(session, FALSE, (void*)FALSE, data);
 		return;
 	}
 
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index c150d4a..068f8bb 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -98,7 +98,7 @@ typedef enum {
 
 typedef void (*sieve_session_cb_fn) (SieveSession *session, gpointer data);
 typedef void (*sieve_session_data_cb_fn) (SieveSession *session,
-		gpointer cb_data, gpointer user_data);
+		gboolean aborted, gpointer cb_data, gpointer user_data);
 typedef void (*sieve_session_error_cb_fn) (SieveSession *session,
 		const gchar *msg, gpointer user_data);
 typedef void (*sieve_session_connected_cb_fn) (SieveSession *session,
@@ -140,6 +140,7 @@ struct SieveSession
 };
 
 struct SieveCommand {
+	SieveSession *session;
 	SieveState next_state;
 	gchar *msg;
 	sieve_session_data_cb_fn cb;
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index a6be14f..eedd3e7 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -266,9 +266,12 @@ static void sieve_editor_search(SieveEditorPage *page)
 
 /* Actions */
 
-static void got_data_reverting(SieveSession *session, gchar *contents,
+static void got_data_reverting(SieveSession *session, gboolean abort,
+		gchar *contents,
 		SieveEditorPage *page)
 {
+	if (abort)
+		return;
 	if (contents == NULL) {
 		/* end of data */
 		undo_unblock(page->undostruct);
@@ -324,9 +327,11 @@ static void sieve_editor_revert_cb(GtkAction *action, SieveEditorPage *page)
 		sieve_editor_revert(page);
 }
 
-static void got_data_saved(SieveSession *session, SieveResult *result,
-		SieveEditorPage *page)
+static void got_data_saved(SieveSession *session, gboolean abort,
+		SieveResult *result, SieveEditorPage *page)
 {
+	if (abort)
+		return;
 	if (result->has_status && result->success) {
 		sieve_editor_set_modified(page, FALSE);
 		if (page->closing) {
@@ -362,9 +367,11 @@ static void sieve_editor_find_cb(GtkAction *action, SieveEditorPage *page)
 	sieve_editor_search(page);
 }
 
-static void got_data_checked(SieveSession *session, SieveResult *result,
-		SieveEditorPage *page)
+static void got_data_checked(SieveSession *session, gboolean abort,
+		SieveResult *result, SieveEditorPage *page)
 {
+	if (abort)
+		return;
 	sieve_editor_update_status(page, result);
 }
 
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 9e89bad..400a671 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -164,13 +164,13 @@ static void filter_add(GtkWidget *widget, SieveManagerPage *page)
 			*/
 }
 
-static void filter_got_data(SieveSession *session, gchar *contents,
-		CommandDataGetScript *cmd_data)
+static void filter_got_data(SieveSession *session, gboolean abort,
+		gchar *contents, CommandDataGetScript *cmd_data)
 {
 	SieveManagerPage *page = cmd_data->page;
 	SieveEditorPage *editor;
 
-	if (!contents) {
+	if (abort || !contents) {
 		g_free(cmd_data->filter_name);
 		g_free(cmd_data);
 		return;
@@ -215,13 +215,14 @@ static void filter_edit(GtkWidget *widget, SieveManagerPage *page)
 	}
 }
 
-static void filter_renamed(SieveSession *session, gboolean success,
-		CommandDataRename *data)
+static void filter_renamed(SieveSession *session, gboolean abort,
+		gboolean success, CommandDataRename *data)
 {
 	SieveManagerPage *page = data->page;
 	GSList *cur;
 
-	if (!success) {
+	if (abort) {
+	} else if (!success) {
 		got_session_error(session, "Unable to rename script", page);
 	} else {
 		manager_sessions_foreach(cur, session, page) {
@@ -261,13 +262,14 @@ static void filter_rename(GtkWidget *widget, SieveManagerPage *page)
 			(sieve_session_data_cb_fn)filter_renamed, (gpointer)cmd_data);
 }
 
-static void filter_activated(SieveSession *session, gboolean success,
-		CommandDataName *cmd_data)
+static void filter_activated(SieveSession *session, gboolean abort,
+		gboolean success, CommandDataName *cmd_data)
 {
 	SieveManagerPage *page = cmd_data->page;
 	GSList *cur;
 
-	if (!success) {
+	if (abort) {
+	} else if (!success) {
 		got_session_error(session, "Unable to set active script", page);
 	} else {
 		manager_sessions_foreach(cur, session, page) {
@@ -292,13 +294,15 @@ static void sieve_set_active_filter(SieveManagerPage *page, gchar *filter_name)
 			(sieve_session_data_cb_fn)filter_activated, cmd_data);
 }
 
-static void filter_deleted(SieveSession *session, const gchar *err_msg,
+static void filter_deleted(SieveSession *session, gboolean abort,
+		const gchar *err_msg,
 		CommandDataName *cmd_data)
 {
 	SieveManagerPage *page = cmd_data->page;
 	GSList *cur;
 
-	if (err_msg) {
+	if (abort) {
+	} else if (err_msg) {
 		got_session_error(session, err_msg, page);
 	} else {
 		manager_sessions_foreach(cur, session, page) {
@@ -550,6 +554,8 @@ static void size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation)
 static void got_session_error(SieveSession *session, const gchar *msg,
 		SieveManagerPage *page)
 {
+	if (!g_slist_find(manager_pages, page))
+		return;
 	if (page->active_session != session)
 		return;
 	gtk_label_set_text(GTK_LABEL(page->status_text), msg);
@@ -575,9 +581,11 @@ static void sieve_manager_on_connected(SieveSession *session,
 	}
 }
 
-static void got_filter_listed(SieveSession *session, SieveScript *script,
-		SieveManagerPage *page)
+static void got_filter_listed(SieveSession *session, gboolean abort,
+		SieveScript *script, SieveManagerPage *page)
 {
+	if (abort)
+		return;
 	if (!script) {
 		got_session_error(session, "Unable to list scripts", page);
 		return;

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Fri Jul 17 08:51:31 2015
From: colin at claws-mail.org (Colin)
Date: Fri, 17 Jul 2015 08:51:31 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-231-ga4e905d
Message-ID: <20150717065131.ED0FF36A43FD@mx.colino.net>

The branch, master has been updated
       via  a4e905df972a306ed6aae3ecce8993ebba9b3eab (commit)
      from  53c39d90ebd1dbe46677c6edd14809b157a87f9a (commit)

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


- Log -----------------------------------------------------------------
commit a4e905df972a306ed6aae3ecce8993ebba9b3eab
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jul 17 08:51:36 2015 +0200

    Fix missing null pointer check

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 9170c05..773fa7a 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -469,6 +469,8 @@ static void parse_response(gchar *msg, SieveResult *result)
 {
 	gchar *end;
 
+	cm_return_if_fail(msg != NULL);
+
 	/* response status */
 	if (isalpha(msg[0])) {
 		end = strchr(msg, ' ');

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Fri Jul 17 17:23:00 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Fri, 17 Jul 2015 17:23:00 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-235-g7e1943d
Message-ID: <20150717152300.B1E3F36A4404@mx.colino.net>

The branch, master has been updated
       via  7e1943d6b833a3de6771aa9076882b73c81356f3 (commit)
       via  cf7df0a057eb09b41a690a671920392ea7d16999 (commit)
       via  cc334ab9de45bf989e29e01921670c85b0e537ae (commit)
       via  c00d3332dd0783737b21a10702429515ac81b738 (commit)
      from  a4e905df972a306ed6aae3ecce8993ebba9b3eab (commit)

Summary of changes:
 src/plugins/managesieve/managesieve.c   |   39 ++++++++++++++++++++++++-------
 src/plugins/managesieve/managesieve.h   |    1 +
 src/plugins/managesieve/sieve_manager.c |   10 ++++----
 3 files changed, 37 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 7e1943d6b833a3de6771aa9076882b73c81356f3
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 10:49:15 2015 -0400

    managesieve: Localize Rename button. Fix bug 3469
    
    not breaking string freeze because the string is already translated and in use

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 56e8e09..bae6afd 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -744,7 +744,7 @@ static SieveManagerPage *sieve_manager_page_new()
 			G_CALLBACK (filter_delete), page);
 
 	/* rename */
-	btn = gtk_button_new_with_label("Rename");
+	btn = gtk_button_new_with_label(_("Rename"));
 	gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT(btn), "clicked",
 			G_CALLBACK (filter_rename), page);

commit cf7df0a057eb09b41a690a671920392ea7d16999
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 10:21:06 2015 -0400

    managesieve: add back dialog hint
    
    This makes the manager window appear floating in tiling window managers
    
    This reverts commit e2d116a25f8aa0105c1319b7669af7e9723eff16.

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index ba19e41..56e8e09 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -657,6 +657,8 @@ static SieveManagerPage *sieve_manager_page_new()
 				      GDK_HINT_MIN_SIZE);
 	gtk_widget_set_size_request(window, sieve_config.manager_win_width,
 			sieve_config.manager_win_height);
+	gtk_window_set_type_hint(GTK_WINDOW(window),
+			GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	vbox = gtk_vbox_new (FALSE, 10);
 	gtk_container_add (GTK_CONTAINER (window), vbox);

commit cc334ab9de45bf989e29e01921670c85b0e537ae
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 10:07:44 2015 -0400

    managesieve: show warnings received when setting active script

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 05b4014..3fd4079 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -673,15 +673,35 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		sieve_session->state = SIEVE_READY;
 		break;
 	case SIEVE_SETACTIVE:
-		if (response_is_no(msg)) {
-			/* error */
+		parse_response((gchar *)msg, &result);
+		if (result.success) {
+			/* clear status possibly set when setting another
+			 * script active. TODO: give textual feedback */
+			sieve_error(sieve_session, "");
+
 			command_cb(sieve_session->current_cmd, NULL);
-		} else if (response_is_ok(msg)) {
-			command_cb(sieve_session->current_cmd, (void*)TRUE);
+		} else if (result.description) {
+			command_cb(sieve_session->current_cmd,
+					result.description);
 		} else {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
-		sieve_session->state = SIEVE_READY;
+		if (result.has_octets) {
+			sieve_session->octets_remaining = result.octets;
+			sieve_session->state = SIEVE_SETACTIVE_DATA;
+		} else {
+			sieve_session->state = SIEVE_READY;
+		}
+		break;
+	case SIEVE_SETACTIVE_DATA:
+		/* Dovecot shows a script's warnings when making it active */
+		sieve_session->octets_remaining -= strlen(msg) + 1;
+		if (sieve_session->octets_remaining > 0) {
+			/* TODO: buffer multi-line message */
+			sieve_error(sieve_session, msg);
+		} else {
+			sieve_session->state = SIEVE_READY;
+		}
 		break;
 	case SIEVE_GETSCRIPT:
 		if (response_is_no(msg)) {
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index 908ffa4..f5c5fbb 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -71,6 +71,7 @@ typedef enum
 	SIEVE_AUTH_CRAM_MD5,
 	SIEVE_RENAMESCRIPT,
 	SIEVE_SETACTIVE,
+	SIEVE_SETACTIVE_DATA,
 	SIEVE_GETSCRIPT,
 	SIEVE_GETSCRIPT_DATA,
 	SIEVE_PUTSCRIPT,
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 8a786e0..ba19e41 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -245,14 +245,14 @@ static void filter_rename(GtkWidget *widget, SieveManagerPage *page)
 }
 
 static void filter_activated(SieveSession *session, gboolean abort,
-		gboolean success, CommandDataName *cmd_data)
+		const gchar *err, CommandDataName *cmd_data)
 {
 	SieveManagerPage *page = cmd_data->page;
 	GSList *cur;
 
 	if (abort) {
-	} else if (!success) {
-		got_session_error(session, "Unable to set active script", page);
+	} else if (err) {
+		got_session_error(session, err, page);
 	} else {
 		manager_sessions_foreach(cur, session, page) {
 			filter_set_active(page, cmd_data->filter_name);

commit c00d3332dd0783737b21a10702429515ac81b738
Author: Charles Lehner <cel at celehner.com>
Date:   Fri Jul 17 09:24:11 2015 -0400

    managesieve: handle putting/checking empty scripts

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 773fa7a..05b4014 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -1016,8 +1016,9 @@ void sieve_session_put_script(SieveSession *session, const gchar *filter_name,
 		sieve_session_data_cb_fn cb, gpointer data)
 {
 	/* TODO: refactor so don't have to copy the whole script here */
-	gchar *msg = g_strdup_printf("PUTSCRIPT \"%s\" {%u+}\r\n%s",
-			filter_name, len, script_contents);
+	gchar *msg = g_strdup_printf("PUTSCRIPT \"%s\" {%u+}%s%s",
+			filter_name, len, len > 0 ? "\r\n" : "",
+			script_contents);
 
 	sieve_queue_send(session, SIEVE_PUTSCRIPT, msg, cb, data);
 }
@@ -1026,8 +1027,8 @@ void sieve_session_check_script(SieveSession *session,
 		gint len, const gchar *script_contents,
 		sieve_session_data_cb_fn cb, gpointer data)
 {
-	gchar *msg = g_strdup_printf("CHECKSCRIPT {%u+}\r\n%s",
-			len, script_contents);
+	gchar *msg = g_strdup_printf("CHECKSCRIPT {%u+}%s%s",
+			len, len > 0 ? "\r\n" : "", script_contents);
 
 	sieve_queue_send(session, SIEVE_PUTSCRIPT, msg, cb, data);
 }

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Sun Jul 19 04:05:58 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Sun, 19 Jul 2015 04:05:58 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-236-gde58cd7
Message-ID: <20150719020558.6BE0136A43C8@mx.colino.net>

The branch, master has been updated
       via  de58cd700bf263047a62b861b2c13200ce4f51f0 (commit)
      from  7e1943d6b833a3de6771aa9076882b73c81356f3 (commit)

Summary of changes:
 src/plugins/managesieve/managesieve.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit de58cd700bf263047a62b861b2c13200ce4f51f0
Author: Charles Lehner <cel at celehner.com>
Date:   Sat Jul 18 21:58:03 2015 -0400

    managesieve: prevent session list corruption
    
    This fixes a crash on plugin unload with a connected session

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 3fd4079..4e7508a 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -46,8 +46,9 @@ static void command_cb(SieveCommand *cmd, gpointer result);
 void sieve_sessions_close()
 {
 	if (sessions) {
-		g_slist_free_full(sessions, (GDestroyNotify)session_destroy);
+		GSList *list = sessions;
 		sessions = NULL;
+		g_slist_free_full(list, (GDestroyNotify)session_destroy);
 	}
 }
 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 09:23:59 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 09:23:59 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-237-g93afe88
Message-ID: <20150719072359.991AE36A4400@mx.colino.net>

The branch, master has been updated
       via  93afe88d2eb6c54241d2a8e89f76edd819eaf9a2 (commit)
      from  de58cd700bf263047a62b861b2c13200ce4f51f0 (commit)

Summary of changes:
 po/ca.po    | 3567 ++++++++++++++++++++++++++++----------------------
 po/cs.po    | 1906 +++++++++++++++------------
 po/de.po    | 4219 +++++++++++++++++++++++++----------------------------------
 po/he.po    | 2404 ++++++++++++++++++----------------
 po/hu.po    | 1943 +++++++++++++--------------
 po/nb.po    | 1038 +++++++++------
 po/nl.po    | 2348 +++++++++++++++++----------------
 po/pt_BR.po |  286 ++--
 po/sk.po    |  908 ++++++++-----
 po/sv.po    | 1070 +++++++--------
 10 files changed, 10107 insertions(+), 9582 deletions(-)


- Log -----------------------------------------------------------------
commit 93afe88d2eb6c54241d2a8e89f76edd819eaf9a2
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 08:23:53 2015 +0100

    updated translations
    
    ca	Carles Tubio Terr?n
    cs	David Vachulka
    de	Thomas Bellmann
    he	Isratine Citizen
    hu	P?der Rezs?
    nb	Petter Adsen
    nl	Marcel Pol
    pt_BR	Frederico Goncalves Guimaraes
    sk	Slavko
    sv	Andreas R?nnquist

diff --git a/po/ca.po b/po/ca.po
index 07e50e5..fad1483 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,26 +1,32 @@
 # Catalan translation of Claws Mail.
-# Copyright ? 2006-2014 The Claws Mail team.
+# Copyright ? 2006-2015 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
+# Carles Tubio Terr?n <c at rles-tub.io>, 2015.
 # Miquel Oliete i Baliarda <ktalanet at yahoo.es>, 2006, 2010.
 #
+# Very special THANKS to the translator team of Softcatal? for:
+#  https://www.softcatala.org/recull.html
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.7.8\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2010-11-17 23:08+0100\n"
-"Last-Translator: Miquel Oliete i Baliarda <ktalanet at yahoo.es>\n"
+"POT-Creation-Date: 2015-07-12 20:01+0200\n"
+"PO-Revision-Date: 2015-07-14 20:52+0200\n"
+"Last-Translator: Carles Tubio <c at rles-tub.io>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet at yahoo.es>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.2\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-SearchPath-0: .\n"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -34,7 +40,7 @@ msgstr "No s'ha pogut crear la carpeta."
 
 #: src/account.c:724
 msgid "Edit accounts"
-msgstr "Editar comptes"
+msgstr "Editar els comptes"
 
 #: src/account.c:741
 msgid ""
@@ -43,8 +49,8 @@ msgid ""
 "indicates the default account."
 msgstr ""
 "Usant 'Rebre' recuperareu els missatges desde els vostres comptes en l'ordre "
-"donat, la casella de selecci? indicar? quins comptes seran inclosos. Text en "
-"negreta"
+"donat, la casella de selecci? indicar? quins comptes seran inclosos. El text "
+"en negreta indica la compte per defecte."
 
 #: src/account.c:812
 msgid " _Set as default account "
@@ -57,12 +63,12 @@ msgstr "Els comptes amb carpetes remotes no es poden copiar"
 #: src/account.c:911
 #, c-format
 msgid "Copy of %s"
-msgstr "Copia de %s"
+msgstr "C?pia de %s"
 
 #: src/account.c:1071
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Realment voleu esborrar el compte '%s'?"
+msgstr "Realment vols esborrar el compte '%s'?"
 
 #: src/account.c:1073
 msgid "(Untitled)"
@@ -70,7 +76,7 @@ msgstr "(Sense t?tol)"
 
 #: src/account.c:1074
 msgid "Delete account"
-msgstr "Esborrar compte"
+msgstr "Esborrar el compte"
 
 #: src/account.c:1544
 msgctxt "Accounts List Get Column Name"
@@ -79,16 +85,17 @@ msgstr "G"
 
 #: src/account.c:1550
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "'Obtenir' recupera el correu desde els comptes marcats"
+msgstr "'Rebre' recupera el correu desde els comptes marcats"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -114,7 +121,7 @@ msgstr "No s'ha pogut obtenir la part del missatge."
 #: src/action.c:437
 #, c-format
 msgid "Can't get part of multipart message: %s"
-msgstr "No es pot obtenir la part del missatge multi-parts: %s"
+msgstr "No es pot obtenir la part del missatge multipart: %s"
 
 #: src/action.c:609
 #, c-format
@@ -122,12 +129,12 @@ msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
-"L'acci? seleccionada no es pot usar a la finestra de composici? perque cont? "
-"%%f, %%F, %%as o %%p."
+"L'acci? seleccionada no es pot usar a la finestra de composici?\n"
+"perque cont? %%f, %%F, %%as o %%p."
 
 #: src/action.c:721
 msgid "There is no filtering action set"
-msgstr "No hi ha acci? de filtratge seleccionada"
+msgstr "No hi ha cap acci? de filtratge definida"
 
 #: src/action.c:723
 #, c-format
@@ -135,7 +142,7 @@ msgid ""
 "Invalid filtering action(s):\n"
 "%s"
 msgstr ""
-"Regla de filtrat inv?lida:\n"
+"Regles de filtrat inv?lides:\n"
 "%s"
 
 #: src/action.c:988
@@ -174,7 +181,7 @@ msgstr "--- Finalitzant: %s\n"
 
 #: src/action.c:1281
 msgid "Action's input/output"
-msgstr "Entrada/sortida de la acci?"
+msgstr "Accions d'entrada/sortida"
 
 #: src/action.c:1609
 #, c-format
@@ -183,13 +190,13 @@ msgid ""
 "('%%h' will be replaced with the argument)\n"
 "  %s"
 msgstr ""
-"Teclejeu l'argument per la acci? seg?ent:\n"
+"Teclejeu l'argument per a l'acci? seg?ent:\n"
 "(`%%h' ser? substitu?t amb l'argument)\n"
 "  %s"
 
 #: src/action.c:1614
 msgid "Action's hidden user argument"
-msgstr "Argument d'usuari ocult per a la acci?"
+msgstr "Argument d'usuari ocult per a l'acci?"
 
 #: src/action.c:1618
 #, c-format
@@ -198,29 +205,27 @@ msgid ""
 "('%%u' will be replaced with the argument)\n"
 "  %s"
 msgstr ""
-"Teclejeu l'argument per a la acci? seg?ent:\n"
+"Teclejeu l'argument per a l'acci? seg?ent:\n"
 "(`%%u' ser? substitu?t amb l'argument)\n"
 "  %s"
 
 #: src/action.c:1623
 msgid "Action's user argument"
-msgstr "Argument d'usuari per a la acci?"
+msgstr "Argument d'usuari per a l'acci?"
 
 #: src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
+msgstr ""
+"No es pot copiar la carpeta en si mateixa o en una de les seves subcarpetes."
 
 #: src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr ""
-"No es pot enganxar. El llibre d'adreces de destinaci? ?s nom?s de lectura."
+msgstr "No es pot copiar el llibre d'adreces en si mateix."
 
 #: src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
+msgstr ""
+"No es pot moure la carpeta en si mateixa o en una de les seves subcarpetes."
 
 #: src/addr_compl.c:685 src/addressbook.c:4873
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
@@ -261,7 +266,7 @@ msgstr "fax"
 
 #: src/addrcustomattr.c:73
 msgid "website"
-msgstr "Lloc web"
+msgstr "lloc web"
 
 #: src/addrcustomattr.c:141
 msgid "Attribute name"
@@ -269,11 +274,11 @@ msgstr "Nom de l'atribut"
 
 #: src/addrcustomattr.c:156
 msgid "Delete all attribute names"
-msgstr "Esborrar tots els noms de l'atribut"
+msgstr "Esborrar tots els noms d'atributs"
 
 #: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
-msgstr "Voleu realment esborrar tots els noms de l'atribut?"
+msgstr "Realment vols esborrar tots els noms d'atributs?"
 
 #: src/addrcustomattr.c:181
 msgid "Delete attribute name"
@@ -281,7 +286,7 @@ msgstr "Esborrar el nom de l'atribut"
 
 #: src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
-msgstr "Voleu realment esborrar aquest nom de l'atribut?"
+msgstr "Realment vols esborrar aquest nom de l'atribut?"
 
 #: src/addrcustomattr.c:191
 msgid "Reset to default"
@@ -292,7 +297,7 @@ msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
-"Voleu realment reempla?ar tots els noms de l' atribut\n"
+"Realment vols reempla?ar tots els noms de l' atribut\n"
 "amb el valor per defecte?"
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
@@ -318,11 +323,11 @@ msgstr "No s'ha establert el nom de l'atribut."
 #: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "Editar l'atribut dels noms"
+msgstr "Editar els noms dels atributs"
 
 #: src/addrcustomattr.c:476
 msgid "New attribute name:"
-msgstr "Nou nom de l'atribut:"
+msgstr "Nou nom d'atribut:"
 
 #: src/addrcustomattr.c:513
 msgid ""
@@ -334,7 +339,7 @@ msgstr ""
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
-msgstr "Mostrar duplicats al mateix llibre"
+msgstr "Mostrar els duplicats dins del mateix llibre"
 
 #: src/addrduplicates.c:133
 msgid "Show duplicates in different books"
@@ -342,21 +347,22 @@ msgstr "Mostrar duplicats en diferents llibres"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Trobar missatges duplicats al llibre d'adreces"
+msgstr "Trobar correus electr?nics duplicats al llibre d'adreces"
 
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr ""
-"Claws Mail cercar? ara adreces de correu duplicades al llibre d'adresses."
+"Claws Mail cercar? ara adreces de correu electr?nic duplicades al llibre "
+"d'adresses."
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
-msgstr "No s'ha trobat adreces de correu duplicades a l'agenda"
+msgstr "No s'han trobat adreces de correu duplicades a l'agenda"
 
 #: src/addrduplicates.c:346
 msgid "Duplicate email addresses"
-msgstr "Adre?a de correu duplicada"
+msgstr "Adreces de correu duplicades"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
 #: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
@@ -365,11 +371,11 @@ msgstr "Adre?a"
 
 #: src/addrduplicates.c:464
 msgid "Address book path"
-msgstr "Ruta de l'agenda d'adreces"
+msgstr "Ruta del llibre d'adreces"
 
 #: src/addrduplicates.c:793 src/addressbook.c:1433 src/addressbook.c:1486
 msgid "Delete address(es)"
-msgstr "Esborrar adre?a(es)"
+msgstr "Esborrar la/les adre?a/es"
 
 #: src/addrduplicates.c:794 src/addressbook.c:1487
 msgid "Really delete the address(es)?"
@@ -385,7 +391,7 @@ msgstr "Aquesta adre?a ?s nom?s de lectura i no es pot esborrar."
 
 #: src/addressadd.c:185 src/prefs_filtering_action.c:201
 msgid "Add to address book"
-msgstr "Afegir a l'agenda"
+msgstr "Afegir al llibre d'adreces"
 
 #: src/addressadd.c:207
 msgid "Contact"
@@ -398,7 +404,7 @@ msgstr "Notes"
 
 #: src/addressadd.c:257 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
-msgstr "Seleccionar carpeta de l'agenda"
+msgstr "Seleccionar la carpeta del llibre d'adreces"
 
 #: src/addressadd.c:485 src/editaddress.c:1582 src/headerview.c:280
 #: src/textview.c:2042
@@ -407,12 +413,12 @@ msgid ""
 "Failed to save image: \n"
 "%s"
 msgstr ""
-"Error al guardar la imatge: \n"
+"Error al desar l'imatge: \n"
 "%s"
 
 #: src/addressadd.c:535 src/addressbook.c:3209 src/addressbook.c:3260
 msgid "Add address(es)"
-msgstr "Afegir adre?a(es)"
+msgstr "Afegir adre?a/es"
 
 #: src/addressadd.c:536
 msgid "Can't add the specified address"
@@ -430,7 +436,7 @@ msgstr "Lli_bre"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -473,16 +479,20 @@ msgid "_Delete book"
 msgstr "_Esborrar llibre"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
-msgstr "_Guardar"
+msgstr "De_sar"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
-msgstr "_Tancar"
+msgstr "Tan_car"
 
 #: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:227
 msgid "_Select all"
-msgstr "_Seleccionar tot"
+msgstr "_Seleccionar-ho tot"
 
 #: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 msgid "C_ut"
@@ -490,11 +500,12 @@ msgstr "T_allar"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Enganxar"
 
@@ -536,16 +547,16 @@ msgstr "Buscar duplicats..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "Editar atributs definits..."
+msgstr "Editar atributs personalitzats..."
 
 #: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
 #: src/messageview.c:339
 msgid "_About"
-msgstr "_Sobre"
+msgstr "Qu_ant a"
 
 #: src/addressbook.c:491
 msgid "_Browse Entry"
-msgstr "_Veure Entrada"
+msgstr "_Cerca Entrada"
 
 #: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:115
 #: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
@@ -577,7 +588,7 @@ msgstr "Error llegint l'arxiu"
 
 #: src/addressbook.c:516 src/importldif.c:127
 msgid "End of file encountered"
-msgstr "Trobat el final de l'arxiu"
+msgstr "S'ha trobat el final de l'arxiu"
 
 #: src/addressbook.c:517 src/importldif.c:128
 msgid "Error allocating memory"
@@ -658,7 +669,7 @@ msgstr "Fonts"
 #: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475
 #: src/toolbar.c:225 src/toolbar.c:2142
 msgid "Address book"
-msgstr "Agenda d'adreces"
+msgstr "Llibre d'adreces"
 
 #: src/addressbook.c:1109
 msgid "Lookup name:"
@@ -673,7 +684,7 @@ msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Voleu realment esborrar el(s) grup(s)?\n"
+"Realment vols esborrar el/s grup/s?\n"
 "Les adreces que cont?/contenen es perdran."
 
 #: src/addressbook.c:2190
@@ -686,9 +697,9 @@ msgid "Cannot paste into an address group."
 msgstr "No es pot enganxar dins d'un grup d'adreces."
 
 #: src/addressbook.c:2906
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
-msgstr "Voleu esborrar els resultats de la b?squeda i adreces a `%s' ?"
+msgstr "Vols esborrar els resultats de la b?squeda i adreces en `%s' ?"
 
 #: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
@@ -697,12 +708,12 @@ msgid "Delete"
 msgstr "Esborrar"
 
 #: src/addressbook.c:2918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
-"Voleu esborrar '%s' ? Si nom?s esborreu la carpeta, les adreces que cont?es "
+"Vols esborrar '%s' ? Si nom?s esborras la carpeta, les adreces que cont? es "
 "mouran a la carpeta mare."
 
 #: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
@@ -713,11 +724,11 @@ msgstr "Esborrar carpeta"
 
 #: src/addressbook.c:2922
 msgid "+Delete _folder only"
-msgstr "+Esborrar nom?s _carpeta"
+msgstr "+Esborrar nom?s la _carpeta"
 
 #: src/addressbook.c:2922
 msgid "Delete folder and _addresses"
-msgstr "Esborrar carpeta i _adreces"
+msgstr "Esborrar la carpeta i les _adreces"
 
 #: src/addressbook.c:2933
 #, c-format
@@ -725,7 +736,7 @@ msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Voleu esborrar '%s'?\n"
+"Vols esborrar '%s'?\n"
 "Les adreces que cont? no es perdran."
 
 #: src/addressbook.c:2940
@@ -734,7 +745,7 @@ msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
-"Voleu esborrar '%s'?\n"
+"Vols esborrar '%s'?\n"
 "Les adreces que cont? es perdran."
 
 #: src/addressbook.c:3054
@@ -748,11 +759,11 @@ msgstr "Nous Contactes"
 
 #: src/addressbook.c:4022
 msgid "New user, could not save index file."
-msgstr "Nou usuari, no s'ha pogut guardar l'arxiu d'?ndex."
+msgstr "Nou usuari, no s'ha pogut desar l'arxiu d'?ndex."
 
 #: src/addressbook.c:4026
 msgid "New user, could not save address book files."
-msgstr "Nou usuari, no s'han pogut guardar els arxius d'adreces"
+msgstr "Nou usuari, no s'han pogut desar els arxius d'adreces"
 
 #: src/addressbook.c:4036
 msgid "Old address book converted successfully."
@@ -764,7 +775,7 @@ msgid ""
 "could not save new address index file."
 msgstr ""
 "L'antiga agenda d'adreces convertida,\n"
-"no s'ha pogut guardar el nou arxiu ?ndex."
+"no s'ha pogut desar el nou arxiu ?ndex."
 
 #: src/addressbook.c:4054
 msgid ""
@@ -780,7 +791,7 @@ msgid ""
 "could not save new address index file."
 msgstr ""
 "No s'ha pogut convertir l'agenda d'adrecess,\n"
-"No s'ha pogut guardar el nou arxiu ?ndex."
+"No s'ha pogut desar el nou arxiu ?ndex."
 
 #: src/addressbook.c:4065
 msgid ""
@@ -862,9 +873,8 @@ msgid "Please specify name for address book."
 msgstr "Especifiqueu el nom de l'agenda, si us plau."
 
 #: src/addrgather.c:179
-#, fuzzy
 msgid "No available address book."
-msgstr "Adreces disponibles"
+msgstr "No hi ha cap llibre d'adreces disponible."
 
 #: src/addrgather.c:200
 msgid "Please select the mail headers to search."
@@ -876,7 +886,7 @@ msgstr "Recopilant adreces..."
 
 #: src/addrgather.c:247
 msgid "address added by claws-mail"
-msgstr ""
+msgstr "adre?a afegida per claws-mail"
 
 #: src/addrgather.c:275
 msgid "Addresses collected successfully."
@@ -956,12 +966,12 @@ msgstr "Modificaci? d'adre?a/es"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Modificaci? fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Notificaci?"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -975,16 +985,15 @@ msgstr "Error"
 
 #: src/alertpanel.c:196 src/gtk/progressdialog.c:94
 msgid "_View log"
-msgstr "_Veure tra?a"
+msgstr "_Veure la tra?a"
 
 #: src/alertpanel.c:347
 msgid "Show this message next time"
 msgstr "Mostrar aquest missatge la propera vegada"
 
 #: src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr "Ha fallat el registre intern de renderitzaci? de l'avatar"
 
 #: src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1051,17 +1060,16 @@ msgstr ""
 
 #: src/common/plugin.c:436
 msgid "Plugin already loaded"
-msgstr "M?dul ja carregat"
+msgstr "Connector ja carregat"
 
 #: src/common/plugin.c:447
 msgid "Failed to allocate memory for Plugin"
 msgstr "Error en petici? de mem?ria per al plug-in"
 
 #: src/common/plugin.c:481
-#, fuzzy
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
-"Aquest m?dul no est? llicenciat sota la GPL v2 ni cap llic?ncia compatible "
+"Aquest m?dul no est? llicenciat sota la GPL v3 ni cap llic?ncia compatible "
 "posterior."
 
 #: src/common/plugin.c:490
@@ -1099,14 +1107,12 @@ msgid "SSL handshake failed\n"
 msgstr "Negociaci? SSL fallida\n"
 
 #: src/common/smtp.c:179
-#, fuzzy
 msgid "No SMTP AUTH method available\n"
-msgstr "SMTP AUTH no est? disponible\n"
+msgstr "No hi ha cap m?tode disponible per SMTP AUTH\n"
 
 #: src/common/smtp.c:182
-#, fuzzy
 msgid "Selected SMTP AUTH method not available\n"
-msgstr "SMTP AUTH no est? disponible\n"
+msgstr "El m?tode SMTP AUTH seleccionat no est? disponible\n"
 
 #: src/common/smtp.c:505 src/common/smtp.c:559
 msgid "bad SMTP response\n"
@@ -1130,39 +1136,37 @@ msgid "couldn't start TLS session\n"
 msgstr "no es pot iniciar la sessi? TLS\n"
 
 #: src/common/socket.c:573
-#, fuzzy
 msgid "Socket IO timeout.\n"
-msgstr "Temps l?mit E/S socket"
+msgstr "Temps d'espera excedit per Socket E/S.\n"
 
 #: src/common/socket.c:602
-#, fuzzy
 msgid "Connection timed out.\n"
-msgstr "La connexi? amb %s:%d ha excedit el l?mit de temps."
+msgstr "La connexi? ha excedit el temps d'espera.\n"
 
 #: src/common/socket.c:630
 #, c-format
 msgid "%s: host lookup timed out.\n"
-msgstr ""
+msgstr "%s: la cerca de l'amfitri? a superat el temps d'espera\n"
 
 #: src/common/socket.c:643
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown host.\n"
-msgstr "\"%s\" desconeguda a %s"
+msgstr "%s amfitri? desconegut.\n"
 
 #: src/common/socket.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: connection failed (%s).\n"
-msgstr "Connexi? fallida."
+msgstr "%s:%d: Connexi? fallida (%s).\n"
 
 #: src/common/socket.c:1071
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: unknown host.\n"
-msgstr "\"%s\" desconeguda a %s"
+msgstr "%s:%d: amfitri? desconegut.\n"
 
 #: src/common/socket.c:1166
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
-msgstr ""
+msgstr "%s:%s: la cerca de l'amfitri? ha fallat (%s).\n"
 
 #: src/common/socket.c:1515
 #, c-format
@@ -1172,22 +1176,21 @@ msgstr "escrit a fd%d: %s\n"
 #: src/common/ssl_certificate.c:328
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
-msgstr ""
+msgstr "No s'ha pogut trobar el fitxer del certificat P12 (%s)\n"
 
 #: src/common/ssl_certificate.c:336
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
-msgstr ""
+msgstr "No s'ha pogut llegir el fitxer del certificat P12 (%s)\n"
 
 #: src/common/ssl_certificate.c:345
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
-msgstr ""
+msgstr "No s'ha pogut importar el fitxer del certificat P12 (%s)\n"
 
 #: src/common/ssl_certificate.c:630
-#, fuzzy
 msgid "Internal error"
-msgstr "a la mem?ria interna"
+msgstr "Error intern"
 
 #: src/common/ssl_certificate.c:635
 msgid "Uncheckable"
@@ -1210,39 +1213,39 @@ msgid "Certificate issuer is not a CA"
 msgstr "L'emisor del certificat no ?s un CA"
 
 #: src/common/ssl_certificate.c:871
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open certificate file %s: %s\n"
-msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
+msgstr "No s'ha pogut obrir l'arxiu del certificat %s: %s\n"
 
 #: src/common/ssl_certificate.c:875
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate file %s missing (%s)\n"
-msgstr "Certificat per enviar"
+msgstr "El fitxer del certificat %s no s'ha pogut trobar (%s)\n"
 
 #: src/common/ssl_certificate.c:894
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open key file %s (%s)\n"
-msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
+msgstr "No s'ha pogut obrir el fitxer de la clau %s (%s)\n"
 
 #: src/common/ssl_certificate.c:898
 #, c-format
 msgid "Key file %s missing (%s)\n"
-msgstr ""
+msgstr "Manca el fitxer de la Clau %s (%s)\n"
 
 #: src/common/ssl_certificate.c:1046
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read P12 certificate file %s\n"
-msgstr "Seleccionar arxiu de certificat"
+msgstr "Ha fallat la lectura del fitxer del certificat P12 %s\n"
 
 #: src/common/ssl_certificate.c:1049
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer del certificat P12 %s (%s)\n"
 
 #: src/common/ssl_certificate.c:1053
-#, fuzzy, c-format
+#, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
-msgstr "Certificat per enviar"
+msgstr "El fitxer del certificat P12 %s no s'ha trobat (%s)\n"
 
 #: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
@@ -1531,48 +1534,43 @@ msgid "Insert si_gnature"
 msgstr "Insertar si_gnatura"
 
 #: src/compose.c:596
-#, fuzzy
 msgid "_Replace signature"
-msgstr "Comprovar signatura"
+msgstr "_Reempla?ar signatura"
 
 #: src/compose.c:600
-#, fuzzy
 msgid "_Print"
-msgstr "Imprimir"
+msgstr "Im_primir"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Desfer"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_refer"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Tallar"
 
 #: src/compose.c:613
-#, fuzzy
 msgid "_Special paste"
-msgstr "Enganxat especial"
+msgstr "Enganxat e_special"
 
 #: src/compose.c:614
-#, fuzzy
 msgid "As _quotation"
-msgstr "com a _citaci?"
+msgstr "Com a _citaci?"
 
 #: src/compose.c:615
-#, fuzzy
 msgid "_Wrapped"
-msgstr "_retallar"
+msgstr "_A_justar"
 
 #: src/compose.c:616
-#, fuzzy
 msgid "_Unwrapped"
-msgstr "_sense retallar"
+msgstr "_Desa_justar"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Seleccion_ar tot"
 
@@ -1637,6 +1635,7 @@ msgid "Delete to end of line"
 msgstr "Esborrar fins a final de l?nia"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Buscar"
 
@@ -1754,7 +1753,7 @@ msgstr "Sollicitar justificant de _recepci?"
 
 #: src/compose.c:700
 msgid "Remo_ve references"
-msgstr "Elimi_nar refer?ncies"
+msgstr "Esb_orrar refer?ncies"
 
 #: src/compose.c:701
 msgid "Show _ruler"
@@ -1766,7 +1765,7 @@ msgstr "_Normal"
 
 #: src/compose.c:707 src/mainwindow.c:659 src/messageview.c:303
 msgid "_All"
-msgstr "_Tot"
+msgstr "_Tothom"
 
 #: src/compose.c:708 src/mainwindow.c:660 src/messageview.c:304
 msgid "_Sender"
@@ -1933,14 +1932,14 @@ msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"Esteu a punt d'insertar un arxiu de %s al cos del missatge. Est?s segur de "
+"Est?s a punt d'insertar un arxiu de %s al cos del missatge. Est?s segur de "
 "que ho vols continuar?"
 
 #: src/compose.c:3610
 msgid "Are you sure?"
 msgstr "Est?s segur?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Insertar"
 
@@ -1950,14 +1949,12 @@ msgid "File %s is empty."
 msgstr "L'arxiu %s es buit."
 
 #: src/compose.c:3736
-#, fuzzy
 msgid "Empty file"
-msgstr "Calendari buit"
+msgstr "Fitxer buit"
 
 #: src/compose.c:3737
-#, fuzzy
 msgid "+_Attach anyway"
-msgstr "Avisador d'adjunts"
+msgstr "+_Adjuntar de totes maneres"
 
 #: src/compose.c:3746
 #, c-format
@@ -2041,7 +2038,7 @@ msgstr "Encuar-lo de totes maneres?"
 msgid "Send later"
 msgstr "Enviar despr?s"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2051,7 +2048,7 @@ msgstr ""
 "\n"
 "Conversi? de joc de car?cters fallida."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2061,7 +2058,7 @@ msgstr ""
 "\n"
 "No s'ha pogut obtenir la clau d'encriptament per al recipient."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2128,68 +2125,73 @@ msgstr ""
 "\n"
 "Vols enviar-lo de totes maneres?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "No s'ha pogut encriptar el correu: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Av?s d'encriptaci?"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "El compte seleccionat no ?s de tipus NNTP: La publicaci? no es possible."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Ignorar-lo?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancel?lar l'enviament"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorar l'adjunt"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
-msgstr ""
+msgstr "Part %s original"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Afegir al lli_bre d'adresses"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Esborrar el contingut"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per autocompletar desde el llibre d'adresses"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Tamany"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
-msgstr "Guardar missatge a "
+msgstr "Desar el missatge en "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2200,24 +2202,23 @@ msgstr "Guardar missatge a "
 msgid "_Browse"
 msgstr "_Veure"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "Ca_p?alera"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Adjunts"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "Alt_res"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Assumpte:"
+msgstr "Ass_umpte:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2226,25 +2227,24 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogr?fic.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Desde: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Des de:"
+msgstr "_De:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Compte a usar per aquest correu electr?nic"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Adre?a del remitent a usar"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2253,69 +2253,68 @@ msgstr ""
 "El sistema de privacitat '%s' no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Cap"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "El cos de la plantilla t? un error a la l?nia %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Error de format el 'Des de' de la plantilla."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Error de format en el Per a de la plantilla."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Error de format en el Cc de la plantilla."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Error de format en el Bcc de la plantilla."
 
-#: src/compose.c:8753
-#, fuzzy
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
-msgstr "Error de format en el Per a de la plantilla."
+msgstr "Hi ha un error en la plantilla de Respondre-a"
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Error de format en l'assumpte de la plantilla."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Tipus MIME inv?lid."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "L'arxiu no existeix o ?s buit."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Codificaci?"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Nom d'arxiu"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2323,18 +2322,18 @@ msgid ""
 "process group id: %d"
 msgstr ""
 "L'editor extern encara resta actiu.\n"
-"Voleu acabar el proc?s?\n"
+"Vols acabar el proc?s?\n"
 "Id. de proc?s: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mails necessita acc?s a la xarxa per enviar aquest correu."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "No s'ha pogut encuar el missatge."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2345,40 +2344,40 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
-msgstr "No s'ha pogut gravar el borrador."
+msgstr "No s'ha pogut desar el borrador."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
-msgstr "No s'ha pogut gravar el borrador"
+msgstr "No s'ha pogut desar el borrador"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
-"No es pot guardar l'esborrany.\n"
-"Voleu cancel?lar la sortida o descartar aquest missatge?"
+"No es pot desar l'esborrany.\n"
+"Vols cancel?lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Cancel?lar sortir"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Descartar el correu"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Seleccionar arxiu"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir l'arxiu '%s'."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2387,86 +2386,86 @@ msgstr ""
 "L'arxiu '%s' contenia car?cters inv?lids per a\n"
 "la codificaci? actual, la inserci? pot ser incorrecta."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Descartar missatge"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
-msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
+msgstr "Aquest missatge ha estat modificat. Vols descartar-lo?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
-msgstr "_Guardar a Borradors"
+msgstr "De_sar en Borradors"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
-msgstr "Guardar canvis"
+msgstr "Desar els canvis"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
-msgstr "Aquest missatge ha estat modificat. Voleu guardar els ?ltims canvis?"
+msgstr "Aquest missatge ha estat modificat. Vols desar els ?ltims canvis?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
-msgstr "_No guardar"
+msgstr "No _desar"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
-msgstr "+_Guardar a Esborranys"
+msgstr "+De_sar en Esborranys"
 
-#: src/compose.c:10372
-#, fuzzy, c-format
+#: src/compose.c:10390
+#, c-format
 msgid "Do you want to apply the template '%s'?"
-msgstr "Voleu aplicar la plantilla '%s'?"
+msgstr "Vols aplicar la plantilla '%s'?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reempla?ar"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Insertar o adjuntar?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
-"Voleu insertar el contingut de/dels arxius(s) dins el cos del missatge, "
-"oadjuntar-lo al correu?"
+"Vols insertar el contingut de/dels arxius(s) dins el cos del missatge, o "
+"adjuntar-lo al correu?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la l?nia %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
-"Esteu a punt de contestar a %d missatges. Obrir la finestra pot trigar una "
-"mica. Voleu continuar?"
+"Est?s a punt de contestar a %d missatges. Obrir la finestra pot trigar una "
+"mica. Vols continuar?"
 
 #: src/crash.c:141
 #, c-format
@@ -2496,7 +2495,7 @@ msgstr "Tancar"
 
 #: src/crash.c:257
 msgid "Save..."
-msgstr "Guardar..."
+msgstr "Desar..."
 
 #: src/crash.c:262
 msgid "Create bug report"
@@ -2504,7 +2503,7 @@ msgstr "Crear informe d'error"
 
 #: src/crash.c:312
 msgid "Save crash information"
-msgstr "Guardar informaci? de finalitzaci? incorrecta"
+msgstr "Desar l'informaci? de la fallada"
 
 #: src/editaddress.c:156 src/editaddress.c:232
 msgid "Add New Person"
@@ -2776,7 +2775,7 @@ msgstr ""
 
 #: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
-msgstr "No s'ha pogut conectar al servidor"
+msgstr "No s'ha pogut connectar al servidor"
 
 #: src/editldap.c:152
 msgid "A Name must be supplied."
@@ -2823,7 +2822,6 @@ msgid "SSL"
 msgstr "SSL"
 
 #: src/editldap.c:475
-#, fuzzy
 msgid ""
 "Enable secure connection to the LDAP server via TLS. If connection fails, be "
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
@@ -2831,10 +2829,9 @@ msgid ""
 msgstr ""
 "Activar la connexi? segura al servidor LDAP via TLS. Si la connexi? falla, "
 "assegureu-vos que la configuraci? a l'arxiu ldap.conf ?s correcta (camps "
-"TLS_CACERT i TLS_CACERTDIR)."
+"TLS_CACERTDIR i TLS_REQCERT)."
 
 #: src/editldap.c:479
-#, fuzzy
 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 "
@@ -2842,7 +2839,7 @@ msgid ""
 msgstr ""
 "Activar la connexi? segura al servidor LDAP via SSL. Si la connexi? falla, "
 "assegureu-vos que la configuraci? a l'arxiu ldap.conf ?s correcta (camps "
-"TLS_CACERT i TLS_CACERTDIR)."
+"TLS_CACERTDIR i TLS_REQCERT)."
 
 #: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -3029,7 +3026,7 @@ msgstr "Esborrar etiqueta"
 
 #: src/edittags.c:217
 msgid "Do you really want to delete this tag?"
-msgstr "Voleu realment esborrar aquesta etiqueta?"
+msgstr "Realment vols esborrar aquesta etiqueta?"
 
 #: src/edittags.c:244
 msgid "Delete all tags"
@@ -3037,11 +3034,12 @@ msgstr "Esborrar totes les  etiquetes"
 
 #: src/edittags.c:245
 msgid "Do you really want to delete all tags?"
-msgstr "Voleu realment esborrar totes les etiquetes?"
+msgstr "Realment vols esborrar totes les etiquetes?"
 
 #: src/edittags.c:416
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
+"Has introdu?t un nom d'etiqueta reservat, siusplau excull-ne un diferent."
 
 #: src/edittags.c:458
 msgid "Tag is not set."
@@ -3080,7 +3078,7 @@ msgstr "Afegir nova entrada vCard"
 
 #: src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "?s impossible definir el certificat del client.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3095,16 +3093,15 @@ msgid "File exported successfully."
 msgstr "Arxiu exportat amb ?xit."
 
 #: src/exphtmldlg.c:178
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
 msgstr ""
 "El directori de sortida HTML '%s'\n"
-"no existeix. Crear-ne un nou?"
+"no existeix. Vols crear-lo?"
 
 #: src/exphtmldlg.c:181
-#, fuzzy
 msgid "Create directory"
 msgstr "Crear directori"
 
@@ -3263,8 +3260,8 @@ msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
 msgstr ""
-"Es necessari un sufixe si les dades s'han d'usar en un servidor LDAP. Esteu "
-"segur de que voleu continuar sense un sufixe?"
+"Es necessari un sufixe si les dades s'han d'usar en un servidor LDAP. Est?s "
+"segur que vols continuar sense un sufixe?"
 
 #: src/expldifdlg.c:262
 msgid "Error creating LDIF file"
@@ -3447,11 +3444,13 @@ msgstr "Sense especificar."
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
+"No s'ha trobat el fitxer %s! Vols utilitzar el fitxer de la c?pia de "
+"seguretat de %s?"
 
 #: src/file_checker.c:84 src/file_checker.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "Could not copy %s to %s"
-msgstr "No s'ha pogut conectar al servidor"
+msgstr "No s'ha pogut copiar %s a %s"
 
 #: src/file_checker.c:98
 #, c-format
@@ -3459,10 +3458,12 @@ msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
 "%s?"
 msgstr ""
+"El fitxer %s est? buit o ?s corrupte! Vols utilitzar el fitxer de la c?pia "
+"de seguretat de %s?"
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "la regle no est? basada en el compte\n"
 
 #: src/filtering.c:607
 #, c-format
@@ -3470,18 +3471,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], coincideix amb el "
+"compte utilitzat actualment per recuperar missatges\n"
 
 #: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
 #: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
 #: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NO_EXISTEIX"
 
 #: src/filtering.c:617
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"la regla est? subjecte al compte, no coincidents el compte utilitzat "
+"actualment per recuperar missatges\n"
 
 #: src/filtering.c:624
 #, c-format
@@ -3489,11 +3494,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], no coincidents el "
+"compte utilitzat actualment per recuperar missatges [id=%d, name='%s']\n"
 
 #: src/filtering.c:643
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"la regla est? subjecte al compte, totes les regles s'apliquen a petici? "
+"d'usuari de totes maneres\n"
 
 #: src/filtering.c:649
 #, c-format
@@ -3501,15 +3510,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], totes les regles "
+"s'apliquen a petici? d'usuari\n"
 
 #: src/filtering.c:667
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], saltar a petici? de "
+"l'usuari\n"
 
 #: src/filtering.c:672
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "la regla est? subjecte al compte, saltar a petici? de l'usuari\n"
 
 #: src/filtering.c:694
 #, c-format
@@ -3517,10 +3530,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], no coincideix amb el "
+"compte actual [id=%d, name='%s']\n"
 
 #: src/filtering.c:700
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "la regla est? subjecte al compte, no coincideix amb el compte actual\n"
 
 #: src/filtering.c:712
 #, c-format
@@ -3528,70 +3543,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"la regla est? subjecte al compte [id=%d, name='%s'], compte actual [id=%d, "
+"name='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplicant l'acci? [ %s ]\n"
 
 #: src/filtering.c:757
 msgid "action could not apply\n"
-msgstr ""
+msgstr "no s'ha pogut aplicar l'acci?\n"
 
 #: src/filtering.c:759
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "sense processament addicional despr?s de l'acci? [%s]\n"
 
 #: src/filtering.c:810
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Exec_utar regles de processament"
+msgstr "processant regla '%s' [ %s ]\n"
 
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "processant regla <sense nom> [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "deshabilitada la regla '%s' [ %s ]\n"
 
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "regla inhabilitatada <sense nom> [ %s ]\n"
 
 #: src/filtering.c:874
-#, fuzzy
 msgid "undetermined"
-msgstr "Indefinida"
+msgstr "indefinit"
 
 #: src/filtering.c:878
-#, fuzzy
 msgid "incorporation"
-msgstr "filtrant al incorporar"
+msgstr "incorporaci?"
 
 #: src/filtering.c:882
-#, fuzzy
 msgid "manually"
-msgstr "_Manual"
+msgstr "manualment"
 
 #: src/filtering.c:886
-#, fuzzy
 msgid "folder processing"
-msgstr "Executar regles de pr_ocessament"
+msgstr "processament de carpetes"
 
 #: src/filtering.c:890
-#, fuzzy
 msgid "pre-processing"
-msgstr "Pre-pr_ocessant..."
+msgstr "pre-processant"
 
 #: src/filtering.c:894
-#, fuzzy
 msgid "post-processing"
-msgstr "Post-pro_cessant..."
+msgstr "post-processant"
 
 #: src/filtering.c:911
 #, c-format
@@ -3603,10 +3614,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrant missatge (%s%s%s)\n"
+"%sfitxer del missatge: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: src/filtering.c:913 src/filtering.c:922
 msgid ": "
-msgstr ""
+msgstr ":"
 
 #: src/filtering.c:920
 #, c-format
@@ -3614,6 +3631,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrant missatge (%s%s%s)\n"
+"%sfitxer del missatge: %s\n"
 
 #: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3666,9 +3685,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronitzant %s per usar sense connexi?...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "No es poden moure carpetes entre b?sties diferents."
+msgstr "Un nom de carpeta no pot comen?ar o acabar amb un punt."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3708,9 +3726,8 @@ msgid "Mark all re_ad"
 msgstr "Marc_ar tot com llegit"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Marcar tot com _llegit"
+msgstr "Marca tots lo llegit recursi_vament"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3718,7 +3735,7 @@ msgstr "Exec_utar regles de processament"
 
 #: src/folderview.c:240 src/mainwindow.c:546
 msgid "_Search folder..."
-msgstr "_Buscar en carpeta..."
+msgstr "_Cerca en la carpeta..."
 
 #: src/folderview.c:242
 msgid "Process_ing..."
@@ -3726,7 +3743,7 @@ msgstr "Pr_ocessant..."
 
 #: src/folderview.c:243
 msgid "Empty _trash..."
-msgstr "Buidar _paperera..."
+msgstr "Buidar la _paperera..."
 
 #: src/folderview.c:244
 msgid "Send _queue..."
@@ -3752,111 +3769,118 @@ msgstr "Total"
 #. TRANSLATORS: This in Number sign in American style
 #: src/folderview.c:437 src/summaryview.c:446
 msgid "#"
-msgstr "N"
+msgstr "#"
 
 #: src/folderview.c:767
 msgid "Setting folder info..."
 msgstr "Establint informaci? de carpeta..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Marcar tot  com a llegit"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Realment vols marcar tots els missatges en aquesta carpeta i les seves "
+"subcarpetes com a llegits?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
-#, fuzzy
 msgid "Do you really want to mark all mails in this folder as read?"
-msgstr "Voleu realment marcar tots els mails d'aquesta carpeta com a llegits?"
+msgstr "Realment vols marcar tots els correus d'aquesta carpeta com a llegits?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
-#, fuzzy, c-format
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Marcar tot  com a llegit"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "Revisant carpeta %s%c%s ..."
+msgstr "Revisant la carpeta %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
-#, fuzzy, c-format
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#, c-format
 msgid "Scanning folder %s..."
-msgstr "Revisant carpeta %s ..."
+msgstr "Revisant la carpeta %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Reconstru?r l'arbre de carpetes"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
-"Refer l'arbre de directoris esborrar? les mem?ries cau locals. Voleu "
+"Refer l'arbre de directoris esborrar? les mem?ries cau locals. Vols "
 "continuar?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Escanejant l'arbre de carpetes..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No s'ha pogut explorar la carpeta %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Comprovar missatges nous en totes les carpetes..."
 
-#: src/folderview.c:2070
-#, fuzzy, c-format
+#: src/folderview.c:2073
+#, c-format
 msgid "Closing folder %s..."
-msgstr "Tancant carpeta %s..."
+msgstr "Tancant la carpeta %s..."
 
-#: src/folderview.c:2165
-#, fuzzy, c-format
+#: src/folderview.c:2168
+#, c-format
 msgid "Opening folder %s..."
-msgstr "Obrint carpeta %s ..."
+msgstr "Obrint la carpeta %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
-msgstr "Buidar paperera"
+msgstr "Buidar la paperera"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Esborrar tots els missatges de la paperera?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+Buidar pap_erera"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Av?s de desconnexi?"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
-msgstr "Esteu treballant sense connexi?. Ignorar?"
+msgstr "Est?s treballant sense connexi?. Ignorar?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar missatge(s) encuats"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Enviar tots els  missatges encuats?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produ?t alguns errors enviant els missatges encuats."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3865,64 +3889,64 @@ msgstr ""
 "S'han produ?t alguns errors enviant els missatges encuats:\n"
 "%s"
 
-#: src/folderview.c:2474
-#, fuzzy, c-format
+#: src/folderview.c:2477
+#, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
-msgstr "Voleu realment copiar la carpeta '%s' a '%s' ?"
+msgstr "Realment vols copiar la carpeta '%s' en '%s' ?"
 
-#: src/folderview.c:2475
-#, fuzzy, c-format
+#: src/folderview.c:2478
+#, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
-msgstr "Voleu realment fer la carpeta '%s' sub-carpeta de '%s' ?"
+msgstr "Realment vols fer la carpeta '%s' sub-carpeta de '%s' ?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
-msgstr "Copiar carpeta"
+msgstr "Copiar la carpeta"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
-msgstr "Moure carpeta"
+msgstr "Moure la carpeta"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiant %s a %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "La destinaci? i l'origen s?n el mateix."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No es poden moure carpetes entre b?sties diferents."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Copiar ha fallat!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Moure ha fallat!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant configuraci? per la carpeta %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta dest? nom?s es pot usar per emmaguetzemar subcarpetes."
 
@@ -3987,9 +4011,10 @@ msgid ""
 "\n"
 "For further information visit the Claws Mail website:\n"
 msgstr ""
-"Claws Mail ?s un lleuger, r?pid i altament configurable client de correu.\n"
+"Claws Mail ?s un lleuger, r?pid i altament configurable client de correu "
+"electr?nic.\n"
 "\n"
-"Per m?s informaci? visiteu la p?gina web de Claws Mail:\n"
+"Per a m?s informaci? visiteu la p?gina web de Claws Mail:\n"
 
 #: src/gtk/about.c:137
 msgid ""
@@ -3997,9 +4022,12 @@ msgid ""
 "\n"
 "For support and discussion subscribe to the Claws Mail users' mailing list:\n"
 msgstr ""
+"\n"
+"\n"
+"Subscriute a la llista de correu d'usuaris de Claws Mail per suport i "
+"discussi?:\n"
 
 #: src/gtk/about.c:142
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4019,6 +4047,11 @@ msgid ""
 "The Claws Mail Team\n"
 " and Hiroyuki Yamamoto"
 msgstr ""
+"\n"
+"\n"
+"Copyright (C) 1999-2015\n"
+"L'equip de Claws Mail\n"
+" i Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:161
 msgid ""
@@ -4191,51 +4224,50 @@ msgstr ""
 "\n"
 
 #: src/gtk/about.c:698 src/main.c:2538
-#, fuzzy
 msgid "Session statistics\n"
-msgstr "Excedit el temps l?mit de la sessi?\n"
+msgstr "Estadistiques de la sessi?\n"
 
 #: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2548 src/main.c:2551
-#, fuzzy, c-format
+#, c-format
 msgid "Started: %s\n"
-msgstr "escrit a fd%d: %s\n"
+msgstr "Comen?at: %s\n"
 
 #: src/gtk/about.c:718 src/main.c:2557
 msgid "Incoming traffic\n"
-msgstr ""
+msgstr "Tr?nsit d'entrada\n"
 
 #: src/gtk/about.c:721 src/main.c:2560
-#, fuzzy, c-format
+#, c-format
 msgid "Received messages: %d\n"
-msgstr "missatges esborrats"
+msgstr "Missatges rebuts: %d\n"
 
 #: src/gtk/about.c:728 src/main.c:2566
 msgid "Outgoing traffic\n"
-msgstr ""
+msgstr "Tr?nsit de sortida\n"
 
 #: src/gtk/about.c:731 src/main.c:2569
-#, fuzzy, c-format
+#, c-format
 msgid "New/redirected messages: %d\n"
-msgstr "_Filtrar els missatges _seleccionats"
+msgstr "Missatges nous/redireccionats: %d\n"
 
 #: src/gtk/about.c:736 src/main.c:2573
-#, fuzzy, c-format
+#, c-format
 msgid "Replied messages: %d\n"
-msgstr "missatges esborrats"
+msgstr "Missatges resposts: %d\n"
 
 #: src/gtk/about.c:741 src/main.c:2577
-#, fuzzy, c-format
+#, c-format
 msgid "Forwarded messages: %d\n"
-msgstr "missatges reenviats"
+msgstr "Missatges reenviats: %d\n"
 
 #: src/gtk/about.c:746 src/main.c:2581
-#, fuzzy, c-format
+#, c-format
 msgid "Total outgoing messages: %d\n"
-msgstr "Filtrant missatge...\n"
+msgstr "Total de missatge sortints: %d\n"
 
 #: src/gtk/about.c:773
 msgid "About Claws Mail"
-msgstr "Sobre Claws Mail"
+msgstr "Quant a Claws Mail"
 
 #: src/gtk/about.c:831
 msgid ""
@@ -4243,10 +4275,13 @@ msgid ""
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
+"Copyright (C) 1999-2015\n"
+"L'equip de Claws Mail\n"
+"i Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:845
 msgid "_Info"
-msgstr "_Info"
+msgstr "_Informaci?"
 
 #: src/gtk/about.c:851
 msgid "_Authors"
@@ -4262,11 +4297,11 @@ msgstr "_Llic?ncia"
 
 #: src/gtk/about.c:871
 msgid "_Release Notes"
-msgstr "_Notes de Versi?"
+msgstr "Notes de Ve_rsi?"
 
 #: src/gtk/about.c:877
 msgid "_Statistics"
-msgstr ""
+msgstr "E_stad?stiques"
 
 #: src/gtk/colorlabel.c:38 src/prefs_common.c:360
 msgid "Orange"
@@ -4329,21 +4364,17 @@ msgid "Magenta"
 msgstr "Magenta"
 
 #: src/gtk/foldersort.c:156
-#, fuzzy
 msgid "Set mailbox order"
-msgstr "Establir l'ordre de la carpeta"
+msgstr "Establir l'ordre de la b?stia de correu"
 
 #: src/gtk/foldersort.c:190
-#, fuzzy
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Moure les carpetes amunt o avall per canviar l'ordre de la llista de "
-"carpetes."
+"Moure les b?sties amunt o avall per canviar l'ordre en la llista de carpetes."
 
 #: src/gtk/foldersort.c:216
-#, fuzzy
 msgid "Mailboxes"
-msgstr "Correu"
+msgstr "B?sties de Correu"
 
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
@@ -4385,18 +4416,17 @@ msgstr ""
 "s'aprendr? l'error.\n"
 
 #: src/gtk/gtkaspell.c:1800
-#, fuzzy
 msgid "Change to..."
-msgstr "Canviar punts"
+msgstr "Canviar a..."
 
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "M?s..."
 
 #: src/gtk/gtkaspell.c:1867
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
-msgstr "\"%s\" desconeguda a %s"
+msgstr "\"%s\" desconegut en el diccionari '%s'"
 
 #: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
@@ -4457,12 +4487,11 @@ msgstr ""
 
 #: src/gtk/gtkutils.c:1909
 msgid "Failed."
-msgstr ""
+msgstr "Ha fallat."
 
 #: src/gtk/gtkutils.c:1972
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Configuraci?"
+msgstr "Configurant..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
 #: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
@@ -4877,9 +4906,8 @@ msgid "Message has been forwarded"
 msgstr "El missatge ha estat re-enviat"
 
 #: src/gtk/icon_legend.c:68
-#, fuzzy
 msgid "Message has been forwarded and replied to"
-msgstr "El missatge ha estat contestat"
+msgstr "El missatge ha sigut reenviat i contestat a"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message is in an ignored thread"
@@ -4919,7 +4947,7 @@ msgstr "Missatge marcat"
 
 #: src/gtk/icon_legend.c:80
 msgid "Message is marked for deletion"
-msgstr "El missatge s'ha marcat per a eliminar"
+msgstr "El missatge s'ha marcat per a ser esborrar"
 
 #: src/gtk/icon_legend.c:81
 msgid "Message is marked for moving"
@@ -4995,6 +5023,9 @@ msgid ""
 "has been truncated for safety. This message could be\n"
 "corrupted, malformed or part of some DoS attempt.</span>"
 msgstr ""
+"<span><b>Advert?ncia:</b> Aquesta URL ?s massa llarg per mostrar i\n"
+"s'ha truncat per seguretat. Aquest missatge podria estar danyat,\n"
+"mal format o potser es part d'algun intent de DoS.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
@@ -5040,6 +5071,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5053,7 +5085,7 @@ msgstr ""
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
 #: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
 msgid "Plugins"
-msgstr "M?duls"
+msgstr "Connectors"
 
 #: src/gtk/pluginwindow.c:337
 msgid "Load..."
@@ -5073,6 +5105,8 @@ msgid ""
 "For more information about plugins see the <a href=\"%s\"><span underline="
 "\"none\">Claws Mail website</span></a>."
 msgstr ""
+"Per obtenir m?s informaci? sobre els connectors veure el <a href=\"%s"
+"\"><span underline=\"none\">lloc web de Claws Mail</span></a>."
 
 #: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
@@ -5084,7 +5118,7 @@ msgstr "Descarregar el m?dul seleccionat"
 
 #: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
-msgstr "M?duls carregats"
+msgstr "Connectors carregats"
 
 #: src/gtk/prefswindow.c:674
 msgid "Page Index"
@@ -5094,11 +5128,12 @@ msgstr "P?gina ?ndex"
 msgid "_Hide"
 msgstr "Ocu_ltar"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Compte"
 
@@ -5107,24 +5142,20 @@ msgid "all messages"
 msgstr "tots els missatges"
 
 #: src/gtk/quicksearch.c:452
-#, fuzzy
 msgid "messages whose age is greater than # days"
-msgstr "missatges amb edat major que "
+msgstr "missatges amb antiguitat major que # dies"
 
 #: src/gtk/quicksearch.c:453
-#, fuzzy
 msgid "messages whose age is less than # days"
-msgstr "missatges amb edat menor que "
+msgstr "missatges amb antiguitat menor que # dies"
 
 #: src/gtk/quicksearch.c:454
-#, fuzzy
 msgid "messages whose age is greater than # hours"
-msgstr "missatges amb edat major que "
+msgstr "missatges amb antiguitat major que # hores"
 
 #: src/gtk/quicksearch.c:455
-#, fuzzy
 msgid "messages whose age is less than # hours"
-msgstr "missatges amb edat menor que "
+msgstr "missatges amb antiguitat menor que # hores"
 
 #: src/gtk/quicksearch.c:456
 msgid "messages which contain S in the message body"
@@ -5163,19 +5194,16 @@ msgid "forwarded messages"
 msgstr "missatges reenviats"
 
 #: src/gtk/quicksearch.c:465
-#, fuzzy
 msgid "messages which have attachments"
-msgstr "missatges els quals tenen etiquet(a/es)"
+msgstr "missatges els quals tenen fitxer/s adjunt/s"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "missatges que contenen S a la cap?alera X-Label"
+msgstr "els missatges que contenen S en qualsevol nom o valor de cap?alera"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "missatges que contenen S a la cap?alera X-Label"
+msgstr "els missatges que contenen S en el valor de qualsevol cap?alera"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5210,9 +5238,8 @@ msgid "incomplete messages (not entirely downloaded)"
 msgstr "missatges incomplerts (no descarregats completament)"
 
 #: src/gtk/quicksearch.c:476
-#, fuzzy
 msgid "messages which you have replied to"
-msgstr "missatges que han estat contestats"
+msgstr "missatges que has contestat"
 
 #: src/gtk/quicksearch.c:477
 msgid "read messages"
@@ -5223,34 +5250,28 @@ msgid "messages which contain S in subject"
 msgstr "missatges que contenen S a l'assumpte"
 
 #: src/gtk/quicksearch.c:479
-#, fuzzy
 msgid "messages whose score is equal to # points"
-msgstr "missatges amb puntuaci? igual a #"
+msgstr "missatges amb puntuaci? igual a # punts"
 
 #: src/gtk/quicksearch.c:480
-#, fuzzy
 msgid "messages whose score is greater than # points"
-msgstr "missatges amb puntuaci? major que #"
+msgstr "missatges amb puntuaci? major que # punts"
 
 #: src/gtk/quicksearch.c:481
-#, fuzzy
 msgid "messages whose score is lower than # points"
-msgstr "missatges amb puntuaci? menor que #"
+msgstr "missatges amb puntuaci? menor que # punts"
 
 #: src/gtk/quicksearch.c:482
-#, fuzzy
 msgid "messages whose size is equal to # bytes"
-msgstr "missatges amb tamany igual a #"
+msgstr "missatges amb tamany igual a # bytes"
 
 #: src/gtk/quicksearch.c:483
-#, fuzzy
 msgid "messages whose size is greater than # bytes"
-msgstr "missatges amb tamany major que #"
+msgstr "missatges amb tamany major que # bytes"
 
 #: src/gtk/quicksearch.c:484
-#, fuzzy
 msgid "messages whose size is smaller than # bytes"
-msgstr "missatges amb tamany menor que #"
+msgstr "missatges amb tamany menor que # bytes"
 
 #: src/gtk/quicksearch.c:485
 msgid "messages which have been sent to S"
@@ -5305,6 +5326,8 @@ msgstr "sensible a majs./mins."
 #: src/gtk/quicksearch.c:498
 msgid "match using regular expressions instead of substring search"
 msgstr ""
+"fer coincidir amb l'?s d'expressions regulars en lloc d'una cerca de "
+"subcadena"
 
 #: src/gtk/quicksearch.c:500
 msgid "all filtering expressions are allowed"
@@ -5326,12 +5349,11 @@ msgstr ""
 
 #: src/gtk/quicksearch.c:610
 msgid "Something went wrong during search. Please check your logs."
-msgstr ""
+msgstr "Quelcom ha fallat durant la cerca. Es recomana consultar la tra?a."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Des de/a/Assumpte/Etiqueta"
+msgstr "De/Per/Cc/Assumpte/Etiqueta"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5367,11 +5389,10 @@ msgstr "_Informaci?"
 
 #: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
 msgid "E_dit"
-msgstr ""
+msgstr "E_ditar"
 
 #: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
 #: src/prefs_filtering.c:495 src/prefs_template.c:330
-#, fuzzy
 msgid "C_lear"
 msgstr "_Netejar"
 
@@ -5425,15 +5446,18 @@ msgid ""
 "You may be connecting to a rogue server.\n"
 "\n"
 msgstr ""
+"El certificat ?s per %s, per? la connexi? ?s per %s.\n"
+"?s possible que la connexi? sigui amb un servidor pirata.\n"
+"\n"
 
 #: src/gtk/sslcertwindow.c:338
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
 msgstr ""
 "Certificat per %s ?s desconegut.\n"
-"Voleu acceptar-lo?"
+"%sVols acceptar-lo?"
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
@@ -5446,14 +5470,12 @@ msgid "_View certificate"
 msgstr "_Veure certificat"
 
 #: src/gtk/sslcertwindow.c:364
-#, fuzzy
 msgid "SSL certificate is invalid"
-msgstr "Cer_tificats SSL"
+msgstr "El Certificat SSL es invalid"
 
 #: src/gtk/sslcertwindow.c:366
-#, fuzzy
 msgid "SSL certificate is unknown"
-msgstr "Cer_tificats SSL"
+msgstr "El Certificat SSL es desconegut"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
@@ -5462,25 +5484,24 @@ msgstr "_Cancel?lar connexi?"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
 msgid "_Accept and save"
-msgstr "_Acceptar i guardar"
+msgstr "_Acceptar i desar"
 
 #: src/gtk/sslcertwindow.c:387
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
 msgstr ""
 "Certificat per %s ha caducat.\n"
-"Voleu continuar?"
+"%sVols continuar?"
 
 #: src/gtk/sslcertwindow.c:414
 msgid "SSL certificate is invalid and expired"
-msgstr ""
+msgstr "El certificat SSL es inv?lid i ha expirat"
 
 #: src/gtk/sslcertwindow.c:416
-#, fuzzy
 msgid "SSL certificate is expired"
-msgstr "Cer_tificats SSL"
+msgstr "El certificat SSL ha expirat"
 
 #: src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5495,25 +5516,25 @@ msgid "Known certificate:"
 msgstr "Certificat conegut:"
 
 #: src/gtk/sslcertwindow.c:451
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
-msgstr "El certificat de %s ha canviat. Voleu aceptar-lo?"
+msgstr ""
+"El certificat de %s ha canviat.\n"
+"%sVols aceptar-lo?"
 
 #: src/gtk/sslcertwindow.c:472
 msgid "_View certificates"
 msgstr "_Veure certificats"
 
 #: src/gtk/sslcertwindow.c:477
-#, fuzzy
 msgid "SSL certificate changed and is invalid"
-msgstr "Certificat SSL per a %s"
+msgstr "El certificat SSL ha canviat i es inv?lid"
 
 #: src/gtk/sslcertwindow.c:479
-#, fuzzy
 msgid "SSL certificate changed"
-msgstr "Cer_tificats SSL"
+msgstr "El certificat SSL ha canviat"
 
 #: src/headerview.c:95
 msgid "Tags:"
@@ -5797,7 +5818,6 @@ msgstr ""
 "suport SASL i el m?dul DIGEST-MD5 SASL est? instal?lat."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5806,8 +5826,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Els logins CRAM-MD5 nom?s funcionen si libetpan ha estat compilat amb suport "
-"SASL i el m?dul CRAM-MD5 SASL est? instal?lat."
+"Les connexions de SCRAM-SHA-1 nom?s funcionen si libetpan s'ha compilat amb "
+"suport SCRAM SASL i el connector est? instal?lat."
 
 #: src/imap.c:959
 #, c-format
@@ -5849,17 +5869,16 @@ msgstr ""
 "Aquesta connexi? s'ha configurat per ser segura usant SSL, per? SSL no est? "
 "disponible en aquesta compilaci? de Claws Mail.\n"
 "\n"
-"Voleu seguir connectant-vos a aquest servidor? La comunicaci? pot no ser "
-"segura."
+"Vols seguir connectant a aquest servidor? La comunicaci? pot no ser segura."
 
 #: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:285
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar connectant"
 
 #: src/imap.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "Connectant al servidor IMAP4: %s ..."
+msgstr "Compte: '%s': Connectant al servidor IMAP4: %s:%d ..."
 
 #: src/imap.c:1195
 #, c-format
@@ -5955,13 +5974,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
-"La connexi? a %s ha fallat: el servidor reqauerexi TLS, per? Claws Mail ha "
-"estat compilat sense suport OpenSSL.\n"
+"La connexi? a %s ha fallat: el servidor requereix TLS, per? s'ha compilat "
+"Claws Mail sense sense suport TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6056,7 +6075,7 @@ msgid ""
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 "Introduiu el nom de la nova carpeta:\n"
-"(si voleu crear una carpeta per emmagatzemar nom?s subcarpetes\n"
+"(si vols crear una carpeta per emmagatzemar nom?s subcarpetes\n"
 "i no correus, afegiu `/' al nom de la carpeta)"
 
 #: src/imap_gtk.c:200 src/mh_gtk.c:148
@@ -6097,19 +6116,19 @@ msgstr ""
 "S'esborraran totes les carpetes i missatges que penjen de '%s'. Recuperar-"
 "los ser? impossible.\n"
 "\n"
-"Voleu eliminar-los definitivament?"
+"Vols eliminar-los definitivament?"
 
 #: src/imap_gtk.c:381 src/news_gtk.c:281 src/plugins/mailmbox/plugin_gtk.c:350
 #: src/plugins/rssyl/rssyl_cb_menu.c:175
 #: src/plugins/vcalendar/vcal_folder.c:1988
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "No es pot eliminar la carpeta '%s'."
+msgstr "No es pot esborrar la carpeta '%s'."
 
 #: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
-msgstr "Voleu realment buscar carpetes no subscrites de '%s'?"
+msgstr "Realment vols buscar carpetes no subscrites de '%s'?"
 
 #: src/imap_gtk.c:510
 msgid "Search recursively"
@@ -6151,7 +6170,7 @@ msgstr ""
 #: src/imap_gtk.c:566
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
-msgstr "Voleu %s la carpeta '%s'?"
+msgstr "Vols %s la carpeta '%s'?"
 
 #: src/imap_gtk.c:567
 msgid "subscribe"
@@ -6397,7 +6416,7 @@ msgstr "Fet (no hi ha missatges nous)"
 msgid "Connection failed"
 msgstr "Connexi? fallida"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Authorizaci? fallida"
 
@@ -6427,9 +6446,9 @@ msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperant nous missatges"
 
 #: src/inc.c:832
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "Conectant al servidor POP3: %s..."
+msgstr "Compte '%s': Connectant al servidor POP3: %s:%d..."
 
 #: src/inc.c:850
 #, c-format
@@ -6441,14 +6460,15 @@ msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentificant..."
 
 #: src/inc.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "Obtenint missatges de %s (%s) ..."
+msgstr "Obtenint missatges de %s (%s)..."
 
 #: src/inc.c:942
 msgid "Getting the number of new messages (STAT)..."
@@ -6572,12 +6592,12 @@ msgstr "Incorporaci? cancel?lada\n"
 #: src/inc.c:1530
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sEsteu treballant sense connexi?. Ignorar durant %d minuts?"
+msgstr "%s%sEst?s treballant sense connexi?. Ignorar durant %d minuts?"
 
 #: src/inc.c:1536
 #, c-format
 msgid "%s%sYou're working offline. Override?"
-msgstr "%s%sEsteu treballant sense connexi?. Ignorar?"
+msgstr "%s%sEst?s treballant sense connexi?. Ignorar?"
 
 #: src/inc.c:1543
 msgid "On_ly once"
@@ -6585,7 +6605,7 @@ msgstr "Nom?s _una vegada"
 
 #: src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
+msgstr "Algun SN"
 
 #: src/ldif.c:759
 msgid "Nick Name"
@@ -6607,7 +6627,7 @@ msgid ""
 "Do you want to migrate this configuration?"
 msgstr ""
 "Trobada configuraci? per %s.\n"
-"Voleu migrar aquesta configuraci??"
+"Vols migrar aquesta configuraci??"
 
 #: src/main.c:365
 #, c-format
@@ -6619,8 +6639,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Les vostres regles de filtratge de Sylpheed poder ser convertides per un\n"
-"script disponible a %s."
+"Les vostres regles de filtratge de Sylpheed poder ser convertides per una\n"
+"seq??ncia d'ordres disponible a %s."
 
 #: src/main.c:377
 msgid "Keep old configuration"
@@ -6719,25 +6739,23 @@ msgstr ""
 
 #: src/main.c:1726
 msgid "Missing filename\n"
-msgstr ""
+msgstr "No s'ha trobat el nom del fitxer\n"
 
 #: src/main.c:1733
 msgid "Cannot open filename for reading\n"
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer per llegir-lo\n"
 
 #: src/main.c:1744
-#, fuzzy
 msgid "Malformed header\n"
-msgstr "Missatge mal format"
+msgstr "Cap?alera mal formada\n"
 
 #: src/main.c:1751
 msgid "Duplicated 'To:' header\n"
-msgstr ""
+msgstr "Cap?alera \"Per:\" duplicada\n"
 
 #: src/main.c:1762
-#, fuzzy
 msgid "Missing required 'To:' header\n"
-msgstr "Informaci? requerida no s'ha informat"
+msgstr "No s'ha trobat la cap?alera requerida 'Per:'\n"
 
 #: src/main.c:1905
 #, c-format
@@ -6758,6 +6776,15 @@ msgid ""
 "an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
+"  --compose-from-file file\n"
+"                         obre finestra de composici? amb les dades dun arxiu "
+"donat;\n"
+"????????????????????????? utilitzar - com nom de fitxer per a la lectura de "
+"l'entrada est?ndard;\n"
+"????????????????????????? format de contingut: encap?alats primer (Per: "
+"requerit) fins trobar una\n"
+"????????????????????????? l?nia buida, llavors el cos del correu fins al "
+"final de l'arxiu."
 
 #: src/main.c:1913
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
@@ -6783,14 +6810,12 @@ msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          rep nous missatges per tots els comptes"
 
 #: src/main.c:1919
-#, fuzzy
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "  --receive              rep els missatges nous"
+msgstr "  --cancel-receiving     cancel?lar la recepci? de missatges"
 
 #: src/main.c:1920
-#, fuzzy
 msgid "  --cancel-sending       cancel sending of messages"
-msgstr "  --receive              rep els missatges nous"
+msgstr "  --cancel-sending       cancel?lar l'enviament dels missatges"
 
 #: src/main.c:1921
 msgid ""
@@ -6802,6 +6827,13 @@ msgid ""
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
+"--search carpeta tipus petici? [recursiva]\n"
+"                        busca al correu\n"
+"                        carpeta ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
+"                        tipus: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
+"g: tag\n"
+"                        petici?: cadena de cerca\n"
+"                        recursiva: false if arg. starts with 0, n, N, f or F"
 
 #: src/main.c:1928
 msgid "  --send                 send all queued messages"
@@ -6821,11 +6853,11 @@ msgstr ""
 
 #: src/main.c:1932
 msgid "  --statistics           show session statistics"
-msgstr ""
+msgstr "  --statistics           mostren estad?stiques de la sessi?"
 
 #: src/main.c:1933
 msgid "  --reset-statistics     reset session statistics"
-msgstr ""
+msgstr "  --reset-statistics     estad?stiques de sessi? de reinici"
 
 #: src/main.c:1934
 msgid ""
@@ -6853,9 +6885,8 @@ msgid "  --debug                debug mode"
 msgstr "  --debug                mode de depuraci?"
 
 #: src/main.c:1940
-#, fuzzy
 msgid "  --toggle-debug         toggle debug mode"
-msgstr "  --debug                mode de depuraci?"
+msgstr "  --toggle-debug         mode de depuraci?"
 
 #: src/main.c:1941
 msgid "  --help -h              display this help and exit"
@@ -6935,9 +6966,8 @@ msgid "MH..."
 msgstr "MH..."
 
 #: src/mainwindow.c:518
-#, fuzzy
 msgid "Change mailbox order..."
-msgstr "Canviar l'ordre de les carpetes..."
+msgstr "Canviar l'ordre de les b?sties de correu..."
 
 #: src/mainwindow.c:521
 msgid "_Import mbox file..."
@@ -6956,14 +6986,12 @@ msgid "Empty all _Trash folders"
 msgstr "Buidar _totes les papereres"
 
 #: src/mainwindow.c:528 src/messageview.c:218
-#, fuzzy
 msgid "_Save email as..."
-msgstr "_Guardar com..."
+msgstr "De_sar com..."
 
 #: src/mainwindow.c:529 src/messageview.c:219
-#, fuzzy
 msgid "_Save part as..."
-msgstr "_Guardar com..."
+msgstr "De_sar com..."
 
 #: src/mainwindow.c:532 src/messageview.c:220
 msgid "Page setup..."
@@ -7010,14 +7038,12 @@ msgid "Set displayed _columns"
 msgstr "Definir _columnes visibles"
 
 #: src/mainwindow.c:554
-#, fuzzy
 msgid "In _folder list..."
-msgstr "a la _llista de carpetes..."
+msgstr "A la _llista de carpetes..."
 
 #: src/mainwindow.c:555
-#, fuzzy
 msgid "In _message list..."
-msgstr "a la llista de _missatges..."
+msgstr "A la llista de _missatges..."
 
 #: src/mainwindow.c:560
 msgid "La_yout"
@@ -7084,14 +7110,12 @@ msgid "Next la_beled message"
 msgstr "Missatge eti_quetat seg?ent"
 
 #: src/mainwindow.c:586 src/messageview.c:248
-#, fuzzy
 msgid "Previous opened message"
-msgstr "Anterior missatge no_u"
+msgstr "Missatge anterior obert"
 
 #: src/mainwindow.c:587 src/messageview.c:249
-#, fuzzy
 msgid "Next opened message"
-msgstr "Seg?_ent Missatge nou"
+msgstr "Seg?ent missatge nou"
 
 #: src/mainwindow.c:589 src/messageview.c:251
 msgid "Parent message"
@@ -7106,29 +7130,24 @@ msgid "_Other folder..."
 msgstr "_Altra carpeta..."
 
 #: src/mainwindow.c:594 src/messageview.c:256 src/mimeview.c:201
-#, fuzzy
 msgid "Next part"
-msgstr "Seg?ent part (a)"
+msgstr "Seg?ent part"
 
 #: src/mainwindow.c:595 src/messageview.c:257 src/mimeview.c:202
-#, fuzzy
 msgid "Previous part"
-msgstr "P?gina anterior"
+msgstr "Part anterior"
 
 #: src/mainwindow.c:598 src/messageview.c:258
-#, fuzzy
 msgid "Message scroll"
-msgstr "Missatges"
+msgstr "Missatge"
 
 #: src/mainwindow.c:599 src/messageview.c:259
-#, fuzzy
 msgid "Previous line"
-msgstr "P?gina anterior"
+msgstr "L?nea anterior"
 
 #: src/mainwindow.c:600 src/messageview.c:260
-#, fuzzy
 msgid "Next line"
-msgstr "l?nia nova"
+msgstr "L?nea seg?ent"
 
 #: src/mainwindow.c:601 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
@@ -7151,23 +7170,20 @@ msgid "Mess_age source"
 msgstr "Fon_t del missatge"
 
 #: src/mainwindow.c:630 src/messageview.c:288
-#, fuzzy
 msgid "Message part"
-msgstr "Llista de missatges"
+msgstr "Part del missatge"
 
 #: src/mainwindow.c:631 src/messageview.c:289
-#, fuzzy
 msgid "View as text"
-msgstr "'Mostrar com a text'"
+msgstr "Mostrar com a text"
 
 #: src/mainwindow.c:632 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
 msgstr "Obrir"
 
 #: src/mainwindow.c:634 src/messageview.c:292
-#, fuzzy
 msgid "Open with..."
-msgstr "'Obrir amb...'"
+msgstr "Obrir amb..."
 
 #: src/mainwindow.c:638 src/messageview.c:295
 msgid "Quotes"
@@ -7215,7 +7231,6 @@ msgid "Repl_y to"
 msgstr "Respon_dre a"
 
 #: src/mainwindow.c:661 src/messageview.c:305
-#, fuzzy
 msgid "Mailing _list"
 msgstr "L_lista de correu"
 
@@ -7319,12 +7334,10 @@ msgid "Unwatch thread"
 msgstr "Deixar de revisar el fil"
 
 #: src/mainwindow.c:707
-#, fuzzy
 msgid "Mark as _spam"
-msgstr "Marcar com a correu brossa"
+msgstr "Marcar com a correu bro_ssa"
 
 #: src/mainwindow.c:708
-#, fuzzy
 msgid "Mark as _ham"
 msgstr "Marcar com a b?"
 
@@ -7361,12 +7374,10 @@ msgid "C_ollect addresses"
 msgstr "Rec_ollir adreces"
 
 #: src/mainwindow.c:729
-#, fuzzy
 msgid "From current _folder..."
-msgstr "de la carpeta ac_tual..."
+msgstr "De la carpeta ac_tual..."
 
 #: src/mainwindow.c:730
-#, fuzzy
 msgid "From selected _messages..."
 msgstr "dels _missatges seleccionats..."
 
@@ -7500,7 +7511,7 @@ msgstr "Etiquete_s..."
 
 #: src/mainwindow.c:793
 msgid "Plu_gins..."
-msgstr "M?d_uls..."
+msgstr "Co_nnectors..."
 
 #: src/mainwindow.c:796
 msgid "_Manual"
@@ -7524,7 +7535,7 @@ msgstr "_Mode sense connexi?"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "Barra de _menu"
 
 #: src/mainwindow.c:809
 msgid "_Message view"
@@ -7543,9 +7554,8 @@ msgid "Th_read view"
 msgstr "Vista je_r?rquica"
 
 #: src/mainwindow.c:815
-#, fuzzy
 msgid "Hide read threads"
-msgstr "Ama_gar els missatges llegits"
+msgstr "Amagar els fils llegits"
 
 #: src/mainwindow.c:816
 msgid "_Hide read messages"
@@ -7564,17 +7574,14 @@ msgid "Show all _headers"
 msgstr "Mostrar totes les ca_p?aleres"
 
 #: src/mainwindow.c:820 src/messageview.c:345
-#, fuzzy
 msgid "_Collapse all"
-msgstr "Co_llapsar tots els fils"
+msgstr "_Collapsar to"
 
 #: src/mainwindow.c:821 src/messageview.c:346
-#, fuzzy
 msgid "Collapse from level _2"
 msgstr "Plegar desde el nivell _2"
 
 #: src/mainwindow.c:822 src/messageview.c:347
-#, fuzzy
 msgid "Collapse from level _3"
 msgstr "Plegar desde el nivell _3"
 
@@ -7615,64 +7622,53 @@ msgid "S_mall screen"
 msgstr "_Pantalla petita"
 
 #: src/mainwindow.c:844
-#, fuzzy
 msgid "By _number"
-msgstr "per _N?mero"
+msgstr "Per _n?mero"
 
 #: src/mainwindow.c:845
-#, fuzzy
 msgid "By s_ize"
-msgstr "per _Tamany"
+msgstr "Per _tamany"
 
 #: src/mainwindow.c:846
 msgid "By _date"
-msgstr ""
+msgstr "Per _data"
 
 #: src/mainwindow.c:847
-#, fuzzy
 msgid "By thread date"
-msgstr "per data del Fil"
+msgstr "Per data del Fil"
 
 #: src/mainwindow.c:850
-#, fuzzy
 msgid "By s_ubject"
-msgstr "Per A_ssumpte"
+msgstr "Per Ass_umpte"
 
 #: src/mainwindow.c:851
-#, fuzzy
 msgid "By _color label"
-msgstr "per Etiqueta de _color"
+msgstr "Per etiqueta de _color"
 
 #: src/mainwindow.c:852
-#, fuzzy
 msgid "By tag"
 msgstr "Qualsevol etiqueta"
 
 # RML To be consistent with previous one.
 #: src/mainwindow.c:853
-#, fuzzy
 msgid "By _mark"
-msgstr "_Desmarca"
+msgstr "Per _marca"
 
 #: src/mainwindow.c:854
-#, fuzzy
 msgid "By _status"
-msgstr "per E_stat"
+msgstr "Per e_stat"
 
 #: src/mainwindow.c:855
-#, fuzzy
 msgid "By a_ttachment"
-msgstr "per A_djunt"
+msgstr "Per adjun_t"
 
 #: src/mainwindow.c:856
-#, fuzzy
 msgid "By score"
-msgstr "per Puntuaci?"
+msgstr "Per puntuaci?"
 
 #: src/mainwindow.c:857
-#, fuzzy
 msgid "By locked"
-msgstr "per Bloquejat"
+msgstr "Per bloquejat"
 
 #: src/mainwindow.c:858
 msgid "D_on't sort"
@@ -7701,11 +7697,11 @@ msgstr ""
 
 #: src/mainwindow.c:1960
 msgid "You are online. Click the icon to go offline"
-msgstr "Esteu connectat. Polseu en la icona per desconectar-se"
+msgstr "Est?s connectat. Polseu en la icona per desconnectar"
 
 #: src/mainwindow.c:1963
 msgid "You are offline. Click the icon to go online"
-msgstr "Esteu desconnectat. Polseu en la icona per conectarse"
+msgstr "Est?s desconnectat. Polseu en la icona per connectar"
 
 #: src/mainwindow.c:1977
 msgid "Select account"
@@ -7716,9 +7712,8 @@ msgid "Network log"
 msgstr "Tra?a de xarxa"
 
 #: src/mainwindow.c:2008
-#, fuzzy
 msgid "Filtering/Processing debug log"
-msgstr "Filtrat/processament de la tra?a de depuraci?"
+msgstr "Filtrat/Processament de la tra?a de depuraci?"
 
 #: src/mainwindow.c:2027 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
@@ -7800,7 +7795,7 @@ msgstr "Sortir"
 
 #: src/mainwindow.c:4026 src/plugins/notification/notification_trayicon.c:515
 msgid "Exit Claws Mail?"
-msgstr "Voleu sortir de Claws Mail?"
+msgstr "Vols sortir de Claws Mail?"
 
 #: src/mainwindow.c:4217
 msgid "Folder synchronisation"
@@ -7808,7 +7803,7 @@ msgstr "Sincronitzaci? de carpetes"
 
 #: src/mainwindow.c:4218
 msgid "Do you want to synchronise your folders now?"
-msgstr "Voleu sincronitzar les vostres carpetes ara?"
+msgstr "Vols sincronitzar les teves carpetes ara?"
 
 #: src/mainwindow.c:4219
 msgid "+_Synchronise"
@@ -7880,9 +7875,8 @@ msgid "body line"
 msgstr "L?nia de cos del missatge"
 
 #: src/matcher.c:221
-#, fuzzy
 msgid "tag"
-msgstr "etiquetes"
+msgstr "etiqueta"
 
 #: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
 #: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
@@ -7921,10 +7915,10 @@ msgstr ""
 "%s\n"
 
 #: src/mbox.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "Important desde mbox... (%d correus improtats)"
+msgstr[0] "Important desde mbox... (%d correu improtat)"
 msgstr[1] "Important desde mbox... (%d correus improtats)"
 
 #: src/mbox.c:554
@@ -7933,7 +7927,7 @@ msgstr "Sobreescriure l'arxiu mbox"
 
 #: src/mbox.c:555
 msgid "This file already exists. Do you want to overwrite it?"
-msgstr "Aquest arxiu ja existeix. Voleu sobreescriure'l?"
+msgstr "Aquest arxiu ja existeix. Vols sobreescriure'l?"
 
 #: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844
 #: src/prefs_themes.c:533 src/textview.c:3053
@@ -7971,11 +7965,11 @@ msgstr "Cadena no trobada."
 
 #: src/message_search.c:338
 msgid "Beginning of message reached; continue from end?"
-msgstr "S'ha arribat a l'inici del missatge. Voleu seguir desde el final?"
+msgstr "S'ha arribat a l'inici del missatge. Vols seguir desde el final?"
 
 #: src/message_search.c:341
 msgid "End of message reached; continue from beginning?"
-msgstr "S'ha arribat al final del missatge. Voleu seguir desde l'inici?"
+msgstr "S'ha arribat al final del missatge. Vols seguir desde l'inici?"
 
 #: src/message_search.c:344 src/summary_search.c:791
 msgid "Search finished"
@@ -8043,7 +8037,7 @@ msgstr ""
 #: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4816
 #: src/summaryview.c:4819 src/textview.c:3041
 msgid "Save as"
-msgstr "Guardar com"
+msgstr "Desar com"
 
 #: src/messageview.c:1849
 msgid "Overwrite existing file?"
@@ -8053,7 +8047,7 @@ msgstr "Sobreescriure l'arxiu existent?"
 #: src/summaryview.c:4854
 #, c-format
 msgid "Couldn't save the file '%s'."
-msgstr "No s'ha pogut guardar l'arxiu '%s'."
+msgstr "No s'ha pogut desar l'arxiu '%s'."
 
 #: src/messageview.c:1910
 #, c-format
@@ -8090,7 +8084,7 @@ msgid ""
 "and has been deleted from the server."
 msgstr ""
 "Aquest missatge s'ha descarregat parcialment,\n"
-"i ha estat eliminat del servidor."
+"i ha estat esborrat del servidor."
 
 #: src/messageview.c:2002
 #, c-format
@@ -8107,7 +8101,7 @@ msgstr "Marcar per a descarregar"
 
 #: src/messageview.c:2007 src/messageview.c:2019
 msgid "Mark for deletion"
-msgstr "Marcar per a eliminar"
+msgstr "Marcar per a esborrar"
 
 #: src/messageview.c:2012
 #, c-format
@@ -8131,23 +8125,23 @@ msgid ""
 "it is %s and will be deleted."
 msgstr ""
 "Aquest missatge s'ha descarregat parcialment;\n"
-"es de %s i ser? eliminat."
+"es de %s i ser? esborrat."
 
 #: src/messageview.c:2096
 msgid "Return Receipt Notification"
 msgstr "Notificaci? de justificant de recepci?"
 
 #: src/messageview.c:2097
-#, fuzzy
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
 "Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
-"El missatge ha estat enviat a diferents comptes seus.\n"
-"Per favor, escolliu el compte que desitjeu usar per enviar la notificaci? de "
-"justificant de recepci?:"
+"M?s d'una de les seves comptes utilitza l'adre?a on aquest missatge ha sigut "
+"enviat.\n"
+"Si us plau, escull el compte que desitjes utilitzar per a fer l'enviament de "
+"la notificaci? de recepci?:"
 
 #: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
 msgid "_Cancel"
@@ -8162,25 +8156,28 @@ msgid "Cannot print: the message doesn't contain text."
 msgstr "No es pot imprimit: el missatge no cont? text."
 
 #: src/messageview.c:2931
-#, fuzzy
 msgid ""
 "\n"
 "  There are no messages in this folder"
-msgstr "Esborrar tots els missatges de la paperera?"
+msgstr ""
+"\n"
+"  No hi ha missatges en aquesta carpeta"
 
 #: src/messageview.c:2939
-#, fuzzy
 msgid ""
 "\n"
 "  Message has been deleted"
-msgstr "El missatge ha estat contestat"
+msgstr ""
+"\n"
+"  El missatge ha sigut esborrat"
 
 #: src/messageview.c:2940
-#, fuzzy
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
-msgstr "El missatge ha estat contestat"
+msgstr ""
+"\n"
+"  El missatge ha estat esborrat o mogut a una altre carpeta"
 
 #: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201
 #: src/summaryview.c:6972
@@ -8202,18 +8199,21 @@ msgstr "Esborrant missatges..."
 
 #: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
-msgstr "Eli_minar b?stia..."
+msgstr "Esborrar _b?stia..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "No es pot eliminar la carpeta '%s'."
+msgstr ""
+"No es pot esborrar la carpeta '%s'\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
@@ -8223,35 +8223,31 @@ msgstr ""
 
 #: src/mh_gtk.c:368 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
-msgstr "Eliminar b?stia"
+msgstr "Esborrar b?stia"
 
 #: src/mimeview.c:193
-#, fuzzy
 msgid "_Open"
-msgstr "Obrir"
+msgstr "_Obrir"
 
 #: src/mimeview.c:195
-#, fuzzy
 msgid "Open _with..."
-msgstr "'Obrir amb...'"
+msgstr "Obrir _amb..."
 
 #: src/mimeview.c:197
-#, fuzzy
 msgid "Send to..."
-msgstr "Enviar _cua..."
+msgstr "Enviar a..."
 
 #: src/mimeview.c:198
-#, fuzzy
 msgid "_Display as text"
-msgstr "'Mostrar com a text'"
+msgstr "_Mostrar com a text"
 
 #: src/mimeview.c:199
 msgid "_Save as..."
-msgstr "_Guardar com..."
+msgstr "De_sar com..."
 
 #: src/mimeview.c:200
 msgid "Save _all..."
-msgstr "Gu_ardar todo..."
+msgstr "Des_ar tot..."
 
 #: src/mimeview.c:273
 msgid "MIME Type"
@@ -8260,36 +8256,35 @@ msgstr "Tipus MIME"
 #: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
 #: src/mimeview.c:1047
 msgid "View full information"
-msgstr "Veure informaci? completa"
+msgstr "Veure l'informaci? completa"
 
 #: src/mimeview.c:1053
 msgid "Check again"
 msgstr "Verificar de nou"
 
 #: src/mimeview.c:1065
-#, fuzzy, c-format
+#, c-format
 msgid "%s Click the icon to check it."
-msgstr "Cliqueu la icona o premeu 'C' per comprovar-ho."
+msgstr "%s Fes clic en l'icona per comprovar-ho."
 
 #: src/mimeview.c:1067
-#, fuzzy, c-format
+#, c-format
 msgid "%s Click the icon or hit '%s' to check it."
-msgstr "Cliqueu la icona o premeu 'C' per comprovar-ho."
+msgstr "%s Fes clic en l'icona o premeu '%s' per comprovar-ho."
 
 #: src/mimeview.c:1077
-#, fuzzy
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
-"Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla ?C? "
-"per a reintentar."
+"Ha expirat el temps comprovant la signatura. Pulseu l'icona per a reintentar-"
+"ho."
 
 #: src/mimeview.c:1079
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla ?C? "
-"per a reintentar."
+"Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla '%s' "
+"per a reintentar-ho."
 
 #: src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8304,7 +8299,7 @@ msgstr "Tornar al correu"
 #: src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
-msgstr "No s'ha pogut guardar la part del missatge multipart: %s"
+msgstr "No s'ha pogut desar la part del missatge multipart: %s"
 
 #: src/mimeview.c:1841 src/textview.c:3051
 #, c-format
@@ -8348,7 +8343,7 @@ msgstr ""
 "Aquest adjunt es un arxiu executable. Executar binaris dubtosos is perill?s "
 "i podria comprometre el vostre ordinador.\n"
 "\n"
-"Voleu executar aquest arxiu?"
+"Vols executar aquest arxiu?"
 
 #: src/mimeview.c:2231
 msgid "Run binary"
@@ -8369,38 +8364,39 @@ msgid "Description:"
 msgstr "Descripci?:"
 
 #: src/news.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
-msgstr "la connexi? NNTP amb %s:%d s'ha desconnectat. Reconnectant...\n"
+msgstr "La connexi? NNTP amb %s:%d s'ha desconnectat.\n"
 
 #: src/news.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "Connectant al servidor SMTP: %s ..."
+msgstr "Compte '%s': Connectant al servidor NNTP: %s:%d...\n"
 
 #: src/news.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "Error logging in to %s:%d...\n"
-msgstr "Error iniciant sessi? a %s:%d ...\n"
+msgstr "Error al registrar la tra?a en %s:%d...\n"
 
 #: src/news.c:437
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
+"Libetpan no admet el codi de retorn 480 per tant per ara optem per seguir\n"
 
 #: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
-msgstr ""
+msgstr "El mode lector ha fracassat, per? continuara igualment\n"
 
 #: src/news.c:450
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session with %s:%d\n"
-msgstr "Error iniciant sessi? a %s:%d ...\n"
+msgstr "Error al crear la sessi? amb %s:%d\n"
 
 #: src/news.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "Error autentificant-se a %s:%d...\n"
+msgstr "Error d'autentificaci? a %s:%d...\n"
 
 #: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
@@ -8604,9 +8600,8 @@ msgid "Address Keeper"
 msgstr "Gestor d'adresses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "Ruta de l'agenda d'adreces"
+msgstr "Localitzaci? del Llibre D'adreses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
@@ -8627,7 +8622,7 @@ msgstr "Seleccionar..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Camps per mantenir les adreces de"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8642,12 +8637,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Mantenir adresses contingudes a les cap??aleres 'Bcc'"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, 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)"
+"Exclou adreces que coincideixen amb les seg?ents expressions regulars (una "
+"per l?nia)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -8658,7 +8652,7 @@ msgid "Create Archive..."
 msgstr "Crear Arxiu..."
 
 #: src/plugins/archive/archiver.c:122
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
@@ -8687,7 +8681,7 @@ msgid ""
 msgstr ""
 "Aquest m?dul afegeix caracter?stiques d'arxivar a Claws Mail.\n"
 "\n"
-"Et permet seleccionar una carpeta de correu que voleu que sigui arxivada i "
+"Et permet seleccionar una carpeta de correu que vols que sigui arxivada i "
 "despr?s seleccionar un nom, format i localitzaci? per a l'arxiu. Les "
 "subcarpetes poden ser incloses i checksums MD5 poden ser afegits per cada "
 "arxiu dins l'arxiu. Varies opcions per arxivar estan tamb? disponibles.\n"
@@ -8699,10 +8693,8 @@ msgstr ""
 "\tCPIO\n"
 "\n"
 "L'arxiu pot ser comprimit usant:\n"
-"\tGZIP/ZIP\n"
-"\tBZIP2\n"
-"\tCOMPRESS\n"
 "\n"
+"%s\n"
 "Els arxius poden ser restauratsamb qualsevol eina estandard que suporti el "
 "format i la compressi? escollida.\n"
 "\n"
@@ -8711,7 +8703,7 @@ msgstr ""
 "Per activar les caracter?stiques d'arxivar aneu a /Eines/Crear Arxiu\n"
 "\n"
 "Les opcions per defecte poden ser activades a /Configuraci?/Prefer?ncies/"
-"M?duls/Correu Arxivador"
+"Connectors/Correu Arxivador"
 
 #: src/plugins/archive/archiver.c:152
 msgid "Archiver"
@@ -9012,7 +9004,7 @@ msgstr ""
 
 #: src/plugins/archive/archiver_prefs.c:186
 msgid "Default save folder"
-msgstr "Carpeta on guardar per defecte"
+msgstr "Carpeta on desar per defecte"
 
 #: src/plugins/archive/archiver_prefs.c:198
 msgid "Click this button to select the default location for saving archives"
@@ -9093,29 +9085,25 @@ msgid "Choose this option to delete mails after archiving"
 msgstr "Escolliu aquesta opci? per esborrar missatge despr?s d'arxivar-los"
 
 #: src/plugins/att_remover/att_remover.c:299
-#, fuzzy
 msgid "<b>Type: </b>"
-msgstr "<b> a:</b>"
+msgstr "<b>Tipus: </b>"
 
 #: src/plugins/att_remover/att_remover.c:300
-#, fuzzy
 msgid "<b>Size: </b>"
-msgstr "<b> a:</b>"
+msgstr "<b>Tamany: </b>"
 
 #: src/plugins/att_remover/att_remover.c:301
-#, fuzzy
 msgid "<b>Filename: </b>"
-msgstr "Nomb d'arxiu:"
+msgstr "<b>Nom del fitxer: </b>"
 
 #: src/plugins/att_remover/att_remover.c:332
-#, fuzzy
 msgid "Remove attachments"
-msgstr "Ignorar l'adjunt"
+msgstr "Esborrar l'adjunts"
 
 #: src/plugins/att_remover/att_remover.c:357
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:945
 msgid "Remove"
-msgstr "Eliminar"
+msgstr "Esborrar"
 
 #: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
 #: src/summaryview.c:2785
@@ -9123,9 +9111,8 @@ msgid "Attachment"
 msgstr "Adjunt"
 
 #: src/plugins/att_remover/att_remover.c:417
-#, fuzzy
 msgid "Destroy attachments"
-msgstr "T? adjunts"
+msgstr "Destru?r adjunts"
 
 #: src/plugins/att_remover/att_remover.c:418
 msgid ""
@@ -9133,22 +9120,23 @@ msgid ""
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
+"Realment vols eliminar tots els fitxers adjunts dels missatges "
+"seleccionats?\n"
+"\n"
+"Les dades suprimides ser?n irrecuperables."
 
 #: src/plugins/att_remover/att_remover.c:479
-#, fuzzy
 msgid "This message doesn't have any attachments."
-msgstr "missatges els quals tenen etiquet(a/es)"
+msgstr "Aquest missatge no t? cap fitxer adjunt."
 
 #: src/plugins/att_remover/att_remover.c:494
-#, fuzzy
 msgid "Remove attachments..."
-msgstr "Ignorar l'adjunt"
+msgstr "Esborrar l'adjunts..."
 
 #: src/plugins/att_remover/att_remover.c:506
 #: src/plugins/att_remover/att_remover.c:566
-#, fuzzy
 msgid "AttRemover"
-msgstr "Eliminar"
+msgstr "Esborrador d'Adjunts"
 
 #: src/plugins/att_remover/att_remover.c:571
 msgid ""
@@ -9157,11 +9145,14 @@ msgid ""
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
+"Aquest connector esborra els fitxers adjunts de correus.\n"
+"\n"
+"Advertiment: aquesta operaci? ser? completament no cancel. lable i els "
+"fitxers adjunts esborrats es perdran per sempre m?s."
 
 #: src/plugins/att_remover/att_remover.c:595
-#, fuzzy
 msgid "Attachment handling"
-msgstr "Av?s d'adjunt"
+msgstr "Maneig d'adjunt"
 
 #: src/plugins/attachwarner/attachwarner.c:214
 #, c-format
@@ -9172,6 +9163,10 @@ msgid ""
 "\n"
 "%s it anyway?"
 msgstr ""
+"Un fitxer adjunt ?s esmentat en el correu que estem enviant, per? no s'ha "
+"adjuntat cap fitxer. La menci? apareix a la l?nia %d, que comen?a amb el "
+"text: <span weight=\"bold\">%.20s</span>...\n"
+"%s de totes maneres?"
 
 #: src/plugins/attachwarner/attachwarner.c:218
 msgid "Attachment warning"
@@ -9196,47 +9191,41 @@ msgid "attach"
 msgstr "adjuntar"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, 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)"
+msgstr "Una de les seg?ents expressions regulars ?s coincident (un per l?nia)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
-msgstr ""
+msgstr "Les expressions s?n sensibles a maj?scules"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:93
-#, fuzzy
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
-"Avisar quan es compleixin les seg?ents expressions regulars:\n"
-"(una per l?nia)"
+"Sensible a les maj?scules al concordar expressions regulars en la llista"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:115
 msgid "Lines starting with quotation marks"
-msgstr ""
+msgstr "Comen?a amb una citaci?"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:122
-#, fuzzy
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
 "replying."
 msgstr ""
-"Excloure l?nies marcades de la validaci? per les expressions regulars "
-"anteriors"
+"Excloure l?nies citades de la comprovaci? de les expressions regulars "
+"anteriors. Recordeu que les citacions fetes a m? no es poden distingir de "
+"les frases generades per respondre."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:125
-#, fuzzy
 msgid "Forwarded or redirected messages"
-msgstr "missatges reenviats"
+msgstr "Missatges reenviats o redireccionats"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:132
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
-"No validar adjunts desapareguts quan contesteu o redireccioneu missatges"
+"No validar adjunts desapareguts quan es respon o es redireccionen missatges"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:135
 #: src/prefs_msg_colors.c:362
@@ -9248,16 +9237,16 @@ msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
+"Excloure l?nies de la primera signatura-separador a partir de la comprovaci? "
+"de les expressions regulars anteriors"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:148
-#, fuzzy
 msgid "Warn when"
-msgstr "Av?s"
+msgstr "Av?sa quan"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:152
-#, fuzzy
 msgid "Excluding"
-msgstr "Codificaci?"
+msgstr "Excloent"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:230
 msgid "Attach Warner"
@@ -9344,10 +9333,11 @@ msgstr ""
 "marcant uns quants correus brossa i correus bons usant \"/Marcar/Marcar com "
 "a correu brossa\" i \"/Marcar/Marcar com a bo\".\n"
 "\n"
-"Quan un missatge s'identifica com a spam es pot esborrar o es pot guardar en "
+"Quan un missatge s'identifica com a spam es pot esborrar o es pot desar en "
 "una carpeta especial.\n"
 "\n"
-"Les opcions les podeu trobar a /Configuraci?/Prefer?ncies/M?duls/Bogofilter"
+"Les opcions les podeu trobar a /Configuraci?/Prefer?ncies/Connectors/"
+"Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter.c:1043
 #: src/plugins/bsfilter/bsfilter.c:674
@@ -9386,19 +9376,16 @@ msgid "KB"
 msgstr "Kb"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Esborrar etiqueta"
+msgstr "Esborrar els correus no desitjats"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Guardar spam a"
+msgstr "Desar els correus no desitjats en..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Marcar com a correu brossa"
+msgstr "Nom?s marca-ho com correu no solicitat"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9418,7 +9405,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "When unsure, move to"
-msgstr "Si no n'esteu segurs, moveu-ho a"
+msgstr "Quan no estiguis segur, moure a"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:250
 msgid ""
@@ -9553,14 +9540,15 @@ msgstr ""
 "correu b?\".\n"
 "\n"
 "Quant un missatge ?s identificat com a correu brossa pot ser esborrat o "
-"guardat a una carpeta especialment designada per fer-ho,\n"
+"desat a una carpeta especialment designada per fer-ho,\n"
 "\n"
-"Les opcions poden ser trobades a /Configuraci?/Prefer?ncies/M?duls/Bsfilter"
+"Les opcions poden ser trobades a /Configuraci?/Prefer?ncies/Connectors/"
+"Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
 #: src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
-msgstr "Guardar spam a"
+msgstr "Desar el correu brossa en"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:209
 msgid ""
@@ -9582,7 +9570,7 @@ msgstr "Ruta de l'executable de bsfilter"
 #: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:553
 msgid "Clam AntiVirus"
-msgstr ""
+msgstr "Clam AntiVirus"
 
 #: src/plugins/clamd/clamav_plugin.c:107
 msgid ""
@@ -9590,6 +9578,9 @@ msgid ""
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Escaneig\n"
+"No hi ha informaci? del s?col.\n"
+"Antivirus desactivat."
 
 #: src/plugins/clamd/clamav_plugin.c:114
 msgid ""
@@ -9597,33 +9588,36 @@ msgid ""
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Escaneig\n"
+"Clamd no respon als ping.\n"
+"S'est? executant clamd?"
 
 #: src/plugins/clamd/clamav_plugin.c:119
 #, c-format
 msgid "Detected %s virus."
-msgstr ""
+msgstr "Virus detectat %s."
 
 #: src/plugins/clamd/clamav_plugin.c:135
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
-msgstr "Revisant carpeta %s ..."
+msgstr ""
+"Revisant l'error:\n"
+"%s"
 
 #: src/plugins/clamd/clamav_plugin.c:146
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
-msgstr ""
+msgstr "Fitxer: %s. Tamany  (%d) superior al l?mit (%d)\n"
 
 #: src/plugins/clamd/clamav_plugin.c:174
-#, fuzzy
 msgid "ClamAV: scanning message..."
-msgstr "Marcant missatges..."
+msgstr "ClamAV: escanejant missatge..."
 
 #: src/plugins/clamd/clamav_plugin.c:275
-#, fuzzy
 msgid "Failed to register mail filtering hook"
-msgstr "No s'ha pogut registrar l'enlla? de tra?a de text"
+msgstr "No s'ha pogut registrar el ganxo de filtre de correu"
 
 #: src/plugins/clamd/clamav_plugin.c:293
 msgid ""
@@ -9631,6 +9625,9 @@ msgid ""
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Init\n"
+"No hi ha informaci? del s?col.\n"
+"Antivirus desactivat."
 
 #: src/plugins/clamd/clamav_plugin.c:297
 msgid ""
@@ -9638,6 +9635,9 @@ msgid ""
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Init\n"
+"Clamd no respon als ping.\n"
+"S'est? executant clamd?"
 
 #: src/plugins/clamd/clamav_plugin.c:328
 msgid ""
@@ -9661,106 +9661,116 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
+"Aquest connector utilitza Clam AntiVirus per explorar tots els missatges que "
+"es reben d'un compte IMAP, LOCAL o POP.\n"
+"\n"
+"Quan es troba un arxiu adjunt en un missatge que cont? un virus, es pot "
+"esborrar o desar en una carpeta especialment designada.\n"
+"\n"
+"A causa que aquest plugin es comunica amb clamd a trav?s d'un\n"
+"s?col hi ha alguns requisits m?nims en\n"
+"els permisos per a la carpeta d'inici i la\n"
+"carpeta .claws-mail sempre que el clamav - daemon ?s\n"
+"configurat per comunicar-se a trav?s d'un s?col Unix. Tots els\n"
+"usuaris, almenys, han de rebre permisos d'execuci?\n"
+"en aquestes carpetes .\n"
+"\n"
+"Per evitar el canvi de permisos es podia configurar\n"
+"el clamav-daemon per comunicar-se a trav?s d'un socket TCP\n"
+"i selecciona la configuraci? manual per clamd .\n"
+"\n"
+"Les opcions es poden trobar a /Configuraci?/Prefer?ncies/Connectors/Clam "
+"AntiVirus"
 
 #: src/plugins/clamd/clamav_plugin.c:367
-#, fuzzy
 msgid "Virus detection"
-msgstr "Detecci? de correu brossa"
+msgstr "Detecci? de virus"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:249
 msgid "Enable virus scanning"
-msgstr ""
+msgstr "Activar l'escaneig de virus"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:259
-#, fuzzy
 msgid "Maximum attachment size"
-msgstr "Tamany m?xim"
+msgstr "Tamany m?xim per fitxer adjunt"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:270
-#, fuzzy
 msgid "Message attachments larger than this will not be scanned"
-msgstr "Missatges m?s grans que aquest no seran comprovats"
+msgstr "Els fitxers adjunts m?s grans que aquest no seran comprovats"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:274
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:283
-#, fuzzy
 msgid "Save infected mail in"
-msgstr "Gravant el correu al disc"
+msgstr "Desar el correu infectat al disc"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:287
 msgid "Save mail that contains viruses"
-msgstr ""
+msgstr "Desar el correu amb virus"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#, fuzzy
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
-"Carpeta per guardar el correu brossa identificat. Deixeu-la buida per usar "
-"la paperera."
+"Carpeta per emmagatzemar el correu infectat. Deixar en blanc per utilitzar "
+"la carpeta de la paperera per defecte"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:303
-#, fuzzy
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
-"Cliqueu aquest bot? per seleccionar la carpeta per guardar el correus "
-"sospitosos."
+"Feu clic en aquest bot? per seleccionar una carpeta per emmagatzemar el "
+"correu infectat"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:311
-#, fuzzy
 msgid "Automatic configuration"
-msgstr "Configurar accions"
+msgstr "Configurac? autom?tica"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:316
 msgid "Should configuration be done automatic or manual"
-msgstr ""
+msgstr "La configuraci? ha de ser autom?tica o manual"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:324
 msgid "Where is clamd.conf"
-msgstr ""
+msgstr "On es troba clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:332
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
 msgstr ""
+"Ccam? senser a clamd.conf. Si aquest camp no est? buit, el connector ha "
+"pogut localitzar l'arxiu autom?ticament"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:336
-#, fuzzy
 msgid "Br_owse"
-msgstr "Mostrar"
+msgstr "Expl_orar"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:340
-#, fuzzy
 msgid "Click this button to select full path to clamd.conf"
-msgstr ""
-"Pulseu aquest bot? per seleccionar la carpeta on guardareu el correu brossa"
+msgstr "Feu clic en aquest bot? per seleccionar ruta completa a clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:348
 msgid "Check permission for folders and adjust if necessary"
-msgstr ""
+msgstr "Comprova els permissos per a carpetes i ajustar si ?s necessari"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:361
-#, fuzzy
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
-"Pulseu aquest bot? per seleccionar la carpeta on guardareu el correu brossa"
+"Fes clic en aquest bot? per comprovar o modificar els permissos de la carpeta"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:369
-#, fuzzy
 msgid "Remote Host"
-msgstr "Eliminar despr?s de"
+msgstr "Servidor remot"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:377
 msgid "Hostname or IP for remote host running clamav daemon"
-msgstr ""
+msgstr "Hostname o IP d'amfitri? remot corrent clamav com un dimoni"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:399
 msgid "Port number where clamav daemon is listening"
-msgstr ""
+msgstr "N?mero de port on est? escoltant clamav com un dimoni"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:528
 msgid ""
@@ -9768,6 +9778,9 @@ msgid ""
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
+"Nova configuraci?\n"
+"Sense informaci? de s?col.\n"
+"Antivirus de inhabilitat."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:532
 msgid ""
@@ -9775,6 +9788,9 @@ msgid ""
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
+"Nova configuraci?\n"
+"Clamd no respon per fer ping.\n"
+"S'est? executant clamd?"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:117
 #, c-format
@@ -9782,6 +9798,8 @@ msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
 msgstr ""
+" %s: No es pot obrir\n"
+"s'inhabilitar? clamd"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:215
 #, c-format
@@ -9789,39 +9807,35 @@ msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
+"%s: no ha sigut possible trobar l'informaci? requerida\n"
+"clamd s'inhabilitar?"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:249
-#, fuzzy
 msgid "Could not create socket"
-msgstr ""
-"No s'ha pogut crear l'arxiu:\n"
-"%s\n"
+msgstr "No s'ha pogut crear el s?col"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:421
-#, fuzzy
 msgid ": File does not exist"
-msgstr "L'arxiu de control no existeix."
+msgstr ": El fitxer no existeix."
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:434
 msgid ": Unable to open"
-msgstr ""
+msgstr ": No s'ha pogut obrir"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:454
 #: src/plugins/clamd/libclamd/clamd-plugin.c:459
 #: src/plugins/clamd/libclamd/clamd-plugin.c:473
-#, fuzzy
 msgid "Socket write error"
-msgstr "Error de socket."
+msgstr "Error d'escritura de s?col"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Error reading"
-msgstr "Error llegint l'arxiu"
+msgstr "%s: Error al llegir"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:480
-#, fuzzy
 msgid "Socket read error"
-msgstr "Error de socket."
+msgstr "Error de lectura de s?col"
 
 #: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
 msgid "Demo"
@@ -9845,65 +9859,60 @@ msgstr ""
 "No ?s realment ?til"
 
 #: src/plugins/fancy/fancy_prefs.c:146
-#, fuzzy
 msgid "Display images"
-msgstr "Veure imatges inline"
+msgstr "Mostra les imatges"
 
 #: src/plugins/fancy/fancy_prefs.c:147
-#, fuzzy
 msgid "Display embedded images"
-msgstr "Cap?aleres mostrades"
+msgstr "Mostra les imatges incrustades"
 
 #: src/plugins/fancy/fancy_prefs.c:151
-#, fuzzy
 msgid "Execute javascript"
-msgstr "Habilita Javascript"
+msgstr "Executar Javascript"
 
 #: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute embedded javascript"
-msgstr ""
+msgstr "Executar javascript incrustat"
 
 #: src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
-msgstr ""
+msgstr "Executar miniaplicacions Java"
 
 #: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
-msgstr ""
+msgstr "Executar miniaplicacions Java incrustades"
 
 #: src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
-msgstr ""
+msgstr "Representar objectes usant connectors"
 
 #: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
-msgstr ""
+msgstr "Render objectes incrustats utilitzant connectors"
 
 #: src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
-msgstr ""
+msgstr "Obrir en el visor (el contingut remot est? habilitat)"
 
 #: src/plugins/fancy/fancy_prefs.c:172
 msgid "Do nothing (remote content is disabled)"
-msgstr ""
+msgstr "No fer res (el contingut remot est? deshabilitat)"
 
 #: src/plugins/fancy/fancy_prefs.c:209
 msgid "Proxy"
-msgstr ""
+msgstr "Servidor intermediari"
 
 #: src/plugins/fancy/fancy_prefs.c:211
 msgid "Use GNOME's proxy settings"
-msgstr ""
+msgstr "Utilizar les opcions del servidor intermediari de GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Usar exp.reg."
+msgstr "Utilitzar un servidor intermediari"
 
 #: src/plugins/fancy/fancy_prefs.c:237
-#, fuzzy
 msgid "Remote resources"
-msgstr "Elimi_nar refer?ncies"
+msgstr "Recursos remots"
 
 #: src/plugins/fancy/fancy_prefs.c:238
 msgid ""
@@ -9913,24 +9922,27 @@ msgid ""
 "Java applets can still be enabled for content that is attached\n"
 "in the email."
 msgstr ""
+"C?rrega recursos remots pot portar a alguns problemes de privacitat.\n"
+"Quan s'impossibilita la carrega de contingut remot, res ser? sol?licitat\n"
+"des de la xarxa. Representaci? d'imatges, scripts, plugin objectes o\n"
+"mini-aplicacions de Java poden encara estar habilitats per al contingut\n"
+"que s'adjunta al correu."
 
 #: src/plugins/fancy/fancy_prefs.c:244
-#, fuzzy
 msgid "Enable loading of remote content"
-msgstr "Permetre colorejat en el text del missatge"
+msgstr "Activar la c?rrega de contingut remot"
 
 #: src/plugins/fancy/fancy_prefs.c:276
 msgid "When clicking on a link, by default"
-msgstr ""
+msgstr "En fer clic a un enlla?, per defecte"
 
 #: src/plugins/fancy/fancy_prefs.c:284
-#, fuzzy
 msgid "Open in external browser"
-msgstr "Obre enlla??os amb un navegador extern"
+msgstr "Obre en un navegador extern"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "El CSS en aquest fitxer s'aplicar? a totes les parts d'HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -9941,22 +9953,20 @@ msgid "Bro_wse"
 msgstr "M_ostrar"
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "Full d'estils"
+msgstr "Selecciona el full d'estil"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
-msgstr ""
+msgstr "La carrega de contingut remote est? deshabilitada."
 
 #: src/plugins/fancy/fancy_viewer.c:472
 msgid "Load images"
 msgstr "Carregar imatges"
 
 #: src/plugins/fancy/fancy_viewer.c:474
-#, fuzzy
 msgid "Enable remote content"
-msgstr "Desbloqueja contingut extern"
+msgstr "Permet el contingut remot"
 
 #: src/plugins/fancy/fancy_viewer.c:476
 msgid "Enable Javascript"
@@ -9964,16 +9974,15 @@ msgstr "Habilita Javascript"
 
 #: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
-msgstr "Habilita M??duls"
+msgstr "Habilita M?duls"
 
 #: src/plugins/fancy/fancy_viewer.c:480
-#, fuzzy
 msgid "Enable Java"
-msgstr "Activa"
+msgstr "Activa Java"
 
 #: src/plugins/fancy/fancy_viewer.c:482
 msgid "Open links with external browser"
-msgstr "Obre enlla??os amb un navegador extern"
+msgstr "Obre els enlla?os amb un navegador extern"
 
 #: src/plugins/fancy/fancy_viewer.c:651
 #, c-format
@@ -9983,24 +9992,23 @@ msgstr "Ha aparegut un error: %d\n"
 #: src/plugins/fancy/fancy_viewer.c:707
 #, c-format
 msgid "%s is a malformed or not supported feed"
-msgstr "%s est?? malformat o no es un feed suportat"
+msgstr "%s est??malformat o no es un canal d'informaci? suportat"
 
 #: src/plugins/fancy/fancy_viewer.c:718
 msgid "Search the Web"
 msgstr "Cerca la web"
 
 #: src/plugins/fancy/fancy_viewer.c:730
-#, fuzzy
 msgid "Open in Viewer"
-msgstr "Obre al navegador"
+msgstr "Obre en el visor"
 
 #: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
-msgstr ""
+msgstr "Obre en el visor (permet contingut remot)"
 
 #: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
-msgstr "Obre al navegador"
+msgstr "Obre en el navegador"
 
 #: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
@@ -10008,15 +10016,15 @@ msgstr "Obre imatge"
 
 #: src/plugins/fancy/fancy_viewer.c:760
 msgid "Copy Link"
-msgstr "Copia l'enlla??"
+msgstr "Copia l'enlla?"
 
 #: src/plugins/fancy/fancy_viewer.c:764
 msgid "Download Link"
-msgstr "Descarrega l'enlla??"
+msgstr "Descarrega l'enlla?"
 
 #: src/plugins/fancy/fancy_viewer.c:775
 msgid "Save Image As"
-msgstr "Guarda la imatge com"
+msgstr "Desar l'imatge com"
 
 #: src/plugins/fancy/fancy_viewer.c:785
 msgid "Copy Image"
@@ -10024,42 +10032,41 @@ msgstr "Copia la imatge"
 
 #: src/plugins/fancy/fancy_viewer.c:803
 msgid "Import feed"
-msgstr "Importa el feed"
+msgstr "Importa el canal d'informaci?"
 
 #: src/plugins/fancy/fancy_viewer.c:1016
 msgid "Fancy"
-msgstr "Fancy"
+msgstr "Elegant"
 
 #: src/plugins/fancy/fancy_viewer.c:1044
 msgid "Fancy HTML Viewer"
-msgstr "Visor HTML Fancy"
+msgstr "Visor Elegant d'HTML"
 
 #: src/plugins/fancy/fancy_viewer.c:1049
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
 "By default all remote content is blocked. Options can be found in /"
 "Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"Aquest m?dul mostra el correu HTML usant el navegador Dillo.\n"
+"Aquest m?dul mostra el correu HTML uyilitzant el WebKit %d.%d.%d.\n"
 "\n"
-"Les opcions podeu trobar-les a /Configuraci?/Preferencies/M?duls/Navegador "
-"Dillo"
+"Per defecte tot el contingut remote est? bloquejat. Les opcions podeu trobar-"
+"les a /Configuraci?/Preferencies/Plugins/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:151
 msgid "failed to write Fetchinfo configuration to file\n"
-msgstr ""
+msgstr "no ha pogut escriure el fitxer de configuraci? de Fetchinfo\n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
-msgstr ""
+msgstr "Recollir informaci?"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:173
-#, fuzzy
 msgid "Failed to register mail receive hook"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr "Ha fallat el registre del ganxo de recepci? de correu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
@@ -10069,72 +10076,73 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
+"Aquest connector modifica els missatges descarregats. Insereix cap?aleres "
+"que contenen informaci? de descarregar: UIDL, nom del compte en Claws Mail, "
+"Servidor POP, ID d'usuari i el l'hora de recuperaci?.\n"
+"\n"
+"Les opcions es poden trobar a /Configuraci?/Prefer?ncies/Connectors/Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:236
-#, fuzzy
 msgid "Mail marking"
-msgstr "Recollida de correu"
+msgstr "Marcat de Correu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
-#, fuzzy
 msgid "Add fetchinfo headers"
-msgstr "Cap?aleres ocultes"
+msgstr "Afegir cap?aleres de recuperaci? d'informac?"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Adre?a del remitent a usar"
+msgstr "Cap?eleres per afegir"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
-msgstr ""
+msgstr "UIDL"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"Afegeix la cap?alera X-FETCH-UIDL amb l'?nica ID llistat del missatge (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
-#, fuzzy
 msgid "Account name"
-msgstr "Compte"
+msgstr "Nom del Compte"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Afegeix la cap?alera X-FETCH-ACCOUNT amb el nom de compte"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
-#, fuzzy
 msgid "Receive server"
-msgstr "Rebre"
+msgstr "Rebre servidor"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "Afegeix la cap?alera X-FETCH SERVER amb el servidor de recepci?"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
-#, fuzzy
 msgid "UserID"
-msgstr "ID d'usuari"
+msgstr "ID d'Usuari"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Afegeix la cap?alera X-FETCH-USERID amb l'ID d'usuari"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
-msgstr ""
+msgstr "Temps de recollida"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Afegeix la cap?alera X-FETCH-TIME amb la data i hora d'extracci? de missatge "
+"en RFC822 format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "401 (Autoritzaci? requerida)"
+msgstr "Connector GData: Autoritzaci? requerida"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10146,99 +10154,108 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Necessita autoritzar Claws Mail per accedir a la llista de contactes de "
+"Google per utilitzar el connector de GData.\n"
+"\n"
+"Visita  la p?gina d'autoritzaci? de Google prement al bot? de sota. Despr?s "
+"confirma l'autoritzaci?, rebr?s un codi d'autoritzaci?. Introdueix-lo en el "
+"camp de sota per concedir acc?s a Claws Mail a la llista de contactes de "
+"Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Pas"
+msgstr "Pas 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
+"Feu clic aqu? per obrir la p?gina d'autoritzaci? de Google en un navegador"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Pas"
+msgstr "Pas 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Interficie"
+msgstr "Introdue?x el codi:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr ""
+msgstr "Connector GData: Error al consultar els contactes: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:340
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Afegit %d de"
+msgstr[1] "Afegits %d de"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:342
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 contacte a la mem?ria cau"
+msgstr[1] "%d contactes a la mem?ria cau"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:352
 msgid "GData plugin: Starting async contacts query\n"
-msgstr ""
+msgstr "Connector GData: Iniciant la consulta de contactes as?ncrona\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:373
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
-msgstr ""
+msgstr "Connector GData: Error al consultar els grups: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:410
 msgid "GData plugin: Groups received\n"
-msgstr ""
+msgstr "Connector GData: Grups rebuts\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Starting async groups query\n"
-msgstr ""
+msgstr "Connector GData: Iniciant la consulta de grups as?ncrona\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr ""
+msgstr "Connector GData: Error d'autoritzaci?: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
 msgid "GData plugin: Authorization successful\n"
-msgstr ""
+msgstr "Connector GData: Autoritzaci? correcta\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr ""
+msgstr "Connector GData: Iniciant l'autentificaci? interactiva\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
+"Connector GData: Ha rebut un codi d'autoritzaci?, demanant l'autoritzaci?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"Connector GData: No s'ha rebut cap codi d'autoritzaci?, cancel?lada la "
+"sol?licitud d'autoritzaci?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr ""
+msgstr "Connector GData: Error d'actualitzaci? de l'autoritzaci?: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr ""
+msgstr "Connector GData: Actualitzaci? de l'autoritzaci? correcta\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr ""
+msgstr "Connector GData: Intentant actualitzar autoritzaci?\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentificaci?"
 
@@ -10249,32 +10266,37 @@ msgstr "Nom d'usuari:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:94
 msgid "Polling interval (seconds):"
-msgstr ""
+msgstr "Interval de sondeig (segons):"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:101
-#, fuzzy
 msgid "Maximum number of results:"
-msgstr "Nmero m?xim d'articles a descarregar"
+msgstr "N?mero m?xim de resultats:"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:137 src/plugins/gdata/gdata_plugin.c:101
 #: src/plugins/gdata/gdata_plugin.c:156
 msgid "GData"
-msgstr ""
+msgstr "GData"
 
 #: src/plugins/gdata/gdata_plugin.c:75
 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"
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
 msgstr ""
+"Ha fallat el registre del ganxo pel interruptor sense conexi? del connector "
+"GData"
 
 #: src/plugins/gdata/gdata_plugin.c:114
-#, fuzzy
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Ha fallat el registre de l'enlla? del canvi a mode sense connexi?"
+msgstr ""
+"Ha fallat el registre del ganxo pel interruptor sense conexi? del connector "
+"GData"
 
 #: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -10286,1034 +10308,1017 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
+"Aquest connector proporciona acc?s al protocol GData de Claws Mail.\n"
+"\n"
+"El protocol GData ?s una interf?cie per als serveis de Google .\n"
+"Actualment , la funcionalitat ?nica implementat ?s incloure els contactes de "
+"Google a la finalitzaci? Tab - direcci? .\n"
+"\n"
+"La teva opini? ?s benvinguda a <berndth at gmx.de>."
 
 #: src/plugins/gdata/gdata_plugin.c:187
-#, fuzzy
 msgid "GData integration"
-msgstr "Destinaci?"
+msgstr "Integraci? GData"
 
 #. TRANSLATORS: The two numbers are latitude and longitude coordinates
 #: src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "S'ha trobat la localitzaci?: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Pa?s al?legat d'origen: "
 
 #. TRANSLATORS: The IP address is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "No s'ha pogut llegir l'?ndex d'adreces"
+msgstr "No s'ha pogut resoldre la direcci? de l'adre?a IP "
 
 #: src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "nom del remitent"
+msgstr "Intentar localitzar el remitent"
 
 #: src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emirats ?rabs Units"
 
 #: src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganistan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua I Barbuda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguila"
 
 #: src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Alb?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Arm?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Antilles Holandeses"
 
 #: src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Ant?rtida"
 
 #: src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Samoa Americana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "?ustria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Austr?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaidjan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "B?snia I Hercegovina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "B?lgica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulg?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #: src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Ben?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bol?via"
 
 #: src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 #: src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahames"
 
 #: src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Illa Bouvet"
 
 #: src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Bielor?ssia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Canad?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Illes Cocos (Keeling)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "Rep?blica Centreafricana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Su?ssa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Costa d'Ivori"
 
 #: src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Illes Cook"
 
 #: src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Xile"
 
 #: src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Camerun"
 
 #: src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Xin?s"
+msgstr "Xina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Colorar"
+msgstr "Colombia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cap Verd"
 
 #: src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Illa de Nadal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Xipre"
 
 #: src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Rep?blica Txeca"
 
 #: src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "Alemanya"
 
 #: src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 # RML To be consistent with previous one.
 #: src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Desmarca"
+msgstr "Dinamarca"
 
 #: src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Rep?blica Dominicana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Alg?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #: src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Est?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egipte"
 
 #: src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Europeu Occidental"
+msgstr "S?hara Occidental"
 
 #: src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Espanya"
 
 #: src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Eti?pia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finl?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #: src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Illes Falkland (Malvines)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Micron?sia, Estats Federats de"
 
 #: src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Illes F?roe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "_Cancel?lar"
+msgstr "Fran?a"
 
 #: src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Fran?a, Metropolitana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:601
 #: src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Regne Unit"
 
 #: src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Granada"
 
 #: src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Ge?rgia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Guiana franc?s"
 
 #: src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:606
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Verd"
+msgstr "Groenl?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "G?mbia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadalupe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guinea Equatorial"
 
 #: src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Verd"
+msgstr "Gr?cia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Ge?rgia del Sud i les Illes Sandwich del Sud"
 
 #: src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea Bissau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guaiana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Illa Illes Heard i McDonald"
 
 #: src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Hondures"
 
 #: src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Cro?cia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Hait?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Hongria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indon?sia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indicador"
+msgstr "?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Territori Brit?nic De l'Oce? ?ndic"
 
 #: src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #: src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "Iran, Rep?blica Isl?mica de l '"
 
 #: src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Isl?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "It?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jord?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japon?s"
+msgstr "Jap?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #: src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzstan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Cambodja"
 
 #: src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "dem?"
+msgstr "Comores"
 
 #: src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Sant Crist?bal i Nieves"
 
 #: src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "Rep?blica de Corea, Popular Democr?tica de"
 
 #: src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Rep?blica De Corea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Illes Caiman"
 
 #: src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Rep?blica Democr?tica Popular Lao"
 
 #: src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "L?ban"
 
 #: src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Santa Ll?cia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Lib?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litu?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Let?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Jamahiriya ?rab L?bia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marroc"
 
 #: src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "M?naco"
 
 #: src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Mold?via, Rep?blica de"
 
 #: src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Marcar tot  com a llegit"
+msgstr "Illes Marshall"
 
 #: src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Maced?nia, Antiga Rep?blica Iugoslava de"
 
 #: src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 # RML To be consistent with previous one.
 #: src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Desmarca"
+msgstr "Myanmar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mong?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Illes Marianes Del Nord"
 
 #: src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Maurit?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurici"
 
 #: src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maldives"
 
 #: src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "M?xic"
 
 #: src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Mal?isia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mo?ambic"
 
 #: src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Nam?bia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nous Contactes"
+msgstr "Nova Caled?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "N?ger"
 
 #: src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Illa Norfolk"
 
 #: src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nig?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Pa?sos Baixos"
 
 #: src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Reenviar"
+msgstr "Noruega"
 
 #: src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nova Zelanda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panam?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Per?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Polin?sia franc?s"
 
 #: src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nova Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "l?nies"
+msgstr "Filipines"
 
 #: src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Pol?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Sant Pere i Miquelon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 #: src/plugins/geolocation/geolocation_plugin.c:705
 msgid "Qatar"
-msgstr ""
+msgstr "Katar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #: src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Federaci? Russa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Ar?bia Saudita"
 
 #: src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Illes Salom?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #: src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Su?cia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Santa Helena"
 
 #: src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslov?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "Svalbard i Jan Mayen"
 
 #: src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslov?quia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "Sant Mar?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Som?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Motiu (nick)"
+msgstr "Surinam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sant Vaig prendre I Pr?ncep"
 
 #: src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Rep?blica ?rab S?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Swazil?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Illes Turks i Caicos"
 
 #: src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Chad"
 
 #: src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Territoris Francesos del Sud"
 
 #: src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Tailand?s"
+msgstr "Tail?ndia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadjikistan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tun?sia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Timor Oriental"
 
 #: src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turquia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinitat I Tobago"
 
 #: src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Taiwan, Prov?ncia De la Xina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanz?nia, Rep?blica Unida de"
 
 #: src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucra?na"
 
 #: src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Illes menors allunyades dels Estats Units"
 
 #: src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Estats Units"
 
 #: src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguai"
 
 #: src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Seu (Ciutat del Vatic?)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Saint Vincent i les Grenadines"
 
 #: src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Vene?uela"
 
 #: src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Illes Verges Brit?niques"
 
 #: src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Illes Verges dels Estats Units"
 
 #: src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Nom de l'arxiu"
+msgstr "Vietnam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis i Futuna"
 
 #: src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Y?men"
 
 #: src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mai?ta"
 
 #: src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "S?rbia i Montenegro"
 
 #: src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Sud-?frica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Z?mbia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Rep?blica Democr?tica Del Congo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:777
 #: src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Localitzaci?:"
+msgstr "Geolocalitzaci?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy
 msgid "Could not initialize clutter"
-msgstr "No s'ha pogut inicialitzar el corrector %s."
+msgstr "No s'ha pogut inicialitzar el corrector"
 
 #: src/plugins/geolocation/geolocation_plugin.c:788
 #: src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "No s'ha pogut crear l'arxiu temporal: %s"
+msgstr "No s'ha pogut crear l'expressi? regular: %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Error al registrar l'enlla? del canvi de tema al m?dul de Notificaci?"
+msgstr ""
+"Ha fallat el registre de vi_sualitzacio de la vista del missatge en el "
+"connector de GeoLocalitzaci?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11331,37 +11336,47 @@ msgid ""
 "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)."
 
 #: src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Destinaci?"
+msgstr "Integraci? per Geolocalitzaci?"
 
 #: src/plugins/libravatar/libravatar.c:360
 #: src/plugins/libravatar/libravatar.c:431
 #: src/plugins/libravatar/libravatar.c:491
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
-msgstr ""
+msgstr "Libravatar"
 
 #: src/plugins/libravatar/libravatar.c:367
-#, fuzzy
 msgid "Failed to register avatar header update hook"
-msgstr "Ha fallat el registre de l'enlla? d'actualitzaci? de les carpetes"
+msgstr "Ha fallat el registre del ganxo per actualitzar la cap?alera d'avatar"
 
 #: src/plugins/libravatar/libravatar.c:375
-#, fuzzy
 msgid "Failed to register avatar image render hook"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr "Ha fallat el registre del ganxo per renderitzar imatges d'avatars"
 
 #: src/plugins/libravatar/libravatar.c:380
-#, fuzzy
 msgid "Failed to create avatar image cache directory"
-msgstr "No s'ha pogut crear el directori"
+msgstr "No s'ha pogut crear el directori per la mem?ria cau d'imatges d'avatar"
 
 #: src/plugins/libravatar/libravatar.c:389
 msgid "Failed to load missing items cache"
-msgstr ""
+msgstr "A fallat la carrega dels elements de la mem?ria cau."
 
 #: src/plugins/libravatar/libravatar.c:441
 msgid ""
@@ -11378,11 +11393,26 @@ msgid ""
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
+"Mostrar imatges de perfils libravatar per als missatges de correu. M?s\n"
+"informaci? sobre libravatar en http://www.libravatar.org/. Si vost? t?\n"
+"un perfil gravatar.com per? no una libravatar, els far? tamb?\n"
+"recuperar (quan es permeti redireccions en la configuraci? del connector) .\n"
+"La p?gina de configuraci? del connector est? disponible des de la finestra "
+"principal en:\n"
+"/Configuraci?/Prefer?ncies/Connectors/Libravatar.\n"
+"\n"
+"Aquest plugin utilitza libcurl per recuperar imatges, aix? que si est?s "
+"darrere d'un\n"
+"Proxy consulti la p?gina curl(1) del manual per a m?s detalls sobre la "
+"configuraci?\n"
+"de 'http_proxy'. M?s detalls sobre aquest i altres a l'arxiu README .\n"
+"\n"
+"La teva opini? ?s benvinguda a <ricardo at mones.org>.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">La vostra adre?a de correu:</span>"
+msgstr ""
+"<span color=\"red\">Error en la lectura d'estad?stiques de mem?ria cau</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11390,25 +11420,25 @@ 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Utilitzant %s a %d fitxers,%d  directoris i %d altres"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Text de la icona"
+msgstr "Netejar mem?ria d'avatars"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Esteu segur de que voleu esborrar aquest tema?"
+msgstr "Realment vols suprimir tota la mem?ria cau d'avatars?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "No hi ha prou mem?ria per a operar"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11417,10 +11447,15 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Esborrada correctament la mem?ria cau d'avatarst:\n"
+"? %u entrades perdudes esborrades.\n"
+"? %u fitxers esborrats."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
 msgstr ""
+"<span color=\"#006400\">S'ha esborrat correctament la mem?ria cau d'avatars!"
+"</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11431,25 +11466,30 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Errors al esborrar la mem?ria cau d'avatars:\n"
+"? %u entrades perdudes esborrades.\n"
+"? %u fitxers esborrats.\n"
+"? %u fitxers que no es poden llegir.\n"
+"? %u fitxers que no es poden esborrar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Error al esborrar la mem?ria cau d'avatars.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
-#, fuzzy
 msgid "_Use cached icons"
-msgstr "Useu autentificaci?"
+msgstr "_Utilitza icones de la mem?ria cau"
 
 #: src/plugins/libravatar/libravatar_prefs.c:214
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
+"Mantenir icones en disc per reciclar en lloc de fer una altra sol?licitud de "
+"la xarxa"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#, fuzzy
 msgid "Cache refresh interval"
-msgstr "Usar l'interval de refresc per defecte"
+msgstr "Interval d'actualitzaci? de la mem?ria cau"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
 #: src/prefs_matcher.c:335
@@ -11458,88 +11498,90 @@ msgstr "hores"
 
 #: src/plugins/libravatar/libravatar_prefs.c:305
 msgid "Mystery man"
-msgstr ""
+msgstr "Home misteri"
 
 #: src/plugins/libravatar/libravatar_prefs.c:306
-#, fuzzy
 msgid "Identicon"
-msgstr "Autentificaci?"
+msgstr "Icona d'identificaci?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:307
-#, fuzzy
 msgid "MonsterID"
-msgstr "ID d'usuari"
+msgstr "MonsterID"
 
 #: src/plugins/libravatar/libravatar_prefs.c:308
 msgid "Wavatar"
-msgstr ""
+msgstr "Wavatar"
 
 #: src/plugins/libravatar/libravatar_prefs.c:309
 msgid "Retro"
-msgstr ""
+msgstr "Retro"
 
 #: src/plugins/libravatar/libravatar_prefs.c:310
-#, fuzzy
 msgid "Custom URL"
-msgstr "Adequat"
+msgstr "URL personalitzada"
 
 #: src/plugins/libravatar/libravatar_prefs.c:313
 msgid "A blank image"
-msgstr ""
+msgstr "Imatge en blanc"
 
 #: src/plugins/libravatar/libravatar_prefs.c:314
 msgid "The unobtrusive low-contrast greyish silhouette"
-msgstr ""
+msgstr "La discreta silueta grisenca amb poc contrast"
 
 #: src/plugins/libravatar/libravatar_prefs.c:315
 msgid "A generated geometric pattern"
-msgstr ""
+msgstr "Un patr? geometric generat."
 
 #: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "A generated full-body monster"
-msgstr ""
+msgstr "Un monstre de cos complet generat"
 
 #: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "A generated almost unique face"
-msgstr ""
+msgstr "Una cara generada gairab? ?nica."
 
 #: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "A generated 8-bit arcade-style pixelated image"
-msgstr ""
+msgstr "Una imatge d'8-bits pixelada d'estil arcade."
 
 #: src/plugins/libravatar/libravatar_prefs.c:319
-#, fuzzy
 msgid "Redirect to a user provided URL"
-msgstr "per a un par?metre introdu?t per l'usuari"
+msgstr "Redirecci? a una URL introdu?da per l'usuari"
 
 #: src/plugins/libravatar/libravatar_prefs.c:333
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Introdue?x l'URL on vols fer redirigir quan cap icona de l'usuari estigui "
+"disponible. Deixar una URL buida per usar l'icona libravatar taronja per "
+"defecte."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
-msgstr ""
+msgstr "Permet redireccions a _altres llocs"
 
 #: src/plugins/libravatar/libravatar_prefs.c:383
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
+"Segueix les respostes amb redirecci? del servidor de libravatar cap a un "
+"altre servei d'avatars com gravatar.com"
 
 #: src/plugins/libravatar/libravatar_prefs.c:392
 msgid "_Enable federated servers"
-msgstr ""
+msgstr "Activa servidors f_ederats"
 
 #: src/plugins/libravatar/libravatar_prefs.c:393
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
+"Tractar d'aconseguir l'avatar del servidor de libravatar de domini del "
+"remitent"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "Excedit el temps l?mit de la sessi?\n"
+msgstr "Temps d'espera de la petici?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -11552,40 +11594,40 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
+"Fes server un 0 per l'utilitzaci? de temps d'espera de s?cols I/O globals. "
+"El valor m?xim ha de ser tamb? menor que el temps d'espera de s?cols I/O "
+"globals."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
-#, fuzzy
 msgid "Icon cache"
-msgstr "Text de la icona"
+msgstr "Mem?ria cau d'icones"
 
 #: src/plugins/libravatar/libravatar_prefs.c:459
-#, fuzzy
 msgid "Default missing icon mode"
-msgstr "Compressi? per defecte"
+msgstr "No s'ha trobat el mode d'icona per defecte"
 
 #: src/plugins/libravatar/libravatar_prefs.c:463
-#, fuzzy
 msgid "Network"
-msgstr "Tra?a de xarxa"
+msgstr "Xarxa"
 
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder (etPan!)"
-msgstr ""
+msgstr "carpeta de b?stia de correu (etPan!)"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr ""
+"Aquest es un connector per gestionar les b?sties de correu amb format mbox."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
-msgstr ""
+msgstr "MBOX"
 
 #: src/plugins/mailmbox/plugin_gtk.c:86
 msgid "mbox (etPan!)..."
-msgstr ""
+msgstr "mbox (etPan!)..."
 
 #: src/plugins/mailmbox/plugin_gtk.c:190
-#, fuzzy
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -11596,32 +11638,294 @@ msgstr ""
 "escaneajada autom?ticament."
 
 #: src/plugins/mailmbox/plugin_gtk.c:331
-#, fuzzy, c-format
+#, c-format
 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 penjen de '%s'. Recuperar-"
-"los ser? impossible.\n"
-"\n"
-"Voleu eliminar-los definitivament?"
+"S'esborraran totes les carpetes i missatges que penjen de '%s'.\n"
+"Realment vols esborrar-los?"
+
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "No hi ha cap m?tode d'autenticaci? Sieve disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "El m?tode Sieve seleccionat no est? disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Desconnectat"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Desconnectat: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "missatge desconegut en la sessi? Sieve: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS ha fallat"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "hi ha hagut un error en la sessi? Sieve\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "hi ha hagut un error en la sessi? Sieve. dades: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "missatge desconegut en la sessi? Sieve: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: s'est? reintentant autentifiaci?\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "M?tode d'autenticaci? no disponible"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtre"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Comprovar la sinta_xi"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "Des_fer"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Incapa? d'aconseguir el contingut de la seq??ncia d'ordres"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Desfent..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Desfer la seq??ncia d'ordres"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr ""
+"Aquesta seq??ncia d'ordres s'ha modificat. Vols desfer els canvis no desats?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "Desfe_r"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Seq??ncies d'ordres guardat satisfact?riament."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Desant?"
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Comprovant la sintaxi..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr ""
+"Aquesta seq??ncia d'ordres s'ha modificat. Vols desar els ?ltims canvis?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+De_sar"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - filtre Sieve %s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Afegir seq??ncia d'ordres Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Introdu?u un nom per la nova seq??ncia d'ordres Sieve."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Introdu?u un nom nou per la seq??ncia d'ordres."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Realment vols esborrar el filtre  '%s'?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Esborrar el filtre"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Actiu"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Un compte nom?s pot tenir una seq??ncia d'ordres activa alhora."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Incapa? de connectar"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Llista de seq??ncies d'ordres..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Connectant ..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Administra filtres Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Per utilitzar Sieve, permetre'l en les prefer?ncies d'un compte."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Administra filtres Sieve..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr ""
+"Administra filtres Sieve en un servidor utilitzant el protocol ManageSieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Activar Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Informaci? del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Nom del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Connectar-se a aquest servidor en comptes del servidor utilitzat per rebre "
+"correu"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Port del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Connectar-se a aquest port en comptes de al predeterminat"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Xifratge"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Sense TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Utilitzar TLS quan estigui disponible"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Requereix TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Sense autentificaci?"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Utilitzeu la mateixa autenticaci? que per rebre correu"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Especifiqueu l'autenticaci?"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "ID d'usuari"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Contrasenya"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "M?tode d'autentificaci?"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Autom?tic"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "El servidor de Sieve no pot contenir un espai."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "No s'ha especificat el servidor Sieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
 
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
-#, fuzzy
 msgid "NewMail"
-msgstr "Rebre Mail"
+msgstr "Nou Correu"
 
 #: src/plugins/newmail/newmail.c:115
-#, fuzzy
 msgid "Failed to register newmail hook"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr "Ha fallat el registre del ganxo per nous correus"
 
 #: src/plugins/newmail/newmail.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open log file %s: %s\n"
-msgstr ""
-"No s'ha pogut obrir l'arxiu:\n"
-"%s\n"
+msgstr "No s'ha pogut obrir el fitxer de tra?a %s: %s\n"
 
 #: src/plugins/newmail/newmail.c:145
 #, c-format
@@ -11633,11 +11937,16 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
+"Aquest plugin escriu un resum de les cap?aleres en un fitxer de tra?a per a "
+"cada correu rebut despr?s de la classificaci?.\n"
+"\n"
+"Per defecte ?s ~/Mail/NewLog\n"
+"\n"
+"La tra?a actual ?s %s"
 
 #: src/plugins/newmail/newmail.c:179
-#, fuzzy
 msgid "Log file"
-msgstr "Nivell de tra?a"
+msgstr "Fitxer de tra?a"
 
 #: src/plugins/notification/notification_banner.c:356
 msgid "Folder:"
@@ -11706,9 +12015,9 @@ msgstr ""
 "Error al registrar el canvi de la llista de comptes al m?dul de notificaci?"
 
 #: src/plugins/notification/notification_plugin.c:306
-#, fuzzy
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr "Error al registrar l'enlla? del canvi de tema al m?dul de Notificaci?"
+msgstr ""
+"Error al registrar el ganxo de canvi de tema del connector de Notificaci?"
 
 #: src/plugins/notification/notification_plugin.c:422
 msgid ""
@@ -11769,9 +12078,8 @@ msgstr "Ha arribat un missatge de tipus desconegut"
 
 #: src/plugins/notification/notification_popup.c:381
 #: src/plugins/notification/notification_trayicon.c:644
-#, fuzzy
 msgid "Present main window"
-msgstr "Obrir en finestra _nova"
+msgstr "Finestra principal actual"
 
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
@@ -11854,7 +12162,8 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"M?dul de notificaci?: Error al escriure la configuraci? del m?dul a l'arxiu\n"
+"Connector de notificaci?: Error al escriure la configuraci? del m?dul a "
+"l'arxiu\n"
 
 #: src/plugins/notification/notification_prefs.c:608
 msgid "Include folder types"
@@ -11869,19 +12178,18 @@ msgid "News folders"
 msgstr "Carpetes de not?cies"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "Carpetes de RSS"
+msgstr "Carpetes RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Carpetes de calendaris"
+msgstr "Carpetes vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
-#, fuzzy
 msgid "These settings override folder-specific selections."
-msgstr "Aquests elements sobreescriuran les seleccions de carpeta."
+msgstr ""
+"Aquestes configuracions sobreescriuran les seleccions especifiques de "
+"carpeta."
 
 #: src/plugins/notification/notification_prefs.c:660
 msgid "Global notification settings"
@@ -11927,23 +12235,21 @@ msgid "Banner speed"
 msgstr "Velocitat de l'av?s"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Nmero m?xim d'articles a descarregar"
+msgstr "Nombre m?xim de missatges"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "N?mero m?xim de missatges (0 significa il?limitat)"
+msgstr ""
+"Limitar el nombre de missatges mostrats, fes servir 0 per a il?limitats"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Velocitat de l'av?s"
+msgstr "Amplada del Banner"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Amplada de l'anunci en pixels (0 significa pantalla sencera)"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11973,9 +12279,8 @@ msgid "Select folders..."
 msgstr "Seleccionar carpetes..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Color de carpeta"
+msgstr "Colors del Banner"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12011,16 +12316,14 @@ msgstr "Activar elements emergents"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Temps l?mit d'elements emergents:"
+msgstr "Temps espera de la finestra emergent"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "segons"
+msgstr "segon(s)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12048,18 +12351,16 @@ msgid "Done"
 msgstr "Fet"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Comanda de shell"
+msgstr "Selecciona l'ordre"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Activar comanda"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Comanda a executar:"
+msgstr "Ordre a executar"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12070,7 +12371,6 @@ msgid "Enable LCD"
 msgstr "Activar LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
 msgstr "Nom de servidor:Port del servei LCDd"
 
@@ -12130,9 +12430,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Alternar minimitzar:"
+msgstr "Commutar minimitzar"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12242,9 +12541,8 @@ msgid "Optimized:"
 msgstr "Optimitzat:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1179
-#, fuzzy
 msgid "PDF properties"
-msgstr "Propietats"
+msgstr "Propietats del PDF"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1276
 msgid "Loading..."
@@ -12256,13 +12554,13 @@ msgid "%s Document"
 msgstr "%s Document"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1341
-#, fuzzy, c-format
+#, c-format
 msgid "of %d"
-msgstr "%ld de %ld"
+msgstr "de %d"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1358
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "La visualtizaci? del PDF ha fallar per un motiu desconegut."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1721
 #: src/plugins/pdf_viewer/poppler_viewer.c:1939
@@ -12349,15 +12647,22 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Advert?ncia: no s'ha pogut trobar el bin?ri ghostscript (gs) requerit per el "
+"connector %s per processar arxius adjunts PostScript, es mostrar? nom?s els "
+"arxius adjunts PDF. Per habilitar el suport PostScript instal el programa "
+"gs.\n"
+"\n"
+"\n"
+"%s"
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "Editar les regles de filtres perl (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:125
-#, fuzzy
 msgid "Failed to register PGP address autocompletion hook"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr ""
+"Ha fallat el registre del ganxo per completaci? autom?tica d'adreces PGP"
 
 #: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:116
 msgid "Passphrase"
@@ -12423,7 +12728,7 @@ msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try and import it "
 "from a keyserver?"
 msgstr ""
-"Aquesta clau no ?s al vostre anell de claus. Voleu que Claws Mail intenti "
+"Aquesta clau no ?s al vostre anell de claus. Vols que Claws Mail intenti "
 "importar-la desde un servidor de claus?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
@@ -12503,7 +12808,6 @@ msgid "PGP/Core"
 msgstr "PGP/Core"
 
 #: src/plugins/pgpcore/plugin.c:71
-#, fuzzy
 msgid ""
 "This plugin handles PGP core operations and provides address autocompletion "
 "from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
@@ -12515,13 +12819,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Aquest m?dul gestiona les operacions b?siques PGP, ?s usat per altres "
-"m?duls, com PGP/Mime.\n"
+"Aquest m?dul gestiona les operacions b?siques PGP i completaci? autom?tica "
+"d'adreces, ?s usat per altres m?duls, com PGP/Mime.\n"
 "\n"
-"Podeu trobar les opcions a /Configuraci?/Preferencies/M?duls/GPG i /"
-"Configuraci?/[Prefer?ncies de Compte]/M?duls/GPG\n"
+"Podeu trobar les opcions a /Configuraci?/Preferencies/Connectors/GPG i /"
+"Configuraci?/[Prefer?ncies de Compte]/Connectors/GPG\n"
 "\n"
-"El m?dul usa la llibreria GPGME com a encapsulaci? de GnuPG.\n"
+"El connector usa la llibreria GPGME com a encapsulaci? de GnuPG.\n"
 "\n"
 "GPGME ?s copyright 2001 per Werner Koch <dd9jn at gnu.org>"
 
@@ -12535,7 +12839,7 @@ msgstr "Verificar signatures autom?ticament"
 
 #: src/plugins/pgpcore/prefs_gpg.c:114
 msgid "Use keyring for address autocompletion"
-msgstr ""
+msgstr "Utilitza l'anell de claus per la compleci? autom?tica d'adreces"
 
 #: src/plugins/pgpcore/prefs_gpg.c:119
 msgid "Use gpg-agent to manage passwords"
@@ -12651,12 +12955,12 @@ msgid "Enter another user or key ID:"
 msgstr "Entreu un altre usuari o clau ID:"
 
 #: src/plugins/pgpcore/select-keys.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Encriptaci? fallida, %s"
+msgstr "Encriptat a %s <%s>"
 
 #: src/plugins/pgpcore/select-keys.c:607
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
@@ -12666,9 +12970,11 @@ msgid ""
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
-"La clau de '%s' no es confiable totalment.\n"
+"La clau d'encriptaci? no es totalment de confian?a.\n"
 "Si escolliu d'encriptar el missatge amb aquesta clau no podreu\n"
 "assegurar-vos de que anir?a la persona que creieu que va.\n"
+"Detalls de la clau: ID %s, identitat prim?ria %s &lt;%s&gt;\n"
+"\n"
 "Hi confieu lo suficient com per usar-la de totes maneres?"
 
 #: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
@@ -12678,7 +12984,7 @@ msgstr "No s'ha trobat signatura"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "Desconfiat"
 
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
@@ -12694,54 +13000,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Nucli PGP: no es pot obtenir la clau - gpg-agent no s'est? executant."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\" [definitiu]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\" [ple]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\" [insignificant]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Signatura caducada de %s"
+msgstr "Signatura expirada de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\", per? la Clau a expirat"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Signatura v?lida de %s."
+msgstr "Signatura correcte de \"%s\", per? la Clau ha sigut revocada"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Signatura err?nia de %s."
+msgstr "Signatura dolenta de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Clau 0x%s no disponible per verificar aquesta signatura."
+msgstr "No s'ha trobat la clau 'x%s per verificar aquesta signatura"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "La signatura no ha estat comprovada"
+msgstr "La signatura no ha sigut validada"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12753,9 +13058,9 @@ msgid "Error checking signature: %s\n"
 msgstr "Error comprovant la signatura: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made on %s using %s key ID %s\n"
-msgstr "Signatura realitzada usant %s ID de clau %s\n"
+msgstr "Signatura realitzada el %s usant %s ID de clau %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
@@ -12763,9 +13068,9 @@ msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signatura v?lida des de l'uid \"%s\" (Validesa: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Signatura caducada de %s."
+msgstr "Expirada l'uid de la clau \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
@@ -12775,7 +13080,7 @@ msgstr "Signatura caducada des de l'uid \"%s\" (Validesa: %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Revocada uid de la Clau \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
@@ -12789,17 +13094,16 @@ msgstr "               uid \"%s\" (Validesa: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "Revocada"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
 msgid "Owner Trust: %s\n"
-msgstr ""
+msgstr "Confian?a de propietari: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:367
-#, fuzzy
 msgid "Primary key fingerprint:"
-msgstr "Empremta digital de clau prim?ria: %s\n"
+msgstr "Empremta digital de clau prim?ria:"
 
 #: src/plugins/pgpcore/sgpgme.c:385
 #, c-format
@@ -12868,8 +13172,8 @@ msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
-"Heu de guardar la informaci? del compte amb \"Acceptar\" abans de poder "
-"generar el parell de claus.\n"
+"Heu de desar l'informaci? del compte amb \"Acceptar\" abans de poder generar "
+"el parell de claus.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:772
 msgid "No PGP key found"
@@ -12883,7 +13187,7 @@ msgid ""
 msgstr ""
 "Claws Mail no ha trobat cap clau secreta PGP, la qual cosa vol dir que no "
 "podeu  signar missatges o rebre missatges encriptats.\n"
-"Voleu crear un nou parell de claus ara?"
+"Vols crear un nou parell de claus ara?"
 
 #: src/plugins/pgpcore/sgpgme.c:843 src/plugins/pgpcore/sgpgme.c:859
 #, c-format
@@ -12913,7 +13217,7 @@ msgstr ""
 "El vostre nou parell de claus ha estat generat. La polsada ?s:\n"
 "%s\n"
 "\n"
-"Voleu exportar-la a un servidor de claus?"
+"Vols exportar-la a un servidor de claus?"
 
 #: src/plugins/pgpcore/sgpgme.c:873
 msgid "Key generated"
@@ -13102,7 +13406,7 @@ msgstr "No s'ha pogut crear l'arxiu temporal: %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "Signatura digital OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
@@ -13148,7 +13452,7 @@ msgstr ""
 #: src/plugins/python/python_plugin.c:358
 #: src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
-msgstr "Scripts Python"
+msgstr "Seq??ncies d'ordres Python"
 
 #: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
@@ -13170,9 +13474,10 @@ msgid "Python"
 msgstr "Python"
 
 #: src/plugins/python/python_plugin.c:657
-#, fuzzy
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "Ha fallat el registre de l'enlla? de tancament"
+msgstr ""
+"Ha fallat el registre de \"composic? de creaci? del ganxo\" en el connector "
+"Python"
 
 #: src/plugins/python/python_plugin.c:738
 msgid ""
@@ -13220,40 +13525,84 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
+"Aquest plugin ofereix funcions d'integraci? de Python.\n"
+"Codi Python es pot introduir de forma interactiva en una consola de Python "
+"incrustat, a Eines -> Mostra consola de Python, o emmagatzemat en scripts.\n"
+"\n"
+"Aquestes seq??ncies d'ordres estaran disponibles a trav?s del men?. Podeu "
+"assignar dreceres de teclat per a ells igual que es fa amb altres elements "
+"del men?. Tamb? pots posar botons per a la invocaci? de l'escriptura en les "
+"barres d'eines utilitzant l'editor de barra d'eines d'ordre interna de Claws "
+"Mail.\n"
+"\n"
+"Pot proporcionar els scripts que treballen a la finestra principal "
+"col?locant arxius a ~ /.claws-mail/python-scripts/main.\n"
+"\n"
+"Tamb? pot proporcionar guions de treball en una finestra de composici? "
+"oberta mitjan?ant la col?locaci? d'arxius en ~ /.claws-mail/ python-scripts/"
+"compose.\n"
+"\n"
+"La carpeta ~ /.claws-mail/python-scripts/auto/ pot contenir algunes "
+"seq??ncies d'ordres que s'executen autom?ticament quan es produeixen "
+"determinats esdeveniments. Actualment, els seg?ents arxius en aquest "
+"directori es reconeixen:\n"
+"\n"
+"compose_any\n"
+"?s executat cada vegada que s'obre una finestra de redacci?, no importa si "
+"aquesta obertura que va oc?rrer com a resultat de compondre un nou missatge, "
+"respondre o reenviar un missatge.\n"
+"\n"
+"startup\n"
+"Executat amb c?rrega del connector\n"
+"\n"
+"shutdown\n"
+"Executat en desc?rrega del connector\n"
+"\n"
+"\n"
+"Per a la majoria de la documentaci? de l'API fins a la data, executa\n"
+"\n"
+"?help(clawsmail)\n"
+"\n"
+"a la consola de Python interactiva.\n"
+"\n"
+"La distribuci? de codi font d'aquest plugin ve amb diversos scripts "
+"d'exemple en el \"exemples\" subdirectori. Si has fet un script i estaries "
+"interessat en compartir-lo, no dubtis a enviar-m'ho per tenir-ho en compte "
+"en els exemples.\n"
+"\n"
+"La teva opini? ?s benvinguda en <berndth at gmx.de>."
 
 #: src/plugins/python/python_plugin.c:789
 msgid "Python integration"
 msgstr "Integraci? Python"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"No s'ha pogut crear l'arxiu:\n"
-"%s\n"
+"No s'ha pogut llegir el contingut del fitxer ?ntic feeds.xml:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: No s'ha pogut escriure '%s' a la llista de canals exportats.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr ""
-"No s'ha pogut obrir l'arxiu:\n"
-"%s\n"
+msgstr "RSSyl: No s'ha pogut esborrar el fitxer ?ntic OPML '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
-msgstr ""
+msgstr "RSSyl: No s'ha pogut obrir el fitxer '%s' per al canal exportat: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl: Error al escriure el canal en el fitxer d'exportaci?.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -13263,6 +13612,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Error al subscriure el canal\n"
+"%s\n"
+"\n"
+"No es perm?s el nom de carpeta '%s'."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -13284,10 +13637,9 @@ msgid "RSS feed"
 msgstr "Feed RSS"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(normalment bu?t)"
+msgstr "(buit)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -13302,51 +13654,48 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Introduiu la URL dels nous feeds als que us volgueu subscriure:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
-msgstr "No s'ha pogut incloure '%c' en el nom de la carpeta."
+msgstr "No es pot utilitzar '%c' en el nom de la carpeta."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
-msgstr[0] "Claws Mail necessita acc?s a la xarxa per actualitzar el feed."
-msgstr[1] "Claws Mail necessita acc?s a la xarxa per actualitzar els feeds."
+msgstr[0] "Claws Mail necessita acc?s a la xarxa per actualitzar el canal."
+msgstr[1] "Claws Mail necessita acc?s a la xarxa per actualitzar els canals."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
-msgstr "Realment voleu esborrar l'arbre de la carpeta '%s' ?\n"
+msgstr "Realment vols esborrar l'arbre del canal '%s'?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
-msgstr "Esborrar arbre de la carpeta"
+msgstr "Esborra l'arbre del canal"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
-msgstr "Selecciona un arxiu .opml"
+msgstr "Selecciona un fitxer OPML"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "No s'ha pogut crear l'arxiu temporal per enviar noticies."
+msgstr "No s'ha pogut crear la carpeta per les noticies del canal '%s'."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: Actualitzant feed %s\n"
+msgstr "RSSyl: Subcribint al new canal: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: Subscripci? al nou canal '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
-msgstr "RSSyl: Actualitzant feed %s\n"
+msgstr "RSSyl: Actualitzan el canal: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
@@ -13354,89 +13703,83 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Actualitzaci? del feed finalitzada: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: Actualitzant feed %s\n"
+msgstr "RSSyl: No s'ha pogut obtenir el canal en '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: Actualitzant feed %s\n"
+msgstr "RSSyl: No s'ha trobat un canal valid en '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "No es pot exportar la informaci? de lliure/ocupat a '%s'\n"
+msgstr "RSSyl: No s'ha pogut processar el canal n '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Useu autentificaci?"
+"RSSyl: Aplicaci? est? sortint, no va poder culminar l'actualitzaci? del "
+"canal en '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Useu autentificaci?"
+msgstr "Autentificaci? basica HTTP"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Usar l'interval de refresc per defecte"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "Mantenir a la carpeta"
+msgstr "Mantenir els elements antics"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "Re_tallar"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
+"Actualitzaci? del canal, esborrant elements que ja no es troben en la font "
+"del canal"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Obtenir els comentaris si es possible"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
-msgstr "Marqueu sempre com a no llegida"
+msgstr "Sempre marca com a nou"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
-msgstr "Si nom?s el text canvia"
+msgstr "Si nomes ha canviat el seu text"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
-msgstr "No marqueu mai com a no llegit"
+msgstr "Mai marca com a nou"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "Afegeix el tit?l de l'element amunt del missatge"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "Ignorar fil"
+msgstr "Ignorar el rebateix del tit?l"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Activa aix? per mantenir el nom de la carpeta actual, fins i tot si l'autor "
+"canvia el t?tol del canal."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
-#, fuzzy
 msgid "Verify SSL certificate validity"
 msgstr "Cer_tificats SSL"
 
@@ -13445,17 +13788,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>URL d'origen:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Nom d'usuari:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Contrasenya"
+msgstr "Nom d'usuari"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13475,9 +13809,8 @@ msgstr ""
 "small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "<b>Si una ocurr?ncia canvia, no la marqueu com a no llegida:</b>"
+msgstr "<b>Si un element canvia, no marcar-lo com nou.</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:609
 msgid "_OK"
@@ -13492,36 +13825,32 @@ msgid "_Refresh feed"
 msgstr "_Refrescar el feed"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
-msgstr "Pr_opietats del feed..."
+msgstr "Pr_opietats del Canal"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
 msgstr "Reno_mbrar..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "Cercar recursivament"
+msgstr "Actualitza r_ecursivament"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
 msgstr "Subscriure's al _nou feed..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
-msgstr "_Crear nova carpeta..."
+msgstr "Crear _nova carpeta..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
 msgstr "Importar una llista de feeds..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "Eliminar despr?s de"
+msgstr "Esborra l'arbre"
 
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
@@ -13546,23 +13875,20 @@ msgid "My Feeds"
 msgstr "Els meus feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Seleccionar arxiu Pine"
+msgstr "Selecciona el fitxer de galetes"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Usar l'interval de refresc per defecte"
+msgstr "Interval d'actualitzaci? per defecte"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Refrescar tots els feed a l'iniciar l'aplicaci?"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "Certificat SSL per a %s"
+msgstr "Verifica els certificats SSL pels nous canals"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -13574,38 +13900,37 @@ msgstr ""
 "Ruta a l'arxiu d'estil Netscape cookies.txt que cont? les vostres cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Refrescar"
+msgstr "Actualitzant"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Seguretat i Privadesa"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "/Subscriure's a un nou feed..."
+msgstr "Subscriure's el nou canal?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> a:</b>"
+msgstr "<b>Carpeta del Canal:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
+"En lloc d'utilitzar el t?tol oficial, pots fer servir un nom diferent per a "
+"la carpeta del canal."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_Editar les propietats del canal despr?s de subscriure's"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "Actualitzant mem?ria cauper %s ..."
+msgstr "Actualitzant els comentaris per '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
 #: src/plugins/vcalendar/vcal_folder.c:1598
@@ -13623,9 +13948,9 @@ msgid "404 (Not found)"
 msgstr "404 (No trobat)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "Error %ld"
+msgstr "Error %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -13636,6 +13961,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"No s'ha pogut obtenir el canal a\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
@@ -13643,11 +13972,13 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"No s'ha trobat un canal valid en\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
-msgstr "Refrescant feed '%s'..."
+msgstr "Actualitzant el canal '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:246
 #, c-format
@@ -13657,17 +13988,26 @@ msgid ""
 "\n"
 "Please contact developers, this should not happen."
 msgstr ""
+"No s'ha pogut procesar els canals a\n"
+"<b>%s</b>\n"
+"\n"
+"Si us plau, poseu-vos en contacte amb els desenvolupadors, aix? no hauria de "
+"succeir."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
-msgstr "Claws Mail necessita acc?s a la xarxa per actualitzar el feed."
+msgstr ""
+"Claws Mail necessita tenir acc?s a la xarxa per tal d'actualitzar els seus "
+"canals."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
+"Problema intern mentre s'actualitza el format d'emmagatzematge. Aix? no "
+"hauria de succeir. Si us plau aviseu-nos incloent el resultat de la "
+"depuraci? adjunta.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
 #: src/plugins/smime/smime.c:911
@@ -13850,10 +14190,11 @@ msgstr ""
 "\n"
 "Tamb? pot ser usat per marcar els missatges con a bons o dolents(Spam).\n"
 "\n"
-"Quan un missatge s'identifica com a spam es pot esborrar o es pot guardar en "
+"Quan un missatge s'identifica com a spam es pot esborrar o es pot desar en "
 "una carpeta especial.\n"
 "\n"
-"Les opcions les podeu trobar a /Configuraci?/Prefer?ncies/M?duls/SpamAssassin"
+"Les opcions les podeu trobar a /Configuraci?/Prefer?ncies/Connectors/"
+"SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -13959,24 +14300,20 @@ msgstr ""
 "Hand <yerase at yerot.com>"
 
 #: src/plugins/vcalendar/common-views.c:62
-#, fuzzy
 msgid "_Edit this meeting..."
-msgstr "Editar reuni?..."
+msgstr "_Editar aquesta reuni?..."
 
 #: src/plugins/vcalendar/common-views.c:63
-#, fuzzy
 msgid "_Cancel this meeting..."
-msgstr "Cancel?lar reuni?..."
+msgstr "_Cancel?lar aquesta reuni?..."
 
 #: src/plugins/vcalendar/common-views.c:65
-#, fuzzy
 msgid "_Create new meeting..."
-msgstr "Creant reuni?..."
+msgstr "_Crear una nova reuni?..."
 
 #: src/plugins/vcalendar/common-views.c:67
-#, fuzzy
 msgid "_Go to today"
-msgstr "_Anar a"
+msgstr "_Anar a avui"
 
 #: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
@@ -14127,7 +14464,7 @@ msgstr "Crear reuni? des del missatge..."
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
-msgstr "Esteu a punt de crear %d reunions, una a una. Voleu continuar?"
+msgstr "Est?s a punt de crear %d reunions, una a una. Vols continuar?"
 
 #: src/plugins/vcalendar/vcalendar.c:139
 msgid "Creating meeting..."
@@ -14223,20 +14560,19 @@ msgstr "Cancel?lar reuni?"
 
 #: src/plugins/vcalendar/vcalendar.c:992
 msgid "Are you sure you want to cancel this meeting?"
-msgstr "Esteu segur que voleu cancel?lar aquesta reuni??"
+msgstr "Est?s segur que vols cancel?lar aquesta reuni??"
 
 #: src/plugins/vcalendar/vcalendar.c:1087
 msgid "No account found"
 msgstr "No s'ha trobat cap compte"
 
 #: src/plugins/vcalendar/vcalendar.c:1088
-#, fuzzy
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
-"No teniu cap compte que coincideixi amb cap convocat.\n"
-"Voleu contestar de totes maneres ?"
+"No tens cap compte que coincideixi amb cap convocat.\n"
+"Vols contestar de totes maneres?"
 
 #: src/plugins/vcalendar/vcalendar.c:1090
 msgid "+Reply anyway"
@@ -14260,7 +14596,7 @@ msgstr "Obrir p?gina web"
 
 #: src/plugins/vcalendar/vcalendar.c:1226
 msgid "You are already busy at this time."
-msgstr "Ja esteu ocupat a aquesta hora."
+msgstr "Ja est?s ocupat a aquesta hora."
 
 #: src/plugins/vcalendar/vcalendar.c:1265
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
@@ -14336,9 +14672,8 @@ msgid "_Month view"
 msgstr "Vista _mensual"
 
 #: src/plugins/vcalendar/vcal_folder.c:1094
-#, fuzzy
 msgid "Meetings"
-msgstr "coses"
+msgstr "Reunions"
 
 #: src/plugins/vcalendar/vcal_folder.c:1478
 msgid "in the past"
@@ -14429,23 +14764,22 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_folder.c:1851
 #: src/plugins/vcalendar/vcal_folder.c:1854
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "No s'ha pogut crear el directori de destinaci? %s."
+msgstr "No s'ha pogut crear el directori %s"
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail necessita acc?s a xarxa per actualitzar el feed de Webcal."
 
 #: src/plugins/vcalendar/vcal_folder.c:1903
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching calendar for %s..."
-msgstr "Actualitzant mem?ria cauper %s ..."
+msgstr "Actualitzant el calendari per %s..."
 
 #: src/plugins/vcalendar/vcal_folder.c:1904
-#, fuzzy
 msgid "new subscription"
-msgstr "Subscripci? a grups de noticies"
+msgstr "Nova subscripci?"
 
 #: src/plugins/vcalendar/vcal_folder.c:1915
 msgid "Claws Mail needs network access in order to update the subscription."
@@ -14465,7 +14799,7 @@ msgstr "No s'ha pogut processar la URL."
 
 #: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Do you really want to unsubscribe?"
-msgstr "Realment voleu desubscriure-vos"
+msgstr "Realment vols desubscriure't?"
 
 #: src/plugins/vcalendar/vcal_manager.c:109
 msgid "accepted"
@@ -14696,9 +15030,9 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr "No tothom est? disponible. Mireu les notes per m?s informaci?..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
-#, fuzzy, c-format
+#, c-format
 msgid "Fetching planning for %s..."
-msgstr "Revisant carpeta %s ..."
+msgstr "Actualitzant la planificaci? per %s ..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
 msgid "Available"
@@ -14728,7 +15062,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
 msgid "Save & Send"
-msgstr "Guardar i enviar"
+msgstr "Desar i Enviar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1475
 msgid "Check availability"
@@ -14863,12 +15197,6 @@ msgstr "Podeu exportar a un fitxer local o URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Especifiqueu un fitxer local o URL(http://servidor/ruta/fitxer.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "ID d'usuari"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Incloure subscripcions webcal a l'exportaci?"
@@ -14916,9 +15244,8 @@ msgstr ""
 "de la part esquerra de l'adre?a de correu, %d per el domini"
 
 #: src/plugins/vcalendar/vcal_prefs.c:506
-#, fuzzy
 msgid "SSL options"
-msgstr "Opcions de selecci?"
+msgstr "Opcions de SSL"
 
 #: src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
@@ -15012,19 +15339,13 @@ msgstr "Nom complet"
 msgid "Mail address"
 msgstr "Adre?a de correu"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Informaci? del servidor"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
-#, fuzzy
 msgid "Auto-configure"
-msgstr "Configurar accions"
+msgstr "Configurar autom?ticament"
 
 #: src/prefs_account.c:1131 src/wizard.c:1477
-#, fuzzy
 msgid "Cancel"
-msgstr "_Cancel?lar"
+msgstr "Cancel?lar"
 
 #: src/prefs_account.c:1147
 msgid ""
@@ -15090,11 +15411,11 @@ msgstr "Usar autentificaci? segura (APOP)"
 
 #: src/prefs_account.c:1455
 msgid "Remove messages on server when received"
-msgstr "Eliminar missatges del servidor quan s'hagin rebut"
+msgstr "Esborrar missatges del servidor quan s'hagin rebut"
 
 #: src/prefs_account.c:1466
 msgid "Remove after"
-msgstr "Eliminar despr?s de"
+msgstr "Esborrar despr?s de"
 
 #: src/prefs_account.c:1473 src/prefs_account.c:1483
 msgid "0 days and 0 hours : remove immediately"
@@ -15124,14 +15445,6 @@ msgstr "Nmero m?xim d'articles a descarregar"
 msgid "unlimited if 0 is specified"
 msgstr "sense l?mit si s'especifica 0"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "M?tode d'autentificaci?"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Autom?tic"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
@@ -15180,9 +15493,8 @@ msgid "Send account mail address in Message-ID"
 msgstr "Enviar adre?a de correu dins el Message-ID"
 
 #: src/prefs_account.c:1726
-#, fuzzy
 msgid "Add user agent header"
-msgstr "Afegir cap?aleres d'usuari"
+msgstr "Afegir cap?alera Agent d'Usuari"
 
 #: src/prefs_account.c:1733
 msgid "Add user-defined header"
@@ -15291,7 +15603,7 @@ msgstr ""
 
 #: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
-msgstr "Guardar en clar els missatges enviats encriptats"
+msgstr "Desar en clar els missatges enviats encriptats"
 
 #: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
 msgid "Don't use SSL"
@@ -15344,7 +15656,7 @@ msgstr "Certificat per enviar"
 
 #: src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr ""
+msgstr "Accepta autom?ticament els certificats SSL v?lids desconeguts"
 
 #: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
@@ -15484,9 +15796,8 @@ msgid "%s - Account preferences"
 msgstr "%s - Prefer?ncies del compte"
 
 #: src/prefs_account.c:3850 src/wizard.c:1374
-#, fuzzy
 msgid "Failed (wrong address)"
-msgstr "Adre?a de correu"
+msgstr "Ha fallat (adre?a incorrecte)"
 
 #: src/prefs_account.c:3933
 msgid "Select signature file"
@@ -15536,9 +15847,8 @@ msgstr "Substitu?r l'acci? seleccionada a la llista amb la acci? de dalt"
 #: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
 #: src/prefs_filtering.c:486 src/prefs_matcher.c:781 src/prefs_template.c:320
 #: src/prefs_toolbar.c:1056
-#, fuzzy
 msgid "Re_move"
-msgstr "Eliminar"
+msgstr "Es_borrar"
 
 #: src/prefs_actions.c:345
 msgid "Delete the selected action from the list"
@@ -15581,7 +15891,7 @@ msgstr "No es permet ':' (dos punts) en el nom del men?."
 
 #: src/prefs_actions.c:616
 msgid "There is an action with this name already."
-msgstr ""
+msgstr "Ja existeix una acci? amb aquest mateix nom."
 
 #: src/prefs_actions.c:635
 msgid "Menu name is too long."
@@ -15612,7 +15922,7 @@ msgstr "Esborrar acci?"
 
 #: src/prefs_actions.c:714
 msgid "Do you really want to delete this action?"
-msgstr "Voleu realment esborrar aquesta acci??"
+msgstr "Realment vols esborrar aquesta acci??"
 
 #: src/prefs_actions.c:734
 msgid "Delete all actions"
@@ -15620,19 +15930,19 @@ msgstr "Esborrar totes les accions"
 
 #: src/prefs_actions.c:735
 msgid "Do you really want to delete all the actions?"
-msgstr "Voleu realment esborrar totes les accions?"
+msgstr "Realment vols esborrar totes les accions?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
 #: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
 #: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
-msgstr "Entrada no guardada"
+msgstr "Entrada no desada"
 
 #: 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
 msgid "The entry was not saved. Close anyway?"
-msgstr "L'entrada no fou guardada. Tancar igualment?"
+msgstr "L'entrada no s'ha desat. Tancar de totes maneres?"
 
 #: 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
@@ -15643,7 +15953,7 @@ msgstr "+_Continuar editant"
 
 #: src/prefs_actions.c:903
 msgid "Actions list not saved"
-msgstr "Llista d'accions no gravada"
+msgstr "Llista d'accions no desades"
 
 #: src/prefs_actions.c:904
 msgid "The actions list has been modified. Close anyway?"
@@ -15764,7 +16074,7 @@ msgstr "Hola,\\n"
 
 #: src/prefs_common.c:296
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
-msgstr "EL %d\\n%f escrigu?:\\n\\n%q\\n%X"
+msgstr "El %d\\n%f escrigu?:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:302 src/prefs_quote.c:85
 msgid ""
@@ -15775,9 +16085,8 @@ msgstr ""
 "%t\\n}?c{Cc: %c\\n}?n{Grups de not?cies: %n\\n}?s{Assumpte: %s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:442
-#, fuzzy
 msgid "%x(%a) %H:%M"
-msgstr "%y/%m/%d(%a) %H:%M"
+msgstr "%x(%a) %H:%M"
 
 #: src/prefs_compose_writing.c:125
 msgid "Automatic account selection"
@@ -15805,16 +16114,15 @@ msgstr "Arrencar l'editor extern autom?ticament"
 
 #: src/prefs_compose_writing.c:152
 msgid "Automatically save message to Drafts folder every"
-msgstr "Guardar autom?ticament el missatge al directori Esborranys cada "
+msgstr "Desar autom?ticament el missatge al directori Esborranys cada "
 
 #: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
 msgid "characters"
 msgstr "car?cters"
 
 #: src/prefs_compose_writing.c:173
-#, fuzzy
 msgid "Even if message is to be encrypted"
-msgstr "Obrir sempre els missatges quan es seleccionin"
+msgstr "Fins i tot si el missatge ?s per ser encriptat"
 
 #: src/prefs_compose_writing.c:180
 msgid "Undo level"
@@ -15936,7 +16244,7 @@ msgstr "Esborrar cap?alera"
 
 #: src/prefs_customheader.c:704
 msgid "Do you really want to delete this header?"
-msgstr "Voleu realment esborrar aquesta cap?alera?"
+msgstr "Realment vols esborrar aquesta cap?alera?"
 
 #: src/prefs_customheader.c:877
 msgid "Current custom headers"
@@ -16226,14 +16534,12 @@ msgid "Condition"
 msgstr "Condici?"
 
 #: src/prefs_filtering.c:424
-#, fuzzy
 msgid " D_efine... "
-msgstr "Definiu... "
+msgstr "D_efineix... "
 
 #: src/prefs_filtering.c:446
-#, fuzzy
 msgid " De_fine... "
-msgstr "Definiu... "
+msgstr "De_fineix... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
@@ -16252,9 +16558,8 @@ msgid "Move the selected rule to the top"
 msgstr "Moure la regla seleccionada a l'inici"
 
 #: src/prefs_filtering.c:535
-#, fuzzy
 msgid "Page u_p"
-msgstr "P?gina amunt"
+msgstr "_P?gina amunt"
 
 #: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
@@ -16269,9 +16574,8 @@ msgid "Move the selected rule down"
 msgstr "Moure la regla seleccionada avall"
 
 #: src/prefs_filtering.c:563
-#, fuzzy
 msgid "Page dow_n"
-msgstr "P?gina avall"
+msgstr "P?gina a_vall"
 
 #: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
@@ -16299,7 +16603,7 @@ msgstr "Esborrar regla"
 
 #: src/prefs_filtering.c:1206
 msgid "Do you really want to delete this rule?"
-msgstr "Voleu esborrar realment aquesta regla?"
+msgstr "Vols esborrar realment aquesta regla?"
 
 #: src/prefs_filtering.c:1224
 msgid "Delete all rules"
@@ -16307,11 +16611,11 @@ msgstr "Esborrar totes les regles"
 
 #: src/prefs_filtering.c:1225
 msgid "Do you really want to delete all the rules?"
-msgstr "Voleu esborrar realment totes les regles?"
+msgstr "Vols esborrar realment totes les regles?"
 
 #: src/prefs_filtering.c:1475
 msgid "Filtering rules not saved"
-msgstr "Regles de filtrat no gravades"
+msgstr "Regles de filtrat no desades"
 
 #: src/prefs_filtering.c:1476
 msgid "The list of filtering rules have been modified. Close anyway?"
@@ -16364,7 +16668,7 @@ msgid ""
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\".</i>"
 msgstr ""
-"<i>Aquestes prefer?ncies no seran guardades perque aquesta carpeta es de "
+"<i>Aquestes prefer?ncies no seran desades perque aquesta carpeta es de "
 "nivell m?xim. De totes maneres podeu assignar-les a tot l'arbre de la b?stia "
 "usant \"Aplicar a subcarpetes\".</i>"
 
@@ -16394,11 +16698,11 @@ msgstr "Exp.reg. per simplificar assumpte"
 
 #: src/prefs_folder_item.c:362
 msgid "Test string:"
-msgstr ""
+msgstr "Cadena de proves:"
 
 #: src/prefs_folder_item.c:379
 msgid "Result:"
-msgstr ""
+msgstr "Resultat:"
 
 #: src/prefs_folder_item.c:394
 msgid "Folder chmod"
@@ -16433,15 +16737,16 @@ msgstr ""
 "amb filtratge del servidor IMAP o per una aplicaci? externa"
 
 #: src/prefs_folder_item.c:502
-#, fuzzy
 msgid "Select the HTML part of multipart messages"
-msgstr "Seleccionar la part HTML en missatges multipart/alternative"
+msgstr "Seleccionar la part HTML en missatges multipart"
 
 #: src/prefs_folder_item.c:519
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
+"\"Default\" fara servir les prefer?ncies globals (que es troba a / "
+"Prefer?ncies/Veure Missatge/Opcions de Text)"
 
 #: src/prefs_folder_item.c:529
 msgid "Synchronise for offline use"
@@ -16469,7 +16774,7 @@ msgstr "Sollicitar justificant de recepci?"
 
 #: src/prefs_folder_item.c:912
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "Guardar els missatges sortints en aquesta carpeta enlloc de a Enviat"
+msgstr "Desar els missatges sortints en aquesta carpeta enlloc de a Enviat"
 
 #: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
 #: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
@@ -16492,7 +16797,7 @@ msgstr "Desactivar mem?ria cau"
 #: src/prefs_folder_item.c:1685
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
-"Voleu realment descartar la informaci? local guardada per a aquesta carpeta?"
+"Realment vols descartar l'informaci? local desada per a aquesta carpeta?"
 
 #: src/prefs_folder_item.c:1687
 msgid "+Discard"
@@ -16563,7 +16868,7 @@ msgstr "Activa/Desactiva l'escalat clicant la imatge"
 
 #: src/prefs_image_viewer.c:83
 msgid "Display images inline"
-msgstr "Veure imatges inline"
+msgstr "Mostra les imatges inserides"
 
 #: src/prefs_image_viewer.c:89
 msgid "Print images"
@@ -16754,9 +17059,8 @@ msgid "headers part"
 msgstr "secci? cap?aleres"
 
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "L?nia de cap?aleres"
+msgstr "valors de les cap?aleres"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -16788,7 +17092,7 @@ msgstr "Reenviat"
 #: src/prefs_matcher.c:397 src/summaryview.c:6290 src/toolbar.c:416
 #: src/toolbar.c:934 src/toolbar.c:1978
 msgid "Spam"
-msgstr "spam"
+msgstr "Correu brossa"
 
 #: src/prefs_matcher.c:398
 msgid "Has attachment"
@@ -16951,7 +17255,7 @@ msgid ""
 msgstr ""
 "La ruta del llibre/carpeta no ha estat definida.\n"
 "\n"
-"Si voleu que l'adre?a %s coincideixi amb tot el llibre d'adreces, haureu de "
+"Si vols que l'adre?a %s coincideixi amb tot el llibre d'adreces, haur?s de "
 "seleccionar '%s' desde la llista desplegable de llibre/carpeta."
 
 #: src/prefs_matcher.c:1842
@@ -16959,9 +17263,8 @@ msgid "Headers part"
 msgstr "Secci? cap?aleres"
 
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "Nom de cap?alera"
+msgstr "Valors de les cap?aleres"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -17036,7 +17339,7 @@ msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
-"L'entrada no fou guardada.\n"
+"L'entrada no ha sigut desada.\n"
 "Tancar igualment?"
 
 #: src/prefs_matcher.c:2190
@@ -17353,7 +17656,7 @@ msgstr "Confirmar al sortir"
 
 #: src/prefs_other.c:492
 msgid "Empty trash on exit"
-msgstr "Buidar paperera al sortir"
+msgstr "Buidar la paperera al sortir"
 
 #: src/prefs_other.c:495
 msgid "Warn if there are queued messages"
@@ -17375,7 +17678,7 @@ msgid ""
 msgstr ""
 "Si el marqueu, podreu canviar les dreceres de teclat de la majoria dels "
 "items del men? marcant l'?tem de men? i prement una combinaci? de tecles.\n"
-"Desmarqueu aquesta opci? si voleu bloquejar totes les dreceres de teclat "
+"Desmarca aquesta opci? si vols bloquejar totes les dreceres de teclat "
 "existents."
 
 #: src/prefs_other.c:510
@@ -17492,9 +17795,8 @@ msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar di?leg d'error en l'error de recepci?"
 
 #: src/prefs_receive.c:199
-#, fuzzy
 msgid "After receiving new mail"
-msgstr "Despr?s de comprovar el correu nou"
+msgstr "Despr?s de rebre nou correu"
 
 #: src/prefs_receive.c:201
 msgid "Go to Inbox"
@@ -17535,7 +17837,7 @@ msgstr "Rebent"
 
 #: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
-msgstr "Guardar missatges enviats a la carpeta Enviat"
+msgstr "Desar dar missatges enviats a la carpeta Enviat"
 
 #: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
@@ -17550,9 +17852,8 @@ msgid "Show send dialog"
 msgstr "Mostrar di?leg d'enviament"
 
 #: src/prefs_send.c:172
-#, fuzzy
 msgid "Warn when Subject is empty"
-msgstr "L'assumpte es buit. %s"
+msgstr "Avisa quan l'assumpte es buit"
 
 #: src/prefs_send.c:180
 msgid "Outgoing encoding"
@@ -17631,9 +17932,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cir?l?lic (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cir?l?lic (KOI8-R)"
+msgstr "Cyrillic (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -17741,9 +18041,8 @@ msgid "Check with both dictionaries"
 msgstr "Comprova amb ambdos diccionaris"
 
 #: src/prefs_spelling.c:197
-#, fuzzy
 msgid "Get more dictionaries..."
-msgstr "Useu els dos diccionaris"
+msgstr "Obtenir m?s diccionaris"
 
 #: src/prefs_spelling.c:207
 msgid "Misspelled word color"
@@ -17760,7 +18059,6 @@ msgid "Spell Checking"
 msgstr "Corregint ortogr?ficament"
 
 #: src/prefs_summaries.c:152
-#, fuzzy
 msgid "the abbreviated weekday name"
 msgstr "el dia de la setmana abreviat"
 
@@ -18068,7 +18366,7 @@ msgstr "Configuraci? de plantilla"
 
 #: src/prefs_template.c:602
 msgid "Templates list not saved"
-msgstr "Llista de lantilles sense gravar"
+msgstr "Llista de plantilles sense desar"
 
 #: src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
@@ -18095,10 +18393,10 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "El camp \"Bcc\" de la plantilla cont? una adre?a de correu err?nia."
 
 #: src/prefs_template.c:835
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "El camp \"A\" de la plantilla cont? una adre?a de correu err?nia."
+msgstr ""
+"El camp \"Respondre a\" de la plantilla cont? una adre?a de correu err?nia."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -18110,7 +18408,7 @@ msgstr "Esborrar plantilla"
 
 #: src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
-msgstr "Voleu realment esborrar aquesta plantilla?"
+msgstr "Realment vols esborrar aquesta plantilla?"
 
 #: src/prefs_template.c:925
 msgid "Delete all templates"
@@ -18118,7 +18416,7 @@ msgstr "Esborrar totes les plantilles"
 
 #: src/prefs_template.c:926
 msgid "Do you really want to delete all the templates?"
-msgstr "Voleu realment esborrar totes les plantilles?"
+msgstr "Realment vols esborrar totes les plantilles?"
 
 #: src/prefs_template.c:1241
 msgid "Current templates"
@@ -18143,16 +18441,16 @@ msgstr "Nom?s l'usuari root pot eliminar temes globals"
 #: src/prefs_themes.c:439
 #, c-format
 msgid "Remove system theme '%s'"
-msgstr "Eliminar tema global '%s'"
+msgstr "Esborrar tema global '%s'"
 
 #: src/prefs_themes.c:442
 #, c-format
 msgid "Remove theme '%s'"
-msgstr "Eliminar tema '%s'"
+msgstr "Esborrar tema '%s'"
 
 #: src/prefs_themes.c:448
 msgid "Are you sure you want to remove this theme?"
-msgstr "Esteu segur de que voleu esborrar aquest tema?"
+msgstr "Est?s segur de que Vols esborrar aquest tema?"
 
 #: src/prefs_themes.c:458
 #, c-format
@@ -18161,11 +18459,11 @@ msgid ""
 "while removing theme."
 msgstr ""
 "Error en l'arxiu %s\n"
-"al eliminar el tema."
+"al esborrar el tema."
 
 #: src/prefs_themes.c:462
 msgid "Removing theme directory failed."
-msgstr "Ha fallat l'eliminaci? del directori del tema."
+msgstr "Ha fallat al esborrar el directori del tema."
 
 #: src/prefs_themes.c:465
 msgid "Theme removed successfully"
@@ -18190,7 +18488,7 @@ msgstr ""
 
 #: src/prefs_themes.c:510
 msgid "Do you want to install theme for all users?"
-msgstr "Voleu installar el tema per tots els usuaris?"
+msgstr "Vols installar el tema per tots els usuaris?"
 
 #: src/prefs_themes.c:530
 msgid "Theme exists"
@@ -18206,7 +18504,7 @@ msgstr ""
 "Ja hi ha un tema amb el mateix nom\n"
 "instal?lat en aquesta ubicaci?.\n"
 "\n"
-"Voleu sobreescriure'l?"
+"Vols sobreescriure'l?"
 
 #: src/prefs_themes.c:537
 #, c-format
@@ -18336,7 +18634,7 @@ msgstr "Icona"
 
 #: src/prefs_toolbar.c:1042
 msgid "A_dd"
-msgstr ""
+msgstr "A_fegir"
 
 #: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
 msgid "Toolbars"
@@ -18461,13 +18759,12 @@ msgstr ""
 "sessi? SMTP"
 
 #: src/procmsg.c:1661
-#, fuzzy
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
-"No s'ha pogut obtenir les condicions d'enviament. Potser el correu no ha "
-"estat generat per Claws Mail."
+"No s'ha pogut obtenir l'informaci? d'enviament. Potser el correu no ha estat "
+"generat per Claws Mail."
 
 #: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
@@ -18817,9 +19114,9 @@ msgid "POP before SMTP"
 msgstr "POP abans de SMTP"
 
 #: src/send_message.c:361
-#, fuzzy, c-format
+#, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Connectant al servidor SMTP: %s ..."
+msgstr "Compte '%s': Connectant al servidor SMTP: %s:%d..."
 
 #: src/send_message.c:418
 msgid "Mail sent successfully."
@@ -18890,10 +19187,10 @@ msgid ""
 "if you have the one.\n"
 "If you're not sure, just select OK."
 msgstr ""
-"Primer estableixi la localitzaci? de la seva b?stia.\n"
-"Podeu utilitzar una b?stia existent en format MH\n"
+"Primer estableixi la localitzaci? de la teva b?stia.\n"
+"Pots utilitzar una b?stia existent en format MH\n"
 "si ja el teniu.\n"
-"Si no esteu segur, seleccioneu Acceptar."
+"Si no est?s segur, selecciona Acceptar."
 
 #: src/sourcewindow.c:64
 msgid "Source of the message"
@@ -18905,17 +19202,16 @@ msgid "%s - Source"
 msgstr "%s - Font"
 
 #: src/ssl_manager.c:157
-#, fuzzy
 msgid "Saved SSL certificates"
-msgstr "Certificats SSL guardats"
+msgstr "Certificats SSL desats"
 
 #: src/ssl_manager.c:431
 msgid "Delete certificate"
-msgstr "Eliminar certificat"
+msgstr "Esborrar certificat"
 
 #: src/ssl_manager.c:432
 msgid "Do you really want to delete this certificate?"
-msgstr "Voleu eliminar realment aquest certificat?"
+msgstr "Vols esborrar realment aquest certificat?"
 
 #: src/summary_search.c:259
 msgid "Search messages"
@@ -19057,7 +19353,7 @@ msgstr "Agrupant missatges per l'assumpte..."
 #: src/summaryview.c:2634
 #, c-format
 msgid "%d deleted"
-msgstr "%d borrat(s)"
+msgstr "%d esborrat(s)"
 
 #: src/summaryview.c:2638
 #, c-format
@@ -19074,11 +19370,10 @@ msgid "%s%d copied"
 msgstr "%s%d copiat"
 
 #: src/summaryview.c:2658
-#, fuzzy
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " element seleccionat"
-msgstr[1] " element seleccionat"
+msgstr[1] " elements seleccionats"
 
 #: src/summaryview.c:2676 src/summaryview.c:2712
 #, c-format
@@ -19161,8 +19456,8 @@ msgstr "Vost? no es l'autor de l'article.\n"
 #, 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] "Voleu realment esborrar el missatge seleccionat?"
-msgstr[1] "Voleu realment esborrar els %d missatges seleccionats?"
+msgstr[0] "Realment vols esborrar el missatge seleccionat?"
+msgstr[1] "Realment vols esborrar els %d missatges seleccionats?"
 
 #: src/summaryview.c:4400
 msgid "Delete message(s)"
@@ -19196,7 +19491,7 @@ msgstr "_Sobreescriure"
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "Esteu a punt d'imprimir %d missatges, un a un. Voleu continuar?"
+msgstr "Est?s a punt d'imprimir %d missatges, un a un. Vols continuar?"
 
 #: src/summaryview.c:5345
 msgid "Building threads..."
@@ -19226,10 +19521,6 @@ msgstr ""
 "Hi ha algunes regles de filtrat que ?rtanyen a un compte.\n"
 "Si us plau, escolliu que s'ha de fer amb aquestes regles:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filtre"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrant..."
@@ -19247,9 +19538,8 @@ msgid "Watched thread"
 msgstr "Fil revisat"
 
 #: src/summaryview.c:6296
-#, fuzzy
 msgid "Replied but also forwarded - click to see reply"
-msgstr "Respost- polsar per veure la resposta"
+msgstr "Respost per? tambe reenviat - fes clic per veure la resposta"
 
 #: src/summaryview.c:6298
 msgid "Replied - click to see reply"
@@ -19322,7 +19612,7 @@ msgstr "_Obrir imatge"
 
 #: src/textview.c:249
 msgid "_Save image..."
-msgstr "_Guardar imatge..."
+msgstr "De_sar imatge..."
 
 #: src/textview.c:722
 #, c-format
@@ -19349,9 +19639,8 @@ msgstr ""
 "  Useu "
 
 #: src/textview.c:909
-#, fuzzy
 msgid "'Network Log'"
-msgstr "Tra?a de _xarxa"
+msgstr "'Tra?a de la Xarxa'"
 
 #: src/textview.c:910
 msgid " in the Tools menu for more information."
@@ -19367,17 +19656,16 @@ msgstr "  clica amb el bot? dret la icona o la llista d'elements:"
 
 #: src/textview.c:979
 msgid "     - To save, select "
-msgstr "     - Per guardar, seleccioneu "
+msgstr "     - Per desar, seleccioneu "
 
 #: src/textview.c:980
 msgid "'Save as...'"
-msgstr "'Guardar com...'"
+msgstr "'Desar com...'"
 
 #: src/textview.c:982 src/textview.c:994 src/textview.c:1006
 #: src/textview.c:1016
-#, fuzzy
 msgid " (Shortcut key: '"
-msgstr "(Drecera: 'y')"
+msgstr "(Drecera: '"
 
 #: src/textview.c:990
 msgid "     - To display as text, select "
@@ -19454,14 +19742,12 @@ msgid "_Open URL"
 msgstr "_Obrir URL"
 
 #: src/toolbar.c:192 src/toolbar.c:1930
-#, fuzzy
 msgid "Receive Mail from all Accounts"
-msgstr "Rebre correu de tots els comptes"
+msgstr "Rebre correu de tots els Comptes"
 
 #: src/toolbar.c:193 src/toolbar.c:1935
-#, fuzzy
 msgid "Receive Mail from current Account"
-msgstr "Rebre correu del compte actual"
+msgstr "Rebre correu del Compte actual"
 
 #: src/toolbar.c:194 src/toolbar.c:1939
 msgid "Send Queued Messages"
@@ -19501,7 +19787,7 @@ msgstr "Reenviar missatge"
 
 #: src/toolbar.c:203 src/toolbar.c:2080
 msgid "Trash Message"
-msgstr "Missatge de la paperera"
+msgstr "Missatge a la Paperera"
 
 #: src/toolbar.c:204 src/toolbar.c:2084
 msgid "Delete Message"
@@ -19537,7 +19823,7 @@ msgstr "Posar a la cua i enviar despr?s"
 
 #: src/toolbar.c:217 src/toolbar.c:2110
 msgid "Save to draft folder"
-msgstr "Guardar com a esborrany"
+msgstr "Desar a la carpeta d'esborranys"
 
 #: src/toolbar.c:218 src/toolbar.c:2114
 msgid "Insert file"
@@ -19552,9 +19838,8 @@ msgid "Insert signature"
 msgstr "Insertar signatura"
 
 #: src/toolbar.c:221 src/toolbar.c:2126
-#, fuzzy
 msgid "Replace signature"
-msgstr "Comprovar signatura"
+msgstr "Reempla?a la signatura"
 
 #: src/toolbar.c:222 src/toolbar.c:2130
 msgid "Edit with external editor"
@@ -19581,9 +19866,8 @@ msgid "Cancel receiving"
 msgstr "Cancel?lar la recepci?"
 
 #: src/toolbar.c:232 src/toolbar.c:2171
-#, fuzzy
 msgid "Cancel receiving/sending"
-msgstr "Cancel?lar la recepci?"
+msgstr "Cancel?lar l'enviament/recepci?"
 
 #: src/toolbar.c:233 src/toolbar.c:1943
 msgid "Close window"
@@ -19591,13 +19875,12 @@ msgstr "Tancar finestra"
 
 #: src/toolbar.c:235
 msgid "Claws Mail Plugins"
-msgstr "M?duls de Claws Mail"
+msgstr "Connectors de Claws Mail"
 
 #: src/toolbar.c:379 src/toolbar.c:414
-#, fuzzy
 msgctxt "Toolbar"
 msgid "Trash"
-msgstr "Barra d'eines"
+msgstr "Paperera [Barra d'eines]"
 
 #: src/toolbar.c:402
 msgid "Folders"
@@ -19605,7 +19888,7 @@ msgstr "Carpetes"
 
 #: src/toolbar.c:404
 msgid "Get Mail"
-msgstr "Rebre Mail"
+msgstr "Rebre"
 
 #: src/toolbar.c:405
 msgid "Get"
@@ -19618,13 +19901,12 @@ msgstr "Composar"
 
 #: src/toolbar.c:410
 msgid "All"
-msgstr "Tot"
+msgstr "Tothom"
 
 #: src/toolbar.c:411
-#, fuzzy
 msgctxt "Toolbar"
 msgid "Sender"
-msgstr "_Barra d'eines"
+msgstr "Remitent [Barra d'eines]"
 
 #: src/toolbar.c:412
 msgid "List"
@@ -19647,9 +19929,8 @@ msgid "Insert sig."
 msgstr "Insertar sig."
 
 #: src/toolbar.c:430
-#, fuzzy
 msgid "Replace sig."
-msgstr "Substituir per..."
+msgstr "Reempla?ar  sig."
 
 #: src/toolbar.c:431
 msgid "Edit"
@@ -19668,9 +19949,8 @@ msgid "Stop"
 msgstr "Parar"
 
 #: src/toolbar.c:437
-#, fuzzy
 msgid "Stop all"
-msgstr "Parar"
+msgstr "Aturar-ho tot"
 
 #: src/toolbar.c:897
 msgid "Compose News message"
@@ -19693,9 +19973,8 @@ msgid "Go to folder list"
 msgstr "Anar a la llista de carpetes"
 
 #: src/toolbar.c:1931
-#, fuzzy
 msgid "Receive Mail from selected Account"
-msgstr "Rebre Correu des Comptes seleccionats"
+msgstr "Rebre Correu de les Comptes seleccionades"
 
 #: src/toolbar.c:1947
 msgid "Open preferences"
@@ -19831,7 +20110,7 @@ msgstr ""
 "com filtres i sistemes d'aprenentatge ant-spam (m?duls Bogofilter o\n"
 "SpamAssassin), protecci? de privacitat (PGP/Mime), un agregador de\n"
 "RSS, una calendari i moltes coses m?s. Els podeu carregar mitjan?ant\n"
-"l'entrada de men? '/Configuraci?/M?duls.\n"
+"l'entrada de men? '/Configuraci?/Connectors.\n"
 "'\n"
 "Podeu canviar les Prefer?ncies del vostre compte usant l'entrada de men?\n"
 "'/Configuraci?/Prefer?ncies' dell compte actual i canviar les '\n"
@@ -19931,20 +20210,17 @@ msgid "Use authentication"
 msgstr "Useu autentificaci?"
 
 #: src/wizard.c:1118
-#, fuzzy
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
-"Nom d'usuari SMTP:\n"
 "<span size=\"small\">(buit per usar el mateix que a la recepci?)</span>"
 
 #: src/wizard.c:1132
 msgid "SMTP username:"
-msgstr ""
+msgstr "Usuari SMTP:"
 
 #: src/wizard.c:1143
-#, fuzzy
 msgid "SMTP password:"
-msgstr "Contrasenya:"
+msgstr "Contrasenya SMTP:"
 
 #: src/wizard.c:1156
 msgid "Use SSL to connect to SMTP server"
@@ -20057,15 +20333,85 @@ msgid ""
 "Click Save to start."
 msgstr ""
 "Claws Mail ja est? preparat.\n"
-"Cliqueu Gravar per comen?ar."
+"Fes clic en Desar per comen?ar."
+
+#~ 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"
 
-#, fuzzy
 #~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "Claws Mail ha estat registrat com a cliente per defecte."
+#~ 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'"
 
@@ -20075,21 +20421,80 @@ msgstr ""
 #~ 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"
 
@@ -20102,6 +20507,9 @@ msgstr ""
 #~ 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'"
@@ -20162,18 +20570,37 @@ msgstr ""
 #~ 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..."
 
@@ -20190,6 +20617,18 @@ 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 "If only its text has changed"
+#~ msgstr "Si nom?s el text canvia"
+
+#~ msgid "Never mark as unread"
+#~ msgstr "No marqueu mai com a no llegit"
+
 #~ msgid "Unsubscribe feed"
 #~ msgstr "Desubsciure's del feed"
 
@@ -20214,11 +20653,9 @@ msgstr ""
 #~ msgid "Set to -1 to keep expired items"
 #~ msgstr "Poseu a -1 per mantenir ocurr?ncies caducades"
 
-#~ msgid "Use this"
-#~ msgstr "Useu aquest"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "No s'ha pogut encriptar el correu: %s"
+#, 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"
@@ -20627,6 +21064,9 @@ msgstr ""
 #~ msgid "by _Mark"
 #~ msgstr " per _Marca"
 
+#~ msgid "headers line"
+#~ msgstr "L?nia de cap?aleres"
+
 #~ msgid "message line"
 #~ msgstr "L?nia de missatge"
 
@@ -20716,6 +21156,9 @@ msgstr ""
 #~ 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..."
 
diff --git a/po/cs.po b/po/cs.po
index 41b3191..3d60404 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,34 +2,30 @@
 # Copyright ? 2000-2014 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
-#
 # Jan Mura <jan_mura at altavista.com>, 2000.
-# David Vachulka <david at konstrukce-cad.com>, 2013.
-#
+# David Vachulka <david at konstrukce-cad.com>, 2013, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-05-19 19:43+0100\n"
+"POT-Creation-Date: 2015-07-12 07:58+0100\n"
+"PO-Revision-Date: 2015-07-12 17:32+0200\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"Plural-Forms: nplurals=3; plural=(((n%100>=10 && n%100<=14) || (n%10>5)) ? "
-"2 : (n%10>=2 && n%10<=4) ? 1 : 0);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 "Jsou st?le otev?ena n?jak? okna s rozepsanou zpr?vou.\n"
-"P?ed ?pravou tohoto ??tu zav?ete pros?m v?echna tato okna."
+"P?ed ?pravou ??t? zav?ete pros?m v?echna tato okna."
 
 #: src/account.c:437
 msgid "Can't create folder."
@@ -88,13 +84,14 @@ msgstr ""
 "za?krtnut?m"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -213,19 +210,16 @@ msgid "Action's user argument"
 msgstr "U?ivatelsk? parametr akce"
 
 #: src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Nelze kop?rovat slo?ku do sv? vlastn? podslo?ky."
+msgstr "Nelze kop?rovat slo?ku do sebe sama nebo do sv? vlastn? podslo?ky."
 
 #: src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Nelze vlo?it. C?lov? kniha adres je pouze pro ?ten?."
+msgstr "Nelze kop?rovat knihu adres do sebe sama."
 
 #: src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Nelze p?esunout slo?ku do sv? vlastn? podslo?ky."
+msgstr "Nelze p?esunout slo?ku do sebe sama nebo do sv? vlastn? podslo?ky."
 
 #: src/addr_compl.c:685 src/addressbook.c:4873
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
@@ -274,7 +268,7 @@ msgstr "N?zev atributu"
 
 #: src/addrcustomattr.c:156
 msgid "Delete all attribute names"
-msgstr "Odstranit v?echna jm?na atribut??"
+msgstr "Odstranit v?echna jm?na atribut?"
 
 #: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
@@ -434,7 +428,7 @@ msgstr "_Kniha"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "?_pravy"
 
@@ -477,10 +471,14 @@ msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Ulo?it"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Zav??t"
 
@@ -494,11 +492,12 @@ msgstr "_Vyjmout"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kop?rovat"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "V_lo?it"
 
@@ -536,7 +535,7 @@ msgstr "Exportovat LDI_F..."
 
 #: src/addressbook.c:451
 msgid "Find duplicates..."
-msgstr "Naj?t duplikovan?"
+msgstr "Naj?t duplikovan?..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
@@ -691,7 +690,7 @@ msgstr "Nelze prov?st vlo?en? do skupiny adres."
 #: src/addressbook.c:2906
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
-msgstr "Opravdu chcete odstranit v?sledky vyhled?v?n? a adresy v '%s' ?"
+msgstr "Opravdu chcete odstranit v?sledky vyhled?v?n? a adresy v '%s'?"
 
 #: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
@@ -858,7 +857,7 @@ msgstr "LDAP dotaz"
 #: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2524
 #: src/prefs_matcher.c:2528
 msgid "Any"
-msgstr "kter?koliv"
+msgstr "Kter?koliv"
 
 #: src/addrgather.c:172
 msgid "Please specify name for address book."
@@ -866,7 +865,7 @@ msgstr "Zadejte pros?m n?zev pro knihu adres."
 
 #: src/addrgather.c:179
 msgid "No available address book."
-msgstr "Kniha adres nen? dostupn?"
+msgstr "Kniha adres nen? dostupn?."
 
 #: src/addrgather.c:200
 msgid "Please select the mail headers to search."
@@ -959,12 +958,12 @@ msgstr "Aktualizace adres"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizace selhala. Zm?ny do slovn?ku nebyly zaps?ny. "
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Pozn?mka"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -985,7 +984,6 @@ msgid "Show this message next time"
 msgstr "Zobrazovat p???t? tuto zpr?vu"
 
 #: src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
 msgstr "Selhala registrace renderov?n? avatar?"
 
@@ -999,7 +997,7 @@ msgstr "N?zev serveru :"
 
 #: src/browseldap.c:247
 msgid "Distinguished Name (dn) :"
-msgstr "Rozli?ovac? jm?no (dn):"
+msgstr "Rozli?ovac? jm?no (dn) :"
 
 #: src/browseldap.c:270
 msgid "LDAP Name"
@@ -1075,7 +1073,8 @@ msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
-"Va?e verze Claws Mail je nov?j?? ne? ta, se kterou byl zkompilov?n modul %s."
+"Va?e verze Claws Mail je nov?j?? ne? ta, se kterou byl zkompilov?n modul "
+"'%s'."
 
 #: src/common/plugin.c:775
 msgid ""
@@ -1088,7 +1087,7 @@ msgstr ""
 #: src/common/plugin.c:784
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
-msgstr "Va?e verze Claws Mail je p??li? star? na pou?it? s modulem %s."
+msgstr "Va?e verze Claws Mail je p??li? star? na pou?it? s modulem '%s'."
 
 #: src/common/plugin.c:786
 msgid "Your version of Claws Mail is too old for the plugin."
@@ -1202,7 +1201,7 @@ msgstr "Nenalezen vydavatel certifik?tu"
 
 #: src/common/ssl_certificate.c:646
 msgid "Certificate issuer is not a CA"
-msgstr "Vydavatel certifik?tu nen? Certifika?n? Autoritou."
+msgstr "Vydavatel certifik?tu nen? Certifika?n? Autoritou"
 
 #: src/common/ssl_certificate.c:871
 #, c-format
@@ -1533,15 +1532,15 @@ msgstr "Na_hradit podpis"
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Zp?t"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
@@ -1562,6 +1561,7 @@ msgid "_Unwrapped"
 msgstr "_Nezalomen?"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Vybrat v?_e"
 
@@ -1626,6 +1626,7 @@ msgid "Delete to end of line"
 msgstr "Smazat do konce ??dku"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Naj?t"
 
@@ -1926,7 +1927,7 @@ msgstr "Chyst?te se vlo?it soubor %s do t?la zpr?vy. Jste si t?m jist??"
 msgid "Are you sure?"
 msgstr "Jste si jist??"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Vlo?it"
 
@@ -2027,7 +2028,7 @@ msgstr "Opravdu za?adit do fronty?"
 msgid "Send later"
 msgstr "Poslat pozd?ji"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2037,7 +2038,7 @@ msgstr ""
 "\n"
 "Konverze znakov? sady se nezda?ila."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2047,7 +2048,7 @@ msgstr ""
 "\n"
 "Nepoda?ilo se z?skat ?ifrovac? kl?? p??jemce."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2109,73 +2110,77 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
-"??dek %d p?ekra?uje limit d?lky ??dku (998 bajt?). \n"
+"??dek %d p?ekra?uje limit d?lky ??dku (998 bajt?).\n"
 "Obsah zpr?vy m??e b?t po?kozen po cest? k adres?tovi.\n"
 "\n"
-"\n"
 "P?esto odeslat?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Nepoda?ilo se za?ifrovat zpr?vu: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Varov?n? ?ifrov?n?"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+_Pokra?ovat"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Nen? dostupn? ??dn? ??et pro odesl?n? po?ty!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybran? ??et nen? NNTP: Odesl?n? nen? mo?n?. "
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "P??loha %s u? neexistuje. Ignorovat?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zru?it pos?l?n?"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorovat p??lohu"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "??st origin?lu %s"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "P?idat do knihy adres"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Pou?ijte <tab> pro automatick? dokon?en? podle knihy adres"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "D?lka"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Ulo?it zpr?vu do "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2186,24 +2191,23 @@ msgstr "Ulo?it zpr?vu do "
 msgid "_Browse"
 msgstr "P_roch?zet"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "_Z?hlav?"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_P??lohy"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "_Ostatn?"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "P?edm?t:"
+msgstr "P?e_dm?t:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2212,25 +2216,24 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Od: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Od:"
+msgstr "_Od:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "??et pou?it? pro tuto zpr?vu"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Adresa odes?latele mus? b?t uvedena"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2239,69 +2242,68 @@ msgstr ""
 "Syst?m zabezpe?en? '%s' se nepoda?ilo na??st. Nebudete moci digit?ln? "
 "podepsat nebo ?ifrovat zpr?vu."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "??_dn?"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v t?le ?ablony na ??dku %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Chyba v poli 'Od' ?ablony."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Chyba v poli 'Komu' ?ablony."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Chyba v poli 'Kopie' ?ablony."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Chyba v poli 'Skryt? kopie' ?ablony."
 
-#: src/compose.c:8753
-#, fuzzy
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Chyba v poli 'Komu' ?ablony."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Chyba v poli 'P?edm?t' ?ablony."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Neplatn? MIME typ."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je pr?zdn?."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "K?dov?n?"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "N?zev souboru"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2312,15 +2314,15 @@ msgstr ""
 "M?m p?eru?it proces?\n"
 "??slo procesu: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail pot?ebuje p??stup k s?ti, aby mohl odeslat tuto zpr?vu."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Zpr?vu nelze ulo?it do fronty pro odesl?n?."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2331,15 +2333,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Nelze ulo?it koncept."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Nelze ulo?it koncept"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2347,24 +2349,24 @@ msgstr ""
 "Nemohu ulo?it koncept.\n"
 "Chcete zru?it ukon?en? nebo zahodit tuto zpr?vu?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Zru?it ukon?en?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Zahodit zpr?vu"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "V?b?r souboru"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze ??st."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2373,62 +2375,62 @@ msgstr ""
 "Soubor '%s' obsahuje neplatn? znaky\n"
 "pro nastaven? k?dov?n?, vlo?en? m??e obsahovat chyby."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Zru?it zpr?vu"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Zpr?va byla modifikov?na. Chcete ji zahodit?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Ulo?it jako _koncept"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Ulo?it zm?ny"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpr?va byla modifikov?na. Chcete ulo?it posledn? zm?ny?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Neukl?dat"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Ulo?it jako _koncept"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
-msgstr "Chcete pou??t ?ablonu '%s' ?"
+msgstr "Chcete pou??t ?ablonu '%s'?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Pou??t ?ablonu"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Vlo?it"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Vlo?it nebo p?ipojit?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2436,16 +2438,16 @@ msgstr ""
 "Chcete obsah souboru(?) vlo?it do textu zpr?vy nebo soubor(y) p?ipojit ke "
 "zpr?v? jako p??lohu?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_P?ilo?it"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba form?tu citace na ??dku %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3057,7 +3059,7 @@ msgstr "P?idat nov? vCard z?znam"
 
 #: src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Nen? mo?n? nastavit klientsk? certifik?t.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3442,7 +3444,7 @@ msgstr ""
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "pravidlo nen? zalo?eno na ??tu\n"
 
 #: src/filtering.c:607
 #, c-format
@@ -3450,18 +3452,22 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], odpov?daj?c? ??et pou??van? "
+"pro z?sk?n? zpr?v\n"
 
 #: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
 #: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
 #: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NON_EXISTENT"
 
 #: src/filtering.c:617
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu, ??dn? odpov?daj?c? ??et nen? pou??van? pro "
+"z?sk?n? zpr?v\n"
 
 #: src/filtering.c:624
 #, c-format
@@ -3469,11 +3475,15 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], ??dn? odpov?daj?c? ??et nen? "
+"pou??van? pro z?sk?n? zpr?v [id=%d, name='%s']\n"
 
 #: src/filtering.c:643
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
+"pravidlo nen? zalo?eno na ??tu, v?echna pravidla p?esto aplikov?na na "
+"u?ivatel?v po?adavek\n"
 
 #: src/filtering.c:649
 #, c-format
@@ -3481,15 +3491,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], ale v?echna pravidla "
+"aplikov?na na u?ivatel?v po?adavek\n"
 
 #: src/filtering.c:667
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], p?esko?ena na u?ivatel?v "
+"po?adavek\n"
 
 #: src/filtering.c:672
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "pravidlo zalo?eno na ??tu, p?esko?ena na u?ivatel?v po?adavek\n"
 
 #: src/filtering.c:694
 #, c-format
@@ -3497,10 +3511,12 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching current account [id="
 "%d, name='%s']\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], neodpov?daj?c? aktu?ln? ??et "
+"[id=%d, name='%s']\n"
 
 #: src/filtering.c:700
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "pravidlo zalo?eno na ??tu, neodpov?daj?c? aktu?ln? ??et\n"
 
 #: src/filtering.c:712
 #, c-format
@@ -3508,70 +3524,66 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"pravidlo zalo?eno na ??tu [id=%d, name='%s'], aktu?ln? ??et [id=%d, "
+"name='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "aplikace akce [ %s ]\n"
 
 #: src/filtering.c:757
 msgid "action could not apply\n"
-msgstr ""
+msgstr "akce nem??e b?t aplikov?na\n"
 
 #: src/filtering.c:759
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "??dn? dal?? zpracov?n? po akci [ %s ]\n"
 
 #: src/filtering.c:810
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "S_pustit pravidla zpracov?n?"
+msgstr "zpracov?v?n? pravidla '%s' [ %s ]\n"
 
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "zpracov?v?n? pravidla <unnamed> [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "zak?zan? pravidlo '%s' [ %s ]\n"
 
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "zak?zan? pravidlo <unnamed> [ %s ]\n"
 
 #: src/filtering.c:874
-#, fuzzy
 msgid "undetermined"
-msgstr "Nedefinovan?"
+msgstr "nedefinovan?"
 
 #: src/filtering.c:878
-#, fuzzy
 msgid "incorporation"
-msgstr "filtrov?n? p?i za?len?n? zpr?v"
+msgstr "za?len?n?"
 
 #: src/filtering.c:882
-#, fuzzy
 msgid "manually"
-msgstr "_Manu?l"
+msgstr "manu?ln?"
 
 #: src/filtering.c:886
-#, fuzzy
 msgid "folder processing"
-msgstr "Spustit pravidl_o zpracov?n? slo?ky"
+msgstr "zpracov?n? slo?ky"
 
 #: src/filtering.c:890
-#, fuzzy
 msgid "pre-processing"
-msgstr "P?ed zpracov?n?..."
+msgstr "p?ed zpracov?n?"
 
 #: src/filtering.c:894
-#, fuzzy
 msgid "post-processing"
-msgstr "N?sledn? zpracov?n?..."
+msgstr "n?sledn? zpracov?n?"
 
 #: src/filtering.c:911
 #, c-format
@@ -3583,10 +3595,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrovan? zpr?vy (%s%s%s)\n"
+"%ssoubor zpr?vy: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: src/filtering.c:913 src/filtering.c:922
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: src/filtering.c:920
 #, c-format
@@ -3594,6 +3612,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrov?n? zpr?vy (%s%s%s)\n"
+"%ssoubor zpr?vy: %s\n"
 
 #: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -3646,9 +3666,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizuji %s pro pou?it? offline...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Slo?ka nem??e b?t p?esouv?na mezi r?zn?mi po?tovn?mi schr?nkami."
+msgstr "Jm?no slo?ky nem??e za??nat nebo kon?it te?kou."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3688,9 +3707,8 @@ msgid "Mark all re_ad"
 msgstr "Ozna?it v?echny jako _p?e?ten?"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Ozna?it v?echny jako p?e?ten?"
+msgstr "Ozna?it v?echny jako p?e?ten? rekurzi_vn?"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3738,104 +3756,112 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o slo?ce..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Ozna?it v?echny jako p?e?ten?"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Opravdu chcete ozna?it v?echny zpr?vy v t?to slo?ce a jej?ch podslo?k?ch "
+"jako p?e?ten??"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete ozna?it v?echny zpr?vy v t?to slo?ce jako p?e?ten??"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Ozna?it v?echny jako p?e?ten?"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "Prohled?v?m slo?ku %s%c%s ..."
+msgstr "Prohled?v?m slo?ku %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
-msgstr "Prohled?v?m slo?ku %s ..."
+msgstr "Prohled?v?m slo?ku %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom slo?ek"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnoven? stromu slo?ek vy?ist? v?echny lok?ln? vyrovn?vac? pam?ti. Chcete "
 "pokra?ovat?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Prov?d?m obnovu stromu slo?ek..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Prohled?v?m strom slo?ek..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepoda?ilo se na??st obsah adres??e %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Zji??uji nov? zpr?vy ve v?ech slo?k?ch..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zav?r?m slo?ku %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otev?r?m slo?ku %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Slo?ku nelze otev??t."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Vypr?zdnit ko?"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Odstranit v?echny zpr?vy v ko?i?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Vypr?zdnit ko?"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varov?n? offline re?imu"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Pracujete v re?imu offline. P?epnout?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Odeslat pozdr?en? zpr?vy"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Odeslat v?echny zpr?vy ve front? pozdr?en?ch zpr?v?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "P?i pos?l?n? pozdr?en?ch zpr?v nastala stejn? chyba."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3844,64 +3870,64 @@ msgstr ""
 "P?i odes?l?n? pozdr?en?ch zpr?v nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
-msgstr "Opravdu chcete slo?ku '%s' zkop?rovat do '%s' ?"
+msgstr "Opravdu chcete slo?ku '%s' zkop?rovat do '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
-msgstr "Opravdu chcete slo?ku '%s' u?init podslo?kou slo?ky '%s' ?"
+msgstr "Opravdu chcete slo?ku '%s' u?init podslo?kou slo?ky '%s'?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kop?rovat slo?ku"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "P?esunout slo?ku"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kop?ruji %s do %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "P?esouv?m %s do %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Zdroj i c?l jsou toto?n?."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Nelze kop?rovat slo?ku do sv? vlastn? podslo?ky."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "Nelze p?esunout slo?ku do sv? vlastn? podslo?ky."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Slo?ka nem??e b?t p?esouv?na mezi r?zn?mi po?tovn?mi schr?nkami."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kop?rov?n? se nezda?ilo!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "P?esun se nezda?il!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracov?n? slo?ky - pravidla pro slo?ku %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "C?lov? slo?ka m??e b?t pou?ita pouze k ulo?en? podslo?ek."
 
@@ -3993,7 +4019,6 @@ msgstr ""
 "chcete p?isp?t na projekt Claws Mail, m??ete tak u?init na:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4003,7 +4028,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 " a Hiroyuki Yamamoto"
 
@@ -4025,7 +4050,7 @@ msgid ""
 "Operating System: %s %s (%s)"
 msgstr ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"Lokalita: %s (znakov? sada: %s)\n"
+"Lokalizace: %s (znakov? sada: %s)\n"
 "Opera?n? syst?m: %s %s (%s)"
 
 #: src/gtk/about.c:176
@@ -4221,13 +4246,12 @@ msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "a Hiroyuki Yamamoto"
 
@@ -4438,12 +4462,11 @@ msgstr ""
 
 #: src/gtk/gtkutils.c:1909
 msgid "Failed."
-msgstr ""
+msgstr "Selhalo."
 
 #: src/gtk/gtkutils.c:1972
-#, fuzzy
 msgid "Configuring..."
-msgstr "Nastav_en?"
+msgstr "Nastavov?n?..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
 #: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
@@ -4839,7 +4862,7 @@ msgstr "Od, Komu nebo P?edm?t"
 
 #: src/gtk/headers.h:65
 msgid "From, To or Subject:"
-msgstr "Od, Komu nebo P?edm?t"
+msgstr "Od, Komu nebo P?edm?t:"
 
 #: src/gtk/icon_legend.c:64
 msgid "New message"
@@ -5023,6 +5046,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5079,11 +5103,12 @@ msgstr "Index str?nky"
 msgid "_Hide"
 msgstr "_Skr?t"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "??et"
 
@@ -5148,14 +5173,12 @@ msgid "messages which have attachments"
 msgstr "zpr?vy, kter? maj? p??lohy"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "zpr?vy obsahuj?c? S v z?hlav? \"X-Label\""
+msgstr "zpr?vy obsahuj?c? S ve jm?n? nebo hodnot? z?hlav?"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "zpr?vy obsahuj?c? S v z?hlav? \"X-Label\""
+msgstr "zpr?vy obsahuj?c? S v hodnot? z?hlav?"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5301,9 +5324,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "N?co selhalo b?hem hled?n?. Pros?m zkontrolujte z?znamy."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Od/Komu/P?edm?t/Zna?ka"
+msgstr "Od/Komu/Kopie/P?edm?t/Zna?ka"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5768,7 +5790,6 @@ msgstr ""
 "podporou SASL a je nainstalov?n z?suvn? modul DIGEST-MD5 SASL."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5777,8 +5798,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"P?ihl??en? pomoc? CRAM-MD5 pracuje pouze pokud byl libetpan zkompilov?n s "
-"podporou SASL a je nainstalov?n z?suvn? modul CRAM-MD5 SASL."
+"P?ihl??en? pomoc? SCRAM-SHA-1 pracuje pouze pokud byl libetpan zkompilov?n s "
+"podporou SASL a je nainstalov?n z?suvn? modul SCRAM SASL."
 
 #: src/imap.c:959
 #, c-format
@@ -5910,7 +5931,7 @@ msgstr "LIST selhal\n"
 
 #: src/imap.c:3794
 msgid "Flagging messages..."
-msgstr "Ozna?uji zpr?vy"
+msgstr "Ozna?uji zpr?vy..."
 
 #: src/imap.c:3897
 #, c-format
@@ -5926,13 +5947,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Nepoda?ilo se na??st ?daje o schopnostech serveru IMAP.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "P?ipojen? k %s selhalo: server po?aduje TLS, ale Claws Mail je zkompilov?n "
-"bez podpory OpenSSL.\n"
+"bez podpory TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6121,7 +6142,7 @@ msgstr ""
 #: src/imap_gtk.c:566
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
-msgstr "Chcete %s slo?ku '%s' ?"
+msgstr "Chcete %s slo?ku '%s'?"
 
 #: src/imap_gtk.c:567
 msgid "subscribe"
@@ -6366,7 +6387,7 @@ msgstr "Hotovo (Nejsou ??dn? nov? zpr?vy)"
 msgid "Connection failed"
 msgstr "Spojen? selhalo"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
@@ -6411,14 +6432,15 @@ msgstr "Nemohu se spojit s POP3 serverem: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
 #: src/inc.c:936
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "Z?sk?v?m zpr?vy z %s (%s) ..."
+msgstr "Z?sk?v?m zpr?vy z %s (%s)..."
 
 #: src/inc.c:942
 msgid "Getting the number of new messages (STAT)..."
@@ -6556,7 +6578,7 @@ msgstr "Pouze _jednou"
 
 #: src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
+msgstr "SN"
 
 #: src/ldif.c:759
 msgid "Nick Name"
@@ -6751,8 +6773,9 @@ msgid ""
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
-"  --attach soubor1 [soubor2]...  otev?e okno pro psan? zpr?vy s p?ipojen?m\n"
-"                                 souborem(y)"
+"  --attach soubor1 [soubor2]...\n"
+"                         otev?e okno pro psan? zpr?vy s p?ipojen?m\n"
+"                         souborem(y)"
 
 #: src/main.c:1917
 msgid "  --receive              receive new messages"
@@ -6801,7 +6824,9 @@ msgstr "  --status [slo?ka]...           zobrazit celkov? po?et zpr?v"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
-msgstr "  --status-full [slo?ka]...      zobraz? status ka?d? slo?ky"
+msgstr ""
+"  --status-full [slo?ka]...\n"
+"                         zobraz? status ka?d? slo?ky"
 
 #: src/main.c:1932
 msgid "  --statistics           show session statistics"
@@ -6816,9 +6841,8 @@ msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
-"  --select <slo?ka>[/<zpr?va>]   p?ejde na uvedenou slo?ku/zpr?vu\n"
-"                                 <slo?ka> je id slo?ky, nap?. 'slo?ka/"
-"podslo?ka'"
+"  --select slo?ka[/msg]  p?ejde na uvedenou slo?ku/zpr?vu\n"
+"                         slo?ka je id slo?ky, nap?. 'slo?ka/podslo?ka'"
 
 #: src/main.c:1936
 msgid "  --online               switch to online mode"
@@ -6991,7 +7015,7 @@ msgstr "Zobrazovan? _sloupce"
 
 #: src/mainwindow.c:554
 msgid "In _folder list..."
-msgstr "V seznamu _slo?ek.."
+msgstr "V seznamu _slo?ek..."
 
 #: src/mainwindow.c:555
 msgid "In _message list..."
@@ -7051,7 +7075,7 @@ msgstr "P?edchoz? _ozna?en? zpr?va"
 
 #: src/mainwindow.c:581 src/messageview.c:243
 msgid "Next m_arked message"
-msgstr "Dal?? o_zna?en? zpr?vy."
+msgstr "Dal?? o_zna?en? zpr?va"
 
 #: src/mainwindow.c:583 src/messageview.c:245
 msgid "Previous _labeled message"
@@ -7430,11 +7454,11 @@ msgstr "Vytvo?it _nov? ??et..."
 
 #: src/mainwindow.c:782
 msgid "_Edit accounts..."
-msgstr "U_pravit ??ty"
+msgstr "U_pravit ??ty..."
 
 #: src/mainwindow.c:785
 msgid "P_references..."
-msgstr "_Volby"
+msgstr "_Volby..."
 
 #: src/mainwindow.c:786
 msgid "Pre-pr_ocessing..."
@@ -7450,7 +7474,7 @@ msgstr "_Filtrov?n?..."
 
 #: src/mainwindow.c:789
 msgid "_Templates..."
-msgstr "?a_blony"
+msgstr "?a_blony..."
 
 #: src/mainwindow.c:790
 msgid "_Actions..."
@@ -7486,7 +7510,7 @@ msgstr "Offline _m?d"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "??dek men_u"
 
 #: src/mainwindow.c:809
 msgid "_Message view"
@@ -7638,7 +7662,7 @@ msgstr "_Autodetekce"
 
 #: src/mainwindow.c:1302 src/summaryview.c:6244
 msgid "Apply tags..."
-msgstr "Pou??t zna?ky"
+msgstr "Pou??t zna?ky..."
 
 #: src/mainwindow.c:1945
 msgid "Some error(s) happened. Click here to view log."
@@ -7647,12 +7671,12 @@ msgstr "Do?lo k chyb? (chyb?m). Klikn?te zde pro zobrazen? protokolu."
 #: src/mainwindow.c:1960
 msgid "You are online. Click the icon to go offline"
 msgstr ""
-"Pracujete v re?imu online. Klikn?te na ikonu pro p?echod do re?imu offline."
+"Pracujete v re?imu online. Klikn?te na ikonu pro p?echod do re?imu offline"
 
 #: src/mainwindow.c:1963
 msgid "You are offline. Click the icon to go online"
 msgstr ""
-"Pracujete v re?imu offline. Klikn?te na ikonu pro p?echod do re?imu online."
+"Pracujete v re?imu offline. Klikn?te na ikonu pro p?echod do re?imu online"
 
 #: src/mainwindow.c:1977
 msgid "Select account"
@@ -7725,8 +7749,8 @@ msgid ""
 "there."
 msgstr ""
 "Vytv??en? mailboxu se nezda?ilo.\n"
-"M??e to b?t t?m, ?e mailbox ji? existuje, nebo nem?te dostate?n? pr?va\n"
-"pro z?pis."
+"M??e to b?t t?m, ?e mailbox ji? existuje, nebo nem?te dostate?n? pr?va pro "
+"z?pis."
 
 #: src/mainwindow.c:3389
 msgid "No posting allowed"
@@ -7965,7 +7989,7 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 "Tato zpr?va vy?aduje potvrzen? o doru?en?, ale podle z?hlav?\n"
-"'Komu:' a 'Kopie: nejste ofici?ln?m adres?tem.\n"
+"'Komu:' a 'Kopie:' nejste ofici?ln?m adres?tem.\n"
 "Doporu?uje se neodes?lat potvrzen? o doru?en?."
 
 #: src/messageview.c:1323
@@ -8011,7 +8035,7 @@ msgstr "Je zobrazen jen prvn? megabyte textu."
 msgid ""
 "You got a return receipt for this message : it has been displayed by the "
 "recipient."
-msgstr "Obdr?el potvrzen? pro tuto zpr?vu : Byla zobrazena p??jemcem"
+msgstr "Obdr?el potvrzen? pro tuto zpr?vu : byla zobrazena p??jemcem."
 
 #: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
@@ -8146,12 +8170,15 @@ msgid "Remove _mailbox..."
 msgstr "Odstranit _mailbox..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Nemohu odstranit slo?ku '%s'."
+msgstr ""
+"Nemohu odstranit slo?ku '%s'\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8176,7 +8203,7 @@ msgstr "Otev??t ??m..."
 
 #: src/mimeview.c:197
 msgid "Send to..."
-msgstr "Odeslat ..."
+msgstr "Odeslat..."
 
 #: src/mimeview.c:198
 msgid "_Display as text"
@@ -8335,7 +8362,7 @@ msgstr "Chyba p?i vytvo?en? sezen? s %s:%d\n"
 #: src/news.c:465
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "Chyba autentizace pro %s:%d ...\n"
+msgstr "Chyba autentizace pro %s:%d...\n"
 
 #: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
@@ -8450,8 +8477,8 @@ msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
-"UIjist?te se, ?e m?te nainstalov?n apanelc.\n"
-"M??ete ho z?skat na adrese http://apanel.sourceforge.net/."
+"Ujist?te se, ?e m?te nainstalov?n apanelc.\n"
+"M??ete ho z?skat na adrese http://apanel.sourceforge.net/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:207
 #: src/plugins/acpi_notifier/acpi_notifier.c:213
@@ -8526,7 +8553,7 @@ msgstr "LED dioda laptopu"
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:250
 msgid "Failed to register check before send hook"
-msgstr "Nepoda?ilo se zaregistrovat kontrolu do operace odes?l?n? zpr?vy."
+msgstr "Nepoda?ilo se zaregistrovat kontrolu do operace odes?l?n? zpr?vy"
 
 #: src/plugins/address_keeper/address_keeper.c:292
 msgid "Keeps all recipient addresses in an addressbook folder."
@@ -8539,7 +8566,6 @@ msgid "Address Keeper"
 msgstr "?dr?b?? adres??"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
 msgstr "Cesta ke knize adres"
 
@@ -8562,7 +8588,7 @@ msgstr "Vyb?r?m..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Pole z kter?ch uchov?vat adresy"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8577,12 +8603,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Uchov? adresy, kter? jsou v 'Bcc' hlavi?ce"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
-"Vylou?it adresy odpov?daj?c? jednomu z t?chto regul?rn?ch v?raz?:\n"
-"(ka?d? v?raz na samostatn? ??dek)"
+"Vylou?it adresy odpov?daj?c? jednomu z t?chto regul?rn?ch v?raz? (ka?d? "
+"v?raz na samostatn? ??dek)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9124,9 +9149,8 @@ msgid "attach"
 msgstr "p?ilo?it"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Jeden z regul?rn?ch v?raz? spln?n (ka?d? na samostatn?m ??dku):"
+msgstr "Jeden z regul?rn?ch v?raz? spln?n (ka?d? na samostatn?m ??dku)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9158,7 +9182,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Text zpr?v, kter? p?ed?v?te (forward) nebo p?esm?rov?v?te (redirect) nebude "
-"kontrolov?n."
+"kontrolov?n"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:135
 #: src/prefs_msg_colors.c:362
@@ -9306,19 +9330,16 @@ msgid "KB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Odstranit zna?ku"
+msgstr "Odstranit spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Ulo?it spam do"
+msgstr "Ulo?it spam do..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Ozna?it jako spam"
+msgstr "Jenom ozna?it jako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9773,7 +9794,7 @@ msgstr ""
 "Tento z?suvn? modul je pouze uk?zka jak ps?t z?suvn? moduly pro Claws Mail. "
 "Tento modul opisuje hl??en? z protokolu na standardn? v?stup.\n"
 "\n"
-"Modul je zcela neu?ite?n?"
+"Modul je zcela neu?ite?n?."
 
 #: src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
@@ -9824,9 +9845,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Pou??t nastaven? GNOME proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Pou??t proxy:"
+msgstr "Pou??t proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9851,9 +9871,8 @@ msgid "Enable loading of remote content"
 msgstr "Povolit na?ten? vzd?len?ho obsahu"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "P?i kliknut? na odkaz:"
+msgstr "P?i kliknut? na odkaz"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -9861,7 +9880,7 @@ msgstr "Otev??t v extern?m prohl??e?i"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "CSS z tohoto souboru bude aplikov?no na v?echny HTML ??sti"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -9872,9 +9891,8 @@ msgid "Bro_wse"
 msgstr "_Proch?zet"
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "?ablona stylu"
+msgstr "Vyberte ?ablona stylu"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -10011,9 +10029,8 @@ msgid "Add fetchinfo headers"
 msgstr "P?id?n? fetchinfo hlavi?ek"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Adresa odes?latele mus? b?t uvedena"
+msgstr "Hlavi?ky budou p??d?ny"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10022,7 +10039,7 @@ msgstr "UIDL"
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
-msgstr ""
+msgstr "P?id? X-FETCH-UIDL hlavi?ku s unik?tn?m ID pro v?pis zpr?v (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10030,7 +10047,7 @@ msgstr "Jm?no ??tu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "P?id? X-FETCH-ACCOUNT hlavi?ku se jm?nem ??tu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10038,7 +10055,7 @@ msgstr "Server p??jmu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "P?id? X-FETCH-SERVER hlavi?ku se serverem p??jmu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10046,7 +10063,7 @@ msgstr "UserID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "P?id? X-FETCH-USERID hlavi?ku s ID u?ivatele"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10057,11 +10074,11 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"P?id? X-FETCH-TIME hlavi?ku s datem a ?asem doru?en? zpr?vy ve form?tu RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "Z?suvn? modul GData: Chyba autentizace: %s\n"
+msgstr "Z?suvn? modul GData: Autentizace vy?adov?na"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10073,25 +10090,28 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Je t?eba autorizovat Claws Mail pro p??stup k seznamu kontakt? Google pomoc? "
+"z?suvn?ho modulu GData.\n"
+"\n"
+"Nav?tivte autoriza?n? str?nku Google stisknut?m tla??tka dole. Po potvrzen? "
+"autorizace dostanete autoriza?n? k?d. Vlo?te k?d do pol??ka dole pro ud?len? "
+"p??stupu Claws Mail k seznamu kontakt? Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Krok"
+msgstr "Krok 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Klikn?te pro otev?en? autoriza?n? str?nky Google v prohl??e?i"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Krok"
+msgstr "Krok 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Rozhran?"
+msgstr "Vlo?te k?d:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10110,7 +10130,7 @@ msgstr[2] "P?id?no %d z"
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
-msgstr[0] "%d kontakt pro ulo?en?"
+msgstr[0] "1 kontakt pro ulo?en?"
 msgstr[1] "%d kontakty pro ulo?en?"
 msgstr[2] "%d kontakt? pro ulo?en?"
 
@@ -10132,47 +10152,45 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "Z?suvn? modul GData: Spu?t?n asynchronn? dotaz na skupiny\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr "Z?suvn? modul GData: Chyba autentizace: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "Z?suvn? modul GData: Chyba autentizace: %s\n"
+msgstr "Z?suvn? modul GData: Autentizace ?sp??n?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Z?suvn? modul GData: Spu?t?na asynchronn? autentizace\n"
+msgstr "Z?suvn? modul GData: Spu?t?na interaktivn? autentizace\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "Z?suvn? modul GData: Spu?t?na asynchronn? autentizace\n"
+msgstr "Z?suvn? modul GData: Obdr?en autoriza?n? k?d, vy?aduj?c? autorizaci\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"Z?suvn? modul GData: Nez?sk?n autoriza?n? k?d, po?adavek na autorizaci "
+"zru?en\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Z?suvn? modul GData: Chyba autentizace: %s\n"
+msgstr "Z?suvn? modul GData: Chyba obnoven? autentizace: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Z?suvn? modul GData: Chyba autentizace: %s\n"
+msgstr "Z?suvn? modul GData: Obnoven? autentizace ?sp??n?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Z?suvn? modul GData: Spu?t?na asynchronn? autentizace\n"
+msgstr "Z?suvn? modul GData: Pokus o obnoven? autentizace\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -10236,1024 +10254,999 @@ msgstr "GData integrace"
 #: src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Nalezeno m?sto: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "?dajn? zem? p?vodu: "
 
 #. TRANSLATORS: The IP address is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "Nelze na??st index adres"
+msgstr "Nelze z?skat um?st?n? IP adresy "
 
 #: src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "Jm?no odes?latele"
+msgstr "Pokusit se ur?it m?sto odes?latele"
 
 #: src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra "
 
 #: src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Spojen? Arabsk? Emir?ty"
 
 #: src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afgh?nist?n "
 
 #: src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua a Barbuda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Alb?nie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "Arm?nie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Nizozemsk? Antily"
 
 #: src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktida"
 
 #: src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Fialov?"
+msgstr "Argentina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Americk? Samoa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Rakousko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Austr?lie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajd??n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosna a Hercegovina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Banglad??"
 
 #: src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulharsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrajn"
 
 #: src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Sultan?t Brunei"
 
 #: src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bol?vie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Braz?lie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bh?t?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet?v ostrov"
 
 #: src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "B?lorusko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokosov? ostrovy (Keeling)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "St?edoafrick? republika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kongo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "?v?carsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Pob?e?? slonoviny"
 
 #: src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cookovy ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #: src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "??n?tina"
+msgstr "??na"
 
 #: src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Barva"
+msgstr "Kolumbie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Kostarika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
 
 #: src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "V?no?n? ostrov"
 
 #: src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Kypr"
 
 #: src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "?esk? republika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "N?mecko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "D?ibutsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Odozna?it"
+msgstr "D?nsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominik?nsk? republika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Al??r"
 
 #: src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ekv?dor"
 
 #: src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "Estonsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 #: src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Z?padn? Evropa"
+msgstr "Z?padn? Sahara"
 
 #: src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "?pan?lsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fid?i"
 
 #: src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falklandy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
-msgstr ""
+msgstr "Mikron?sie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Faersk? ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Zru?it"
+msgstr "Francie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Francie, Metropolitan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:601
 #: src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Velk? Brit?nie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Gruzie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Francouzsk? Guyana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Zelen?"
+msgstr "Gr?nsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Rovn?kov? Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Zelen?"
+msgstr "?ecko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Ji?n? Georgie a Ji?n? Sandwichovy ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
-msgstr ""
+msgstr "Heard?v ostrov a McDonaldovy ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Chorvatsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Ma?arsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indon?sie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "Irsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Izrael"
 
 #: src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indik?tor"
+msgstr "Indie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Britsk? ?zem? v Indick?m oce?nu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "?r?k"
 
 #: src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
-msgstr ""
+msgstr "?r?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #: src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "It?lie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamajka"
 
 #: src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jord?nsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japon?tina"
+msgstr "Japonsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Ke?a"
 
 #: src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzst?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambod?a"
 
 #: src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "z?tra"
+msgstr "Komory"
 
 #: src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Svat? Kry?tof a Nevis"
 
 #: src/plugins/geolocation/geolocation_plugin.c:642
 msgid "Korea, Democratic People'S Republic Of"
-msgstr ""
+msgstr "KLDR"
 
 #: src/plugins/geolocation/geolocation_plugin.c:643
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Ji?n? Korea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuvajt"
 
 #: src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajmansk? ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazachst?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
-msgstr ""
+msgstr "Laos"
 
 #: src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Svat? Lucie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Lichten?tejnsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sr? Lanka"
 
 #: src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Lib?rie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litva"
 
 #: src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Lucembursko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Loty?sko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Libye"
 
 #: src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Maroko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monako"
 
 #: src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Mold?vie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Ozna?it v?echny jako p?e?ten?"
+msgstr "Marshallovy ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
-msgstr ""
+msgstr "Makedonie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Odozna?it"
+msgstr "Myanmar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Severn? Mariany"
 
 #: src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinik"
 
 #: src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauret?nie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauricius"
 
 #: src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Maledivy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malajsie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
 
 #: src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Namibie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nov? kontakt"
+msgstr "Nov? Kaledonie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk? ostrov"
 
 #: src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nig?rie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nikaragua"
 
 #: src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Nizozem?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "P?edat"
+msgstr "Norsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nep?l"
 
 #: src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "Nov? Z?land"
 
 #: src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Om?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Francouzsk? Polyn?sie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nov? Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "??dk?"
+msgstr "Filip?ny"
 
 #: src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakist?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Polsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
-msgstr ""
+msgstr "Saint-Pierre a Miquelon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Portoriko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugalsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay "
 
 #: src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Katar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "R?union"
 
 #: src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rumunsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rusko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudsk? Ar?bie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomonovy ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychely"
 
 #: src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "S?d?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "?v?dsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
-msgstr ""
+msgstr "Svat? Helena"
 
 #: src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovinsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
-msgstr ""
+msgstr "?picberky a Jan Mayen"
 
 #: src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovensko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Som?lsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP u?ivatelsk? jm?no:"
+msgstr "Surinam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tome a Principe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvador"
 
 #: src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "S?rie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Svazijsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Ostrovy Turks a Caicos"
 
 #: src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "?ad"
 
 #: src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Francouzsk? ji?n? ?zem?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thaj?tina"
+msgstr "Thajsko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tad?ikist?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenist?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "V?chodn? Timor"
 
 #: src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "Turecko"
 
 #: src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad a Tobago"
 
 #: src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
-msgstr ""
+msgstr "Tchaj-wan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:744
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzanie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Spojen? st?ty Men?? odlehl? ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Spojen? St?ty"
 
 #: src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekist?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Vatik?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "Svat? Vincenc a Grenadiny"
 
 #: src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Britsk? Panensk? ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Americk? Panensk? ostrovy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "N?zev souboru"
+msgstr "Vietnam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis a Futuna"
 
 #: src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
 
 #: src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Srbsko a ?ern? Hora"
 
 #: src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "Ji?n? Afrika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
-msgstr ""
+msgstr "Demokratick? republika Kongo"
 
 #: src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:777
 #: src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "M?sto:"
+msgstr "GeoLocation"
 
 #: src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy
 msgid "Could not initialize clutter"
-msgstr "Nelze inicializovat %s kontrolu pravopisu."
+msgstr "Nelze inicializovat nepo??dek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:788
 #: src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Nepoda?ilo se vytvo?it do?asn? soubor: %s"
+msgstr "Nepoda?ilo se vytvo?it regul?rn? v?raz: %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "Selhala registrace zm?ny t?matu pro z?suvn? modul Upozor?ov?n?"
+msgstr ""
+"Z?suvn?mu modulu GeoLocation se nepoda?ilo se zaregistrovat zobrazen? Okna "
+"zpr?vy"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11271,11 +11264,22 @@ msgid ""
 "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)."
 
 #: src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData integrace"
+msgstr "GeoLocation integrace"
 
 #: src/plugins/libravatar/libravatar.c:360
 #: src/plugins/libravatar/libravatar.c:431
@@ -11329,9 +11333,8 @@ msgstr ""
 "Zp?tn? vazba na <ricardo at mones.org> v?t?na.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Va?e e-mailov? adresa:</span>"
+msgstr "<span color=\"red\">Chyba ?ten? statistiky vyrovn?vac? pam?ti</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11339,25 +11342,25 @@ 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Pou?it? %s v %d souborech, %d adres???ch a %d dal??ch"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Vyrovn?vac? pam?? ikon"
+msgstr "Vy?istit vyrovn?vac? pam?? ikon"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Opravdu chcete odstranit tento motiv?"
+msgstr "Opravdu chcete odstranit v?echny ikony avatar? z vyrovn?vac? pam?ti?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Nedostatek pam?ti pro operaci"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11366,10 +11369,14 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Vyrovn?vac? pam?? ikon ?sp??n? vy?i?t?na:\n"
+"? %u chyb?j?c?ch vstup? odstran?no.\n"
+"? %u soubor? odstran?no."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
 msgstr ""
+"<span color=\"#006400\">Vyrovn?vac? pam?? ikon ?sp??n? vy?i?t?na!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11380,10 +11387,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Chyby ?i?t?n? vyrovn?vac? pam?ti ikon:\n"
+"? %u chyb?j?c?ch vstup? odstran?no.\n"
+"? %u soubor? odstran?no.\n"
+"? %u soubor? selhalo p?i ?ten?.\n"
+"? %u soubor? nemohlo b?t odstran?no."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Chyba ?i?t?n? vyrovn?vac? pam?ti</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11461,6 +11473,8 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Vlo?te URL na kterou chcete b?t p?esm?rov?n, pokud ikona nen? dostupn?. "
+"Ponechte pr?zdn? pro pou?it? v?choz? libravatar ikony."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11483,9 +11497,8 @@ msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Pokusit se z?skat avatar ze libravatar serveru odes?latele"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "?asov? limit pro relaci vypr?el\n"
+msgstr "?asov? limit po?adavku vypr?el"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -11498,6 +11511,8 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
+"Nastavte na 0 pro pou?it? glob?ln?ho timeoutu I/O soketu. Maxim?ln? hodnota "
+"mus? b?t men?? ne? glob?ln?."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
@@ -11543,9 +11558,272 @@ msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
-"V?echny slo?ky a zpr?vy v `%s' budou nen?vratn? odstran?ny\n"
+"V?echny slo?ky a zpr?vy v '%s' budou nen?vratn? odstran?ny\n"
 "Chcete je opravdu odstranit?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Sieve auth metoda je nedostupn?\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "Vybran? Sieve auth metoda je nedostupn?\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Odpojeno"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Odpojeno: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "neo?et?en? zpr?va na Sieve relaci: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS selhal"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "nastala chyba v SIEVE relaci\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "nastala chyba v SMTP relaci. data: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "neo?et?en? zpr?va na Sieve relaci: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: opakov?ni auth\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Metoda autentizace nedostupn?"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtrovat"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Zkontolova_t syntaxi"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "_Vr?tit"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Nemohu z?skat obsah skriptu"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Vracen?..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Vr?tit skript"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Skript byl modifikov?na. Vr?tit neulo?en? zm?ny?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "V_r?tit"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Skript ?sp??n? ulo?en."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Ukl?d?n?..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Kontroluji syntaxi..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Skript byl modifikov?n. Chcete ulo?it posledn? zm?ny?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Ulo?it"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve Filtr%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "P?idat Sieve skript"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Vlo?te jm?no nov?ho Sieve filtrovac?ho skriptu."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Zadejte nov? jm?no pro skript."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Opravdu chcete odstranit filtr '%s'?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Odstranit filtr"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Aktivovat"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "??et m??e jen jeden aktivn? skript sou?asn?."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Nemohu p?ipojit"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Vypisov?n? skript?..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "P?ipojen?..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Spravovat Sieve filtry"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Pro pou?it? Sieve ho povolte v nastaven? ??t?."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Spravovat Sieve filtry..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "Spravovat sieve filtry na serveru pomoc? ManageSieve protokolu."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Povolit Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Informace o serveru"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "N?zev serveru"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr "P?ipojit na tohoto hostitele nam?sto toho pro p??jem mailu"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Server port"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "P?ipojit na tento port nam?sto v?choz?ho"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "?ifrovan?n?"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "??dn? TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Pou??t TLS kdy? je dostupn?"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Vy?adovat TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "??dn? autentizace"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Pou??t stejnou autentizaci jako pro p??jem zpr?v"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Nastavit autentizaci"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "U?ivatelsk? jm?no"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Heslo"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Metoda autentizace"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automaticky"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Sieve server nesm? obsahovat mezery."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Nebyl zad?n Sieve server."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NewMail"
@@ -11618,42 +11896,42 @@ msgstr ""
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat funkci pro "
-"obsluhu ud?losti \"item update\"."
+"obsluhu ud?losti \"item update\""
 
 #: src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat update "
-"slo?ky."
+"slo?ky"
 
 #: src/plugins/notification/notification_plugin.c:246
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat funkci pro "
-"obsluhu ud?losti \"msginfo update\"."
+"obsluhu ud?losti \"msginfo update\""
 
 #: src/plugins/notification/notification_plugin.c:256
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat p?ep?n?n? "
-"offline."
+"offline"
 
 #: src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat zav?en? "
-"hlavn?ho okna."
+"hlavn?ho okna"
 
 #: src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 "Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat "
-"ikonifikov?n?."
+"ikonifikov?n?"
 
 #: src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
-"Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat seznam ??t?."
+"Z?suvn?mu modulu \"Upozor?ov?n?\" se nepoda?ilo se zaregistrovat seznam ??t?"
 
 #: src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
@@ -11822,19 +12100,16 @@ msgid "News folders"
 msgstr "Diskuzn? skupiny"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS kan?ly"
+msgstr "RSSyl slo?ky"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
 msgstr "Kalend??ov? slo?ky"
 
 #: src/plugins/notification/notification_prefs.c:649
-#, fuzzy
 msgid "These settings override folder-specific selections."
-msgstr "Toto nastaven? m? p?ednost p?ed nastaven?m slo?ek"
+msgstr "Toto nastaven? m? p?ednost p?ed nastaven?m slo?ek."
 
 #: src/plugins/notification/notification_prefs.c:660
 msgid "Global notification settings"
@@ -11876,23 +12151,20 @@ msgid "Banner speed"
 msgstr "Rychlost textu"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Maxim?ln? po?et v?sledk?:"
+msgstr "Maxim?ln? po?et zpr?v"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "Maxim?ln? po?et zpr?v (0 znamen? bez omezen?)"
+msgstr "Maxim?ln? po?et zobrazen?ch zpr?v, 0 znamen? bez omezen?"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Rychlost textu"
+msgstr "???ka textu"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Limit pro ???ku textu, 0 pro ???ku displeje"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11922,9 +12194,8 @@ msgid "Select folders..."
 msgstr "Vybrat slo?ky..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Barva slo?ky"
+msgstr "Barva textu"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -11960,16 +12231,14 @@ msgstr "Povolit vyskakovac? okno"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
 msgstr "?asov? limit pro zobrazen? okna"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "sekund"
+msgstr "sekunda(sekund)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -11997,18 +12266,16 @@ msgid "Done"
 msgstr "Hotovo"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "P??kaz"
+msgstr "Vyberte p??kaz"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Povolit spu?t?n? p??kazu"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "P??kaz:"
+msgstr "P??kaz pro spu?t?n?"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12019,9 +12286,8 @@ msgid "Enable LCD"
 msgstr "Povolit LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Hostname:Port LCDd serveru:"
+msgstr "Hostname:Port LCDd serveru"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12079,9 +12345,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "P?epnout minimalizaci:"
+msgstr "P?epnout minimalizaci"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12213,7 +12478,7 @@ msgstr "z %d"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1358
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Renderovan? PDF selhalo z nezn?m?ho d?vodu."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1721
 #: src/plugins/pdf_viewer/poppler_viewer.c:1939
@@ -12308,7 +12573,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "?prava pravidla perl filtru (extern?)..."
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12471,8 +12736,8 @@ msgstr ""
 "Tento z?suvn? modul zaji??uje kl??ov? operace PGP, je vyu??v?n ostatn?mi "
 "moduly (nap??klad PGP/MIME).\n"
 "\n"
-"Nastaven? naleznete v '/ Nastaven? / P?edvolby / Z?suvn? moduly / GPG' a '/ "
-"Nastaven? / [Nastaven? ??t?] / Z?suvn? moduly / GPG'\n"
+"Nastaven? naleznete v '/Nastaven?/P?edvolby/Z?suvn? moduly/GPG' a "
+"'/Nastaven?/[Nastaven? ??t?]/Z?suvn? moduly/GPG'\n"
 "\n"
 "Modul pou??v? knihovnu GPGME jako ob?lku pro GnuPG.\n"
 "\n"
@@ -12634,7 +12899,7 @@ msgstr "Podpis nenalezen"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "Ned?v?ryhodn?"
 
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
@@ -12650,54 +12915,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP J?dro: Nelze z?skat kl?? - neb??? ??dn? slu?ba (gpg-agent)."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\" [ultimate]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\" [full]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\" [marginal]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Podpis s pro?lou platnost? od %s."
+msgstr "Podpis s pro?lou platnost? od \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\", ale kl?? vypr?el"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Spr?vn? podpis od %s."
+msgstr "Spr?vn? podpis od \"%s\", ale kl?? byl odvol?n"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "?patn? podpis od %s."
+msgstr "?patn? podpis od \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Kl?? 0x%s pro ov??en? tohoto podpisu nen? dostupn?."
+msgstr "Kl?? 0x%s pro ov??en? tohoto podpisu nen? dostupn?"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Digit?ln? podpis nebyl zkontrolov?n."
+msgstr "Digit?ln? podpis nebyl zkontrolov?n"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12719,9 +12983,9 @@ msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Spr?vn? podpis od uid \"%s\" (Platnost: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Kl?? s pro?lou platnost? od %s."
+msgstr "Kl?? s pro?lou platnost? \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
@@ -12731,12 +12995,12 @@ msgstr "Podpis s pro?lou platnost? od uid\"%s\" (Platnost: %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Odvolan? kl?? \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
 msgid "BAD signature from \"%s\"\n"
-msgstr "?PATN? pdopis od \"%s\"\n"
+msgstr "?PATN? podpis od \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:358
 #, c-format
@@ -12745,12 +13009,12 @@ msgstr "                    uid \"%s\" (Platnost: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "Odvol?n"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
 msgid "Owner Trust: %s\n"
-msgstr ""
+msgstr "Majitel Trust: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:367
 msgid "Primary key fingerprint:"
@@ -13032,7 +13296,7 @@ msgstr ""
 "\n"
 "Modul m??e b?t nastaven jako \"V?choz? syst?m zabezpe?en?\" v nastaven? ??tu "
 "na z?lo?ce \"Zabezpe?en?\". D?le m??e b?t pou?it p?i psan? nov? zpr?vy "
-"pomoc? nab?dky '/ Nastaven? / Syst?m zabezpe?en?'\n"
+"pomoc? nab?dky '/Nastaven?/Syst?m zabezpe?en?'\n"
 "\n"
 "Modul pou??v? knihovnu GPGME jako ob?lku pro GnuPG.\n"
 "\n"
@@ -13057,7 +13321,7 @@ msgstr "Nepoda?ilo se vytvo?it do?asn? soubor: %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "Digit?ln? podpis OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
@@ -13093,7 +13357,7 @@ msgstr ""
 "\n"
 "Modul m??e b?t nastaven jako \"V?choz? syst?m zabezpe?en?\" v nastaven? ??tu "
 "na z?lo?ce \"Zabezpe?en?\". D?le m??e b?t pou?it p?i psan? nov? zpr?vy "
-"pomoc? nab?dky '/ Nastaven? / Syst?m zabezpe?en?'\n"
+"pomoc? nab?dky '/Nastaven?/Syst?m zabezpe?en?'\n"
 "\n"
 "Modul pou??v? knihovnu GPGME jako ob?lku pro GnuPG.\n"
 "\n"
@@ -13128,7 +13392,6 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Selhala registrace \"compose create hook\" v z?suvn?m modulu Python"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13174,7 +13437,7 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Tenot z?suvn? modul poskytuje integraci s Python.\n"
+"Tento z?suvn? modul poskytuje integraci s Python.\n"
 "Python k?d mu?e b?t vlo?en interaktivn? v N?stroje -> Zobrazit Python "
 "konzoli, nebo ulo?en? ve skriptu.\n"
 "\n"
@@ -13182,15 +13445,15 @@ msgstr ""
 "pracuje jako jin? polo?ka menu. Jde skript tak? p?i?adit tla??tku pomoc? "
 "Claws Mail's toolbar editor.\n"
 "\n"
-"M??ete napsat skript pracuj?c? s hlavn?m oknem ulo?it do ~/.claws-mail/"
-"python-scripts/main.\n"
+"M??ete napsat skript pracuj?c? s hlavn?m oknem a ulo?it do ~/.claws-mail"
+"/python-scripts/main.\n"
 "\n"
-"M??ete napsat skript p?i otev?en? okna nov? zpr?va ulo?it do ~/.claws-mail/"
-"python-scripts/compose.\n"
+"M??ete napsat skript p?i otev?en? okna nov? zpr?va a ulo?it do ~/.claws-mail"
+"/python-scripts/compose.\n"
 "\n"
 "Slo?ka ~/.claws-mail/python-scripts/auto/ m??e obsahovat skripty, kter? "
-"budou automaticky spu?t?ny p?i dan? ud?losti. Aktu?ln? jsou to tyto "
-"skripty:\n"
+"budou automaticky spu?t?ny p?i dan? ud?losti. Aktu?ln? jsou rozpozn?v?ny "
+"tyto skripty:\n"
 "\n"
 "compose_any\n"
 "Spu?t?no p?i otev?en? okna nov? zpr?va.\n"
@@ -13209,7 +13472,7 @@ msgstr ""
 "v interaktivn? Python konzoli.\n"
 "\n"
 "Zdroj z?suvn?ho modulu obsahuje uk?zkov? skripty v podadres??i \"examples\". "
-"Jestli?e nap??ete skript vhodn? pro s?len?, po?lete mi ho pro vlo?eni do "
+"Jestli?e nap??ete skript vhodn? pro sd?len?, po?lete mi ho pro vlo?eni do "
 "examples.\n"
 "\n"
 "Zp?tn? vazba na <berndth at gmx.de> je v?t?na."
@@ -13219,32 +13482,34 @@ msgid "Python integration"
 msgstr "Integrace Pythonu"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Nepoda?ilo se vytvo?it mbox soubor:\n"
-"%s\n"
+"Nepoda?ilo se p?e??st obsah star?ho feeds.xml souboru:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: Chyba p?i z?pisu '%s' do seznamu exportovan?ch kan?l?.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "Nepoda?ilo se otev??t soubor z?znamu %s: %s\n"
+msgstr "RSSyl: Nepoda?ilo se smazat star? OPML soubor '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
+"RSSyl: Nepoda?ilo se otev??t soubor '%s' pro seznam exportovan?ch kan?l?: %"
+"s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl: Cnyba p?i z?pisu souboru  exportovan?ch kan?l?.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -13254,6 +13519,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Chyba p?i odb?ru kan?lu\n"
+"%s\n"
+"\n"
+"Jm?no slo?ky '%s' nen? povolen?."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -13275,7 +13544,6 @@ msgid "RSS feed"
 msgstr "RSS kan?l"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(obvykle pr?zdn?)"
@@ -13293,12 +13561,11 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Vlo?te URL kan?lu, kter? chcete odeb?rat:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' nem??e b?t obsa?eno ve jm?n? slo?ky."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail pot?ebuje p??stup k s?ti, aby mohl aktualizovat kan?l."
@@ -13306,39 +13573,37 @@ msgstr[1] "Claws Mail pot?ebuje p??stup k s?ti, aby mohl aktualizovat kan?l
 msgstr[2] "Claws Mail pot?ebuje p??stup k s?ti, aby mohl aktualizovat kan?ly."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
-msgstr "Opravdu chcete odstranit strom slo?ek '%s' ?\n"
+msgstr "Opravdu chcete odstranit strom kan?l? `%s' ?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
-msgstr "Odstranit strom slo?ek"
+msgstr "Odstranit strom kan?l?"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
-msgstr "Vyberte .opml soubor"
+msgstr "Vyberte OPML soubor"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "Nelze vytvo?it do?asn? soubor pro odes?l?n? do diskusn? skupiny."
+msgstr "Nelze vytvo?it slo?ku pro nov? kan?l '%s'."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: Aktualizuji kan?l %s\n"
+msgstr "RSSyl: Odeb?r?n? nov?ho kan?lu: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: Nov? kan?l odeb?r?n: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
-msgstr "RSSyl: Aktualizuji kan?l %s\n"
+msgstr "RSSyl: Aktualizuji kan?l: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
@@ -13346,85 +13611,77 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Aktualizace dokon?ena: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: Aktualizuji kan?l %s\n"
+msgstr "RSSyl: Chyba p?i z?sk?n? kan?lu '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: Aktualizuji kan?l %s\n"
+msgstr "RSSyl: Neplatn? kan?l nalezen na '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "Nemohu exportovat voln?/zanepr?zdn?n do '%s'\n"
+msgstr "RSSyl: Nemohu zpracovat kan?l na '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Pou??t autentizaci"
+"RSSyl: Aplikace se ukon?uje, nemohl b?t dokon?en obnova kan?lu na '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Pou??t autentizaci"
+msgstr "HTTP z?kladn? autentizace"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Pou??t v?choz? nastaven? intervalu aktualizace"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "Uchovat do slo?ky"
+msgstr "Uchovat star? polo?ky"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "_O??znout"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
+msgstr "Obnova kan?lu, maz?n? polo?ek, kter? u? nejsou ve zdrojov?m kan?lu"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Stahovat koment??e, pokud je to mo?n?"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
 msgstr "V?dy ozna?it jako nep?e?ten?"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
 msgstr "Jen jestli se text zm?n?"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
 msgstr "Nikdy ozna?it jako nep?e?ten?"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "P?idat n?zev polo?ky na za??tek zpr?vy"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "Ignorovat vl?kno"
+msgstr "Ignorovat p?ejmenov?n? n?zvu"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Povolit pro uchov?n? aktu?ln?ho jm?na slo?ky, a?koliv autor kan?lu zm?n? "
+"n?zev kan?lu."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
@@ -13436,17 +13693,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>Zdrojov? URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "U?ivatelsk? jm?no:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Heslo"
+msgstr "U?ivatelsk? jm?no"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13466,7 +13714,6 @@ msgstr ""
 "small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 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>"
 
@@ -13483,36 +13730,32 @@ msgid "_Refresh feed"
 msgstr "_Aktualizovat kan?l"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
-msgstr "Vlastnosti _kan?lu..."
+msgstr "Vlastnosti _kan?lu"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
 msgstr "P?ejmenovat slo?ku..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "Vyhled?vat i v podslo?k?ch"
+msgstr "O_bnovit rekurzivn?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
 msgstr "Odeb?rat nov? kan?l..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
-msgstr "Vytvo?it _novou slo?ku..."
+msgstr "Vytvo?it novou _slo?ku..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
 msgstr "Importovat seznam kan?l?..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "Odstranit po"
+msgstr "Odstranit strom"
 
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
@@ -13520,7 +13763,7 @@ msgstr "P?idat strom RSS slo?ek"
 
 #: src/plugins/rssyl/rssyl_gtk.c:127
 msgid "Enter name for a new RSS folder tree."
-msgstr "Vlo?te jm?no nov?ho stromu RSS slo?ek"
+msgstr "Vlo?te jm?no nov?ho stromu RSS slo?ek."
 
 #: src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
@@ -13529,28 +13772,25 @@ msgid ""
 "there?"
 msgstr ""
 "Vytvo?en? stromu slo?ek selhalo.\n"
-"Mo?n? u? n?kter? soubory existuj? nebo nem?te opr?vn?n? k z?pisu."
+"Mo?n? u? n?kter? soubory existuj? nebo nem?te opr?vn?n? k z?pisu?"
 
 #: src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Moje kan?ly"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Vyberte Pine soubor"
+msgstr "Vyberte cookie soubor"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Pou??t v?choz? nastaven? intervalu aktualizace"
+msgstr "V?choz? interval aktualizace"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Aktualizovat v?echny kan?ly po spu?t?n? aplikace"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
 msgstr "Ov??ovat platnost SSL certifik?t? pro nov? kan?ly"
 
@@ -13563,38 +13803,35 @@ msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Cesta k souboru cookies.txt (Netscape stylu) obsahuj?c? va?e cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Obnovit"
+msgstr "Obnovov?n?"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Bezpe?nost a soukrom?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "Odeb?rat nov? kan?l..."
+msgstr "Odeb?rat nov? kan?l?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> p?es:</b>"
+msgstr "<b>Slo?ka kan?lu:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
-msgstr ""
+msgstr "M?sto pou?it? ofici?ln?ho n?zvu m??ete pou??t jin? pro slo?ku kan?lu."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_Upravit vlastnosti kan?lu po p?ihl??en? k odb?ru"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "Aktualizuji vyrovn?vac? pam?? pro %s..."
+msgstr "Aktualizuji koment??e pro '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
 #: src/plugins/vcalendar/vcal_folder.c:1598
@@ -13612,9 +13849,9 @@ msgid "404 (Not found)"
 msgstr "404 (Nenalezen)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "Chyba %ld"
+msgstr "Chyba %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -13625,6 +13862,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Chyba p?i z?sk?v?n? kan?lu na\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
@@ -13632,9 +13873,11 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"Neplatn? kan?l na\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
 msgstr "Aktualizuji kan?l '%s'..."
 
@@ -13646,17 +13889,22 @@ msgid ""
 "\n"
 "Please contact developers, this should not happen."
 msgstr ""
+"Nemohu zpracovat kan?l na\n"
+"<b>%s</b>\n"
+"\n"
+"Pros?m kontaktujte v?voj??e, toto by nem?lo nastat."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
-msgstr "Claws Mail pot?ebuje p??stup k s?ti, aby mohl aktualizovat kan?l."
+msgstr "Claws Mail pot?ebuje p??stup k s?ti, aby mohl aktualizovat kan?ly."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
+"Intern? probl?m b?hem upgrade form?tu ukl?d?n?. Toto by nem?lo nastat. "
+"Pros?m reportujte to s p?ilo?en?m v?stupem lad?n?.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
 #: src/plugins/smime/smime.c:911
@@ -13688,7 +13936,7 @@ msgstr ""
 "\n"
 "Modul m??e b?t nastaven jako \"V?choz? syst?m zabezpe?en?\" v nastaven? ??tu "
 "na z?lo?ce \"Zabezpe?en?\". D?le m??e b?t pou?it p?i psan? nov? zpr?vy "
-"pomoc? nab?dky '/ Nastaven? / Syst?m zabezpe?en?'\n"
+"pomoc? nab?dky '/Nastaven?/Syst?m zabezpe?en?'\n"
 "\n"
 "Modul pou??v? knihovnu GPGME jako ob?lku pro GnuPG.\n"
 "Modul tak? pot?ebuje nainstalovan? a zkonfigurovan? gpgsm, gnupg-agent a "
@@ -13706,15 +13954,15 @@ msgstr "Nepoda?ilo se nastavit GPG, %s"
 
 #: src/plugins/smime/smime.c:451
 msgid "Couldn't open temporary file"
-msgstr "Nelze otev??t do?asn? soubor."
+msgstr "Nelze otev??t do?asn? soubor"
 
 #: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
 msgid "Couldn't write to temporary file"
-msgstr "Nelze zapisovat do do?asn?ho souboru."
+msgstr "Nelze zapisovat do do?asn?ho souboru"
 
 #: src/plugins/smime/smime.c:488
 msgid "Couldn't close temporary file"
-msgstr "Nelze zav??t do?asn? soubor."
+msgstr "Nelze zav??t do?asn? soubor"
 
 #: src/plugins/smime/smime.c:708
 msgid ""
@@ -13839,8 +14087,7 @@ msgstr ""
 "Pokud je zpr?va identifikov?na jako spam, m??e b?t odstran?na nebo ulo?ena "
 "ve vybran? slo?ce.\n"
 "\n"
-"Nastaven? naleznete v '/ Nastaven? / P?edvolby / Z?suvn? moduly / "
-"SpamAssassin'"
+"Nastaven? naleznete v '/Nastaven?/P?edvolby/Z?suvn? moduly/SpamAssassin'"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -13951,11 +14198,11 @@ msgstr "_Upravit sch?zku..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "_Zru?it sch?zku"
+msgstr "_Zru?it sch?zku..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "_Vytvo?it sch?zku"
+msgstr "_Vytvo?it sch?zku..."
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -14297,7 +14544,7 @@ msgstr "_P?ihl?sit webCal..."
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
-msgstr "P?e_jmenovat"
+msgstr "P?e_jmenovat..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
@@ -14408,9 +14655,9 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_folder.c:1851
 #: src/plugins/vcalendar/vcal_folder.c:1854
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Nepoda?ilo se vytvo?it c?lovou slo?ku %s."
+msgstr "Nepoda?ilo se vytvo?it slo?ku %s"
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -14843,12 +15090,6 @@ msgstr "Nemohu exportovat do lok?ln?ho souboru nebo URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specifikovat lok?ln? soubor nebo URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "U?ivatelsk? jm?no"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Vlo?it webcal p?ihl??en? do exportu"
@@ -14859,7 +15100,7 @@ msgstr "P??kaz pro spu?t?n? po exportu kalend??e"
 
 #: src/plugins/vcalendar/vcal_prefs.c:390
 msgid "Register Claws' calendar in XFCE's Orage clock"
-msgstr "Registrovat Claws kalned?? do XFCE Orage"
+msgstr "Registrovat Claws kalend?? do XFCE Orage"
 
 #: src/plugins/vcalendar/vcal_prefs.c:392
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
@@ -14892,7 +15133,7 @@ msgid ""
 "left part of the email address, %d for the domain"
 msgstr ""
 "Specifikovat lok?ln? soubor nebo URL (http://server/path/file.ifb). Pou?ijte "
-"%u pro levou ??st emailov? adresy, %d pro dom?nu."
+"%u pro levou ??st emailov? adresy, %d pro dom?nu"
 
 #: src/plugins/vcalendar/vcal_prefs.c:506
 msgid "SSL options"
@@ -14990,10 +15231,6 @@ msgstr "Cel? jm?no"
 msgid "Mail address"
 msgstr "Po?tovn? adresa"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Informace o serveru"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Automatick? konfigurace"
@@ -15100,14 +15337,6 @@ msgstr "Maxim?ln? po?et p??sp?vk? pro sta?en?"
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezen? po?et)"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Metoda autentizace"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automaticky"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "adres?? pro IMAP server"
@@ -15596,7 +15825,7 @@ msgstr "Opravdu chcete odstranit v?echny akce?"
 #: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
 #: src/prefs_template.c:572 src/prefs_template.c:597
 msgid "Entry not saved"
-msgstr "Neulo?en? z?znam."
+msgstr "Neulo?en? z?znam"
 
 #: 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
@@ -15882,12 +16111,12 @@ msgstr "Obr?zek nem? spr?vn? form?t (PNG)."
 
 #: src/prefs_customheader.c:605
 msgid "The image isn't in the correct format (XBM)."
-msgstr "Obr?zek nem? spr?vn? form?t (XBM)"
+msgstr "Obr?zek nem? spr?vn? form?t (XBM)."
 
 #: src/prefs_customheader.c:614
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
-"Nepoda?ilo se zavolat program 'compface'. Ujist?te se, ?e je v adres??i "
+"Nepoda?ilo se zavolat program `compface`. Ujist?te se, ?e je v adres??i "
 "uveden?m v prom?nn? $PATH."
 
 #: src/prefs_customheader.c:620
@@ -16561,7 +16790,7 @@ msgstr ""
 
 #: src/prefs_logging.c:187
 msgid "Log filtering/processing when..."
-msgstr "Zapisovat do protokolu filtrov?n?/zpracov?n?, prob?h?-li ..."
+msgstr "Zapisovat do protokolu filtrov?n?/zpracov?n?, prob?h?-li..."
 
 #: src/prefs_logging.c:191
 msgid "filtering at incorporation"
@@ -16708,9 +16937,8 @@ msgid "headers part"
 msgstr "??st z?hlav?"
 
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "??dka z?hlav?"
+msgstr "hodnoty z?hlav?"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -16910,9 +17138,8 @@ msgid "Headers part"
 msgstr "??st z?hlav?"
 
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "Z?hlav?"
+msgstr "Hodnoty z?hlav?"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -17156,7 +17383,7 @@ msgstr "Vybrat barvu pozad? pro 2. ?rove? citace"
 #: src/prefs_msg_colors.c:321
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
-msgstr "Vybrat barvu pozad? pro 2. ?rove? citace"
+msgstr "Vybrat barvu pozad? pro 3. ?rove? citace"
 
 #: src/prefs_msg_colors.c:341
 msgctxt "Tooltip"
@@ -17575,9 +17802,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Azbuka (KOI8-R)"
+msgstr "Azbuka (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -17662,7 +17888,7 @@ msgstr "Povolit kontrolu pravopisu"
 
 #: src/prefs_spelling.c:134
 msgid "Enable alternate dictionary"
-msgstr "Zobrazovat volbu 'Pou??t p?edchoz?...'"
+msgstr "Povolit alternativn? slovn?k"
 
 #: src/prefs_spelling.c:139
 msgid "Faster switching with last used dictionary"
@@ -17823,7 +18049,7 @@ msgstr "Nastavit v?choz? v?b?r p?i vstupu do slo?ky"
 
 #: src/prefs_summaries.c:435
 msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Zobrazit dotaz \"Nejsou dal?? ... zpr?vy\""
+msgstr "Zobrazit dotaz \"nejsou nep?e?ten? (nebo nov?) zpr?vy\""
 
 #: src/prefs_summaries.c:445
 msgid "Assume 'Yes'"
@@ -17981,7 +18207,7 @@ msgstr "Zobrazit informace o konfiguraci ?ablon"
 
 #: src/prefs_template.c:370
 msgid "Move the selected template to the top"
-msgstr "P?esunout vybran? ?ablony nahoru."
+msgstr "P?esunout vybran? ?ablony nahoru"
 
 #: src/prefs_template.c:380
 msgid "Move the selected template up"
@@ -17993,7 +18219,7 @@ msgstr "Posunout vybranou ?ablonu dol?"
 
 #: src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
-msgstr "P?esunout vybran? ?ablony dol?."
+msgstr "P?esunout vybran? ?ablony dol?"
 
 #: src/prefs_template.c:414
 msgid "Template configuration"
@@ -18028,7 +18254,6 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Pole \"Skryt? kopie\" ?ablony obsahuje neplatnou emailovou adresu."
 
 #: src/prefs_template.c:835
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Pole \"Komu\" ?ablony obsahuje neplatnou emailovou adresu."
@@ -18144,7 +18369,7 @@ msgstr ""
 #: src/prefs_themes.c:537
 #, c-format
 msgid "Couldn't delete the old theme in %s."
-msgstr "Nepoda?ilo se odstranit star? motiv v %s"
+msgstr "Nepoda?ilo se odstranit star? motiv v %s."
 
 #: src/prefs_themes.c:545
 #, c-format
@@ -18171,7 +18396,7 @@ msgstr ""
 #: src/prefs_themes.c:667
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
-msgstr "Dostupn?ch motiv?: %d (u?ivatelsk?: %d, syst?mov?: %d, vnit?n?: 1)"
+msgstr "%d dostupn?ch motiv? (u?ivatelsk?: %d, syst?mov?: %d, vnit?n?: 1)"
 
 #: src/prefs_themes.c:708
 #, c-format
@@ -18423,7 +18648,7 @@ msgstr "<span weight=\"bold\">symboly:</span>"
 
 #: src/quote_fmt.c:48
 msgid "customized date format (see 'man strftime')"
-msgstr "Vlastn? form?t datumu (viz 'man strftime')"
+msgstr "vlastn? form?t data (viz 'man strftime')"
 
 #: src/quote_fmt.c:51
 msgid "email address of sender"
@@ -18431,11 +18656,11 @@ msgstr "emailov? adresa odes?latele"
 
 #: src/quote_fmt.c:52
 msgid "full name of sender"
-msgstr "Cel? jm?no odes?latele"
+msgstr "cel? jm?no odes?latele"
 
 #: src/quote_fmt.c:53
 msgid "first name of sender"
-msgstr "Jm?no odes?latele"
+msgstr "jm?no odes?latele"
 
 #: src/quote_fmt.c:54
 msgid "last name of sender"
@@ -18443,23 +18668,23 @@ msgstr "P??jmen? odes?latele"
 
 #: src/quote_fmt.c:55
 msgid "initials of sender"
-msgstr "Inici?ly odes?latele"
+msgstr "inici?ly odes?latele"
 
 #: src/quote_fmt.c:62
 msgid "message body"
-msgstr "T?lo zpr?vy"
+msgstr "t?lo zpr?vy"
 
 #: src/quote_fmt.c:63
 msgid "quoted message body"
-msgstr "T?lo citovan? zpr?vy"
+msgstr "t?lo citovan? zpr?vy"
 
 #: src/quote_fmt.c:64
 msgid "message body without signature"
-msgstr "T?lo zpr?vy bez podpisu"
+msgstr "t?lo zpr?vy bez podpisu"
 
 #: src/quote_fmt.c:65
 msgid "quoted message body without signature"
-msgstr "T?lo citovan? zpr?vy bez podpisu"
+msgstr "t?lo citovan? zpr?vy bez podpisu"
 
 #: src/quote_fmt.c:66
 msgid "message tags"
@@ -18471,75 +18696,75 @@ msgstr "aktu?ln? slovn?k"
 
 #: src/quote_fmt.c:68
 msgid "cursor position"
-msgstr "Pozice kurzoru"
+msgstr "pozice kurzoru"
 
 #: src/quote_fmt.c:69
 msgid "account property: your name"
-msgstr "Nastaven? ??tu: va?e jm?no"
+msgstr "nastaven? ??tu: va?e jm?no"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "Nastaven? ??tu: va?e e-mailov? adresa"
+msgstr "nastaven? ??tu: va?e e-mailov? adresa"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
-msgstr "Nastaven? ??tu: n?zev ??tu"
+msgstr "nastaven? ??tu: n?zev ??tu"
 
 #: src/quote_fmt.c:72
 msgid "account property: organization"
-msgstr "Nastaven? ??tu: organizace"
+msgstr "nastaven? ??tu: organizace"
 
 #: src/quote_fmt.c:73
 msgid "account property: signature"
-msgstr "Nastaven? ??tu: podpis"
+msgstr "nastaven? ??tu: podpis"
 
 #: src/quote_fmt.c:74
 msgid "account property: signature path"
-msgstr "Nastaven? ??tu: cesta k podpisu"
+msgstr "nastaven? ??tu: cesta k podpisu"
 
 #: src/quote_fmt.c:75
 msgid "account property: default dictionary"
-msgstr "Nastaven? ??tu: v?choz? slovn?k"
+msgstr "nastaven? ??tu: v?choz? slovn?k"
 
 #: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
-msgstr "Kniha adres <span style=\"oblique\">kompletace</span>: Kopie"
+msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Kopie"
 
 #: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: From"
-msgstr "Kniha adres <span style=\"oblique\">kompletace</span>: Od"
+msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Od"
 
 #: src/quote_fmt.c:78
 msgid "address book <span style=\"oblique\">completion</span>: To"
-msgstr "Kniha adres <span style=\"oblique\">kompletace</span>: Komu"
+msgstr "kniha adres <span style=\"oblique\">kompletace</span>: Komu"
 
 #: src/quote_fmt.c:80
 msgid "literal backslash"
-msgstr "Zp?tn? lom?tko - znak \\"
+msgstr "zp?tn? lom?tko - znak \\"
 
 #: src/quote_fmt.c:81
 msgid "literal question mark"
-msgstr "Otazn?k - znak ?"
+msgstr "otazn?k - znak ?"
 
 #: src/quote_fmt.c:82
 msgid "literal exclamation mark"
-msgstr "Vyk?i?n?k - znak !"
+msgstr "vyk?i?n?k - znak !"
 
 #: src/quote_fmt.c:83
 msgid "literal pipe"
-msgstr "\"Roura\" - znak |"
+msgstr "\"roura\" - znak |"
 
 #: src/quote_fmt.c:84
 msgid "literal opening curly brace"
-msgstr "Lev? slo?en? z?vorka - znak {"
+msgstr "lev? slo?en? z?vorka - znak {"
 
 #: src/quote_fmt.c:85
 msgid "literal closing curly brace"
-msgstr "Prav? slo?en? z?vorka - znak }"
+msgstr "prav? slo?en? z?vorka - znak }"
 
 #: src/quote_fmt.c:86
 msgid "tab"
-msgstr "Tabul?tor"
+msgstr "tabul?tor"
 
 #: src/quote_fmt.c:89
 msgid "<span weight=\"bold\">commands:</span>"
@@ -18574,7 +18799,7 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to insert"
 msgstr ""
-"Vlo?? soubor:\n"
+"vlo?? soubor:\n"
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako cesta k souboru "
 "pro vlo?en?"
 
@@ -18585,7 +18810,7 @@ msgid ""
 "get\n"
 "the output from"
 msgstr ""
-"Vlo?? v?stup programu:\n"
+"vlo?? v?stup programu:\n"
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako konzole,\n"
 "pro v?stup"
 
@@ -18595,9 +18820,9 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
 "user-entered text"
 msgstr ""
-"Vlo?? informace zadan? u?ivatelem:\n"
+"vlo?? informace zadan? u?ivatelem:\n"
 "<span style=\"oblique\">sub_expr</span> je prom?nn?, kter? bude nahrazena\n"
-"textem vlo?en?m u?ivatelem."
+"textem vlo?en?m u?ivatelem"
 
 #: src/quote_fmt.c:95
 msgid ""
@@ -18605,7 +18830,7 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
 msgstr ""
-"P?ipoj? soubor:\n"
+"p?ipoj? soubor:\n"
 "<span style=\"oblique\">sub_expr</span> je vyhodnoceno jako cesta k souboru "
 "pro p?ipojen?"
 
@@ -18618,7 +18843,7 @@ msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
-"Text, kter? m??e obsahovat libovoln? v??e uveden? symboly nebo\n"
+"text, kter? m??e obsahovat libovoln? v??e uveden? symboly nebo\n"
 "p??kaz"
 
 #: src/quote_fmt.c:99
@@ -18626,7 +18851,7 @@ msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
-"Text, kter? m??e obsahovat libovoln? v??e uveden? symboly(ne\n"
+"text, kter? m??e obsahovat libovoln? v??e uveden? symboly(ne\n"
 "p??kazy)"
 
 #: src/quote_fmt.c:100
@@ -18740,7 +18965,7 @@ msgstr "POP p?ed SMTP"
 #: src/send_message.c:361
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "??et '%s': P?ipojuji se na SMTP server: %s:%d ..."
+msgstr "??et '%s': P?ipojuji se na SMTP server: %s:%d..."
 
 #: src/send_message.c:418
 msgid "Mail sent successfully."
@@ -19081,7 +19306,7 @@ msgstr "Nejste autorem tohoto p??sp?vku.\n"
 #, 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] "Opravdu chcete odstranit %d vybranou zpr?vu?"
+msgstr[0] "Opravdu chcete odstranit vybranou zpr?vu?"
 msgstr[1] "Opravdu chcete odstranit %d vybran? zpr?vy?"
 msgstr[2] "Opravdu chcete odstranit %d vybran?ch zpr?v?"
 
@@ -19148,10 +19373,6 @@ msgstr ""
 "N?kter? filtrovac? pravidla jsou p?i?azena specifick?m ??t?m.\n"
 "Zvolte pros?m zp?sob aplikace t?chto pravidel:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filtrovat"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtruji..."
@@ -19661,7 +19882,7 @@ msgstr "V t?to zpr?v? nejsou ??dn? odkazy."
 
 #: src/uri_opener.c:116
 msgid "Available URLs:"
-msgstr "Dostupn? odkazy"
+msgstr "Dostupn? odkazy:"
 
 #: src/uri_opener.c:181
 msgctxt "Dialog title"
@@ -20122,6 +20343,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Pou??t tento"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Nepoda?ilo se za?ifrovat zpr?vu: %s"
diff --git a/po/de.po b/po/de.po
index 0f9beb8..05a0dc4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,29 +3,29 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012-2014
 # Stephan Sachse <white at dev-zero.com>, 2005-2010
 # Marc Arens <marens at marens.eu>, 2009
 # Thomas Gilgin <thg1 at karate-muellheim.de>, 2004, 2005
 # Hubert Gilgin, 2004
 # Jens Oberender <j.obi at troja.net>, 2003, 2004
 # Kilian Krause <kk at verfaction.de>, 2002
+# Thomas Bellmann <ThomasBellmann at gmx.net>, 2012-2015, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-18 16:29+0100\n"
+"POT-Creation-Date: 2015-07-12 12:44+0200\n"
+"PO-Revision-Date: 2015-07-16 21:05+0200\n"
 "Last-Translator: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
-"Language-Team: Thomas Bellmann <ThomasBellmann at gmx.net>\n"
+"Language-Team: Deutsch <>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: 2990,1708,-1,2647,2658,2696,2793,-1,-1,-1\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.8.2\n"
 
 # in General: maybe should unify "receive, retrieve" when translating into german.
 # (maybe) todo: replace "Protokoll-Datei" by "Log-Datei"; "Stylesheet" by "..?"; "free/busy" by "..?"
@@ -39,7 +39,7 @@ msgid ""
 "Please close all the composing windows before editing accounts."
 msgstr ""
 "Einige Editor-Fenster sind ge?ffnet.\n"
-"Bitte schlie?en Sie alle Editor-Fenster vor dem Bearbeiten der Konten."
+"Bitte schlie?en Sie vor dem Bearbeiten von Email-Konten alle Editor-Fenster."
 
 #: src/account.c:437
 msgid "Can't create folder."
@@ -51,13 +51,11 @@ msgstr "Konten bearbeiten"
 
 #: src/account.c:741
 msgid ""
-"Using 'Get Mail' will retrieve messages from your Accounts in the order "
-"given, the checkbox indicates which accounts will be included. Bold text "
-"indicates the default account."
+"Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox "
+"indicates which accounts will be included. Bold text indicates the default account."
 msgstr ""
-"'Abrufen' holt die Nachrichten Ihrer Konten in vorgegebener Reihenfolge ab. "
-"Das Kontrollk?stchen zeigt an, welche Konten einbezogen sind. Fette Schrift "
-"markiert das Standardkonto."
+"'Abrufen' holt die Nachrichten Ihrer Konten in vorgegebener Reihenfolge ab. Das Kontrollk?stchen "
+"zeigt an, welche Konten einbezogen sind. Fette Schrift markiert das Standardkonto."
 
 #: src/account.c:812
 msgid " _Set as default account "
@@ -94,16 +92,14 @@ msgstr "G"
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Abrufen' holt Nachrichten von den gew?hlten Konten ab"
 
-#: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
-#: src/editaddress.c:1320 src/editaddress.c:1340
-#: src/editaddress_other_attributes_ldap.c:302
-#: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
-#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1866 src/prefs_template.c:79
+#: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215 src/addressbook.c:125
+#: src/compose.c:7213 src/editaddress.c:1263 src/editaddress.c:1320 src/editaddress.c:1340
+#: src/editaddress_other_attributes_ldap.c:302 src/editaddress_other_attributes_ldap.c:350
+#: src/editbook.c:170 src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222 src/mimeview.c:275
+#: src/plugins/managesieve/sieve_manager.c:479 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384 src/prefs_filtering.c:1866
+#: src/prefs_template.c:79
 msgid "Name"
 msgstr "Name"
 
@@ -163,10 +159,8 @@ msgstr ""
 "%s"
 
 #: src/action.c:990 src/ldaputil.c:326 src/plugins/bogofilter/bogofilter.c:884
-#: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1805
-#: src/plugins/vcalendar/vcal_folder.c:1809
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/tnef_parse/tnef_parse.c:67 src/plugins/vcalendar/vcal_folder.c:1805
+#: src/plugins/vcalendar/vcal_folder.c:1809 src/plugins/vcalendar/vcal_folder.c:1820
 #: src/plugins/vcalendar/vcal_folder.c:1823 src/privacy.c:62
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -230,11 +224,9 @@ msgstr "Ein Adressbuch kann nicht in sich selbst kopiert werden."
 #: src/addrclip.c:593
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
-"Ein Ordner kann nicht in sich selbst oder in einen seiner untergeordneten "
-"Ordner verschoben werden."
+"Ein Ordner kann nicht in sich selbst oder in einen seiner untergeordneten Ordner verschoben werden."
 
-#: src/addr_compl.c:685 src/addressbook.c:4873
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:685 src/addressbook.c:4873 src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Gruppe"
 
@@ -306,15 +298,14 @@ msgstr ""
 "M?chten Sie wirklich alle Zusatzangaben durch die\n"
 "Standardeinstellung ersetzen?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
-#: src/addressbook.c:480 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1182 src/prefs_actions.c:1090
+#: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463 src/addressbook.c:480
+#: src/edittags.c:272 src/plugins/archive/archiver_gtk.c:1182 src/prefs_actions.c:1090
 #: src/prefs_filtering.c:1693 src/prefs_template.c:1119
 msgid "_Delete"
 msgstr "_L?schen"
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091 src/prefs_filtering.c:1694
+#: src/prefs_template.c:1120
 msgid "Delete _all"
 msgstr "_alle L?schen"
 
@@ -336,12 +327,8 @@ msgid "New attribute name:"
 msgstr "Neue Zusatzangabe:"
 
 #: src/addrcustomattr.c:513
-msgid ""
-"Adding or removing attribute names won't affect attributes already set for "
-"contacts."
-msgstr ""
-"Das Hinzuf?gen oder Entfernen von Zusatzangaben ?ndert bereits bestehende "
-"Kontakte nicht."
+msgid "Adding or removing attribute names won't affect attributes already set for contacts."
+msgstr "Das Hinzuf?gen oder Entfernen von Zusatzangaben ?ndert bereits bestehende Kontakte nicht."
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
@@ -356,10 +343,8 @@ msgid "Find address book email duplicates"
 msgstr "E-Mail-Duplikate im Adressbuch suchen"
 
 #: src/addrduplicates.c:145
-msgid ""
-"Claws Mail will now search for duplicate email addresses in the address book."
-msgstr ""
-"Claws Mail wird nun nach doppelten E-Mailadressen im Adressbuch suchen."
+msgid "Claws Mail will now search for duplicate email addresses in the address book."
+msgstr "Claws Mail wird nun nach doppelten E-Mailadressen im Adressbuch suchen."
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
@@ -369,8 +354,8 @@ msgstr "keine doppelten E-Mailadressen im Adressbuch gefunden"
 msgid "Duplicate email addresses"
 msgstr "Doppelte E-Mailadressen"
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
+#: src/addrduplicates.c:442 src/addressadd.c:227 src/plugins/pgpcore/select-keys.c:397
+#: src/toolbar.c:434
 msgid "Address"
 msgstr "Adresse"
 
@@ -402,8 +387,8 @@ msgstr "als Adressbucheintrag"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055
-#: src/editaddress.c:1130 src/editgroup.c:290
+#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1055 src/editaddress.c:1130
+#: src/editgroup.c:290
 msgid "Remarks"
 msgstr "Anmerkungen"
 
@@ -411,8 +396,7 @@ msgstr "Anmerkungen"
 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner ausw?hlen"
 
-#: src/addressadd.c:485 src/editaddress.c:1582 src/headerview.c:280
-#: src/textview.c:2042
+#: src/addressadd.c:485 src/editaddress.c:1582 src/headerview.c:280 src/textview.c:2042
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -429,9 +413,8 @@ msgstr "Adresse(n) hinzuf?gen"
 msgid "Can't add the specified address"
 msgstr "Hinzuf?gen der angegebenen Adresse schlug fehl"
 
-#: src/addressbook.c:126 src/addressbook.c:4861 src/editaddress.c:1052
-#: src/editaddress.c:1113 src/editgroup.c:289 src/expldifdlg.c:518
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:763
+#: src/addressbook.c:126 src/addressbook.c:4861 src/editaddress.c:1052 src/editaddress.c:1113
+#: src/editgroup.c:289 src/expldifdlg.c:518 src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:763
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
@@ -439,19 +422,17 @@ msgstr "E-Mail-Adresse"
 msgid "_Book"
 msgstr "Adressb_uch"
 
-#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
-#: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462 src/addressbook.c:479
+#: src/compose.c:581 src/mainwindow.c:506 src/messageview.c:210
+#: src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/addressbook.c:404 src/compose.c:586 src/mainwindow.c:509
-#: src/messageview.c:213
+#: src/addressbook.c:404 src/compose.c:586 src/mainwindow.c:509 src/messageview.c:213
 msgid "_Tools"
 msgstr "E_xtras"
 
-#: src/addressbook.c:405 src/compose.c:587 src/mainwindow.c:511
-#: src/messageview.c:214
+#: src/addressbook.c:405 src/compose.c:587 src/mainwindow.c:511 src/messageview.c:214
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -483,29 +464,31 @@ msgstr "Adressbuch _bearbeiten"
 msgid "_Delete book"
 msgstr "Adressbuch _l?schen"
 
-#: src/addressbook.c:424 src/compose.c:598
+#: src/addressbook.c:424 src/compose.c:598 src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Speichern"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86 src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
-msgstr "S_chlie?en"
+msgstr "_Schlie?en"
 
 #: src/addressbook.c:428 src/addressbook.c:477 src/messageview.c:227
 msgid "_Select all"
-msgstr "All_e ausw?hlen"
+msgstr "_Alle ausw?hlen"
 
 #: src/addressbook.c:430 src/addressbook.c:469 src/addressbook.c:485
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
-#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486 src/compose.c:610
+#: src/mainwindow.c:540 src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487 src/compose.c:611
+#: src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Einf?gen"
 
@@ -547,10 +530,9 @@ msgstr "Duplikate finden..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "Nutzerdefinierte Angaben..."
+msgstr "Benutzerdefinierte Angaben..."
 
-#: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
-#: src/messageview.c:339
+#: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803 src/messageview.c:339
 msgid "_About"
 msgstr "?_ber"
 
@@ -561,8 +543,8 @@ msgstr "Eintrag ?_berfliegen"
 #: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:115
 #: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:140
 #: src/plugins/pgpcore/sgpgme.c:168 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683
-#: src/prefs_themes.c:715 src/prefs_themes.c:716
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:683 src/prefs_themes.c:715
+#: src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -652,7 +634,7 @@ msgstr "Distinguierter Name (dn) fehlt"
 
 #: src/addressbook.c:541
 msgid "Missing required information"
-msgstr "Ben?tigte Informationen fehlen"
+msgstr "Erforderliche Informationen fehlen"
 
 #: src/addressbook.c:542
 msgid "Another contact exists with that key"
@@ -660,14 +642,14 @@ msgstr "Es existiert bereits ein Kontakt mit diesem Index"
 
 #: src/addressbook.c:543
 msgid "Strong(er) authentication required"
-msgstr "Strenge(re) Authentifizierung erforderlich"
+msgstr "St?rkere Authentifizierung erforderlich"
 
 #: src/addressbook.c:910
 msgid "Sources"
 msgstr "Quellen"
 
-#: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/addressbook.c:914 src/prefs_matcher.c:632 src/prefs_other.c:475 src/toolbar.c:225
+#: src/toolbar.c:2142
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -701,23 +683,21 @@ msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Sollen die Suchergebnisse und Adressen in '%s' gel?scht werden?"
 
 #: src/addressbook.c:2909 src/addressbook.c:2935 src/addressbook.c:2942
-#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177 src/toolbar.c:415
 msgid "Delete"
 msgstr "L?schen"
 
 #: src/addressbook.c:2918
 #, c-format
 msgid ""
-"Do you want to delete '%s'? If you delete the folder only, the addresses it "
-"contains will be moved into the parent folder."
+"Do you want to delete '%s'? If you delete the folder only, the addresses it contains will be moved "
+"into the parent folder."
 msgstr ""
-"Soll '%s' gel?scht werden? Wenn nur der Ordner gel?scht wird, werden die "
-"Adressen in den dar?ber liegenden Ordner verschoben."
+"Soll '%s' gel?scht werden? Wenn nur der Ordner gel?scht wird, werden die Adressen in den dar?ber "
+"liegenden Ordner verschoben."
 
-#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:157
-#: src/plugins/vcalendar/vcal_folder.c:1968
+#: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206 src/plugins/mailmbox/plugin_gtk.c:333
+#: src/plugins/rssyl/rssyl_cb_menu.c:157 src/plugins/vcalendar/vcal_folder.c:1968
 msgid "Delete folder"
 msgstr "Ordner l?schen"
 
@@ -820,8 +800,8 @@ msgstr "Suche l?uft..."
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:4837 src/addressbook_foldersel.c:182 src/exphtmldlg.c:372
-#: src/expldifdlg.c:389 src/exporthtml.c:984 src/importldif.c:658
+#: src/addressbook.c:4837 src/addressbook_foldersel.c:182 src/exphtmldlg.c:372 src/expldifdlg.c:389
+#: src/exporthtml.c:984 src/importldif.c:658
 msgid "Address Book"
 msgstr "Adressbuch"
 
@@ -829,8 +809,8 @@ msgstr "Adressbuch"
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:4885 src/exporthtml.c:884 src/folderview.c:345
-#: src/folderview.c:433 src/prefs_account.c:2769 src/prefs_folder_column.c:78
+#: src/addressbook.c:4885 src/exporthtml.c:884 src/folderview.c:345 src/folderview.c:433
+#: src/prefs_account.c:2769 src/prefs_folder_column.c:78
 msgid "Folder"
 msgstr "Ordner"
 
@@ -851,19 +831,14 @@ msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 
 #: src/addressbook_foldersel.c:388 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1619 src/prefs_matcher.c:1626
-#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1636 src/prefs_matcher.c:2524
-#: src/prefs_matcher.c:2528
+#: src/plugins/bogofilter/bogofilter_gtk.c:274 src/plugins/bogofilter/bogofilter_gtk.c:347
+#: src/plugins/bogofilter/bogofilter_gtk.c:424 src/plugins/bsfilter/bsfilter.c:107
+#: src/plugins/bsfilter/bsfilter_gtk.c:197 src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326 src/plugins/spamassassin/spamassassin.c:117
+#: src/plugins/spamassassin/spamassassin_gtk.c:443 src/plugins/spamassassin/spamassassin_gtk.c:490
+#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675 src/prefs_matcher.c:710
+#: src/prefs_matcher.c:1619 src/prefs_matcher.c:1626 src/prefs_matcher.c:1634
+#: src/prefs_matcher.c:1636 src/prefs_matcher.c:2524 src/prefs_matcher.c:2528
 msgid "Any"
 msgstr "Alle"
 
@@ -904,8 +879,7 @@ msgid "Address book folder size:"
 msgstr "Gr??e des Adressbuchordners:"
 
 #: src/addrgather.c:399 src/addrgather.c:409
-msgid ""
-"Maximum amount of entries per folder within the newly created address book"
+msgid "Maximum amount of entries per folder within the newly created address book"
 msgstr "Maximale Anzahl der Eintr?ge pro Ordner im neu erzeugten Adressbuch"
 
 #: src/addrgather.c:413
@@ -928,8 +902,7 @@ msgstr "Adressenzahl"
 msgid "Header Fields"
 msgstr "Kopfzeilenfelder"
 
-#: src/addrgather.c:568 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:1023
+#: src/addrgather.c:568 src/exphtmldlg.c:659 src/expldifdlg.c:723 src/importldif.c:1023
 msgid "Finish"
 msgstr "Ende"
 
@@ -963,18 +936,15 @@ msgstr "Adresse(n) aktualisieren"
 
 #: src/addrindex.c:1828
 msgid "Update failed. Changes not written to Directory."
-msgstr ""
-"Fehler bei Aktualisierung. ?nderungen nicht ins Verzeichnis geschrieben."
+msgstr "Fehler bei Aktualisierung. ?nderungen nicht ins Verzeichnis geschrieben."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868
-#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4871
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196 src/compose.c:11779
+#: src/file_checker.c:78 src/file_checker.c:100 src/messageview.c:855 src/messageview.c:868
+#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4871
 msgid "Warning"
 msgstr "Warnung"
 
@@ -1053,11 +1023,8 @@ msgstr "Dinge"
 
 #: src/common/plugin.c:334
 #, c-format
-msgid ""
-"This plugin provides %s (%s), which is already provided by the %s plugin."
-msgstr ""
-"Dieses Plugin stellt %s (%s) zur Verf?gung, welches schon durch das Plugin "
-"%s bereitsteht."
+msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
+msgstr "Dieses Plugin stellt %s (%s) zur Verf?gung, was schon vom Plugin %s bereitgestellt wird."
 
 #: src/common/plugin.c:436
 msgid "Plugin already loaded"
@@ -1069,9 +1036,7 @@ msgstr "Fehler bei Speicherzuweisung f?r das Plugin"
 
 #: src/common/plugin.c:481
 msgid "This module is not licensed under a GPL v3 or later compatible license."
-msgstr ""
-"Diese Modul ist nicht unter GPL v3 oder einer kompatiblen Folgelizenz "
-"zugelassen."
+msgstr "Diese Modul ist nicht unter GPL v3 oder einer kompatiblen Folgelizenz zugelassen."
 
 #: src/common/plugin.c:490
 msgid "This module is for Claws Mail GTK1."
@@ -1079,20 +1044,12 @@ msgstr "Dies ist ein Plugin f?r Claws Mail GTK1."
 
 #: src/common/plugin.c:772
 #, c-format
-msgid ""
-"Your version of Claws Mail is newer than the version the '%s' plugin was "
-"built with."
-msgstr ""
-"Ihr Claws Mail ist neuer als die Version, mit der das Plugin '%s' kompiliert "
-"wurde."
+msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
+msgstr "Ihr Claws Mail ist neuer als die Version, mit der das Plugin '%s' kompiliert wurde."
 
 #: src/common/plugin.c:775
-msgid ""
-"Your version of Claws Mail is newer than the version the plugin was built "
-"with."
-msgstr ""
-"Ihr Claws Mail ist neuer als die Version, mit der das Plugin kompiliert "
-"wurde."
+msgid "Your version of Claws Mail is newer than the version the plugin was built with."
+msgstr "Ihr Claws Mail ist neuer als die Version, mit der das Plugin kompiliert wurde."
 
 #: src/common/plugin.c:784
 #, c-format
@@ -1248,9 +1205,8 @@ msgstr "Kann P12-Zertifikat %s nicht ?ffnen (%s)\n"
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12-Zertifikat %s fehlt (%s)\n"
 
-#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
+#: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
+#: src/gtk/sslcertwindow.c:107 src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<nicht im Zertifikat>"
@@ -1542,15 +1498,15 @@ msgstr "Signatur E_rsetzen"
 msgid "_Print"
 msgstr "Drucken"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_R?ckg?ngig"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
@@ -1570,7 +1526,7 @@ msgstr "mit _Umbruch"
 msgid "_Unwrapped"
 msgstr "_ohne Umbruch"
 
-#: src/compose.c:618 src/mainwindow.c:541
+#: src/compose.c:618 src/mainwindow.c:541 src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "_Alles ausw?hlen"
 
@@ -1634,7 +1590,7 @@ msgstr "Zeile l?schen"
 msgid "Delete to end of line"
 msgstr "Bis zum Ende der Zeile l?schen"
 
-#: src/compose.c:637 src/messageview.c:229
+#: src/compose.c:637 src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Suchen"
 
@@ -1829,15 +1785,11 @@ msgstr "Der Text der Vorlage \"neue Nachricht\" hat einen Fehler in Zeile %d."
 
 #: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
-msgstr "Keine Antwort m?glich. Die Original-Mail existiert vermutlich nicht."
+msgstr "Keine Antwort m?glich. Die urspr?ngliche E-Mail gibt es vermutlich nicht."
 
 #: src/compose.c:1633 src/quote_fmt.c:586
-msgid ""
-"The \"From\" field of the \"Reply\" template contains an invalid email "
-"address."
-msgstr ""
-"Das \"Von\"-Feld der \"Antworten\"-Vorlage enth?lt eine ung?ltige E-"
-"Mailadresse."
+msgid "The \"From\" field of the \"Reply\" template contains an invalid email address."
+msgstr "Das \"Von\"-Feld der \"Antworten\"-Vorlage enth?lt eine ung?ltige E-Mailadresse."
 
 #: src/compose.c:1681 src/quote_fmt.c:589
 #, c-format
@@ -1845,12 +1797,8 @@ msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Der K?rper der \"Antworten\"-Vorlage hat eine Fehler in Zeile %d."
 
 #: src/compose.c:1817 src/compose.c:2009 src/quote_fmt.c:606
-msgid ""
-"The \"From\" field of the \"Forward\" template contains an invalid email "
-"address."
-msgstr ""
-"Das \"Von\" Feld der \"Weiterleiten\"-Vorlage enth?lt eine ung?ltige E-"
-"Mailadresse."
+msgid "The \"From\" field of the \"Forward\" template contains an invalid email address."
+msgstr "Das \"Von\" Feld der \"Weiterleiten\"-Vorlage enth?lt eine ung?ltige E-Mailadresse."
 
 #: src/compose.c:1877 src/quote_fmt.c:609
 #, c-format
@@ -1878,8 +1826,7 @@ msgstr "Bcc:"
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931
-#: src/gtk/headers.h:33
+#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931 src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgruppen:"
 
@@ -1891,15 +1838,14 @@ msgstr "Followup an:"
 msgid "In-Reply-To:"
 msgstr "In-Reply-To:"
 
-#: src/compose.c:2617 src/compose.c:4926 src/compose.c:4934
-#: src/gtk/headers.h:13 src/summary_search.c:433
+#: src/compose.c:2617 src/compose.c:4926 src/compose.c:4934 src/gtk/headers.h:13
+#: src/summary_search.c:433
 msgid "To:"
 msgstr "An:"
 
 #: src/compose.c:2826
 msgid "Couldn't attach a file (charset conversion failed)."
-msgstr ""
-"Datei konnte nicht angeh?ngt werden (Zeichensatzkonvertierung schlug fehl)."
+msgstr "Datei konnte nicht angeh?ngt werden (Zeichensatzkonvertierung schlug fehl)."
 
 #: src/compose.c:2832
 #, c-format
@@ -1927,18 +1873,16 @@ msgstr "Die Gr??e der Datei '%s' ist nicht ermittelbar."
 
 #: src/compose.c:3607
 #, c-format
-msgid ""
-"You are about to insert a file of %s in the message body. Are you sure you "
-"want to do that?"
+msgid "You are about to insert a file of %s in the message body. Are you sure you want to do that?"
 msgstr ""
-"Sie sind dabei eine %s gro?e Datei in den Nachrichtenk?rper einzuf?gen. "
-"M?chten Sie das wirklich tun?"
+"Sie sind dabei eine %s gro?e Datei in den Nachrichtenk?rper einzuf?gen. M?chten Sie das wirklich "
+"tun?"
 
 #: src/compose.c:3610
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+Einf?gen"
 
@@ -1992,8 +1936,8 @@ msgstr ""
 "Bitte w?hlen Sie einen E-Mail-Konto vor dem Senden."
 
 #: src/compose.c:5025 src/compose.c:5057 src/compose.c:5099
-#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_account.c:3270
-#: src/toolbar.c:406 src/toolbar.c:424
+#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_account.c:3270 src/toolbar.c:406
+#: src/toolbar.c:424
 msgid "Send"
 msgstr "Senden"
 
@@ -2035,7 +1979,7 @@ msgstr "Trotzdem vorspeichern?"
 msgid "Send later"
 msgstr "Sp?ter senden"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2045,7 +1989,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung schlug fehl."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2055,7 +1999,7 @@ msgstr ""
 "\n"
 "Schl?ssel des Empf?ngers nicht erh?ltlich."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2097,8 +2041,7 @@ msgid ""
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
-"Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum "
-"Wiederholen."
+"Benutzen Sie \"Vorgespeicherte Nachrichten senden\" vom Hauptfenster zum Wiederholen."
 
 #: src/compose.c:5612
 #, c-format
@@ -2124,96 +2067,96 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "E-Mail konnte nicht verschl?sselt werden: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Verschl?sselungshinweis"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+Fortfahren"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Gew?hltes Konto ist nicht NNTP: Absenden schlug fehl."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Der Anhang %s existiert nicht mehr. Ignorieren?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Senden abbrechen"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Anhang ignorieren"
 
 # Maybe not completely correct translated but I could not get the context...
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Originaler %s-Teil"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Zum Adress_buch hinzuf?gen"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Inhalt des Eintrags l?schen"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Mit <tab> automatisch aus dem Adressbuch vervollst?ndigen"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Gr??e"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518 src/editvcard.c:192 src/export.c:164
+#: src/import.c:163 src/importmutt.c:239 src/importpine.c:238
+#: src/plugins/archive/archiver_gtk.c:1021 src/plugins/bogofilter/bogofilter_gtk.c:229
+#: src/plugins/bogofilter/bogofilter_gtk.c:252 src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/clamd/clamav_plugin_gtk.c:299 src/plugins/spamassassin/spamassassin_gtk.c:418
 msgid "_Browse"
 msgstr "_Durchsuchen"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "_Kopfzeile"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Anh?nge"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "_Weiteres"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Betreff:"
+msgstr "B_etreff:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2222,95 +2165,93 @@ msgstr ""
 "Rechtschreibpr?fung konnte nicht gestartet werden.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Von: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Von:"
+msgstr "V_on:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "F?r diese E-Mail zu verwendendes Konto"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Zu benutzende Absenderadresse"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
-"The privacy system '%s' cannot be loaded. You will not be able to sign or "
-"encrypt this message."
+"The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
 msgstr ""
-"Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht m?glich "
-"sein, diese Nachricht zu signieren oder zu verschl?sseln."
+"Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht m?glich sein, diese Nachricht "
+"zu signieren oder zu verschl?sseln."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Keines"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Der Text der Vorlage hat einen Fehler in Zeile %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Formatierungsfehler in Von-Vorlage."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Formatierungsfehler in An-Vorlage."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Formatierungsfehler in Cc-Vorlage."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Formatierungsfehler in Bcc-Vorlage."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Formatierungsfehler in Reply-to-Vorlage."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Formatierungsfehler in Betreff-Vorlage."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Ung?ltiger MIME-Typ."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2321,15 +2262,15 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail ben?tigt Zugang zum Netz, um diese E-Mail zu senden."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht vorgespeichert werden."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2339,15 +2280,15 @@ msgstr ""
 "Nachricht konnte nicht vorgespeichert werden\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Entwurf konnte nicht gespeichert werden"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2355,24 +2296,24 @@ msgstr ""
 "Entwurf konnte nicht gespeichert werden.\n"
 "M?chten Sie das Beenden zur?cknehmen oder die Nachricht verwerfen?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "Beenden _zur?cknehmen"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Nachricht verwerfen"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Datei ausw?hlen"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2381,86 +2322,84 @@ msgstr ""
 "Die Datei '%s' enth?lt ung?ltige Zeichen\n"
 "f?r die aktuelle Kodierung, Einf?gung kann fehlerhaft sein."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde ge?ndert. Verwerfen?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "?nderungen speichern"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Diese Nachricht wurde ge?ndert. Die letzten ?nderungen speichern?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Nicht Speichern"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Als Entwurf _speichern"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "M?chten Sie die Vorlage '%s' anwenden?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10393 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:775 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Ersetzen"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "Einf?gen"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Einf?gen oder Anh?ngen?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
-"Do you want to insert the contents of the file(s) into the message body, or "
-"attach it to the email?"
+"Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
 msgstr ""
-"Wollen Sie den Inhalt der Datei in den Nachrichtenk?rper einf?gen oder an "
-"die Nachricht anh?ngen?"
+"Wollen Sie den Inhalt der Datei in den Nachrichtenk?rper einf?gen oder an die Nachricht anh?ngen?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Anhang"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Zitat-Formatierungsfehler in Zeile %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
-"You are about to reply to %d messages. Opening the windows could take some "
-"time. Do you want to continue?"
+"You are about to reply to %d messages. Opening the windows could take some time. Do you want to "
+"continue?"
 msgstr ""
-"Sie sind dabei, auf %d Nachrichten zu antworten. Das ?ffnen der Fenster kann "
-"eine Weile dauern. Wollen Sie fortfahren?"
+"Sie sind dabei, auf %d Nachrichten zu antworten. Das ?ffnen der Fenster kann eine Weile dauern. "
+"Wollen Sie fortfahren?"
 
 #: src/crash.c:141
 #, c-format
@@ -2603,8 +2542,8 @@ msgstr "Bild _entfernen"
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:517
-#: src/exporthtml.c:761 src/ldif.c:747
+#: src/editaddress.c:952 src/editaddress.c:954 src/expldifdlg.c:517 src/exporthtml.c:761
+#: src/ldif.c:747
 msgid "Display Name"
 msgstr "Angezeigter Name"
 
@@ -2626,8 +2565,8 @@ msgstr "Alias"
 
 # UI adapted
 #: src/editaddress.c:1264 src/editaddress.c:1333 src/editaddress.c:1353
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
+#: src/editaddress_other_attributes_ldap.c:303 src/editaddress_other_attributes_ldap.c:371
+#: src/prefs_customheader.c:222
 msgid "Value"
 msgstr "Feldwert"
 
@@ -2663,9 +2602,8 @@ msgstr "Adressbuch bearbeiten"
 msgid " Check File "
 msgstr " Datei ?berpr?fen "
 
-#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1959
-#: src/wizard.c:1187 src/wizard.c:1602
+#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185 src/importmutt.c:232
+#: src/importpine.c:231 src/prefs_account.c:1959 src/wizard.c:1187 src/wizard.c:1602
 msgid "File"
 msgstr "Datei"
 
@@ -2718,8 +2656,8 @@ msgstr "Geben Sie den neuen Namen des Ordners ein:"
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: src/editgroup.c:557 src/foldersel.c:586 src/mh_gtk.c:146 src/plugins/mailmbox/plugin_gtk.c:246
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
 
@@ -2751,8 +2689,8 @@ msgstr "LDAP bearbeiten - Suchbasis w?hlen"
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/editldap_basedn.c:167 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:110
+#: src/editldap_basedn.c:167 src/editldap.c:458 src/plugins/clamd/clamav_plugin_gtk.c:389
+#: src/ssl_manager.c:110
 msgid "Port"
 msgstr "Port"
 
@@ -2766,8 +2704,7 @@ msgstr "Verf?gbare Suchbasen"
 
 #: src/editldap_basedn.c:288
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr ""
-"Suchbasen konnten nicht vom Server gelesen werden - bitte manuell setzen"
+msgstr "Suchbasen konnten nicht vom Server gelesen werden - bitte manuell setzen"
 
 #: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
@@ -2799,15 +2736,13 @@ msgstr "Geben Sie dem Server einen Namen."
 
 #: src/editldap.c:450
 msgid ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
-"be appropriate for the \"mydomain.com\" organization. An IP address may also "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
-"computer as Claws Mail."
+"This is the hostname of the server. For example, \"ldap.mydomain.com\" may be appropriate for the "
+"\"mydomain.com\" organization. An IP address may also be used. You may specify \"localhost\" if "
+"running an LDAP server on the same computer as Claws Mail."
 msgstr ""
-"Dies ist der Hostname des Servers. \"ldap.mydomain.com\" w?re z.B. f?r die "
-"Organisation \"mydomain.com\" geeignet. Eine IP-Adresse kann auch verwendet "
-"werden. Wenn der LDAP-Server und Claws Mail auf dem selben Computer laufen, "
-"k?nnen Sie \"localhost\" angeben."
+"Dies ist der Hostname des Servers. \"ldap.mydomain.com\" w?re z.B. f?r die Organisation \"mydomain."
+"com\" geeignet. Eine IP-Adresse kann auch verwendet werden. Wenn der LDAP-Server und Claws Mail "
+"auf dem selben Computer laufen, k?nnen Sie \"localhost\" angeben."
 
 #: src/editldap.c:470
 msgid "TLS"
@@ -2819,23 +2754,19 @@ msgstr "SSL"
 
 #: src/editldap.c:475
 msgid ""
-"Enable secure connection to the LDAP server via TLS. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
-"TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via TLS. If connection fails, be sure to check the "
+"correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
 msgstr ""
-"Sichere Verbindung zum LDAP Server via TLS aktivieren. Wenn keine Verbindung "
-"erfolgt, ?berpr?fen Sie die Konfiguration in der ldap.conf (die Felder "
-"TLS_CACERTDIR und TLS_REQCERT)."
+"Sichere Verbindung zum LDAP Server via TLS aktivieren. Wenn keine Verbindung erfolgt, ?berpr?fen "
+"Sie die Konfiguration in der ldap.conf (die Felder TLS_CACERTDIR und TLS_REQCERT)."
 
 #: src/editldap.c:479
 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)."
+"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 ""
-"Sichere Verbindung zum LDAP Server via SSL aktivieren. Wenn keine Verbindung "
-"erfolgt, ?berpr?fen Sie die Konfiguration in der ldap.conf (die Felder "
-"TLS_CACERTDIR und TLS_REQCERT)."
+"Sichere Verbindung zum LDAP Server via SSL aktivieren. Wenn keine Verbindung erfolgt, ?berpr?fen "
+"Sie die Konfiguration in der ldap.conf (die Felder TLS_CACERTDIR und TLS_REQCERT)."
 
 #: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -2847,30 +2778,24 @@ msgstr " Server ?berpr?fen "
 
 #: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um die Verbindung zum Server zu testen."
+msgstr "Klicken Sie auf diese Schaltfl?che, um die Verbindung zum Server zu testen."
 
 #: src/editldap.c:511
 msgid ""
-"This specifies the name of the directory to be searched on the server. "
-"Examples include:\n"
+"This specifies the name of the directory to be searched on the server. Examples include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Dies gibt das Verzeichnis an, das auf dem Server durchsucht werden soll. "
-"Beispiele sind:\n"
+"Dies gibt das Verzeichnis an, das auf dem Server durchsucht werden soll. Beispiele sind:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 #: src/editldap.c:522
-msgid ""
-"Press this button to lookup the name of available directory names on the "
-"server."
+msgid "Press this button to lookup the name of available directory names on the server."
 msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um auf dem Server verf?gbare "
-"Verzeichnisnamen nachzuschlagen."
+"Klicken Sie auf diese Schaltfl?che, um auf dem Server verf?gbare Verzeichnisnamen nachzuschlagen."
 
 #: src/editldap.c:578
 msgid "Search Attributes"
@@ -2878,11 +2803,10 @@ msgstr "Suchattribute"
 
 #: src/editldap.c:587
 msgid ""
-"A list of LDAP attribute names that should be searched when attempting to "
-"find a name or address."
+"A list of LDAP attribute names that should be searched when attempting to find a name or address."
 msgstr ""
-"Eine Liste von LDAP-Attributnamen, die bei der Suche nach Name oder Adresse "
-"durchsucht werden sollen."
+"Eine Liste von LDAP-Attributnamen, die bei der Suche nach Name oder Adresse durchsucht werden "
+"sollen."
 
 #: src/editldap.c:590
 msgid " Defaults "
@@ -2890,11 +2814,11 @@ msgstr " Standardwerte "
 
 #: src/editldap.c:594
 msgid ""
-"This resets the attribute names to a default value that should find most "
-"names and addresses during a name or address search process."
+"This resets the attribute names to a default value that should find most names and addresses "
+"during a name or address search process."
 msgstr ""
-"Dies setzt die Attributnamen auf einen Standardwert zur?ck, der die meisten "
-"Namen und Adressen bei einer Suche finden sollte."
+"Dies setzt die Attributnamen auf einen Standardwert zur?ck, der die meisten Namen und Adressen bei "
+"einer Suche finden sollte."
 
 #: src/editldap.c:600
 msgid "Max Query Age (secs)"
@@ -2902,40 +2826,33 @@ msgstr "Max. Abfragealter (Sek.)"
 
 #: src/editldap.c:615
 msgid ""
-"This defines the maximum period of time (in seconds) that an address search "
-"result is valid for address completion purposes. Search results are stored "
-"in a cache until this period of time has passed and then retired. This will "
-"improve the response time when attempting to search for the same name or "
-"address on subsequent address completion requests. The cache will be "
-"searched in preference to performing a new server search request. The "
-"default value of 600 seconds (10 minutes), should be sufficient for most "
-"servers. A larger value will reduce the search time for subsequent searches. "
-"This is useful for servers that have slow response times at the expense of "
+"This defines the maximum period of time (in seconds) that an address search result is valid for "
+"address completion purposes. Search results are stored in a cache until this period of time has "
+"passed and then retired. This will improve the response time when attempting to search for the "
+"same name or address on subsequent address completion requests. The cache will be searched in "
+"preference to performing a new server search request. The default value of 600 seconds (10 "
+"minutes), should be sufficient for most servers. A larger value will reduce the search time for "
+"subsequent searches. This is useful for servers that have slow response times at the expense of "
 "more memory to cache results."
 msgstr ""
-"Dies definiert die maximale Zeit (in Sekunden), f?r die das Ergebnis einer "
-"Adresssuche f?r die Vervollst?ndigung g?ltig sein soll. Suchergebnisse "
-"werden f?r diesen Zeitraum in einem Zwischenspeicher gehalten und dann "
-"entfernt. Dies verbessert die Antwortzeit bei der Suche nach gleichen Namen "
-"oder Adressen in aufeinanderfolgenden Anfragen zur Adressvervollst?ndigung. "
-"Der Zwischenspeicher wird vorrangig vor Anfragen an den Server zur Suche "
-"verwendet. Der Standardwert ist 600 Sekunden (10 Minuten), was f?r die "
-"meisten Server genug sein sollte. Ein gr??erer Wert reduziert die Suchzeit "
-"f?r aufeinanderfolgende Anfragen. Dies ist n?tzlich bei Servern mit "
-"langsamer Antwortzeit, ben?tigt aber mehr Speicher zum Zwischenspeichern der "
-"Ergebnissen."
+"Dies definiert die maximale Zeit (in Sekunden), f?r die das Ergebnis einer Adresssuche f?r die "
+"Vervollst?ndigung g?ltig sein soll. Suchergebnisse werden f?r diesen Zeitraum in einem "
+"Zwischenspeicher gehalten und dann entfernt. Dies verbessert die Antwortzeit bei der Suche nach "
+"gleichen Namen oder Adressen in aufeinanderfolgenden Anfragen zur Adressvervollst?ndigung. Der "
+"Zwischenspeicher wird vorrangig vor Anfragen an den Server zur Suche verwendet. Der Standardwert "
+"ist 600 Sekunden (10 Minuten), was f?r die meisten Server genug sein sollte. Ein gr??erer Wert "
+"reduziert die Suchzeit f?r aufeinanderfolgende Anfragen. Dies ist n?tzlich bei Servern mit "
+"langsamer Antwortzeit, ben?tigt aber mehr Speicher zum Zwischenspeichern der Ergebnissen."
 
 #: src/editldap.c:632
 msgid "Include server in dynamic search"
 msgstr "Server in dynamische Suche einbeziehen"
 
 #: src/editldap.c:637
-msgid ""
-"Check this option to include this server for dynamic searches when using "
-"address completion."
+msgid "Check this option to include this server for dynamic searches when using address completion."
 msgstr ""
-"Diese Option w?hlen, um den Server bei der dynamischen Suche zur Adress-"
-"Vervollst?ndigung zu verwenden."
+"Diese Option w?hlen, um den Server bei der dynamischen Suche zur Adress-Vervollst?ndigung zu "
+"verwenden."
 
 #: src/editldap.c:643
 msgid "Match names 'containing' search term"
@@ -2943,17 +2860,15 @@ msgstr "Treffernamen 'enthalten' Suchbegriff"
 
 #: src/editldap.c:648
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-with\" or \"contains\" "
+"search term. Check this option to perform a \"contains\" search; this type of search usually takes "
+"longer to complete. Note that for performance reasons, address completion uses \"begins-with\" for "
+"all searches against other address interfaces."
 msgstr ""
-"Die Suche nach Namen und Adressen kann entweder mit 'beginnt-mit' oder "
-"'enth?lt' durchgef?hrt werden. Diese Option w?hlen, um eine 'enth?lt' Suche "
-"durchzuf?hren; diese Art der Suche dauert normalerweise l?nger. Aus "
-"Geschwindigkeitsgr?nden wird deshalb f?r die Adressvervollst?ndigung eine "
-"'beginnt mit'-Suche f?r alle anderen Adressinterfaces verwendet."
+"Die Suche nach Namen und Adressen kann entweder mit 'beginnt-mit' oder 'enth?lt' durchgef?hrt "
+"werden. Diese Option w?hlen, um eine 'enth?lt' Suche durchzuf?hren; diese Art der Suche dauert "
+"normalerweise l?nger. Aus Geschwindigkeitsgr?nden wird deshalb f?r die Adressvervollst?ndigung "
+"eine 'beginnt mit'-Suche f?r alle anderen Adressinterfaces verwendet."
 
 #: src/editldap.c:701
 msgid "Bind DN"
@@ -2961,15 +2876,13 @@ msgstr "Bind DN"
 
 #: src/editldap.c:710
 msgid ""
-"The LDAP user account name to be used to connect to the server. This is "
-"usually only used for protected servers. This name is typically formatted "
-"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
-"performing a search."
+"The LDAP user account name to be used to connect to the server. This is usually only used for "
+"protected servers. This name is typically formatted as: \"cn=user,dc=claws-mail,dc=org\". This is "
+"usually left empty when performing a search."
 msgstr ""
-"Der LDAP Useraccountname zum Verbinden mit dem Server. Dies wird "
-"?blicherweise nur bei gesch?tzten Servern verwendet. Dieser Name ist "
-"typischerweise folgenderma?en formatiert: \"cn=user,dc=claws-mail,dc=com\". "
-"Gew?hnlich wird das Feld bei einer Suche leer gelassen."
+"Der LDAP Useraccountname zum Verbinden mit dem Server. Dies wird ?blicherweise nur bei gesch?tzten "
+"Servern verwendet. Dieser Name ist typischerweise folgenderma?en formatiert: \"cn=user,dc=claws-"
+"mail,dc=com\". Gew?hnlich wird das Feld bei einer Suche leer gelassen."
 
 #: src/editldap.c:717
 msgid "Bind Password"
@@ -2992,11 +2905,8 @@ msgid "Maximum Entries"
 msgstr "Maximale Anzahl von Eintr?gen"
 
 #: src/editldap.c:764
-msgid ""
-"The maximum number of entries that should be returned in the search result."
-msgstr ""
-"Die maximale Zahl von Eintr?gen, die im Suchresultat ausgegeben werden "
-"sollen."
+msgid "The maximum number of entries that should be returned in the search result."
+msgstr "Die maximale Zahl von Eintr?gen, die im Suchresultat ausgegeben werden sollen."
 
 #: src/editldap.c:779 src/prefs_account.c:3234
 msgid "Basic"
@@ -3036,9 +2946,7 @@ msgstr "Sollen wirklich alle Marken gel?scht werden?"
 
 #: src/edittags.c:416
 msgid "You entered a reserved tag name, please choose another instead."
-msgstr ""
-"Sie haben einen reservierten Tag-Name eingegeben, bitte verwenden Sie einen "
-"anderen."
+msgstr "Sie haben einen reservierten Tag-Name eingegeben, bitte verwenden Sie einen anderen."
 
 #: src/edittags.c:458
 msgid "Tag is not set."
@@ -3127,8 +3035,7 @@ msgstr "HTML-Ausgabedatei w?hlen"
 msgid "HTML Output File"
 msgstr "HTML-Ausgabedatei"
 
-#: src/exphtmldlg.c:393 src/expldifdlg.c:410 src/export.c:171 src/import.c:170
-#: src/importldif.c:685
+#: src/exphtmldlg.c:393 src/expldifdlg.c:410 src/export.c:171 src/import.c:170 src/importldif.c:685
 msgid "B_rowse"
 msgstr "Du_rchsuchen"
 
@@ -3136,39 +3043,37 @@ msgstr "Du_rchsuchen"
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
-#: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1178
-#: src/plugins/archive/archiver_prefs.c:235
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:948
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:6016
+#: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571 src/gtk/gtkaspell.c:2231
+#: src/gtk/menu.c:125 src/mainwindow.c:1178 src/plugins/archive/archiver_prefs.c:235
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:948 src/prefs_toolbar.c:780
+#: src/prefs_toolbar.c:1466 src/summaryview.c:6016
 msgid "None"
 msgstr "ohne"
 
-#: src/exphtmldlg.c:455 src/prefs_folder_item.c:512 src/prefs_other.c:116
-#: src/prefs_other.c:408
+#: src/exphtmldlg.c:455 src/prefs_folder_item.c:512 src/prefs_other.c:116 src/prefs_other.c:408
 msgid "Default"
 msgstr "Standard"
 
-#: src/exphtmldlg.c:456 src/plugins/pgpcore/select-keys.c:244
-#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:164
+#: src/exphtmldlg.c:456 src/plugins/pgpcore/select-keys.c:244 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Full"
 msgstr "Voll"
 
 #: src/exphtmldlg.c:457
 msgid "Custom"
-msgstr "Nutzerdefiniert"
+msgstr "Benutzerdefiniert"
 
 #: src/exphtmldlg.c:458
 msgid "Custom-2"
-msgstr "Nutzerdefiniert-2"
+msgstr "Benutzerdefiniert-2"
 
 #: src/exphtmldlg.c:459
 msgid "Custom-3"
-msgstr "Nutzerdefiniert-3"
+msgstr "Benutzerdefiniert-3"
 
 #: src/exphtmldlg.c:460
 msgid "Custom-4"
-msgstr "Nutzerdefiniert-4"
+msgstr "Benutzerdefiniert-4"
 
 #: src/exphtmldlg.c:467
 msgid "Full Name Format"
@@ -3254,11 +3159,11 @@ msgstr "Kein Suffix angegeben"
 
 #: src/expldifdlg.c:244
 msgid ""
-"A suffix is required if data is to be used for an LDAP server. Are you sure "
-"you wish to proceed without a suffix?"
+"A suffix is required if data is to be used for an LDAP server. Are you sure you wish to proceed "
+"without a suffix?"
 msgstr ""
-"Ein Suffix ist erforderlich, um Daten mit einem LDAP Server zu verwenden. "
-"Sind Sie sicher, dass Sie ohne Suffix fortfahren wollen?"
+"Ein Suffix ist erforderlich, um Daten mit einem LDAP Server zu verwenden. Sind Sie sicher, dass "
+"Sie ohne Suffix fortfahren wollen?"
 
 #: src/expldifdlg.c:262
 msgid "Error creating LDIF file"
@@ -3274,32 +3179,28 @@ msgstr "LDIF-Ausgabedatei"
 
 #: src/expldifdlg.c:432
 msgid ""
-"The address book Unique ID is used to create a DN that is formatted similar "
-"to:\n"
+"The address book Unique ID is used to create a DN that is formatted similar to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Die eindeutige ID des Adressbuchs wird verwendet, um ein DN zu erzeugen, der "
-"formatiert ist wie:\n"
+"Die eindeutige ID des Adressbuchs wird verwendet, um ein DN zu erzeugen, der formatiert ist wie:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:438
 msgid ""
-"The address book Display Name is used to create a DN that is formatted "
-"similar to:\n"
+"The address book Display Name is used to create a DN that is formatted similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Der angezeigte Adressbuchname wird verwendet, um ein DN zu erzeugen, der "
-"formatiert ist wie:\n"
+"Der angezeigte Adressbuchname wird verwendet, um ein DN zu erzeugen, der formatiert ist wie:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:444
 msgid ""
-"The first Email Address belonging to a person is used to create a DN that is "
-"formatted similar to:\n"
+"The first Email Address belonging to a person is used to create a DN that is formatted similar "
+"to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"Die erste zu einer Person geh?rige E-Mail-Adresse wird verwendet, um ein DN "
-"zu erzeugen, der formatiert ist wie:\n"
+"Die erste zu einer Person geh?rige E-Mail-Adresse wird verwendet, um ein DN zu erzeugen, der "
+"formatiert ist wie:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:490
@@ -3308,14 +3209,14 @@ msgstr "Suffix"
 
 #: src/expldifdlg.c:500
 msgid ""
-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
-"entry. Examples include:\n"
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP entry. Examples "
+"include:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
-"Das Suffix wird verwendet, um einen \"Distinguierten Name\" (oder DN) f?r "
-"einen LDAP Eintrag zu erzeugen. Beispiele sind:\n"
+"Das Suffix wird verwendet, um einen \"Distinguierten Name\" (oder DN) f?r einen LDAP Eintrag zu "
+"erzeugen. Beispiele sind:\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
@@ -3330,18 +3231,15 @@ msgstr "Eindeutige ID"
 
 #: src/expldifdlg.c:524
 msgid ""
-"The LDIF file contains several data records that are usually loaded into an "
-"LDAP server. Each data record in the LDIF file is uniquely identified by a "
-"\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
-"Distinguished Name\" (or RDN) to create the DN. Please select one of the "
-"available RDN options that will be used to create the DN."
+"The LDIF file contains several data records that are usually loaded into an LDAP server. Each data "
+"record in the LDIF file is uniquely identified by a \"Distinguished Name\" (or DN). The suffix is "
+"appended to the \"Relative Distinguished Name\" (or RDN) to create the DN. Please select one of "
+"the available RDN options that will be used to create the DN."
 msgstr ""
-"Die LDIF-Datei enth?lt mehrere Eintr?ge, die normalerweise in einen LDAP-"
-"Server geladen werden. Jeder Eintrag der LDIF-Datei wird eindeutig "
-"identifiziert durch einen 'Distinguierten Name' (oder DN). Das Suffix wird "
-"an den 'Relativen Distinguierten Name' (oder RDN) angeh?ngt, um den DN zu "
-"erzeugen. Bitte eine der verf?gbaren RDN-Optionen f?r die Erstellung des DN "
-"w?hlen."
+"Die LDIF-Datei enth?lt mehrere Eintr?ge, die normalerweise in einen LDAP-Server geladen werden. "
+"Jeder Eintrag der LDIF-Datei wird eindeutig identifiziert durch einen 'Distinguierten Name' (oder "
+"DN). Das Suffix wird an den 'Relativen Distinguierten Name' (oder RDN) angeh?ngt, um den DN zu "
+"erzeugen. Bitte eine der verf?gbaren RDN-Optionen f?r die Erstellung des DN w?hlen."
 
 #: src/expldifdlg.c:544
 msgid "Use DN attribute if present in data"
@@ -3349,15 +3247,13 @@ msgstr "DN-Zusatzangabe verwenden, wenn in den Daten verf?gbar"
 
 #: src/expldifdlg.c:549
 msgid ""
-"The addressbook may contain entries that were previously imported from an "
-"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
-"address book data, may be used in the exported LDIF file. The RDN selected "
-"above will be used if the DN user attribute is not found."
+"The addressbook may contain entries that were previously imported from an LDIF file. The "
+"\"Distinguished Name\" (DN) user attribute, if present in the address book data, may be used in "
+"the exported LDIF file. The RDN selected above will be used if the DN user attribute is not found."
 msgstr ""
-"Das Adressbuch kann zuvor aus einer LDIF-Datei importierte Eintr?ge "
-"enthalten. Die Zusatzangabe 'Distinguished Name' (DN) l?sst sich, wenn in "
-"den Adressbuchdaten vorhanden, in der exportierten LDIF-Date verwenden. Der "
-"oben gew?hlte RDN wird benutzt, wenn die Benutzer-Zusatzangabe DN nicht "
+"Das Adressbuch kann zuvor aus einer LDIF-Datei importierte Eintr?ge enthalten. Die Zusatzangabe "
+"'Distinguished Name' (DN) l?sst sich, wenn in den Adressbuchdaten vorhanden, in der exportierten "
+"LDIF-Date verwenden. Der oben gew?hlte RDN wird benutzt, wenn die Benutzer-Zusatzangabe DN nicht "
 "gefunden wird."
 
 #: src/expldifdlg.c:559
@@ -3366,11 +3262,11 @@ msgstr "Eintrag ausschlie?en, wenn ohne E-Mail-Adresse"
 
 #: src/expldifdlg.c:564
 msgid ""
-"An addressbook may contain entries without Email Addresses. Check this "
-"option to ignore these records."
+"An addressbook may contain entries without Email Addresses. Check this option to ignore these "
+"records."
 msgstr ""
-"Ein Adressbuch kann Eintr?ge ohne E-Mail-Adresse enthalten. Diese Option "
-"aktivieren, um solche Eintr?ge zu ignorieren."
+"Ein Adressbuch kann Eintr?ge ohne E-Mail-Adresse enthalten. Diese Option aktivieren, um solche "
+"Eintr?ge zu ignorieren."
 
 #: src/expldifdlg.c:656
 msgid "Export Address Book to LDIF File"
@@ -3416,8 +3312,7 @@ msgstr "Export-Datei w?hlen"
 msgid "Full Name"
 msgstr "Vollst?ndiger Name"
 
-#: src/exporthtml.c:771 src/importldif.c:1022
-#: src/plugins/archive/archiver_gtk.c:731
+#: src/exporthtml.c:771 src/importldif.c:1022 src/plugins/archive/archiver_gtk.c:731
 msgid "Attributes"
 msgstr "Merkmal"
 
@@ -3453,11 +3348,8 @@ msgstr "Konnte %s nicht nach %s kopieren."
 
 #: 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?"
-msgstr ""
-"Datei %s ist leer oder defekt! M?chten Sie die Backup-Datei von %s verwenden?"
+msgid "The file %s is empty or corrupted! Do you want to use the backup file from %s?"
+msgstr "Datei %s ist leer oder defekt! M?chten Sie die Backup-Datei von %s verwenden?"
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
@@ -3467,58 +3359,51 @@ msgstr "Filterregel ist nicht kontobasiert\n"
 #: src/filtering.c:607
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], matching the account currently "
-"used to retrieve messages\n"
+"rule is account-based [id=%d, name='%s'], matching the account currently used to retrieve "
+"messages\n"
 msgstr ""
-"Filterregel ist kontobasiert [id=%d, name='%s'], passend zu dem Konto das "
-"gerade benutzt wird, um Nachrichten empfangen\n"
+"Filterregel ist kontobasiert [id=%d, name='%s'], passend zu dem Konto das gerade benutzt wird, um "
+"Nachrichten empfangen\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627 src/filtering.c:651
+#: src/filtering.c:669 src/filtering.c:696 src/filtering.c:697 src/filtering.c:714
+#: src/filtering.c:715
 msgid "NON_EXISTENT"
 msgstr "NICHT_EXISTENT"
 
 #: src/filtering.c:617
-msgid ""
-"rule is account-based, not matching the account currently used to retrieve "
-"messages\n"
+msgid "rule is account-based, not matching the account currently used to retrieve messages\n"
 msgstr ""
-"Filterregel ist kontenbasiert und passt nicht zu dem Konto, mit dem "
-"gegenw?rtig Nachrichten abgerufen werden\n"
+"Filterregel ist kontenbasiert und passt nicht zu dem Konto, mit dem gegenw?rtig Nachrichten "
+"abgerufen werden\n"
 
 #: src/filtering.c:624
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching the account currently "
-"used to retrieve messages [id=%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching the account currently used to retrieve "
+"messages [id=%d, name='%s']\n"
 msgstr ""
-"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zu dem "
-"Konto, mit dem gegenw?rtig Nachrichten abgerufen werden [id=%d, name='%s']\n"
+"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zu dem Konto, mit dem gegenw?rtig "
+"Nachrichten abgerufen werden [id=%d, name='%s']\n"
 
 # ?bersetzung im Programmkontext pr?fen
 #: src/filtering.c:643
-msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+msgid "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
-"Filterregel ist nicht kontenbasiert, alle Filterregeln werden nach "
-"Benutzeranforderung ohnehin angewendet\n"
+"Filterregel ist nicht kontenbasiert, alle Filterregeln werden nach Benutzeranforderung ohnehin "
+"angewendet\n"
 
 #: src/filtering.c:649
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+msgid "rule is account-based [id=%d, name='%s'], but all rules are applied on user request\n"
 msgstr ""
-"Filterregel ist kontenbasiert [id=%d, name='%s'], aber auf "
-"Benutzeranforderung werden alle Filterregeln werden angewandt\n"
+"Filterregel ist kontenbasiert [id=%d, name='%s'], aber auf Benutzeranforderung werden alle "
+"Filterregeln werden angewandt\n"
 
 #: src/filtering.c:667
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
-"Filterregel ist kontenbasiert [id=%d, name='%s'], auf Benutzeranforderung "
-"?bersprungen\n"
+msgstr "Filterregel ist kontenbasiert [id=%d, name='%s'], auf Benutzeranforderung ?bersprungen\n"
 
 #: src/filtering.c:672
 msgid "rule is account-based, skipped on user request\n"
@@ -3526,12 +3411,10 @@ msgstr "Filterregel ist kontenbasiert, auf Benutzeranforderung ?bersprungen\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"
+msgid "rule is account-based [id=%d, name='%s'], not matching current account [id=%d, name='%s']\n"
 msgstr ""
-"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zum "
-"gegenw?rtigen Account [id=%d, name='%s']\n"
+"Filterregel ist kontenbasiert [id=%d, name='%s'] und passt nicht zum gegenw?rtigen Account [id=%d, "
+"name='%s']\n"
 
 #: src/filtering.c:700
 msgid "rule is account-based, not matching current account\n"
@@ -3540,12 +3423,8 @@ msgstr "Filterregel ist kontenbasiert und passt nicht zum aktuellen Konto\n"
 # ?bersetzung im Programmkontext pr?fen
 #: src/filtering.c:712
 #, c-format
-msgid ""
-"rule is account-based [id=%d, name='%s'], current account [id=%d, "
-"name='%s']\n"
-msgstr ""
-"Filterregel ist kontenbasiert [id=%d, name='%s'], aktuelles Konto ist [id="
-"%d, name='%s']\n"
+msgid "rule is account-based [id=%d, name='%s'], current account [id=%d, name='%s']\n"
+msgstr "Filterregel ist kontenbasiert [id=%d, name='%s'], aktuelles Konto ist [id=%d, name='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
@@ -3644,8 +3523,8 @@ msgstr "Posteingang"
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/folder.c:1573 src/foldersel.c:411
-#: src/plugins/attachwarner/attachwarner.c:217 src/prefs_folder_item.c:309
+#: src/folder.c:1573 src/foldersel.c:411 src/plugins/attachwarner/attachwarner.c:217
+#: src/prefs_folder_item.c:309
 msgid "Queue"
 msgstr "Postausgang"
 
@@ -3687,39 +3566,35 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisiere %s f?r Offline-Nutzung...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Ordner k?nnen nicht zwischen verschiedenen Mailboxen verschoben werden"
+msgstr "Ein Ordnername darf nicht mit einem Punkt beginnen oder enden."
 
 #: src/foldersel.c:247
 msgid "Select folder"
 msgstr "Ordner w?hlen"
 
-#: src/foldersel.c:587 src/imap_gtk.c:199 src/mh_gtk.c:147
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:95
+#: src/foldersel.c:587 src/imap_gtk.c:199 src/mh_gtk.c:147 src/plugins/mailmbox/plugin_gtk.c:247
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "NewFolder"
 msgstr "NeuerOrdner"
 
-#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
-#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
+#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216 src/imap_gtk.c:272 src/imap_gtk.c:277
+#: src/mh_gtk.c:155 src/mh_gtk.c:264 src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
 #: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
 #: src/plugins/vcalendar/vcal_folder.c:2042
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
-#: src/foldersel.c:610 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:168
-#: src/mh_gtk.c:274 src/news_gtk.c:322 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:437 src/plugins/rssyl/rssyl_cb_menu.c:221
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/foldersel.c:610 src/imap_gtk.c:226 src/imap_gtk.c:284 src/mh_gtk.c:168 src/mh_gtk.c:274
+#: src/news_gtk.c:322 src/plugins/mailmbox/plugin_gtk.c:270 src/plugins/mailmbox/plugin_gtk.c:437
+#: src/plugins/rssyl/rssyl_cb_menu.c:221 src/plugins/vcalendar/vcal_folder.c:2049
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 
-#: src/foldersel.c:617 src/imap_gtk.c:232 src/mh_gtk.c:174
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:126
+#: src/foldersel.c:617 src/imap_gtk.c:232 src/mh_gtk.c:174 src/plugins/mailmbox/plugin_gtk.c:277
+#: src/plugins/rssyl/opml_import.c:91 src/plugins/rssyl/rssyl_cb_menu.c:126
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
@@ -3729,9 +3604,8 @@ msgid "Mark all re_ad"
 msgstr "Alle _gelesen markieren"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Alle als _gelesen markieren"
+msgstr "Rekursiv alle als gelesen marki_eren"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3753,14 +3627,12 @@ msgstr "_Papierkorb leeren"
 msgid "Send _queue..."
 msgstr "_Postausgang senden..."
 
-#: src/folderview.c:387 src/folderview.c:434
-#: src/plugins/notification/notification_lcdproc.c:141
+#: src/folderview.c:387 src/folderview.c:434 src/plugins/notification/notification_lcdproc.c:141
 #: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6292
 msgid "New"
 msgstr "Neu"
 
-#: src/folderview.c:388 src/folderview.c:435
-#: src/plugins/notification/notification_lcdproc.c:145
+#: src/folderview.c:388 src/folderview.c:435 src/plugins/notification/notification_lcdproc.c:145
 #: src/prefs_folder_column.c:80 src/prefs_matcher.c:390 src/summaryview.c:6294
 msgid "Unread"
 msgstr "Ungelesen"
@@ -3779,105 +3651,105 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Ordnerdaten werden erstellt..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Alle als gelesen markieren"
+#: src/folderview.c:839
+msgid "Do you really want to mark all mails in this folder and its sub-folders as read?"
+msgstr ""
+"M?chten Sie wirklich alle Mails in diesem Ordner und seinen Unterordnern als gelesen markieren?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
-msgstr ""
-"M?chten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
+msgstr "M?chten Sie wirklich alle Mails in diesem Ordner als gelesen markieren?"
+
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Alle als gelesen markieren"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ordner %s%c%s wird durchsucht..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ordner %s wird durchsucht..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Ordnerbaum erneuern"
 
-#: src/folderview.c:1040
-msgid ""
-"Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr ""
-"Erneuern des Ordnerbaumes l?scht den lokalen Pufferspeicher. M?chten Sie "
-"fortfahren?"
+#: src/folderview.c:1043
+msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
+msgstr "Erneuern des Ordnerbaumes l?scht den lokalen Pufferspeicher. M?chten Sie fortfahren?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten gepr?ft..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Schlie?e Ordner %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "?ffne Ordner %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht ge?ffnet werden."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb l?schen?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Vorgespeicherte Nachrichten senden"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle vorgespeicherten Nachrichten senden?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
-#: src/toolbar.c:2629
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873 src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden vorgespeicherter Nachrichten."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3886,66 +3758,64 @@ msgstr ""
 "Fehler beim Senden vorgespeicherter Nachrichten:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Soll der Ordner '%s' wirklich ein Unterordner von '%s' werden?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Quelle und Ziel sind identisch."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Ein Ordner ist nicht in untergeordnete Ordner kopierbar."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
-msgstr ""
-"Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
-"werden."
+msgstr "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben werden."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner k?nnen nicht zwischen verschiedenen Mailboxen verschoben werden"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kopieren schlug fehl!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Verschieben schlug fehl!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration Verarbeitung f?r Ordner %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Der Zielordner kann nur Unterordner aufnehmen."
 
@@ -3986,8 +3856,7 @@ msgid "readonly"
 msgstr "nur lesen"
 
 #: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:113
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:113 src/plugins/vcalendar/vcal_manager.c:146
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -4012,7 +3881,7 @@ msgid ""
 msgstr ""
 "Claws Mail ist ein schlankes, schnelles und sehr flexibles E-Mailprogramm.\n"
 "\n"
-"Weitere Informationen finden Sie auf der  Webseite von Claws Mail:\n"
+"Weitere Informationen finden Sie auf der Webseite von Claws Mail:\n"
 
 #: src/gtk/about.c:137
 msgid ""
@@ -4022,23 +3891,21 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"F?r Hilfe und Diskussionen k?nnen Sie die Claws Mail-Users-Mailingliste "
-"abonnieren:\n"
+"F?r Hilfe und Diskussionen k?nnen Sie die Claws Mail-Users-Mailingliste abonnieren:\n"
 
 #: src/gtk/about.c:142
 msgid ""
 "\n"
 "\n"
-"Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"Claws Mail is free software released under the GPL. If you wish to donate to the Claws Mail "
+"project you can do so at:\n"
 msgstr ""
 "\n"
 "\n"
-"Claws Mail ist freie Software, ver?ffentlicht unter der GPL. Wenn Sie an das "
-"Claws Mail-Projekt spenden m?chten, hier entlang:\n"
+"Claws Mail ist freie Software, ver?ffentlicht unter der GPL. Wenn Sie an das Claws Mail-Projekt "
+"spenden m?chten, hier entlang:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4048,7 +3915,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "Das Claws Mail Team\n"
 " und Hiroyuki Yamamoto"
 
@@ -4131,90 +3998,84 @@ msgstr "Fest eingebundene Funktionen\n"
 #: src/gtk/about.c:420
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
-msgstr "unterst?tzt X-Face Kopfzeilen\n"
+msgstr "f?r X-Face Kopfzeilen\n"
 
 #: src/gtk/about.c:430
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
-msgstr "unterst?tzt Rechtschreibpr?fung\n"
+msgstr "f?r Rechtschreibpr?fung\n"
 
 #: src/gtk/about.c:440
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
-msgstr "unterst?tzt verschl?sselte Server-Verbindungen\n"
+msgstr "f?r verschl?sselte Server-Verbindungen\n"
 
 #: src/gtk/about.c:450
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr ""
-"unterst?tzt Internet Protokoll Version 6, das neue Internet-"
-"Adressierungsprotokoll\n"
+msgstr "f?r IPv6, das neue Internet-Adressprotokoll\n"
 
 #: src/gtk/about.c:461
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
-msgstr "Konvertiert zwischen verschiedenen Zeichens?tzen\n"
+msgstr "f?r das Konvertieren verschiedener Zeichens?tze\n"
 
 #: src/gtk/about.c:471
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
-msgstr "unterst?tzt die Nutzung von PalmOS Adressb?chern\n"
+msgstr "f?r die Nutzung von PalmOS Adressb?chern\n"
 
 #: src/gtk/about.c:481
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
-msgstr "unterst?tzt das Mitbenutzen von LDAP Adressb?chern\n"
+msgstr "f?r verteilte LDAP-Adressb?cher\n"
 
 #: src/gtk/about.c:491
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
-msgstr "unterst?tzt IMAP- und NNTP-Server\n"
+msgstr "f?r IMAP- und NNTP-Server\n"
 
 #: src/gtk/about.c:501
 msgctxt "libSM"
 msgid "adds support for session handling\n"
-msgstr "unterst?tzt die Verwaltung von Session-Kennungen\n"
+msgstr "f?r das Verwalten von Sitzungen\n"
 
 #: src/gtk/about.c:511
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
-msgstr "unterst?tzt das Erkennen von Netzwerkverbindungs?nderungen\n"
+msgstr "f?r das Erkennen von ?nderungen der Netzwerkverbindung\n"
 
 #: src/gtk/about.c:543
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 3, or (at your option) any later "
-"version.\n"
+"This program is free software; you can redistribute it and/or modify it under the terms of the GNU "
+"General Public License as published by the Free Software Foundation; either version 3, or (at your "
+"option) any later version.\n"
 "\n"
 msgstr ""
-"Dieses Programm ist freie Software; Sie k?nnen es weitergeben und/oder "
-"modifizieren im Sinne der GNU General Public License wie sie von der Free "
-"Software Foundation ver?ffentlicht wird; entweder Version 3, oder "
-"(wahlweise) jede neuere Version.\n"
+"Dieses Programm ist freie Software; Sie k?nnen es weitergeben und/oder modifizieren im Sinne der "
+"GNU General Public License, wie sie von der Free Software Foundation ver?ffentlicht wird; entweder "
+"Version 3, oder (wahlweise) jede neuere Version.\n"
 "\n"
 
 #: src/gtk/about.c:549
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without "
+"even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU "
+"General Public License for more details.\n"
 "\n"
 msgstr ""
-"Dieses Programm wird in der Hoffnung vertrieben, dass es n?tzlich ist, "
-"jedoch OHNE JEDE GARANTIE; selbst ohne die implizite Garantie der "
-"TAUGLICHKEIT oder der EIGNUNG F?R EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU "
-"General Public License f?r weitere Details.\n"
+"Dieses Programm wird in der Hoffnung vertrieben, dass es n?tzlich ist, jedoch OHNE JEGLICHE "
+"GARANTIE; selbst ohne die implizite Garantie der TAUGLICHKEIT oder der EIGNUNG F?R EINEN "
+"BESTIMMTEN ZWECK. Lesen Sie die GNU General Public License f?r weitere Details.\n"
 "\n"
 
 #: src/gtk/about.c:567
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <"
+"You should have received a copy of the GNU General Public License along with this program. If not, "
+"see <"
 msgstr ""
-"Sie sollten eine Kopie der GNU General Public License mit diesem Programm "
-"erhalten haben; wenn nicht, finden Sie diese unter <"
+"Sie sollten eine Kopie der GNU General Public License mit diesem Programm erhalten haben; wenn "
+"nicht, finden Sie diese unter <"
 
 #: src/gtk/about.c:572
 msgid ""
@@ -4273,13 +4134,12 @@ msgid "About Claws Mail"
 msgstr "?ber Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "Das Claws Mail Team\n"
 "und Hiroyuki Yamamoto"
 
@@ -4499,9 +4359,8 @@ msgstr "Fehlgeschlagen."
 msgid "Configuring..."
 msgstr "Konfiguriere?"
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
-#: src/summaryview.c:444
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259 src/prefs_matcher.c:2174
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:444
 msgid "Date"
 msgstr "Datum"
 
@@ -4509,9 +4368,8 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2171 src/prefs_summary_column.c:82 src/quote_fmt.c:50
-#: src/summaryview.c:442
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256 src/prefs_matcher.c:2171
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:442
 msgid "From"
 msgstr "Von"
 
@@ -4532,14 +4390,13 @@ msgid "Reply-To"
 msgstr "Reply-To"
 
 #: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2172
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:57 src/summaryview.c:443
+#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2172 src/prefs_summary_column.c:83
+#: src/quote_fmt.c:57 src/summaryview.c:443
 msgid "To"
 msgstr "An"
 
 #: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173
-#: src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4547,8 +4404,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2175 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260 src/prefs_matcher.c:2175
+#: src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4560,8 +4417,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2177 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262 src/prefs_matcher.c:2177
+#: src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenzen"
 
@@ -4569,14 +4426,12 @@ msgstr "Referenzen"
 msgid "References:"
 msgstr "Referenzen:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2170 src/prefs_summary_column.c:81 src/quote_fmt.c:56
-#: src/summaryview.c:441
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255 src/prefs_matcher.c:2170
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:441
 msgid "Subject"
 msgstr "Betreff"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
-#: src/summary_search.c:440
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702 src/summary_search.c:440
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -4668,8 +4523,8 @@ msgstr "Empfangen"
 msgid "Received:"
 msgstr "Empfangen:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2176 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261 src/prefs_matcher.c:2176
+#: src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Newsgruppen"
 
@@ -4693,9 +4548,8 @@ msgstr "Seen"
 msgid "Seen:"
 msgstr "Seen:"
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summary_column.c:79
-#: src/summaryview.c:2801
+#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149 src/gtk/sslcertwindow.c:164
+#: src/prefs_summary_column.c:79 src/summaryview.c:2801
 msgid "Status"
 msgstr "Status"
 
@@ -4985,19 +4839,19 @@ msgstr "Erkl?rung der Symbole"
 
 #: src/gtk/icon_legend.c:140
 msgid ""
-"<span weight=\"bold\">The following icons are used to show the status of "
-"messages and folders:</span>"
+"<span weight=\"bold\">The following icons are used to show the status of messages and folders:</"
+"span>"
 msgstr ""
-"<span weight=\"bold\">Folgende Symbole werden genutzt, um den Status von "
-"Nachrichten/Ordnern anzuzeigen:</span>"
+"<span weight=\"bold\">Folgende Symbole werden genutzt, um den Status von Nachrichten/Ordnern "
+"anzuzeigen:</span>"
 
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Kennwort f?r %s auf %s angeben:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239 src/gtk/inputdialog.c:258
+#: src/gtk/inputdialog.c:261
 #, c-format
 msgid "Input password for %s:"
 msgstr "Kennwort f?r %s eingeben:"
@@ -5006,8 +4860,7 @@ msgstr "Kennwort f?r %s eingeben:"
 msgid "Input password:"
 msgstr "Kennwort eingeben:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "Kennwort eingeben"
 
@@ -5030,8 +4883,8 @@ msgid ""
 "corrupted, malformed or part of some DoS attempt.</span>"
 msgstr ""
 "<span><b>Warnung:</b> Diese URL war zu lang um dargestellt zu werden.\n"
-"Sie wurde aus Sicherheitsgr?nden gek?rzt. Diese Nachricht k?nnte defekt, "
-"missgebildet oder Teil eines DoS-Versuchs sein.</span>"
+"Sie wurde aus Sicherheitsgr?nden gek?rzt. Diese Nachricht k?nnte defekt, missgebildet oder Teil "
+"eines DoS-Versuchs sein.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
 msgid ""
@@ -5067,28 +4920,22 @@ msgstr ""
 "%s\n"
 
 #: src/gtk/pluginwindow.c:304 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
-#: src/plugins/archive/archiver_prefs.c:90
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:552
-#: src/plugins/fancy/fancy_prefs.c:114
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:136
-#: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/notification/notification_prefs.c:399
+#: src/plugins/address_keeper/address_keeper_prefs.c:256 src/plugins/archive/archiver_prefs.c:90
+#: src/plugins/attachwarner/attachwarner_prefs.c:229 src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bsfilter/bsfilter_gtk.c:400 src/plugins/clamd/clamav_plugin_gtk.c:552
+#: src/plugins/fancy/fancy_prefs.c:114 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
+#: src/plugins/gdata/cm_gdata_prefs.c:136 src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397 src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
 #: src/plugins/notification/notification_prefs.c:451
 #: src/plugins/notification/notification_prefs.c:469
 #: src/plugins/notification/notification_prefs.c:487
 #: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
-#: src/plugins/pgpcore/prefs_gpg.c:569 src/plugins/rssyl/rssyl_prefs.c:70
-#: src/plugins/spam_report/spam_report_prefs.c:79
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
+#: src/plugins/notification/notification_prefs.c:523 src/plugins/pgpcore/prefs_gpg.c:569
+#: src/plugins/rssyl/rssyl_prefs.c:70 src/plugins/spam_report/spam_report_prefs.c:79
+#: src/plugins/spamassassin/spamassassin_gtk.c:648 src/plugins/vcalendar/vcal_prefs.c:680
+#: src/prefs_toolbar.c:944
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5107,11 +4954,11 @@ msgstr "Beschreibung"
 #: src/gtk/pluginwindow.c:374
 #, c-format
 msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
+"For more information about plugins see the <a href=\"%s\"><span underline=\"none\">Claws Mail "
+"website</span></a>."
 msgstr ""
-"Mehr Informationen zu Plugins finden Sie auf der <a href=\"%s\"><span "
-"underline=\"none\">Website von Claws Mail</span></a>."
+"Mehr Informationen zu Plugins finden Sie auf der <a href=\"%s\"><span underline=\"none\">Website "
+"von Claws Mail</span></a>."
 
 #: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
@@ -5133,11 +4980,11 @@ msgstr "Seitenindex"
 msgid "_Hide"
 msgstr "_Ausblenden"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663 src/prefs_account.c:3233
 #: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
 #: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Konto"
 
@@ -5304,9 +5151,7 @@ msgstr "Nachrichten, die S in der Referenz-Kopfzeile enthalten"
 #: src/gtk/quicksearch.c:491
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
-msgstr ""
-"Nachrichten, die bei ?bergabe an einen Befehl 0 zur?ckgeben - %F ist die "
-"Nachrichtendatei"
+msgstr "Nachrichten, die bei ?bergabe an einen Befehl 0 zur?ckgeben - %F ist die Nachrichtendatei"
 
 #: src/gtk/quicksearch.c:492
 msgid "messages which contain S in X-Label header"
@@ -5342,22 +5187,19 @@ msgstr "Erweiterte Suche"
 
 #: src/gtk/quicksearch.c:510
 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"
+"Extended Search allows the user to define criteria that messages must have in order to match and "
+"be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Die erweiterte Suche erlaubt, Kriterien zu definieren, die Nachrichten "
-"erf?llen m?ssen, um in der Liste angezeigt zu werden.\n"
+"Die erweiterte Suche erlaubt, Kriterien zu definieren, die Nachrichten erf?llen m?ssen, um in der "
+"Liste angezeigt zu werden.\n"
 "Folgende Symbole k?nnen verwendet werden:"
 
 #: src/gtk/quicksearch.c:610
 msgid "Something went wrong during search. Please check your logs."
-msgstr ""
-"W?hrend der Suche lief etwas schief. Bitte ?berpr?fen Sie die Protokoll-"
-"Dateien."
+msgstr "W?hrend der Suche lief etwas schief. Bitte ?berpr?fen Sie die Protokoll-Dateien."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Von/An/Betreff/Marke"
 
@@ -5402,8 +5244,8 @@ msgstr "Bearbeiten"
 msgid "C_lear"
 msgstr "_Leeren"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348 src/gtk/sslcertwindow.c:398
+#: src/gtk/sslcertwindow.c:462
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -5415,8 +5257,7 @@ msgstr "Eigent?mer"
 msgid "Signer"
 msgstr "Unterzeichner"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:837
+#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194 src/prefs_themes.c:837
 msgid "Name: "
 msgstr "Name: "
 
@@ -5453,8 +5294,7 @@ msgid ""
 "\n"
 msgstr ""
 "Das Zertifikat ist f?r %s, aber die Verbindung geht zu %s.\n"
-"M?glicherweise sind Sie mit einem nicht authentifizierten (Rogue) Server "
-"verbunden.\n"
+"M?glicherweise sind Sie mit einem nicht authentifizierten (Rogue) Server verbunden.\n"
 "\n"
 
 #: src/gtk/sslcertwindow.c:338
@@ -5466,8 +5306,7 @@ msgstr ""
 "Zertifikat f?r %s ist unbekannt.\n"
 "%sWollen Sie es akzeptieren?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400 src/gtk/sslcertwindow.c:464
 #, c-format
 msgid "Signature status: %s"
 msgstr "Status der Signatur: %s"
@@ -5484,8 +5323,7 @@ msgstr "SSL-Zertifikat ist ung?ltig"
 msgid "SSL certificate is unknown"
 msgstr "SSL-Zertifikat ist unbekannt"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:481
 msgid "_Cancel connection"
 msgstr "Verbindung abbre_chen"
 
@@ -5565,8 +5403,7 @@ msgstr "(Kein Betreff)"
 msgid "Error:"
 msgstr "Fehler:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2545
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/image_viewer.c:299 src/mimeview.c:2545 src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
 msgstr "Dateiname:"
 
@@ -5604,12 +5441,8 @@ msgstr "IMAP Fehler auf %s: stream error\n"
 
 #: src/imap.c:633
 #, c-format
-msgid ""
-"IMAP error on %s: parse error (very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"IMAP Fehler auf %s: parse error (sehr wahrscheinlich ein nicht RFC-konformer "
-"Server)\n"
+msgid "IMAP error on %s: parse error (very probably non-RFC compliance from the server)\n"
+msgstr "IMAP Fehler auf %s: parse error (sehr wahrscheinlich ein nicht RFC-konformer Server)\n"
 
 #: src/imap.c:637
 #, c-format
@@ -5628,12 +5461,8 @@ msgstr "IMAP Fehler auf %s: schwerer Fehler\n"
 
 #: src/imap.c:646
 #, c-format
-msgid ""
-"IMAP error on %s: protocol error(very probably non-RFC compliance from the "
-"server)\n"
-msgstr ""
-"IMAP Fehler auf %s: Protokollfehler (sehr wahrscheinlich ein nicht RFC-"
-"konformer Server)\n"
+msgid "IMAP error on %s: protocol error(very probably non-RFC compliance from the server)\n"
+msgstr "IMAP Fehler auf %s: Protokollfehler (sehr wahrscheinlich ein nicht RFC-konformer Server)\n"
 
 #: src/imap.c:650
 #, c-format
@@ -5804,39 +5633,37 @@ msgstr "IMAP Fehler auf %s: unbekannter Fehler [%d]\n"
 msgid ""
 "\n"
 "\n"
-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
-"and the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and the CRAM-MD5 SASL "
+"plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5-Anmeldungen sind nur m?glich, wenn libetpan mit SASL-Unterst?tzung "
-"kompiliert wurde und das CRAM-MD5 SASL-Plugin installiert ist."
+"CRAM-MD5-Anmeldungen sind nur m?glich, wenn libetpan mit SASL-Unterst?tzung kompiliert wurde und "
+"das CRAM-MD5 SASL-Plugin installiert ist."
 
 #: src/imap.c:946
 msgid ""
 "\n"
 "\n"
-"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
-"and the DIGEST-MD5 SASL plugin is installed."
+"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support and the DIGEST-MD5 "
+"SASL plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"DIGEST-MD5-Anmeldungen sind nur m?glich, wenn libetpan mit SASL-"
-"Unterst?tzung kompiliert wurde und das DIGEST-MD5 SASL-Plugin installiert "
-"ist."
+"DIGEST-MD5-Anmeldungen sind nur m?glich, wenn libetpan mit SASL-Unterst?tzung kompiliert wurde und "
+"das DIGEST-MD5 SASL-Plugin installiert ist."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
-"SCRAM-SHA-1 logins only work if libetpan has been compiled with SASL support "
-"and the SCRAM SASL plugin is installed."
+"SCRAM-SHA-1 logins only work if libetpan has been compiled with SASL support and the SCRAM SASL "
+"plugin is installed."
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5-Anmeldungen sind nur m?glich, wenn libetpan mit SASL-Unterst?tzung "
-"kompiliert wurde und das CRAM-MD5 SASL-Plugin installiert ist."
+"SCRAM-SHA-1 -Anmeldungen sind nur m?glich, wenn libetpan mit SASL-Unterst?tzung kompiliert wurde "
+"und das SCRAM-SHA-1 -Plugin installiert ist."
 
 #: src/imap.c:959
 #, c-format
@@ -5858,12 +5685,9 @@ msgstr "Verbindung zu %s schlug fehl"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
-#: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387
-#: src/imap.c:4567 src/imap.c:5376
+#: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387 src/imap.c:4567 src/imap.c:5376
 msgid "Claws Mail needs network access in order to access the IMAP server."
-msgstr ""
-"Claws Mail ben?tigt eine Netzwerkverbindung, um auf den IMAP-Server "
-"zuzugreifen."
+msgstr "Claws Mail ben?tigt eine Netzwerkverbindung, um auf den IMAP-Server zuzugreifen."
 
 #: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:278
 msgid "Insecure connection"
@@ -5871,17 +5695,15 @@ msgstr "Unsichere Verbindung"
 
 #: src/imap.c:1131 src/inc.c:819 src/news.c:388 src/send_message.c:279
 msgid ""
-"This connection is configured to be secured using SSL, but SSL is not "
-"available in this build of Claws Mail. \n"
+"This connection is configured to be secured using SSL, but SSL is not available in this build of "
+"Claws Mail. \n"
 "\n"
-"Do you want to continue connecting to this server? The communication would "
-"not be secure."
+"Do you want to continue connecting to this server? The communication would not be secure."
 msgstr ""
-"F?r diese Verbindung ist SSL-Schutz vorgesehen, doch SSL ist in dieser "
-"Variante von Claws Mail nicht verf?gbar. \n"
+"F?r diese Verbindung ist SSL-Schutz vorgesehen, doch SSL ist in dieser Variante von Claws Mail "
+"nicht verf?gbar. \n"
 "\n"
-"Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation "
-"w?re nicht gesch?tzt."
+"Soll die Verbindung zu diesem Server fortgesetzt werden? Die Kommunikation w?re nicht gesch?tzt."
 
 #: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:285
 msgid "Con_tinue connecting"
@@ -5978,20 +5800,20 @@ msgstr "Ordner %s kann nicht ausgew?hlt werden\n"
 
 #: src/imap.c:4049
 msgid "Server requires TLS to log in.\n"
-msgstr "Server ben?tigt TLS zur Anmeldung.\n"
+msgstr "Server erfordert TLS zur Anmeldung.\n"
 
 #: src/imap.c:4059
 msgid "Can't refresh capabilities.\n"
 msgstr "Ressourcen k?nnen nicht aktualisiert werden.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Connection to %s failed: server requires TLS, but Claws Mail has been "
-"compiled without TLS support.\n"
+"Connection to %s failed: server requires TLS, but Claws Mail has been compiled without TLS "
+"support.\n"
 msgstr ""
-"Verbindung zu %s schlug fehl: Server ben?tigt TLS, aber Claws Mail wurde "
-"ohne OpenSSL kompiliert.\n"
+"Verbindung zu %s schlug fehl: Server erfordert TLS, aber Claws Mail wurde ohne TLS-Unterst?tzung "
+"kompiliert.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6008,15 +5830,13 @@ msgstr "Gel?scht-Merker nicht setzbar: %d\n"
 
 #: src/imap.c:6032
 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"
+"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 ""
-"Es wurde mindestens ein IMAP Konto gefunden. Allerdings wurde diese Version "
-"von Claws Mail ohne IMAP Unterst?tzung compiliert; die IMAP Konten bleiben "
-"deshalb deaktiviert.\n"
+"Es wurde mindestens ein IMAP Konto gefunden. Allerdings wurde diese Version von Claws Mail ohne "
+"IMAP Unterst?tzung compiliert; die IMAP Konten bleiben deshalb deaktiviert.\n"
 "\n"
 "Vermutlich muss libetpan installiert und Claws Mail neu kompiliert werden."
 
@@ -6024,8 +5844,7 @@ msgstr ""
 msgid "Create _new folder..."
 msgstr "_Neuen Ordner erstellen..."
 
-#: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:60
+#: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
 msgstr "Ordner _umbenennen..."
 
@@ -6062,8 +5881,7 @@ msgstr "_Abonnieren..."
 msgid "_Unsubscribe..."
 msgstr "_Abmelden..."
 
-#: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:64
+#: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:64
 msgid "_Check for new messages"
 msgstr "Auf neue Nachrichten _pr?fen"
 
@@ -6094,22 +5912,19 @@ msgstr ""
 msgid "Inherit properties from parent folder"
 msgstr "Eigenschaften des ?berordners ?bernehmen"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/news_gtk.c:306
-#: src/plugins/mailmbox/plugin_gtk.c:414 src/plugins/rssyl/rssyl_cb_menu.c:201
-#: src/plugins/vcalendar/vcal_folder.c:2034
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:414
+#: src/plugins/rssyl/rssyl_cb_menu.c:201 src/plugins/vcalendar/vcal_folder.c:2034
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name f?r '%s':"
 
 #: src/imap_gtk.c:263 src/mh_gtk.c:256 src/plugins/mailmbox/plugin_gtk.c:415
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2035
+#: src/plugins/rssyl/rssyl_cb_menu.c:202 src/plugins/vcalendar/vcal_folder.c:2035
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
-#: src/imap_gtk.c:292 src/mh_gtk.c:282 src/news_gtk.c:328
-#: src/plugins/mailmbox/plugin_gtk.c:445 src/plugins/rssyl/rssyl_cb_menu.c:228
-#: src/plugins/vcalendar/vcal_folder.c:2055
+#: src/imap_gtk.c:292 src/mh_gtk.c:282 src/news_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:445
+#: src/plugins/rssyl/rssyl_cb_menu.c:228 src/plugins/vcalendar/vcal_folder.c:2055
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6120,19 +5935,16 @@ msgstr ""
 #: src/imap_gtk.c:360 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:154
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted. Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Alle Ordner und Nachrichten in '%s' werden endg?ltig und unwiederbringlich "
-"gel?scht.\n"
+"Alle Ordner und Nachrichten in '%s' werden endg?ltig und unwiederbringlich gel?scht.\n"
 "\n"
 "M?chten Sie sie wirklich l?schen?"
 
 #: src/imap_gtk.c:381 src/news_gtk.c:281 src/plugins/mailmbox/plugin_gtk.c:350
-#: src/plugins/rssyl/rssyl_cb_menu.c:175
-#: src/plugins/vcalendar/vcal_folder.c:1988
+#: src/plugins/rssyl/rssyl_cb_menu.c:175 src/plugins/vcalendar/vcal_folder.c:1988
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' kann nicht entfernt werden."
@@ -6171,15 +5983,13 @@ msgstr "alle"
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
-"If there are new folders, created and subscribed to from another client, use "
-"\"Check for new folders\" at the mailbox's root folder."
+"If there are new folders, created and subscribed to from another client, use \"Check for new "
+"folders\" at the mailbox's root folder."
 msgstr ""
-"Dieser Ordner ist bereits abonniert und enth?lt keine nicht abonnierten "
-"Unterordner.\n"
+"Dieser Ordner ist bereits abonniert und enth?lt keine nicht abonnierten Unterordner.\n"
 "\n"
-"Wenn es neue Ordner gibt, die von einem anderem Programm erzeugt und "
-"angemeldet wurden, benutzen Sie \"Auf neue Ordner pr?fen\" im Stammordner "
-"der Mailbox."
+"Wenn es neue Ordner gibt, die von einem anderem Programm erzeugt und angemeldet wurden, benutzen "
+"Sie \"Auf neue Ordner pr?fen\" im Stammordner der Mailbox."
 
 #: src/imap_gtk.c:566
 #, c-format
@@ -6194,8 +6004,8 @@ msgstr "abonnieren"
 msgid "unsubscribe"
 msgstr "abmelden"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
-#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440 src/prefs_folder_item.c:1468
+#: src/prefs_folder_item.c:1496
 msgid "Apply to subfolders"
 msgstr "auf Unterordner anwenden"
 
@@ -6268,12 +6078,8 @@ msgid "Select LDIF File"
 msgstr "LDIF-Datei w?hlen"
 
 #: src/importldif.c:668
-msgid ""
-"Specify the name for the address book that will be created from the LDIF "
-"file data."
-msgstr ""
-"W?hlen Sie den Namen des Adressbuchs, das mit den Daten der LDIF-Datei "
-"erzeugt wird."
+msgid "Specify the name for the address book that will be created from the LDIF file data."
+msgstr "W?hlen Sie den Namen des Adressbuchs, das mit den Daten der LDIF-Datei erzeugt wird."
 
 #: src/importldif.c:673
 msgid "File Name"
@@ -6313,21 +6119,17 @@ msgstr "Zusatz"
 
 #: src/importldif.c:808
 msgid ""
-"Choose the LDIF field that will be renamed or selected for import in the "
-"list above. Reserved fields (marked with a tick in the \"R\" column), are "
-"automatically imported and cannot be renamed. A single click in the Select "
-"(\"S\") column will select the field for import with a tick. A single click "
-"anywhere in the row will select that field for rename in the input area "
-"below the list. A double click anywhere in the row will also select the "
-"field for import."
-msgstr ""
-"W?hlen Sie das LDIF-Feld, das zum Import in obige Liste umbenannt oder "
-"markiert wird. Reservierte Felder (mit H?kchen in der 'R' Spalte) werden "
-"automatisch importiert und k?nnen nicht umbenannt werden. Ein Einzelklick in "
-"der 'S'-Spalte markiert das Feld durch ein H?kchen f?r den Import. Ein "
-"Einzelklick in die Zeile w?hlt das Feld zum Umbenennen im Eingabebereich "
-"unter der Liste. Ein Doppelklick in die Zeile w?hlt das Feld auch f?r den "
-"Import aus."
+"Choose the LDIF field that will be renamed or selected for import in the list above. Reserved "
+"fields (marked with a tick in the \"R\" column), are automatically imported and cannot be renamed. "
+"A single click in the Select (\"S\") column will select the field for import with a tick. A single "
+"click anywhere in the row will select that field for rename in the input area below the list. A "
+"double click anywhere in the row will also select the field for import."
+msgstr ""
+"W?hlen Sie das LDIF-Feld, das zum Import in obige Liste umbenannt oder markiert wird. Reservierte "
+"Felder (mit H?kchen in der 'R' Spalte) werden automatisch importiert und k?nnen nicht umbenannt "
+"werden. Ein Einzelklick in der 'S'-Spalte markiert das Feld durch ein H?kchen f?r den Import. Ein "
+"Einzelklick in die Zeile w?hlt das Feld zum Umbenennen im Eingabebereich unter der Liste. Ein "
+"Doppelklick in die Zeile w?hlt das Feld auch f?r den Import aus."
 
 #: src/importldif.c:823
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6429,12 +6231,12 @@ msgstr "Erledigt (keine neuen Nachrichten)"
 msgid "Connection failed"
 msgstr "Verbindung schlug fehl"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Authentifizierung schlug fehl"
 
-#: src/inc.c:662 src/prefs_matcher.c:396 src/prefs_summary_column.c:88
-#: src/summaryview.c:2797 src/summaryview.c:6318
+#: src/inc.c:662 src/prefs_matcher.c:396 src/prefs_summary_column.c:88 src/summaryview.c:2797
+#: src/summaryview.c:6318
 msgid "Locked"
 msgstr "Gesperrt"
 
@@ -6473,7 +6275,7 @@ msgstr "Keine Verbindung zu POP3-Server: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung zu POP3-Server: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278 src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Authentifizierung erfolgt..."
 
@@ -6586,12 +6388,11 @@ msgstr ""
 
 #: src/inc.c:1222 src/send_message.c:690
 msgid ""
-"Session timed out. You may be able to recover by increasing the timeout "
-"value in Preferences/Other/Miscellaneous."
+"Session timed out. You may be able to recover by increasing the timeout value in Preferences/Other/"
+"Miscellaneous."
 msgstr ""
-"Zeit?berschreitung w?hrend der Sitzung. Es mag helfen, den Wert f?r "
-"Zeit?berschreitung unter Konfiguration/Einstellungen/Weiteres/Verschiedenes "
-"zu erh?hen."
+"Zeit?berschreitung w?hrend der Sitzung. Es mag helfen, den Wert f?r Zeit?berschreitung unter "
+"Konfiguration/Einstellungen/Weiteres/Verschiedenes zu erh?hen."
 
 #: src/inc.c:1227
 #, c-format
@@ -6616,7 +6417,7 @@ msgstr "%s%sSie arbeiten offline. Soll dies aufgehoben werden?"
 msgid "On_ly once"
 msgstr "nur einmal"
 
-# SN ist ein LDAP-Attribut, sollte vermutlich nicht ?bersetzt werden. 
+# SN ist ein LDAP-Attribut, sollte vermutlich nicht ?bersetzt werden.
 #: src/ldapupdate.c:1056
 msgid "Some SN"
 msgstr "Some SN"
@@ -6662,13 +6463,12 @@ msgstr "alte Einstellungen behalten"
 
 #: src/main.c:380
 msgid ""
-"Keeping a backup will allow you to go back to an older version, but may take "
-"a while if you have cached IMAP or News data, and will take some extra room "
-"on your disk."
+"Keeping a backup will allow you to go back to an older version, but may take a while if you have "
+"cached IMAP or News data, and will take some extra room on your disk."
 msgstr ""
-"Eine Sicherheitskopie erm?glicht die R?ckkehr zu einer ?lteren Version, kann "
-"aber eine Weile dauern, wenn gepufferte IMAP- oder News-Daten vorhanden "
-"sind; auch wird dadurch mehr Platz auf der Festplatte ben?tigt."
+"Eine Sicherheitskopie erm?glicht die R?ckkehr zu einer ?lteren Version, kann aber eine Weile "
+"dauern, wenn gepufferte IMAP- oder News-Daten vorhanden sind; auch wird dadurch mehr Platz auf der "
+"Festplatte ben?tigt."
 
 #: src/main.c:388
 msgid "Migration of configuration"
@@ -6713,42 +6513,38 @@ msgstr "Sylpheed-Claws 1.0.5 (oder ?lter)"
 #: src/main.c:1442
 #, c-format
 msgid ""
-"The following plugin failed to load. Check the Plugins configuration for "
-"more information:\n"
+"The following plugin failed to load. Check the Plugins configuration for more information:\n"
 "%s"
 msgid_plural ""
-"The following plugins failed to load. Check the Plugins configuration for "
-"more information:\n"
+"The following plugins failed to load. Check the Plugins configuration for more information:\n"
 "%s"
 msgstr[0] ""
-"Das folgende Plugin konnte nicht geladen werden. Pr?fen Sie die "
-"Einstellungen des Plugins f?r mehr Informationen:\n"
+"Das folgende Plugin konnte nicht geladen werden. Pr?fen Sie die Einstellungen des Plugins f?r mehr "
+"Informationen:\n"
 "%s"
 msgstr[1] ""
-"Die folgenden Plugins konnte nicht geladen werden. Pr?fen Sie die "
-"Einstellungen des Plugins f?r mehr Informationen:\n"
+"Die folgenden Plugins konnte nicht geladen werden. Pr?fen Sie die Einstellungen des Plugins f?r "
+"mehr Informationen:\n"
 "%s"
 
 #: src/main.c:1470
 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 "
-"mailbox parent folder's context menu to try to fix it."
+"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 mailbox parent folder's context menu to "
+"try to fix it."
 msgstr ""
-"Claws Mail hat eine unvollst?ndig konfigurierte Mailbox erkannt. "
-"M?glicherweise liegt dies an einem fehlerhaften IMAP Konto. \"Ordnerbaum "
-"erneuern\" im Kontextmen? vom Hauptverzeichnis der Mailbox k?nnte das "
-"Problem l?sen."
+"Claws Mail hat eine unvollst?ndig konfigurierte Mailbox erkannt. M?glicherweise liegt dies an "
+"einem fehlerhaften IMAP Konto. \"Ordnerbaum erneuern\" im Kontextmen? vom Hauptverzeichnis der "
+"Mailbox k?nnte das Problem l?sen."
 
 #: src/main.c:1476
 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 "
-"plugin and try again."
+"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 plugin and try again."
 msgstr ""
-"Claws Mail hat eine konfigurierte Mailbox gefunden, kann diese aber nicht "
-"laden. Diese Mailbox wird vermutlich von einem alten Plugin zur Verf?gung "
-"gestellt. Bitte installieren Sie das Plugin neu und versuchen es noch einmal."
+"Claws Mail hat eine konfigurierte Mailbox gefunden, kann diese aber nicht laden. Diese Mailbox "
+"wird vermutlich von einem alten Plugin zur Verf?gung gestellt. Bitte installieren Sie das Plugin "
+"neu und versuchen es noch einmal."
 
 #: src/main.c:1726
 msgid "Missing filename\n"
@@ -6768,7 +6564,7 @@ msgstr "Doppelte 'An:'-Kopfzeile\n"
 
 #: src/main.c:1762
 msgid "Missing required 'To:' header\n"
-msgstr "Ben?tigte 'An:'-Kopfzeile fehlt\n"
+msgstr "Erforderliche 'An:'-Kopfzeile fehlt\n"
 
 #: src/main.c:1905
 #, c-format
@@ -6783,20 +6579,15 @@ msgstr "  --compose [Adresse]  ?ffnet das Editor-Fenster"
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
-"                         use - as file name for reading from standard "
-"input;\n"
-"                         content format: headers first (To: required) until "
-"an\n"
+"                         use - as file name for reading from standard input;\n"
+"                         content format: headers first (To: required) until an\n"
 "                         empty line, then mail body until end of file."
 msgstr ""
 "  --compose-from-file Datei\n"
-"                       ?ffnet Editor-Fenster mit Daten aus der angegebenen "
-"Datei;\n"
+"                       ?ffnet Editor-Fenster mit Daten aus der angegebenen Datei;\n"
 "                       \"-\" als Dateiname liest von der Standardeingabe;\n"
-"                       Inhaltsformat: zuerst Kopfzeilen (An: ben?tigt) bis "
-"zu einer\n"
-"                       Leerzeile, dann der Nachrichtenk?rper bis zum Ende "
-"der Datei."
+"                       Inhaltsformat: zuerst Kopfzeilen (An: erforderlich) bis zu einer\n"
+"                       Leerzeile, dann der Nachrichtenk?rper bis zum Ende der Datei."
 
 #: src/main.c:1913
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
@@ -6833,20 +6624,16 @@ msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
 "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
-"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or "
-"g: tag\n"
+"                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 "  --search Ordner Typ Abfrage [rekursiv]\n"
 "                       durchsucht Nachrichten\n"
-"                       Ordner Beispiel.: \"#mh/Mailbox/inbox\" oder \"Mail"
-"\"\n"
-"                       Typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] oder g: "
-"tag\n"
+"                       Ordner Beispiel.: \"#mh/Mailbox/inbox\" oder \"Mail\"\n"
+"                       Typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] oder g: tag\n"
 "                       Abfrage: Suchstring\n"
-"                       rekursiv: nicht mit einem der folgenden Argumente: 0, "
-"n, N, f or F"
+"                       rekursiv: nicht mit einem der folgenden Argumente: 0, n, N, f or F"
 
 #: src/main.c:1928
 msgid "  --send                 send all queued messages"
@@ -6910,12 +6697,8 @@ msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus"
 
 #: src/main.c:1943
-msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
-msgstr ""
-"  --version-full -V    gibt Versionsinformationen und enthaltene Funktionen "
-"aus"
+msgid "  --version-full -V      output version and built-in features information and exit"
+msgstr "  --version-full -V    gibt Versionsinformationen und enthaltene Funktionen aus"
 
 #: src/main.c:1944
 msgid "  --config-dir           output configuration directory"
@@ -7234,8 +7017,7 @@ msgstr "Neue _Nachricht verfassen"
 msgid "Compose a news message"
 msgstr "Neue _News-Nachricht verfassen"
 
-#: src/mainwindow.c:657 src/messageview.c:301
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:657 src/messageview.c:301 src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Antworten"
 
@@ -7327,8 +7109,7 @@ msgstr "Als g_elesen markieren"
 msgid "Mark all read"
 msgstr "Alle als _gelesen markieren"
 
-#: src/mainwindow.c:701 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:701 src/prefs_filtering_action.c:199 src/toolbar.c:208 src/toolbar.c:419
 msgid "Ignore thread"
 msgstr "Dis_kurs ignorieren"
 
@@ -7336,8 +7117,7 @@ msgstr "Dis_kurs ignorieren"
 msgid "Unignore thread"
 msgstr "Diskurs _nicht ignorieren"
 
-#: src/mainwindow.c:703 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:703 src/prefs_filtering_action.c:200 src/toolbar.c:209 src/toolbar.c:420
 msgid "Watch thread"
 msgstr "Diskurs be_obachten"
 
@@ -7413,23 +7193,21 @@ msgstr "Ordner-Verarbeitungsregeln _anwenden"
 msgid "_Create filter rule"
 msgstr "Filterre_gel erstellen"
 
-#: src/mainwindow.c:738 src/mainwindow.c:744 src/messageview.c:319
-#: src/messageview.c:325
+#: src/mainwindow.c:738 src/mainwindow.c:744 src/messageview.c:319 src/messageview.c:325
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:739 src/mainwindow.c:745 src/mainwindow.c:848
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:739 src/mainwindow.c:745 src/mainwindow.c:848 src/messageview.c:320
+#: src/messageview.c:326
 msgid "By _From"
 msgstr "_Nach Absender"
 
-#: src/mainwindow.c:740 src/mainwindow.c:746 src/mainwindow.c:849
-#: src/messageview.c:321 src/messageview.c:327
+#: src/mainwindow.c:740 src/mainwindow.c:746 src/mainwindow.c:849 src/messageview.c:321
+#: src/messageview.c:327
 msgid "By _To"
 msgstr "Nach _Empf?nger"
 
-#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:322
-#: src/messageview.c:328
+#: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:322 src/messageview.c:328
 msgid "By _Subject"
 msgstr "Nach _Betreff"
 
@@ -7737,9 +7515,8 @@ msgstr "Filterprotokoll aktiviert\n"
 msgid "filtering log disabled\n"
 msgstr "Filterprotokoll deaktiviert.\n"
 
-#: src/mainwindow.c:2472 src/mainwindow.c:2479 src/mainwindow.c:2522
-#: src/mainwindow.c:2555 src/mainwindow.c:2587 src/mainwindow.c:2632
-#: src/plugins/notification/notification_trayicon.c:360
+#: src/mainwindow.c:2472 src/mainwindow.c:2479 src/mainwindow.c:2522 src/mainwindow.c:2555
+#: src/mainwindow.c:2587 src/mainwindow.c:2632 src/plugins/notification/notification_trayicon.c:360
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1065
 msgid "Untitled"
 msgstr "Unbenannt"
@@ -7770,26 +7547,22 @@ msgstr ""
 "Wird eine existierende Mailbox angegeben,\n"
 "wird sie automatisch durchsucht."
 
-#: src/mainwindow.c:2927 src/plugins/mailmbox/plugin_gtk.c:196
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2927 src/plugins/mailmbox/plugin_gtk.c:196 src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52 src/wizard.c:741
 msgid "Mailbox"
 msgstr "Mailbox"
 
 #: src/mainwindow.c:2937 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 "
-"there."
+"Maybe some files already exist, or you don't have the permission to write there."
 msgstr ""
 "Erstellen der Mailbox schlug fehl.\n"
-"M?glicherweise existieren einige Dateien bereits oder Sie haben keine "
-"Schreibrechte"
+"M?glicherweise existieren einige Dateien bereits oder Sie haben keine Schreibrechte"
 
 #: src/mainwindow.c:3389
 msgid "No posting allowed"
@@ -7849,19 +7622,16 @@ msgstr "Filter-Konfiguration"
 #: src/mainwindow.c:5084
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
-"Registrierung als Standardanwendung schlug fehl: Pfad zur ausf?hrbaren Datei "
-"wurde nicht gefunden."
+"Registrierung als Standardanwendung schlug fehl: Pfad zur ausf?hrbaren Datei wurde nicht gefunden."
 
 #: src/mainwindow.c:5143
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail wurde als Standardanwendung eingetragen."
 
 #: src/mainwindow.c:5145
-msgid ""
-"Can not register as default client: impossible to write to the registry."
+msgid "Can not register as default client: impossible to write to the registry."
 msgstr ""
-"Eintragung als Standardanwendung schlug fehl: es konnte nicht in die "
-"Registry geschrieben werden."
+"Eintragung als Standardanwendung schlug fehl: es konnte nicht in die Registry geschrieben werden."
 
 #: src/mainwindow.c:5303
 #, c-format
@@ -7870,8 +7640,8 @@ msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d Kennwort in %d Konten verworfen.\n"
 msgstr[1] "%d Passw?rter in %d Konten verworfen.\n"
 
-#: src/matcher.c:211 src/matcher.c:212 src/matcher.c:213 src/matcher.c:214
-#: src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
+#: src/matcher.c:211 src/matcher.c:212 src/matcher.c:213 src/matcher.c:214 src/matcher.c:215
+#: src/matcher.c:216 src/matcher.c:217
 #, c-format
 msgid "%s header"
 msgstr "%s Kopfzeile"
@@ -7892,8 +7662,8 @@ msgstr "K?rperzeile"
 msgid "tag"
 msgstr "Marke"
 
-#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555
-#: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
+#: src/matcher.c:525 src/matcher.c:530 src/matcher.c:550 src/matcher.c:555 src/message_search.c:212
+#: src/prefs_matcher.c:742 src/summary_search.c:466
 msgid "Case sensitive"
 msgstr "Gro?-/Kleinschreibung"
 
@@ -7914,8 +7684,8 @@ msgstr "Nachricht ist passend\n"
 msgid "message does not match\n"
 msgstr "Nachricht ist unpassend\n"
 
-#: src/matcher.c:2209 src/matcher.c:2210 src/matcher.c:2211 src/matcher.c:2212
-#: src/matcher.c:2213 src/matcher.c:2214 src/matcher.c:2215 src/matcher.c:2216
+#: src/matcher.c:2209 src/matcher.c:2210 src/matcher.c:2211 src/matcher.c:2212 src/matcher.c:2213
+#: src/matcher.c:2214 src/matcher.c:2215 src/matcher.c:2216
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -7932,8 +7702,8 @@ msgstr ""
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "Importiere von Mbox... (%d Mail importiert)"
-msgstr[1] "Importiere von Mbox... (%d Mails importiert)"
+msgstr[0] "Importiere von Mbox... (%d E-Mail importiert)"
+msgstr[1] "Importiere von Mbox... (%d E-Mails importiert)"
 
 #: src/mbox.c:554
 msgid "Overwrite mbox file"
@@ -7943,8 +7713,8 @@ msgstr "Mbox-Datei ?berschreiben "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie ?berschrieben werden?"
 
-#: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844
-#: src/prefs_themes.c:533 src/textview.c:3053
+#: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844 src/prefs_themes.c:533
+#: src/textview.c:3053
 msgid "Overwrite"
 msgstr "?berschreiben"
 
@@ -8044,13 +7814,11 @@ msgstr "Entschl?sseln schlug fehl: %s"
 
 #: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
-msgstr ""
-"Nachricht entspricht nicht dem MIME-Standard und k?nnte falsch dargestellt "
-"werden."
+msgstr "Nachricht entspricht nicht dem MIME-Standard und k?nnte falsch dargestellt werden."
 
 #: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1997
-#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4816
-#: src/summaryview.c:4819 src/textview.c:3041
+#: src/plugins/fancy/fancy_viewer.c:671 src/summaryview.c:4816 src/summaryview.c:4819
+#: src/textview.c:3041
 msgid "Save as"
 msgstr "Speichern als"
 
@@ -8058,8 +7826,7 @@ msgstr "Speichern als"
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei ?berschreiben?"
 
-#: src/messageview.c:1857 src/summaryview.c:4836 src/summaryview.c:4839
-#: src/summaryview.c:4854
+#: src/messageview.c:1857 src/summaryview.c:4836 src/summaryview.c:4839 src/summaryview.c:4854
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
@@ -8074,12 +7841,8 @@ msgid "Only the first megabyte of text is shown."
 msgstr "Nur das erste Megabyte an Text wird angezeigt."
 
 #: src/messageview.c:1943
-msgid ""
-"You got a return receipt for this message : it has been displayed by the "
-"recipient."
-msgstr ""
-"Sie haben eine Empfangsbest?tigung f?r diese Nachricht: Der Empf?nger hat "
-"sie ge?ffnet."
+msgid "You got a return receipt for this message : it has been displayed by the recipient."
+msgstr "Sie haben eine Empfangsbest?tigung f?r diese Nachricht: Der Empf?nger hat sie ge?ffnet."
 
 #: src/messageview.c:1946
 msgid "You asked for a return receipt in this message."
@@ -8127,8 +7890,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgerufen;\n"
 "sie ist %s gro? und wird heruntergeladen."
 
-#: src/messageview.c:2017 src/messageview.c:2030
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2017 src/messageview.c:2030 src/prefs_filtering_action.c:180
 msgid "Unmark"
 msgstr "Demarkieren"
 
@@ -8147,15 +7909,11 @@ msgstr "Empfangsbest?tigung"
 
 #: src/messageview.c:2097
 msgid ""
-"More than one of your accounts uses the address that this message was sent "
-"to.\n"
-"Please choose which account you want to use for sending the receipt "
-"notification:"
+"More than one of your accounts uses the address that this message was sent to.\n"
+"Please choose which account you want to use for sending the receipt notification:"
 msgstr ""
-"Mehr als eines Ihrer Konten verwendet die Adresse, an die diese Nachricht "
-"gesendet wurde.\n"
-"Bitte w?hlen Sie, welches Konto Sie zum Senden der Empfangsbest?tigung "
-"verwenden m?chten:"
+"Mehr als eines Ihrer Konten verwendet die Adresse, an die diese Nachricht gesendet wurde.\n"
+"Bitte w?hlen Sie, welches Konto Sie zum Senden der Empfangsbest?tigung verwenden m?chten:"
 
 #: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
 msgid "_Cancel"
@@ -8193,8 +7951,7 @@ msgstr ""
 "\n"
 "  Nachricht wurde in den Papierkorb oder einen anderen Ordner verschoben"
 
-#: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201
-#: src/summaryview.c:6972
+#: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201 src/summaryview.c:6972
 msgid "An error happened while learning.\n"
 msgstr "Beim Lernen ist ein Fehler aufgetreten.\n"
 
@@ -8216,12 +7973,15 @@ msgid "Remove _mailbox..."
 msgstr "_Mailbox entfernen..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Ordner '%s' kann nicht entfernt werden."
+msgstr ""
+"Ordner '%s' kann nicht entfernt werden\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8264,8 +8024,7 @@ msgstr "_Alles speichern..."
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
-#: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
-#: src/mimeview.c:1047
+#: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042 src/mimeview.c:1047
 msgid "View full information"
 msgstr "Vollst?ndige Informationen anzeigen"
 
@@ -8286,16 +8045,14 @@ msgstr "%s Klicken Sie zur ?berpr?fung auf das Symbol oder dr?cken Sie '%s'."
 #: src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
-"Zeit?berschreitung beim Pr?fen der Signatur. Symbol anklicken, um es noch "
-"einmal zu versuchen."
+"Zeit?berschreitung beim Pr?fen der Signatur. Symbol anklicken, um es noch einmal zu versuchen."
 
 #: src/mimeview.c:1079
 #, c-format
-msgid ""
-"Timeout checking the signature. Click the icon or hit '%s' to try again."
+msgid "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Zeit?berschreitung beim Pr?fen der Signatur. Symbol anklicken oder '%s' "
-"dr?cken, um es noch einmal zu versuchen."
+"Zeit?berschreitung beim Pr?fen der Signatur. Symbol anklicken oder '%s' dr?cken, um es noch einmal "
+"zu versuchen."
 
 #: src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8305,9 +8062,8 @@ msgstr "Digitale Signatur wird ?berpr?ft..."
 msgid "Go back to email"
 msgstr "Zur?ck zur E-Mail"
 
-#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
-#: src/mimeview.c:2080 src/mimeview.c:2192
-#: src/plugins/fancy/fancy_viewer.c:424
+#: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044 src/mimeview.c:2080
+#: src/mimeview.c:2192 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
@@ -8345,13 +8101,13 @@ msgstr "Fremde Programmdatei ausf?hren?"
 
 #: src/mimeview.c:2227
 msgid ""
-"This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"This attachment is an executable file. Executing untrusted binaries is dangerous and could "
+"probably lead to compromission of your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Dieser Anhang ist eine Programmdatei. Das Ausf?hren unbekannter Programme "
-"ist gef?hrlich und kann Ihren Computers kompromittieren.\n"
+"Dieser Anhang ist eine Programmdatei. Das Ausf?hren unbekannter Programme ist gef?hrlich und kann "
+"Ihren Computers kompromittieren.\n"
 "\n"
 "M?chten Sie diese Datei ausf?hren?"
 
@@ -8368,8 +8124,7 @@ msgid "Size:"
 msgstr "Gr??e:"
 
 #: src/mimeview.c:2545 src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1722 src/plugins/vcalendar/vcal_meeting_gtk.c:1732
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -8389,11 +8144,8 @@ msgid "Error logging in to %s:%d...\n"
 msgstr "Fehler beim Anmelden an %s:%d...\n"
 
 #: src/news.c:437
-msgid ""
-"Libetpan does not support return code 480 so for now we choose to continue\n"
-msgstr ""
-"Libetpan unterst?tzt Statusmeldung 480 nicht, also machen wir erstmal "
-"weiter\n"
+msgid "Libetpan does not support return code 480 so for now we choose to continue\n"
+msgstr "Libetpan unterst?tzt Statusmeldung 480 nicht, also machen wir erstmal weiter\n"
 
 #: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
@@ -8412,8 +8164,7 @@ msgstr "Fehler beim Authentifizieren an %s:%d...\n"
 
 #: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
-msgstr ""
-"Claws Mail ben?tigt Zugang zum Netz, um auf den News-Server zuzugreifen."
+msgstr "Claws Mail ben?tigt Zugang zum Netz, um auf den News-Server zuzugreifen."
 
 #: src/news.c:861
 #, c-format
@@ -8449,15 +8200,13 @@ msgstr "ung?ltige XOVER Zeile\n"
 
 #: src/news.c:1445
 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"
+"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 ""
-"Sie haben wenigstens ein News-Konto definiert. Allerdings wurde diese "
-"Version von Claws Mail ohne News-Unterst?tzung kompiliert, so dass Ihre News-"
-"Konten ung?ltig sind.\n"
+"Sie haben wenigstens ein News-Konto definiert. Allerdings wurde diese Version von Claws Mail ohne "
+"News-Unterst?tzung kompiliert, so dass Ihre News-Konten ung?ltig sind.\n"
 "\n"
 "Vermutlich muss libetpan installiert und Claws Mail neu kompiliert werden."
 
@@ -8496,8 +8245,7 @@ msgid ""
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
 "Stellen Sie sicher, dass das Kernel-Modul 'acerhk' geladen ist.\n"
-"Das Kernel-Modul erhalten Sie unter http://www.informatik.hu-berlin.de/"
-"~tauber/acerhk/"
+"Das Kernel-Modul erhalten Sie unter http://www.informatik.hu-berlin.de/~tauber/acerhk/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
@@ -8505,8 +8253,7 @@ msgid ""
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
 "Stellen Sie sicher, dass das Kernel-Modul 'acer_acpi' geladen ist.\n"
-"Das Kernel-Modul erhalten Sie unter http://www.archernar.co.uk/acer_acpi/"
-"acer_acpi_main.html"
+"Das Kernel-Modul erhalten Sie unter http://www.archernar.co.uk/acer_acpi/acer_acpi_main.html"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
@@ -8528,8 +8275,7 @@ msgstr ""
 "Stellen Sie sicher, dass apanelc installiert ist.\n"
 "Sie erhalten es unter http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
+#: src/plugins/acpi_notifier/acpi_notifier.c:207 src/plugins/acpi_notifier/acpi_notifier.c:213
 #: src/plugins/acpi_notifier/acpi_notifier.c:425
 msgid "Control file doesn't exist."
 msgstr "Die Steuerdatei existiert nicht."
@@ -8546,26 +8292,22 @@ msgstr " : ungelesene Nachrichten"
 msgid " : new mail"
 msgstr " : neue Nachrichten"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:309 src/plugins/acpi_notifier/acpi_notifier.c:315
 #: src/plugins/acpi_notifier/acpi_notifier.c:321
 msgid "off"
 msgstr "aus"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:311
-#: src/plugins/acpi_notifier/acpi_notifier.c:317
+#: src/plugins/acpi_notifier/acpi_notifier.c:311 src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
 msgid "blinking"
 msgstr "blinken"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:313
-#: src/plugins/acpi_notifier/acpi_notifier.c:319
+#: src/plugins/acpi_notifier/acpi_notifier.c:313 src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
 msgid "on"
 msgstr "an"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
+#: src/plugins/acpi_notifier/acpi_notifier.c:347 src/plugins/acpi_notifier/acpi_notifier.c:356
 #: src/plugins/acpi_notifier/acpi_notifier.c:371
 msgid "LED "
 msgstr "LED "
@@ -8588,7 +8330,7 @@ msgstr " - Aus: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:433
 msgid "Blink when user interaction is required"
-msgstr "Blinken, wenn ein Nutzereingriff n?tig ist"
+msgstr "Blinken, wenn ein Nutzereingriff erforderlich ist"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:867
 msgid "This plugin handles various ACPI mail LEDs."
@@ -8598,8 +8340,7 @@ msgstr "Dieses Plugin verwaltet verschiedene ACPI-Mail-LEDs."
 msgid "Laptop LED"
 msgstr "Laptop-LED"
 
-#: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:250
+#: src/plugins/address_keeper/address_keeper.c:252 src/plugins/attachwarner/attachwarner.c:250
 msgid "Failed to register check before send hook"
 msgstr "Registrieren des 'check before send'-Hooks schlug fehl"
 
@@ -8607,14 +8348,12 @@ msgstr "Registrieren des 'check before send'-Hooks schlug fehl"
 msgid "Keeps all recipient addresses in an addressbook folder."
 msgstr "F?gt alle Empf?ngeradressen in einen Adressbuch-Ordner ein."
 
-#: src/plugins/address_keeper/address_keeper.c:333
-#: src/plugins/address_keeper/address_keeper.h:32
+#: 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
 msgid "Address Keeper"
 msgstr "Adressbewahrer"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
 msgstr "Adressbuch-Pfad"
 
@@ -8626,18 +8365,15 @@ msgstr "In Ordner speichern"
 msgid "Address book path where addresses are kept"
 msgstr "Pfad zum Adressbuch, in dem die Adressen gespeichert werden"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/address_keeper/address_keeper_prefs.c:121 src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bsfilter/bsfilter_gtk.c:201 src/plugins/spamassassin/spamassassin_gtk.c:447
+#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580 src/prefs_matcher.c:679
 msgid "Select..."
 msgstr "Ausw?hlen..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Felder, deren Adressen gespeichert werden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8652,12 +8388,8 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Adressen aus 'Bcc'-Kopfzeile speichern"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
-msgid ""
-"Exclude addresses matching the following regular expressions (one per line)"
-msgstr ""
-"Adressen ausschlie?en, wenn die folgenden Regul?ren Ausdr?cke zutreffen "
-"(einer pro Zeile):"
+msgid "Exclude addresses matching the following regular expressions (one per line)"
+msgstr "Adressen ausschlie?en, wenn die folgenden Regul?ren Ausdr?cke zutreffen (einer pro Zeile):"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -8672,10 +8404,9 @@ msgstr "Erstelle Archiv..."
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
 "\n"
-"It enables you to select a mail folder that you want to be archived, and "
-"then choose a name, format and location for the archive. Subfolders can be "
-"included and MD5 checksums can be added for each file in the archive. "
-"Several archiving options are also available.\n"
+"It enables you to select a mail folder that you want to be archived, and then choose a name, "
+"format and location for the archive. Subfolders can be included and MD5 checksums can be added for "
+"each file in the archive. Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
 "\tTAR\n"
@@ -8685,22 +8416,20 @@ msgid ""
 "\n"
 "The archive can be compressed using:\n"
 "%s\n"
-"The archives can be restored with any standard tool that supports the chosen "
-"format and compression.\n"
+"The archives can be restored with any standard tool that supports the chosen format and "
+"compression.\n"
 "\n"
 "The supported folder types are MH, IMAP, RSSyl and vCalendar.\n"
 "\n"
 "To activate the archiving feature go to /Tools/Create Archive\n"
 "\n"
-"Default options can be set in /Configuration/Preferences/Plugins/Mail "
-"Archiver"
+"Default options can be set in /Configuration/Preferences/Plugins/Mail Archiver"
 msgstr ""
 "Dieses Plugin stattet Claws Mail mit der F?higkeit zur Archivierung aus.\n"
 "\n"
-"Sie k?nnen einen Mailordner ausw?hlen, den Sie archivieren m?chten und dann "
-"Name, Format und Ort des Archivs angeben. Unterordner k?nnen eingeschlossen "
-"und MD5-Pr?fsummen f?r jede Datei k?nnen dem Archiv hinzugef?gt werden. "
-"Verschiedene Archivierungsoptionen sind verf?gbar.\n"
+"Sie k?nnen einen Mailordner ausw?hlen, den Sie archivieren m?chten und dann Name, Format und Ort "
+"des Archivs angeben. Unterordner k?nnen eingeschlossen und MD5-Pr?fsummen f?r jede Datei k?nnen "
+"dem Archiv hinzugef?gt werden. Verschiedene Archivierungsoptionen sind verf?gbar.\n"
 "\n"
 "Das Archiv kann gespeichert werden als:\n"
 "\tTAR\n"
@@ -8710,15 +8439,14 @@ msgstr ""
 "\n"
 "Das Archiv kann komprimiert werden mit:\n"
 "%s\n"
-"Die Archive k?nnen mit jedem Standardwerkzeug wiederhergestellt werden, das "
-"das Format und die gew?hlte Kompressionsmethode unterst?tzt.\n"
+"Die Archive k?nnen mit jedem Standardwerkzeug wiederhergestellt werden, das das Format und die "
+"gew?hlte Kompressionsmethode unterst?tzt.\n"
 "\n"
 "Die unterst?tzten Ordnertypen sind MH, IMAP, RSSyl und vCalendar.\n"
 "\n"
 "Um das Archivieren zu aktivieren, gehen Sie zu /Werkzeuge/Archiv erstellen\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Mail-"
-"Archiver"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Mail-Archiver"
 
 #: src/plugins/archive/archiver.c:152
 msgid "Archiver"
@@ -8835,18 +8563,15 @@ msgstr "Ordnergr??e"
 msgid "Compression level"
 msgstr "Kompressionsst?rke"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:514
+#: src/plugins/archive/archiver_gtk.c:795 src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:811 src/plugins/pdf_viewer/poppler_viewer.c:718
+#: src/prefs_folder_item.c:514
 msgid "Yes"
 msgstr "ja"
 
-#: src/plugins/archive/archiver_gtk.c:795
-#: src/plugins/archive/archiver_gtk.c:803
-#: src/plugins/archive/archiver_gtk.c:811
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:513
-#: src/prefs_summaries.c:369
+#: src/plugins/archive/archiver_gtk.c:795 src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:811 src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/prefs_folder_item.c:513 src/prefs_summaries.c:369
 msgid "No"
 msgstr "Nein"
 
@@ -8862,16 +8587,15 @@ msgstr "Aussagekr?ftige Namen"
 msgid "Delete selected files"
 msgstr "Ausgew?hlte Dateien l?schen"
 
-#: src/plugins/archive/archiver_gtk.c:823
-#: src/plugins/archive/archiver_gtk.c:1199
+#: src/plugins/archive/archiver_gtk.c:823 src/plugins/archive/archiver_gtk.c:1199
 msgid "Select mails before"
 msgstr "W?hle Nachrichten vor Datum"
 
 #: src/plugins/archive/archiver_gtk.c:899
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
-"Dateiname f?r Archiv angeben [die Endung sollte das Archivformat "
-"wiedergeben, wie zum Beispiel .tgz]"
+"Dateiname f?r Archiv angeben [die Endung sollte das Archivformat wiedergeben, wie zum Beispiel ."
+"tgz]"
 
 #: src/plugins/archive/archiver_gtk.c:947
 #, c-format
@@ -8896,9 +8620,7 @@ msgstr "Ordner f?rdas Wurzelverzeichnis des Archivs"
 
 #: src/plugins/archive/archiver_gtk.c:1024
 msgid "Click this button to select a folder which is to be root of the archive"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um einen Ordner zum Speichern des "
-"Archivs zu w?hlen."
+msgstr "Klicken Sie auf diese Schaltfl?che, um einen Ordner zum Speichern des Archivs zu w?hlen."
 
 #: src/plugins/archive/archiver_gtk.c:1030
 msgid "Name for archive"
@@ -8908,8 +8630,7 @@ msgstr "Name f?r das Archiv"
 msgid "Archive location and name"
 msgstr "Archivpfad und -name"
 
-#: src/plugins/archive/archiver_gtk.c:1038
-#: src/plugins/archive/archiver_prefs.c:194
+#: src/plugins/archive/archiver_gtk.c:1038 src/plugins/archive/archiver_prefs.c:194
 #: src/plugins/pgpcore/select-keys.c:422
 msgid "_Select"
 msgstr "_W?hlen"
@@ -8917,8 +8638,7 @@ msgstr "_W?hlen"
 #: src/plugins/archive/archiver_gtk.c:1041
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um einen Name und einen Speicherplatz "
-"f?r das Archiv zu w?hlen"
+"Klicken Sie auf diese Schaltfl?che, um einen Name und einen Speicherplatz f?r das Archiv zu w?hlen"
 
 #: src/plugins/archive/archiver_gtk.c:1043
 msgid "Choose compression"
@@ -8982,24 +8702,20 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archive"
 msgstr ""
-"Diese Option w?hlen, um MD5-Pr?fsummen f?r jede Datei des Archivs zu "
-"erstellen.\n"
-"Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich "
-"verl?ngert."
+"Diese Option w?hlen, um MD5-Pr?fsummen f?r jede Datei des Archivs zu erstellen.\n"
+"Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich verl?ngert."
 
 #: src/plugins/archive/archiver_gtk.c:1174
 msgid "R_ename"
 msgstr "_Umbenennen"
 
-#: src/plugins/archive/archiver_gtk.c:1178
-#: src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1178 src/plugins/archive/archiver_prefs.c:325
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
-"Diese Option w?hlen, um f?r jede Datei im Archiv einen aussagekr?ftigen "
-"Namen zu verwenden.\n"
+"Diese Option w?hlen, um f?r jede Datei im Archiv einen aussagekr?ftigen Namen zu verwenden.\n"
 "Das Benennungsschema: Datum_von at an@Betreff.\n"
 "Die Namen werden maximal 96 Zeichen lang."
 
@@ -9008,8 +8724,8 @@ msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
-"Diese Option w?hlen, um Mails nach dem Archivieren zu l?schen. Hier werden "
-"nur lokale Mboxen, IMAP4 und POP3 ber?cksichtigt."
+"Diese Option w?hlen, um Mails nach dem Archivieren zu l?schen. Hier werden nur lokale Mboxen, "
+"IMAP4 und POP3 ber?cksichtigt."
 
 #: src/plugins/archive/archiver_gtk.c:1190
 msgid "Selection options"
@@ -9030,8 +8746,7 @@ msgstr "Standardordner"
 #: src/plugins/archive/archiver_prefs.c:198
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um den Standard-Ordner zum Speichern von "
-"Archiven auszuw?hlen"
+"Klicken Sie auf diese Schaltfl?che, um den Standardpfad zum Speichern von Archiven auszuw?hlen"
 
 #: src/plugins/archive/archiver_prefs.c:207
 msgid "Default compression"
@@ -9047,8 +8762,7 @@ msgstr "Diese Option w?hlen, um standardm??ig BZIP2-Kompression zu verwenden"
 
 #: src/plugins/archive/archiver_prefs.c:233
 msgid "Choose this option to use COMPRESS compression by default"
-msgstr ""
-"Diese Option w?hlen, um standardm??ig COMPRESS-Kompression zu verwenden"
+msgstr "Diese Option w?hlen, um standardm??ig COMPRESS-Kompression zu verwenden"
 
 #: src/plugins/archive/archiver_prefs.c:240
 msgid "Choose this option to disable compression by default"
@@ -9088,15 +8802,12 @@ msgstr "MD5sum"
 
 #: src/plugins/archive/archiver_prefs.c:319
 msgid ""
-"Choose this option to add MD5 checksums for each file in the archives by "
-"default.\n"
+"Choose this option to add MD5 checksums for each file in the archives by default.\n"
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
 msgstr ""
-"Diese Option w?hlen, um standardm??ig MD5-Pr?fsummen f?r jede Datei des "
-"Archivs zu erstellen.\n"
-"Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich "
-"verl?ngert."
+"Diese Option w?hlen, um standardm??ig MD5-Pr?fsummen f?r jede Datei des Archivs zu erstellen.\n"
+"Beachten Sie, dass dies die Zeit zum Erstellen des Archivs erheblich verl?ngert."
 
 #: src/plugins/archive/archiver_prefs.c:323
 msgid "Rename"
@@ -9122,13 +8833,12 @@ msgstr "<b>Dateiname: </b>"
 msgid "Remove attachments"
 msgstr "Anh?nge entfernen"
 
-#: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:945
+#: src/plugins/att_remover/att_remover.c:357 src/plugins/vcalendar/vcal_meeting_gtk.c:324
+#: src/prefs_themes.c:945
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80
-#: src/summaryview.c:2785
+#: src/plugins/att_remover/att_remover.c:365 src/prefs_summary_column.c:80 src/summaryview.c:2785
 msgid "Attachment"
 msgstr "Anhang"
 
@@ -9154,8 +8864,7 @@ msgstr "Diese Nachricht hat keine Anh?nge"
 msgid "Remove attachments..."
 msgstr "Anh?nge entfernen..."
 
-#: src/plugins/att_remover/att_remover.c:506
-#: src/plugins/att_remover/att_remover.c:566
+#: src/plugins/att_remover/att_remover.c:506 src/plugins/att_remover/att_remover.c:566
 msgid "AttRemover"
 msgstr "AttRemover"
 
@@ -9163,13 +8872,13 @@ msgstr "AttRemover"
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
-"Warning: this operation will be completely un-cancellable and the deleted "
-"attachments will be lost forever, and ever, and ever."
+"Warning: this operation will be completely un-cancellable and the deleted attachments will be lost "
+"forever, and ever, and ever."
 msgstr ""
 "Dieses Plugin entfernt Anh?nge von E-Mails.\n"
 "\n"
-"Warnung: Dieser Vorgang kann nicht abgebrochen werden und die gel?schten "
-"Anh?nge werden f?r immer und ewig und ewig und ewig verloren sein."
+"Warnung: Dieser Vorgang kann nicht abgebrochen werden und die gel?schten Anh?nge werden f?r immer "
+"und ewig und ewig und ewig verloren sein."
 
 #: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
@@ -9178,15 +8887,13 @@ msgstr "Behandlung von Anh?ngen"
 #: src/plugins/attachwarner/attachwarner.c:214
 #, c-format
 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"
+"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 ""
-"In der Nachricht wird ein Anhang erw?hnt, aber es ist keine Datei angeh?ngt. "
-"Die Nennung erfolgt in Zeile %d, die wie folgt beginnt: <span weight=\"bold"
-"\">%.20s</span>?\n"
+"In der Nachricht wird ein Anhang erw?hnt, aber es ist keine Datei angeh?ngt. Die Nennung erfolgt "
+"in Zeile %d, die wie folgt beginnt: <span weight=\"bold\">%.20s</span>?\n"
 "\n"
 "Trotzdem %s?"
 
@@ -9194,29 +8901,25 @@ msgstr ""
 msgid "Attachment warning"
 msgstr "Warnung: fehlender Anhang?"
 
-#: src/plugins/attachwarner/attachwarner.c:243
-#: src/plugins/attachwarner/attachwarner.c:280
+#: src/plugins/attachwarner/attachwarner.c:243 src/plugins/attachwarner/attachwarner.c:280
 #: src/plugins/attachwarner/attachwarner.c:332
 msgid "Attach warner"
 msgstr "Anhangswarner"
 
 #: src/plugins/attachwarner/attachwarner.c:290
 msgid ""
-"Warns user if some reference to attachments is found in the message text and "
-"no file is attached."
+"Warns user if some reference to attachments is found in the message text and no file is attached."
 msgstr ""
-"Warnt den Benutzer, wenn ein Anhang in der Mail erw?hnt wurde, aber keine "
-"Datei angeh?ngt ist."
+"Warnt den Benutzer, wenn ein Anhang in der Mail erw?hnt wurde, aber keine Datei angeh?ngt ist."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:52
 msgid "attach"
 msgstr "anh?ngen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
-"einer der folgenden Regul?ren Ausdr?cke zutrifft:\n"
+"Einer der folgenden Regul?ren Ausdr?cke zutrifft:\n"
 "(einer pro Zeile)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
@@ -9226,8 +8929,8 @@ msgstr "Zwischen Gro?- und Kleinschreibung unterscheiden"
 #: src/plugins/attachwarner/attachwarner_prefs.c:93
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
-"Beim Pr?fen auf die Regul?ren Ausdr?cke der Liste wird zwischen Gro?- und "
-"Kleinschreibung unterschieden"
+"Beim Pr?fen auf die Regul?ren Ausdr?cke der Liste wird zwischen Gro?- und Kleinschreibung "
+"unterschieden"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:115
 msgid "Lines starting with quotation marks"
@@ -9235,37 +8938,30 @@ msgstr "Zeilen mit Zitatzeichen am Anfang"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:122
 msgid ""
-"Exclude quoted lines from checking for the regular expressions above. Note "
-"that handmade quotes cannot be distinguished from quotes generated by "
-"replying."
+"Exclude quoted lines from checking for the regular expressions above. Note that handmade quotes "
+"cannot be distinguished from quotes generated by replying."
 msgstr ""
-"Zitierte Zeilen von der Pr?fung gegen obige Regul?re Ausdr?cke ausschlie?en. "
-"Beachten Sie, dass manuelle Zitate nicht unterschieden werden k?nnen von "
-"Zitaten, die beim Beantworten von Nachrichten erzeugt werden."
+"Zitierte Zeilen von der Pr?fung gegen obige Regul?re Ausdr?cke ausschlie?en. Beachten Sie, dass "
+"manuelle Zitate nicht unterschieden werden k?nnen von Zitaten, die beim Beantworten von "
+"Nachrichten erzeugt werden."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:125
 msgid "Forwarded or redirected messages"
 msgstr "Weitergeleitete oder umgeleitete Nachrichten"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:132
-msgid ""
-"Don't check for missing attachments when forwarding or redirecting messages"
-msgstr ""
-"Nicht auf fehlende Anh?nge pr?fen, wenn die Nachricht weiter- oder "
-"umgeleitet wird"
+msgid "Don't check for missing attachments when forwarding or redirecting messages"
+msgstr "Nicht auf fehlende Anh?nge pr?fen, wenn die Nachricht weiter- oder umgeleitet wird"
 
-#: 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 "Signaturen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:142
 msgid ""
-"Exclude lines from the first signature-separator onwards from checking for "
-"the regular expressions above"
-msgstr ""
-"Zeilen nach dem ersten Signatur-Separator nicht auf obige Regul?re Ausdr?cke "
-"pr?fen"
+"Exclude lines from the first signature-separator onwards from checking for the regular expressions "
+"above"
+msgstr "Zeilen nach dem ersten Signatur-Separator nicht auf obige Regul?re Ausdr?cke pr?fen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:148
 msgid "Warn when"
@@ -9279,8 +8975,7 @@ msgstr "Ausschlie?en"
 msgid "Attach Warner"
 msgstr "Anhangswarner"
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:81 src/plugins/bogofilter/bogofilter_gtk.c:499
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
@@ -9294,31 +8989,29 @@ msgstr "Bogofilter: filtere Nachricht..."
 
 #: src/plugins/bogofilter/bogofilter.c:612
 msgid ""
-"The Bogofilter plugin couldn't filter a message. The probable cause of the "
-"error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
-"with a few hundred spam and ham messages."
+"The Bogofilter plugin couldn't filter a message. The probable cause of the error is that it didn't "
+"learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter with a few hundred spam "
+"and ham messages."
 msgstr ""
-"Das Bogofilter-Plugin konnte eine Nachricht nicht filtern. M?gliche "
-"Fehlerursache ist, dass es noch nicht von Nachrichten gelernt hat.\n"
-"Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bogofilter mit "
-"m?glichst vielen (Nicht-)Spam-Nachrichten zu trainieren."
+"Das Bogofilter-Plugin konnte eine Nachricht nicht filtern. M?gliche Fehlerursache ist, dass es "
+"noch nicht von Nachrichten gelernt hat.\n"
+"Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bogofilter mit m?glichst vielen "
+"(Nicht-)Spam-Nachrichten zu trainieren."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
-msgid ""
-"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
-"couldn't be run."
+msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
 msgstr ""
-"Das Bogofilter-Plugin konnte die Nachricht nicht filtern. Der Befehl `%s %s "
-"%s` konnte nicht ausgef?hrt werden."
+"Das Bogofilter-Plugin konnte die Nachricht nicht filtern. Der Befehl `%s %s %s` konnte nicht "
+"ausgef?hrt werden."
 
 #: src/plugins/bogofilter/bogofilter.c:766
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lerne von Nachricht..."
 
-#: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:511
+#: src/plugins/bogofilter/bogofilter.c:779 src/plugins/bogofilter/bogofilter.c:826
+#: src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Lernen schlug fehl; `%s` wurde mit Status %d beendet."
@@ -9338,117 +9031,91 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:1010
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using Bogofilter. You will need Bogofilter installed "
-"locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam "
+"using Bogofilter. You will need Bogofilter installed locally.\n"
 "\n"
-"Before Bogofilter can recognize spam messages, you have to train it by "
-"marking a few hundred spam and ham messages with the use of \"/Mark/Mark as "
-"spam\" and \"/Mark/Mark as ham\".\n"
+"Before Bogofilter can recognize spam messages, you have to train it by marking a few hundred spam "
+"and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten "
-"mittels Bogofilter auf Spam pr?fen. Sie m?ssen Bogofilter lokal installiert "
-"haben.\n"
+"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten mittels Bogofilter "
+"auf Spam pr?fen. Sie m?ssen Bogofilter lokal installiert haben.\n"
 "\n"
-"Bevor Bogofilter Spam erkennt, muss es mit einigen hundert Spam- und Nicht-"
-"Spam-Nachrichten trainiert werden. Dies geschieht mit Hilfe von \"/Markieren/"
-"als Spam markieren\" und \"/Markieren/als Nicht-Spam markieren\"\n"
-"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem "
-"speziellen Ordner gespeichert werden.\n"
+"Bevor Bogofilter Spam erkennt, muss es mit einigen hundert Spam- und Nicht-Spam-Nachrichten "
+"trainiert werden. Dies geschieht mit Hilfe von \"/Markieren/als Spam markieren\" und \"/Markieren/"
+"als Nicht-Spam markieren\"\n"
+"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem speziellen Ordner "
+"gespeichert werden.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
-"Bogofilter"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Spam-Erkennung"
 
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Lernen von Spam"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
+#: src/plugins/bogofilter/bogofilter_gtk.c:161 src/plugins/bsfilter/bsfilter_gtk.c:143
 #: src/plugins/spamassassin/spamassassin_gtk.c:400
 msgid "Process messages on receiving"
 msgstr "Nachrichten beim Empfang ?berpr?fen"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:169
-#: src/plugins/bsfilter/bsfilter_gtk.c:151
+#: src/plugins/bogofilter/bogofilter_gtk.c:169 src/plugins/bsfilter/bsfilter_gtk.c:151
 #: src/plugins/spamassassin/spamassassin_gtk.c:358
 msgid "Maximum size"
 msgstr "Maximale Gr??e"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:178
-#: src/plugins/bsfilter/bsfilter_gtk.c:160
+#: src/plugins/bogofilter/bogofilter_gtk.c:178 src/plugins/bsfilter/bsfilter_gtk.c:160
 #: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Messages larger than this will not be checked"
 msgstr "Gr??ere Nachrichten als diese werden nicht ?berpr?ft"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:181
-#: src/plugins/bsfilter/bsfilter_gtk.c:163
+#: src/plugins/bogofilter/bogofilter_gtk.c:181 src/plugins/bsfilter/bsfilter_gtk.c:163
 #: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1507
 msgid "KB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Marke l?schen"
+msgstr "Spam l?schen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Speichere Spam in"
+msgstr "Speichere Spam in..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Als _Spam markieren"
+msgstr "Nur als Spam markieren"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
+#: src/plugins/bogofilter/bogofilter_gtk.c:227 src/plugins/bsfilter/bsfilter_gtk.c:179
 #: src/plugins/spamassassin/spamassassin_gtk.c:416
-msgid ""
-"Folder for storing identified spam. Leave empty to use the trash folder."
-msgstr ""
-"Ordner f?r identifizierten Spam. Nichts eintragen, um den Papierkorb zu "
-"verwenden"
+msgid "Folder for storing identified spam. Leave empty to use the trash folder."
+msgstr "Ordner f?r identifizierten Spam. Nichts eintragen, um den Papierkorb zu verwenden"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
+#: src/plugins/bogofilter/bogofilter_gtk.c:233 src/plugins/bsfilter/bsfilter_gtk.c:185
 #: src/plugins/spamassassin/spamassassin_gtk.c:422
 msgid "Click this button to select a folder for storing spam"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um einen Ordner zum Speichern von Spam "
-"auszuw?hlen"
+msgstr "Klicken Sie auf diese Schaltfl?che, um einen Ordner zum Speichern von Spam auszuw?hlen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "When unsure, move to"
 msgstr "Wenn ungewiss, verschieben nach"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:250
-msgid ""
-"Folder for storing mail for which spam status is Unsure. Leave empty to use "
-"the Inbox folder."
+msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."
 msgstr ""
-"Ordner f?r Nachrichten mit ungewissem Spamstatus; ist nichts eingetragen, "
-"gilt der Eingangsordner."
+"Ordner f?r Nachrichten mit ungewissem Spamstatus; ist nichts eingetragen, gilt der Eingangsordner."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 msgid "Click this button to select a folder for storing Unsure mails."
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um einen Ordner f?r ungewisse Mails "
-"auszuw?hlen."
+msgstr "Klicken Sie auf diese Schaltfl?che, um einen Ordner f?r ungewisse Mails auszuw?hlen."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 msgid "Insert X-Bogosity header"
@@ -9458,42 +9125,34 @@ msgstr "X-Bogosity-Kopfzeile einf?gen"
 msgid "Only done for messages in MH folders"
 msgstr "nur f?r Nachrichten in MH-Ordnern"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
+#: src/plugins/bogofilter/bogofilter_gtk.c:268 src/plugins/bsfilter/bsfilter_gtk.c:191
 #: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "Whitelist senders found in address book/folder"
 msgstr "Im Adressbuch/Ordner gefundene, stets akzeptierte Absender"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
-#: src/plugins/bsfilter/bsfilter_gtk.c:195
+#: src/plugins/bogofilter/bogofilter_gtk.c:272 src/plugins/bsfilter/bsfilter_gtk.c:195
 #: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid ""
-"Messages coming from your address book contacts will be received in the "
-"normal folder even if detected as spam"
+"Messages coming from your address book contacts will be received in the normal folder even if "
+"detected as spam"
 msgstr ""
-"Nachrichten, deren Absender im Adressbuch vorhanden ist, landen im normalen "
-"Ordner, auch wenn sie als Spam erkannt wurden"
+"Nachrichten, deren Absender im Adressbuch vorhanden ist, landen im normalen Ordner, auch wenn sie "
+"als Spam erkannt wurden"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
+#: src/plugins/bogofilter/bogofilter_gtk.c:282 src/plugins/bsfilter/bsfilter_gtk.c:205
 #: src/plugins/spamassassin/spamassassin_gtk.c:451
 msgid "Click this button to select a book or folder in the address book"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um ein Adressbuch oder einen Ordner "
-"darin zu w?hlen"
+msgstr "Klicken Sie auf diese Schaltfl?che, um ein Adressbuch oder einen Ordner darin zu w?hlen"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:284 src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr "Lerne akzeptierte (whitelisted) E-Mails als Nicht-Spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:286
-msgid ""
-"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
-"learn it as ham."
+msgid "If Bogofilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
 msgstr ""
-"Wenn Bogofilter eine Spam-Mail vermutet oder ungewiss ist, sie aber "
-"akzeptiert (whitelisted), dann als Nicht-Spam lernen."
+"Wenn Bogofilter eine Spam-Mail vermutet oder ungewiss ist, sie aber akzeptiert (whitelisted), dann "
+"als Nicht-Spam lernen."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:295
 msgid "Bogofilter call"
@@ -9503,8 +9162,7 @@ msgstr "Bogofilter-Aufruf"
 msgid "Path to bogofilter executable"
 msgstr "Pfad zur Bogofilter-Programmdatei"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
+#: src/plugins/bogofilter/bogofilter_gtk.c:309 src/plugins/bsfilter/bsfilter_gtk.c:232
 #: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "Mark spam as read"
 msgstr "Spam als gelesen markieren"
@@ -9523,24 +9181,22 @@ msgstr "Bsfilter: filtere Nachricht..."
 
 #: src/plugins/bsfilter/bsfilter.c:393
 msgid ""
-"The Bsfilter plugin couldn't filter a message. The probable cause of the "
-"error is that it didn't learn from any mail.\n"
-"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
-"a few hundred spam and ham messages."
+"The Bsfilter plugin couldn't filter a message. The probable cause of the error is that it didn't "
+"learn from any mail.\n"
+"Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with a few hundred spam and "
+"ham messages."
 msgstr ""
-"Das Bsfilter-Plugin konnte eine Nachricht nicht filtern. M?gliche "
-"Fehlerursache ist, dass es noch nicht von Nachrichten gelernt hat.\n"
-"Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bsfilter mit "
-"m?glichst vielen (Nicht-)Spam-Nachrichten zu trainieren."
+"Das Bsfilter-Plugin konnte eine Nachricht nicht filtern. M?gliche Fehlerursache ist, dass es noch "
+"nicht von Nachrichten gelernt hat.\n"
+"Bitte \"/Markieren/Als (Nicht-)Spam markieren\" benutzen, um Bsfilter mit m?glichst vielen "
+"(Nicht-)Spam-Nachrichten zu trainieren."
 
 #: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
-msgid ""
-"The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
-"run."
+msgid "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be run."
 msgstr ""
-"Das Bsfilter-Plugin konnte die Nachricht nicht filtern. Der Befehl '%s' "
-"konnte nicht ausgef?hrt werden."
+"Das Bsfilter-Plugin konnte die Nachricht nicht filtern. Der Befehl '%s' konnte nicht ausgef?hrt "
+"werden."
 
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
@@ -9548,44 +9204,36 @@ msgstr "Bsfilter: lerne von Nachricht..."
 
 #: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using Bsfilter. You will need Bsfilter installed "
-"locally.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam "
+"using Bsfilter. You will need Bsfilter installed locally.\n"
 "\n"
-"Before Bsfilter can recognize spam messages, you have to train it by marking "
-"a few hundred spam and ham messages with the use of \"/Mark/Mark as spam\" "
-"and \"/Mark/Mark as ham\".\n"
+"Before Bsfilter can recognize spam messages, you have to train it by marking a few hundred spam "
+"and ham messages with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\".\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten "
-"mittels Bsfilter auf Spam pr?fen. Sie m?ssen Bsfilter lokal installiert "
-"haben.\n"
+"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten mittels Bsfilter auf "
+"Spam pr?fen. Sie m?ssen Bsfilter lokal installiert haben.\n"
 "\n"
-"Bevor Bsfilter Spam erkennen kann, muss es mit einigen hundert Spam- und "
-"Nicht-Spam-Nachrichten trainiert werden. Dies geschieht mit Hilfe von \"/"
-"Markieren/als Spam markieren\" und \"/Markieren/als Nicht-Spam markieren\"\n"
-"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem "
-"speziellen Ordner gespeichert werden.\n"
+"Bevor Bsfilter Spam erkennen kann, muss es mit einigen hundert Spam- und Nicht-Spam-Nachrichten "
+"trainiert werden. Dies geschieht mit Hilfe von \"/Markieren/als Spam markieren\" und \"/Markieren/"
+"als Nicht-Spam markieren\"\n"
+"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem speziellen Ordner "
+"gespeichert werden.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
-"Bsfilter"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/bsfilter/bsfilter_gtk.c:171 src/plugins/spamassassin/spamassassin_gtk.c:408
 msgid "Save spam in"
 msgstr "Speichere Spam in"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:209
-msgid ""
-"If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
-"learn it as ham."
+msgid "If Bsfilter thought an email was spam or unsure, but it was whitelisted, learn it as ham."
 msgstr ""
-"Wenn Bsfilter eine Spam-Mail vermutet oder ungewiss ist, sie aber akzeptiert "
-"(whitelisted), dann als Nicht-Spam lernen."
+"Wenn Bsfilter eine Spam-Mail vermutet oder ungewiss ist, sie aber akzeptiert (whitelisted), dann "
+"als Nicht-Spam lernen."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:218
 msgid "Bsfilter call"
@@ -9595,8 +9243,7 @@ msgstr "Bsfilter-Aufruf"
 msgid "Path to bsfilter executable"
 msgstr "Pfad zur Bsfilter-Programmdatei"
 
-#: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:553
+#: src/plugins/clamd/clamav_plugin.c:47 src/plugins/clamd/clamav_plugin_gtk.c:553
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
@@ -9668,11 +9315,11 @@ msgstr ""
 
 #: src/plugins/clamd/clamav_plugin.c:328
 msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from "
-"an IMAP, LOCAL or POP account.\n"
+"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"
+"When a message attachment is found to contain a virus it can be deleted or saved in a specially "
+"designated folder.\n"
 "\n"
 "Because this plugin communicates with clamd via a\n"
 "socket then there are some minimum requirements to\n"
@@ -9688,22 +9335,21 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
-"Dieses Plugin verwendet Clam AntiVirus, um alle ?ber IMAP, POP oder LOCAL "
-"empfangene Nachrichten zu ?berpr?fen.\n"
+"Dieses Plugin verwendet Clam AntiVirus, um alle ?ber IMAP, POP oder LOCAL empfangene Nachrichten "
+"zu ?berpr?fen.\n"
 "\n"
-"Wenn entdeckt wird, dass ein Anhang einen Virus enth?lt, kann er gel?scht "
-"oder in einem gesonderten Ordner gespeichert werden.\n"
+"Wenn entdeckt wird, dass ein Anhang einen Virus enth?lt, kann er gel?scht oder in einem "
+"gesonderten Ordner gespeichert werden.\n"
 "\n"
-"Da dieses Plugin mit clamd ?ber einen Socket kommuniziert, gibt es einige "
-"Mindestanforderungen an die Rechte Ihres home- und .claws-mail-Ordners - "
-"vorausgesetzt der clamav-Daemon kommuniziert ?ber einen Unix-Socket.\n"
+"Da dieses Plugin mit clamd ?ber einen Socket kommuniziert, gibt es einige Mindestanforderungen an "
+"die Rechte Ihres home- und .claws-mail-Ordners - vorausgesetzt der clamav-Daemon kommuniziert ?ber "
+"einen Unix-Socket.\n"
 "\n"
 "Um keine ?nderungen an den Rechten vornehmen zu m?ssen, \n"
 "k?nnen Sie den clamav-Daemon so einrichten, dass er ?ber einen \n"
 "TCP-Socket kommuniziert und f?r clamd die manuelle Konfiguration w?hlen.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Clam "
-"AntiVirus"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Clam AntiVirus"
 
 #: src/plugins/clamd/clamav_plugin.c:367
 msgid "Virus detection"
@@ -9734,16 +9380,12 @@ msgid "Save mail that contains viruses"
 msgstr "Speichere Mail, die Viren enth?lt"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-msgid ""
-"Folder for storing infected mail. Leave empty to use the default trash folder"
-msgstr ""
-"Ordner f?r infizierte Mails. Nichts eintragen, um den Papierkorb zu verwenden"
+msgid "Folder for storing infected mail. Leave empty to use the default trash folder"
+msgstr "Ordner f?r infizierte Mails. Nichts eintragen, um den Papierkorb zu verwenden"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:303
 msgid "Click this button to select a folder for storing infected mail"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um einen Ordner f?r infizierte Mails "
-"auszuw?hlen."
+msgstr "Klicken Sie auf diese Schaltfl?che, um einen Ordner f?r infizierte Mails auszuw?hlen."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:311
 msgid "Automatic configuration"
@@ -9759,11 +9401,11 @@ msgstr "Pfad zu clamd.conf"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:332
 msgid ""
-"Full path to clamd.conf. If this field is not empty then the plugin has been "
-"able to locate the file automatically"
+"Full path to clamd.conf. If this field is not empty then the plugin has been able to locate the "
+"file automatically"
 msgstr ""
-"Absoluter Pfad zu clamd.conf. Wenn dieses Feld nicht leer ist, hat das "
-"Plugin die Datei automatisch lokalisiert."
+"Absoluter Pfad zu clamd.conf. Wenn dieses Feld nicht leer ist, hat das Plugin die Datei "
+"automatisch lokalisiert."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:336
 msgid "Br_owse"
@@ -9771,9 +9413,7 @@ msgstr "Durchsuchen"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:340
 msgid "Click this button to select full path to clamd.conf"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um den absoluten Pfad zu clamd.conf "
-"auszuw?hlen."
+msgstr "Klicken Sie auf diese Schaltfl?che, um den absoluten Pfad zu clamd.conf auszuw?hlen."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:348
 msgid "Check permission for folders and adjust if necessary"
@@ -9781,8 +9421,7 @@ msgstr "Die Rechte von Ordnern pr?fen und gegebenenfalls anpassen."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:361
 msgid "Click this button to check and adjust folder permissions"
-msgstr ""
-"Klicken Sie auf diese Schaltfl?che, um Ordnerrechte zu pr?fen und anzupassen"
+msgstr "Klicken Sie auf diese Schaltfl?che, um Ordnerrechte zu pr?fen und anzupassen"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:369
 msgid "Remote Host"
@@ -9831,7 +9470,7 @@ msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
-"%s: Kann ben?tigte Informationen nicht finden\n"
+"%s: Kann erforderliche Informationen nicht finden\n"
 "Clamd wird deaktiviert"
 
 #: src/plugins/clamd/libclamd/clamd-plugin.c:249
@@ -9846,8 +9485,7 @@ msgstr ": Datei existiert nicht"
 msgid ": Unable to open"
 msgstr ": Kann nicht ge?ffnet werden"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:454
-#: src/plugins/clamd/libclamd/clamd-plugin.c:459
+#: src/plugins/clamd/libclamd/clamd-plugin.c:454 src/plugins/clamd/libclamd/clamd-plugin.c:459
 #: src/plugins/clamd/libclamd/clamd-plugin.c:473
 msgid "Socket write error"
 msgstr "Socket-Schreibfehler"
@@ -9871,14 +9509,13 @@ msgstr "Registrierung des \"log text hook\" schlug fehl"
 
 #: src/plugins/demo/demo.c:76
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
-"installs a hook for new log output and writes it to stdout.\n"
+"This Plugin is only a demo of how to write plugins for Claws Mail. It installs a hook for new log "
+"output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
 msgstr ""
-"Dieses Plugin ist nur ein Beispiel, wie man Plugins f?r Claws Mail schreibt. "
-"Es installiert einen Hook f?r neue Protokollausgabe und schreibt dies nach "
-"STDOUT.\n"
+"Dieses Plugin ist nur ein Beispiel, wie man Plugins f?r Claws Mail schreibt. Es installiert einen "
+"Hook f?r neue Protokollausgabe und schreibt dies nach STDOUT.\n"
 "\n"
 "Es ist eigentlich nicht n?tzlich."
 
@@ -9931,9 +9568,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Die Proxy-Einstellungen von GNOME verwenden"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Proxy verwenden:"
+msgstr "Proxy verwenden"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9958,9 +9594,8 @@ msgid "Enable loading of remote content"
 msgstr "Nachladen von Inhalten aktivieren"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Beim Klicken auf einen Link standardm??ig:"
+msgstr "Beim Klicken auf einen Link standardm??ig"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -9968,13 +9603,11 @@ msgstr "In externem Webbrowser ?ffnen"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr "Das CSS in dieser Datei wird auf alle HTML-Teile angewendet"
+msgstr "Das CSS in dieser Datei wird auf alle HTML-Elemente angewendet"
 
-#: src/plugins/fancy/fancy_prefs.c:308
-#: src/plugins/notification/notification_prefs.c:1347
-#: src/plugins/rssyl/rssyl_prefs.c:186 src/prefs_account.c:1441
-#: src/prefs_account.c:1530 src/prefs_account.c:1991
-#: src/prefs_customheader.c:236
+#: src/plugins/fancy/fancy_prefs.c:308 src/plugins/notification/notification_prefs.c:1347
+#: src/plugins/rssyl/rssyl_prefs.c:186 src/prefs_account.c:1441 src/prefs_account.c:1530
+#: src/prefs_account.c:1991 src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Durchsuchen"
 
@@ -10072,11 +9705,10 @@ msgstr "Fancy - HTML-Betrachter"
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /"
-"Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in /Configuration/Preferences/"
+"Plugins/Fancy"
 msgstr ""
-"Dieses Plugin stellt HTML-Mails mit Hilfe der WebKit %d.%d.%d-Bibliothek "
-"dar.\n"
+"Dieses Plugin stellt HTML-Mails mit Hilfe der WebKit %d.%d.%d-Bibliothek dar.\n"
 "Alle nachzuladenden Inhalte sind standardm??ig blockiert.\n"
 "\n"
 "Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Fancy"
@@ -10085,8 +9717,7 @@ msgstr ""
 msgid "failed to write Fetchinfo configuration to file\n"
 msgstr "Schreiben der Fetchinfo-Einstellungen in Datei schlug fehl\n"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:200
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:167 src/plugins/fetchinfo/fetchinfo_plugin.c:200
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
@@ -10097,19 +9728,16 @@ msgstr "Registrieren des \"mail receive hook\" schlug fehl."
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:209
 msgid ""
-"This plugin modifies the downloaded messages. It inserts headers containing "
-"some download information: UIDL, Claws Mail account name, POP server, user "
-"ID and retrieval time.\n"
+"This plugin modifies the downloaded messages. It inserts headers containing some download "
+"information: UIDL, Claws Mail account name, POP server, user ID and retrieval time.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
-"Dieses Plugin modifiziert die heruntergeladenen Nachrichten. Es f?gt den "
-"Kopfzeilen folgende Informationen hinzu:\n"
-"UIDL, Name des Kontos in Claws Mail, POP-Server, Benutzer-ID und Zeitpunkt "
-"des Herunterladens.\n"
+"Dieses Plugin modifiziert die heruntergeladenen Nachrichten. Es f?gt den Kopfzeilen folgende "
+"Informationen hinzu:\n"
+"UIDL, Name des Kontos in Claws Mail, POP-Server, Benutzer-ID und Zeitpunkt des Herunterladens.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
-"Fetchinfo"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:236
 msgid "Mail marking"
@@ -10120,18 +9748,16 @@ msgid "Add fetchinfo headers"
 msgstr "Fetchinfo-Kopfzeilen hinzuf?gen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Zu benutzende Absenderadresse"
+msgstr "Hinzuzuf?gende Kopfzeilen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
 msgstr "UIDL"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid ""
-"Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
-msgstr ""
+msgid "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
+msgstr "F?gt diese Kopfzeile hinzu: X-FETCH-UIDL mit der unique ID der Nachricht (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10139,7 +9765,7 @@ msgstr "Kontoname"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "F?gt diese Kopfzeile hinzu: X-FETCH-ACCOUNT mit dem Kontonamen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10147,7 +9773,7 @@ msgstr "Empfangender Server"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "F?gt diese Kopfzeile hinzu: X-FETCH-SERVER mit dem empfangenden Server"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10155,52 +9781,48 @@ msgstr "Benutzer-ID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "F?gt diese Kopfzeile hinzu: X-FETCH-USERID mit der Benutzer-ID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr "Uhrzeit der Abholung"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
-msgid ""
-"Adds the X-FETCH-TIME header with the date and time of message retrieval in "
-"RFC822 format"
+msgid "Adds the X-FETCH-TIME header with the date and time of message retrieval in RFC822 format"
 msgstr ""
+"F?gt diese Kopfzeile hinzu: X-FETCH-TIME mit Datum und Uhrzeit des Nachrichtenempfangs im RFC822-"
+"Format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "GData-Plugin: Fehler beim Authentifizieren: %s\n"
+msgstr "GData-Plugin: Autorisierung erforderlich"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
+"You need to authorize Claws Mail to access your Google contact list to use the GData plugin.\n"
 "\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
+"Visit Google's authorization page by pressing the button below. After you confirmed the "
+"authorization, you will get an authorization code. Enter that code in the field below to grant "
+"Claws Mail access to your Google contact list."
 msgstr ""
+"Sie m?ssen Claws Mail autorisieren, mit dem GData-Plugin auf Ihre Google-Kontakte zugreifen zu "
+"k?nnen."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Schritt"
+msgstr "Schritt 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Klicken Sie hier, um die Seite f?r die Google-Autorisierung in einem Browser zu ?ffnen"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Schritt"
+msgstr "Schritt 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Benutzerschnittstelle"
+msgstr "Geben Sie den Code ein:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10223,7 +9845,7 @@ msgstr[1] "%d Kontakte dem Zwischenspeicher hinzugef?gt"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:352
 msgid "GData plugin: Starting async contacts query\n"
-msgstr "GData-Plugin: Starte asynchrone Abfrage von Kontakten\n"
+msgstr "GData-Plugin: Beginne asynchrone Abfrage von Kontakten\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:373
 #, c-format
@@ -10236,55 +9858,48 @@ msgstr "GData-Plugin: Gruppen empfangen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Starting async groups query\n"
-msgstr "GData-Plugin: Starte asynchrone Abfrage von Gruppen\n"
+msgstr "GData-Plugin: Beginne asynchrone Abfrage von Gruppen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData-Plugin: Fehler beim Authentifizieren: %s\n"
+msgstr "GData-Plugin: Fehler beim Autorisieren: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "GData-Plugin: Fehler beim Authentifizieren: %s\n"
+msgstr "GData-Plugin: Autorisierung erfolgreich: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData-Plugin: Starte asynchrone Authentifizierung\n"
+msgstr "GData-Plugin: Beginne interaktive Autorisierung\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData-Plugin: Starte asynchrone Authentifizierung\n"
+msgstr "GData-Plugin: Autorisierungs-Code erhalten, fordere Autorisierung an\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
+msgid "GData plugin: No authorization code received, authorization request cancelled\n"
+msgstr "GData-Plugin: Keinen Autorisierungs-Code erhalten, breche Autorisierungsanfrage ab\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData-Plugin: Fehler beim Authentifizieren: %s\n"
+msgstr "GData-Plugin: Fehler beim Erneuern der Autorisierung: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData-Plugin: Fehler beim Authentifizieren: %s\n"
+msgstr "GData-Plugin: Erneuern der Autorisierung erfolgreich: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData-Plugin: Starte asynchrone Authentifizierung\n"
+msgstr "GData-Plugin: Versuche, Autorisierung zu erneuern\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77 src/plugins/managesieve/sieve_prefs.c:188
+#: src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:83
-#: src/plugins/spam_report/spam_report_prefs.c:152
+#: src/plugins/gdata/cm_gdata_prefs.c:83 src/plugins/spam_report/spam_report_prefs.c:152
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -10311,8 +9926,7 @@ msgstr ""
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Registrieren des \"address completion hook\" im GData-Plugin schlug fehl."
+msgstr "Registrieren des \"address completion hook\" im GData-Plugin schlug fehl."
 
 #: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
@@ -10323,16 +9937,16 @@ msgid ""
 "This plugin provides access to the GData protocol for Claws Mail.\n"
 "\n"
 "The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\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 ""
 "Dieses Plugin erm?glicht die Verwendung des GData-Protokolls in Claws Mail.\n"
 "\n"
 "Das GData-Protokoll ist eine Schnittstelle zu den Google Services.\n"
-"Gegenw?rtig ist die einzige implementierte Funktion die M?glichkeit, Google "
-"Contacts bei der Adressvervollst?ndigung per Tabulator-Taste zu verwenden.\n"
+"Gegenw?rtig ist die einzige implementierte Funktion die M?glichkeit, Google Contacts bei der "
+"Adressvervollst?ndigung per Tabulator-Taste zu verwenden.\n"
 "\n"
 "R?ckmeldungen an <berndth at gmx.de> sind gern gesehen."
 
@@ -10652,8 +10266,7 @@ msgstr "France m?tropolitaine"
 msgid "Gabon"
 msgstr "Gabun"
 
-#: src/plugins/geolocation/geolocation_plugin.c:601
-#: src/plugins/geolocation/geolocation_plugin.c:747
+#: src/plugins/geolocation/geolocation_plugin.c:601 src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
 msgstr "Vereinigtes K?nigreich"
 
@@ -11318,8 +10931,7 @@ msgstr "Demokratische Republik Kongo"
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: src/plugins/geolocation/geolocation_plugin.c:777
-#: src/plugins/geolocation/geolocation_plugin.c:862
+#: src/plugins/geolocation/geolocation_plugin.c:777 src/plugins/geolocation/geolocation_plugin.c:862
 msgid "GeoLocation"
 msgstr "GeoLocation"
 
@@ -11328,55 +10940,46 @@ msgstr "GeoLocation"
 msgid "Could not initialize clutter"
 msgstr "Clutter konnte nicht initialisiert werden."
 
-#: src/plugins/geolocation/geolocation_plugin.c:788
-#: src/plugins/geolocation/geolocation_plugin.c:795
+#: src/plugins/geolocation/geolocation_plugin.c:788 src/plugins/geolocation/geolocation_plugin.c:795
 #, c-format
 msgid "Could not create regular expression: %s\n"
 msgstr "Anlegen des Regul?ren Ausdrucks schlug fehl: %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr ""
-"Registrieren des \"messageview_show hook \" im Geolocation-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"messageview_show hook \" im Geolocation-Plugin schlug fehl."
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 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"
+"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)."
+"Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital quarrels)."
 msgstr ""
 "Dieses Plugin stellt ein Geolocation-Funktion f?r Claws Mail bereit.\n"
 "\n"
-"Achtung: Es ist technisch unm?glich, den genauen geografischen Standort von "
-"Absendern aus deren Mails abzuleiten. Die Resultate dieses Plugins sind nur "
-"grobe N?herungen. Vor allem Mailing-Listen-Software entfernt oft "
-"Informationen des Absenders, so dass Mails von Mailinglisten der Standort "
+"Achtung: Es ist technisch unm?glich, den genauen geografischen Standort von Absendern aus deren "
+"Mails abzuleiten. Die Resultate dieses Plugins sind nur grobe N?herungen. Vor allem Mailing-Listen-"
+"Software entfernt oft Informationen des Absenders, so dass Mails von Mailinglisten der Standort "
 "des Mailing-Listen-Servers statt der des Absenders zugeordnet wird.\n"
-"Im Zweifelsfall sollten Sie dem Resultat dieses Plugins misstrauen und sich "
-"nicht aufgrund dieser Information von Ihrem Partner trennen.\n"
+"Im Zweifelsfall sollten Sie dem Resultat dieses Plugins misstrauen und sich nicht aufgrund dieser "
+"Information von Ihrem Partner trennen.\n"
 "\n"
-"R?ckmeldungen an <berndth at gmx.de> sind willkommen (aber nur, wenn es nicht "
-"um Eheprobleme geht)."
+"R?ckmeldungen an <berndth at gmx.de> sind willkommen (aber nur, wenn es nicht um Eheprobleme geht)."
 
 #: src/plugins/geolocation/geolocation_plugin.c:900
 msgid "GeoLocation integration"
 msgstr "GeoLocation-Integration"
 
-#: src/plugins/libravatar/libravatar.c:360
-#: src/plugins/libravatar/libravatar.c:431
-#: src/plugins/libravatar/libravatar.c:491
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:360 src/plugins/libravatar/libravatar.c:431
+#: src/plugins/libravatar/libravatar.c:491 src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
@@ -11411,57 +11014,44 @@ msgid ""
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
-"Dieses Plugin dient der Anzeige von Libravatar-Profilbildern in "
-"Mailnachrichten.\n"
-"Mehr Informationen zu Libravatar finden Sie unter http://www.libravatar."
-"org/.\n"
-"Falls Sie ein Profil bei gravatar.com haben aber nicht bei Libravatar, wird "
-"dieses\n"
-"ebenfalls abgefragt, sofern in den Plugin-Einstellungen Umleitungen erlaubt "
-"werden.\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
-"Libravatar.\n"
-"\n"
-"Dieses Plugin verwendet libcurl, um Bilder herunterzuladen. Falls Sie sich "
-"hinter\n"
-"einem Proxy befinden, ziehen Sie f?r Details zur Konfiguration von "
-"'http_proxy'\n"
-"bitte die curl(1) manpage zu Rate. Mehr Details zu diesem und anderen "
-"Themen\n"
+"Dieses Plugin dient der Anzeige von Libravatar-Profilbildern in Mailnachrichten.\n"
+"Mehr Informationen zu Libravatar finden Sie unter http://www.libravatar.org/.\n"
+"Falls Sie ein Profil bei gravatar.com haben aber nicht bei Libravatar, wird dieses\n"
+"ebenfalls abgefragt, sofern in den Plugin-Einstellungen Umleitungen erlaubt werden.\n"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/Libravatar.\n"
+"\n"
+"Dieses Plugin verwendet libcurl, um Bilder herunterzuladen. Falls Sie sich hinter\n"
+"einem Proxy befinden, ziehen Sie f?r Details zur Konfiguration von 'http_proxy'\n"
+"bitte die curl(1) manpage zu Rate. Mehr Details zu diesem und anderen Themen\n"
 "finden Sie in der README-Datei.\n"
 "\n"
 "R?ckmeldungen an <ricardo at mones.org> sind gern gesehen.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Ihre E-Mail-Adresse:</span>"
+msgstr "<span color=\"red\">Fehler beim Lesen der Cache-Statistiken</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
-msgid ""
-"<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
-"errors</span>"
-msgstr ""
+msgid "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d errors</span>"
+msgstr "<span color=\"red\">Verwende %s in %d Dateien, %d Ordnern, %d Anderen und %d Fehler</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Verwende %s in %d Dateien, %d Ordnern und %d Anderen"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Icon-Cache"
+msgstr "Icon-Cache s?ubern"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Soll dieses Thema wirklich gel?scht werden?"
+msgstr "Sollen wirklich alle Avatar-Icons aus dem Cache entfernt werden?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Ungen?gend Speicher f?r diesen Vorgang"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11470,10 +11060,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Icon-Cache erfolgreich geleert:\n"
+"? %u fehlende Eintr?ge entfernt.\n"
+"? %u Dateien entfernt."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">Icon-Cache erfolgreich geleert!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11484,28 +11077,29 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Fehler beim Leeren des Icon-Caches:\n"
+"? %u fehlende Eintr?ge entfernt.\n"
+"? %u Dateien entfernt.\n"
+"? %u Dateien konnten nicht gelesen werden.\n"
+"? %u Dateien konnten nicht entfernt werden."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Fehler beim Leeren des Icon-Caches.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
 msgstr "Icons aus dem Cache verwenden"
 
 #: src/plugins/libravatar/libravatar_prefs.c:214
-msgid ""
-"Keep icons on disk for reusing instead of making another network request"
-msgstr ""
-"Icons f?r Wiederbenutzung lokal speichern anstatt eine weitere "
-"Netzwerkanfrage zu machen."
+msgid "Keep icons on disk for reusing instead of making another network request"
+msgstr "Icons f?r Wiederbenutzung lokal speichern anstatt eine weitere Netzwerkanfrage zu machen."
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
 msgid "Cache refresh interval"
 msgstr "Zeitintervall zum Aktualisieren des Caches"
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486
-#: src/prefs_matcher.c:335
+#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1486 src/prefs_matcher.c:335
 msgid "hours"
 msgstr "Stunden"
 
@@ -11563,9 +11157,11 @@ msgstr "Umleiten zu einer vom Benutzer definierten URL"
 
 #: src/plugins/libravatar/libravatar_prefs.c:333
 msgid ""
-"Enter the URL you want to be redirected when no user icon is available. "
-"Leave an empty URL to use the default libravatar orange icon."
+"Enter the URL you want to be redirected when no user icon is available. Leave an empty URL to use "
+"the default libravatar orange icon."
 msgstr ""
+"URL eingeben, zu der weitergeleitet werden soll, wenn kein Benutzer-Icon verf?gbar ist. Leer "
+"lassen, um libravatars oranges Standard-Icon zu verwenden."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11573,11 +11169,10 @@ msgstr "Umleitung zu anderen Seiten erlauben."
 
 #: src/plugins/libravatar/libravatar_prefs.c:383
 msgid ""
-"Follow redirect responses received from libravatar server to other avatar "
-"services like gravatar.com"
+"Follow redirect responses received from libravatar server to other avatar services like gravatar."
+"com"
 msgstr ""
-"Folge Umleitungs-Antworten vom libravatar-Server zu anderen Avatar-Diensten "
-"wie gravatar.com."
+"Folge Umleitungs-Antworten vom libravatar-Server zu anderen Avatar-Diensten wie gravatar.com."
 
 #: src/plugins/libravatar/libravatar_prefs.c:392
 msgid "_Enable federated servers"
@@ -11585,26 +11180,24 @@ msgstr "Aktiviere f?derierte Server "
 
 #: src/plugins/libravatar/libravatar_prefs.c:393
 msgid "Try to get avatar from sender's domain libravatar server"
-msgstr ""
-"Versuche, das Avatar vom Domain-libravatar-Server des Absenders zu holen."
+msgstr "Versuche, das Avatar vom Domain-libravatar-Server des Absenders zu holen."
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "Request timeout"
 msgstr "Zeit?berschreitung der Anfrage"
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
-#: src/prefs_summaries.c:496
+#: src/plugins/libravatar/libravatar_prefs.c:410 src/plugins/spamassassin/spamassassin_gtk.c:391
+#: src/prefs_other.c:558 src/prefs_summaries.c:496
 msgid "seconds"
 msgstr "Sekunden"
 
 #: src/plugins/libravatar/libravatar_prefs.c:411
 msgid ""
-"Set to 0 to use global socket I/O timeout. Maximum value must be also less "
-"than global socket I/O timeout."
+"Set to 0 to use global socket I/O timeout. Maximum value must be also less than global socket I/O "
+"timeout."
 msgstr ""
-"Auf 0 setzen, um den globalen Socket I/O-Timeout zu verwenden. Der "
-"Maximalwert muss niedriger sein als der globale Socket I/O-Timeout."
+"Auf 0 setzen, um den globalen Socket I/O-Timeout zu verwenden. Der Maximalwert muss niedriger sein "
+"als der globale Socket I/O-Timeout."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
@@ -11624,7 +11217,7 @@ msgstr "Mailmbox-Ordner (etPan!)"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr "Dieses Plugin erm?glicht die Handhabung von Mailboxen im mbox-Format ."
+msgstr "Dieses Plugin erm?glicht die Benutzung von Mailboxen im mbox-Format."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
@@ -11650,10 +11243,260 @@ msgid ""
 "All folder(s) and message(s) under '%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
-"Alle Ordner und Nachrichten in '%s' werden endg?ltig und unwiederbringlich "
-"gel?scht.\n"
+"Alle Ordner und Nachrichten in '%s' werden endg?ltig und unwiederbringlich gel?scht.\n"
 "M?chten Sie wirklich l?schen?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Kein Sieve-Authentifizierungs-Verfahren verf?gbar\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "Gew?hltes Sieve-Authentifizierungs-Verfahren nicht verf?gbar\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Verbindung unterbrochen"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Verbindung unterbrochen: %s"
+
+#: src/plugins/managesieve/managesieve.c:570 src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "Unbearbeitete Nachricht in der Sieve-Sitzung: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS schlug fehl"
+
+#: src/plugins/managesieve/managesieve.c:651 src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "Fehler bei der Sieve-Sitzung\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "Fehler bei der Sieve-Sitzung: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "Unbearbeitete Nachricht in der Sieve-Sitzung: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: Wiederhole Authentifizierungs-Versuch\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Authentifizierungs-Verfahren nicht verf?gbar"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtern"
+
+#: src/plugins/managesieve/sieve_editor.c:84 src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "P_r?fe Syntax"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "R_?ckg?ngig"
+
+#: src/plugins/managesieve/sieve_editor.c:282 src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Script-Inhalte nicht abrufbar"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Mache r?ckg?ngig..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Script r_?ckg?ngig machen"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Dieses Script wurde ge?ndert. Die letzten nicht gespeicherten ?nderungen r?ckg?ngig machen?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "_R?ckg?ngig"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Script erfolgreich gespeichert."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Speichere..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Syntax wird ?berpr?ft..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Dieses Script wurde ge?ndert. Die letzten ?nderungen speichern?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Speichern"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve-Filter%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156 src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Sieve-Script hinzuf?gen"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Name f?r ein neues Sieve-Filter-Script eingeben."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Neuen Name das Script eingeben."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "M?chten Sie den Filter '%s' wirklich l?schen?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Filter l?schen"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Ein Konto kann nur ein aktives Sieve-Script haben."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Verbindung nicht m?glich"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Auflisten der Scripte..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Verbinde..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Sieve-Filter verwalten"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Um Sieve zu verwenden, muss es in den Einstellungen eines Kontos aktiviert sein."
+
+#: src/plugins/managesieve/sieve_plugin.c:35 src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Sieve-Filter verwalten..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "Verwaltet Sieve-Filter auf einem Server unter Verwendung des ManageSieve-Protokolls."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Sieve aktivieren"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Serverdaten"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Servername"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr "Anstatt mit dem Standard-Host f?r den Empfang von E-Mails mit diesem verbinden"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Serverport"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Anstatt mit dem Standard-Port mit diesem verbinden."
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Verschl?sselung"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Kein TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "TLS nutzen, wenn verf?gbar"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "TLS erforderlich"
+
+#: src/plugins/managesieve/sieve_prefs.c:191 src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Keine Authentifizierung"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Selbe Authentifizierung wie beim Empfang verwenden"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Authentifizierung spezifizieren"
+
+#: src/plugins/managesieve/sieve_prefs.c:225 src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280 src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Benutzer-ID"
+
+#: src/plugins/managesieve/sieve_prefs.c:235 src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337 src/plugins/vcalendar/vcal_prefs.c:443
+#: src/prefs_account.c:1286 src/prefs_account.c:1811 src/prefs_account.c:2517
+#: src/prefs_account.c:2539 src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Kennwort"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569 src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Authentifizierungsverfahren"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579 src/prefs_account.c:1772
+#: src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Der Sieve-Server darf kein Leerzeichen enthalten."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Kein Sieve-Server angegeben."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NewMail"
@@ -11670,15 +11513,14 @@ msgstr "Konnte Protokoll-Datei nicht ?ffnen %s: %s\n"
 #: src/plugins/newmail/newmail.c:145
 #, c-format
 msgid ""
-"This plugin writes a header summary to a log file for each mail received "
-"after sorting.\n"
+"This plugin writes a header summary to a log file for each mail received after sorting.\n"
 "\n"
 "Default is ~/Mail/NewLog\n"
 "\n"
 "Current log is %s"
 msgstr ""
-"Dieses Plugin schreibt eine Zusammenfassung der Kopfzeilen jeder empfangenen "
-"E-Mail nach dem Sortieren in eine Logdatei.\n"
+"Dieses Plugin schreibt eine Zusammenfassung der Kopfzeilen jeder empfangenen E-Mail nach dem "
+"Sortieren in eine Logdatei.\n"
 "\n"
 "Der Standardpfad ist ~/Mail/NewLog\n"
 "\n"
@@ -11723,65 +11565,47 @@ msgstr "Das Benachrichtigungsplugin ben?tigt Unterst?tzung f?r Threads."
 
 #: src/plugins/notification/notification_plugin.c:228
 msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"folder item update hook\" im Benachrichtigungs-Plugin "
-"schlug fehl."
+msgstr "Registrieren des \"folder item update hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"folder update hook\" im Benachrichtigungs-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"folder update hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:246
 msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"msginfo update hook\" im Benachrichtigungs-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"msginfo update hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:256
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"offline switch hook\" im Benachrichtigungs-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"offline switch hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"main window close hook\" im Benachrichtigungs-Plugin "
-"schlug fehl."
+msgstr "Registrieren des \"main window close hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"got iconified hook\" im Benachrichtigungs-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"got iconified hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"account list changed hook\" im Benachrichtigungs-Plugin "
-"schlug fehl."
+msgstr "Registrieren des \"account list changed hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr ""
-"Registrieren des \"theme change hook\" im Benachrichtigungs-Plugin schlug "
-"fehl."
+msgstr "Registrieren des \"theme change hook\" im Benachrichtigungs-Plugin schlug fehl."
 
 #: src/plugins/notification/notification_plugin.c:422
 msgid ""
-"This plugin provides various ways to notify the user of new and unread "
-"email.\n"
-"The plugin is extensively configurable in the plugins section of the "
-"preferences dialog.\n"
+"This plugin provides various ways to notify the user of new and unread email.\n"
+"The plugin is extensively configurable in the plugins section of the preferences dialog.\n"
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Dieses Plugin bietet verschiedene M?glichkeiten, den Benutzer ?ber neue und "
-"ungelesene E-Mails zu benachrichtigen.\n"
-"Das Plugin bietet viele Konfigurationsm?glichkeiten unter dem Abschnitt "
-"Plugins im Einstellungsdialog.\n"
+"Dieses Plugin bietet verschiedene M?glichkeiten, den Benutzer ?ber neue und ungelesene E-Mails zu "
+"benachrichtigen.\n"
+"Das Plugin bietet viele Konfigurationsm?glichkeiten unter dem Abschnitt Plugins im "
+"Einstellungsdialog.\n"
 "\n"
 "R?ckmeldungen an <berndth at gmx.de> sind gern gesehen."
 
@@ -11890,8 +11714,7 @@ msgstr "Banner"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:133
+#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263 src/prefs_receive.c:133
 msgid "Command"
 msgstr "Befehl"
 
@@ -11913,8 +11736,7 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"Benachrichtigungs-Plugin: Speichern der Plugin-Einstellungen in Datei schlug "
-"fehl\n"
+"Benachrichtigungs-Plugin: Speichern der Plugin-Einstellungen in Datei schlug fehl\n"
 
 #: src/plugins/notification/notification_prefs.c:608
 msgid "Include folder types"
@@ -11929,14 +11751,12 @@ msgid "News folders"
 msgstr "News-Ordner"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS-Ordner"
+msgstr "RSSyl-Ordner"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Kalender-Ordner"
+msgstr "vCalender-Ordner"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11948,14 +11768,11 @@ msgstr "Globale Einstellungen f?r Benachrichtigungen"
 
 #: src/plugins/notification/notification_prefs.c:669
 msgid "Set window manager urgency hint when new messages exist"
-msgstr ""
-"Setze Wichtig-Signal im Fenstermanager, wenn neue Nachrichten vorhanden sind"
+msgstr "Setze Wichtig-Signal im Fenstermanager, wenn neue Nachrichten vorhanden sind"
 
 #: src/plugins/notification/notification_prefs.c:678
 msgid "Set window manager urgency hint when unread messages exist"
-msgstr ""
-"Setze Wichtig-Signal im Fenstermanager, wenn ungelesene Nachrichten "
-"vorhanden sind"
+msgstr "Setze Wichtig-Signal im Fenstermanager, wenn ungelesene Nachrichten vorhanden sind"
 
 #: src/plugins/notification/notification_prefs.c:688
 msgid "Use sound theme"
@@ -11965,9 +11782,8 @@ msgstr "Klangthema verwenden"
 msgid "Show banner"
 msgstr "Banner anzeigen"
 
-#: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:144
-#: src/prefs_receive.c:183 src/prefs_summaries.c:462
+#: src/plugins/notification/notification_prefs.c:767 src/plugins/pgpcore/select-keys.c:238
+#: src/plugins/pgpcore/sgpgme.c:144 src/prefs_receive.c:183 src/prefs_summaries.c:462
 msgid "Never"
 msgstr "Nie"
 
@@ -11985,26 +11801,22 @@ msgid "Banner speed"
 msgstr "Banner-Geschwindigkeit"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "H?chstzahl der Ergebnisse:"
+msgstr "H?chstzahl von Nachrichten"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "H?chstzahl von Nachrichten (0 f?r unbegrenzt)"
+msgstr "H?chstzahl angezeigter Nachrichten (0 f?r unbegrenzt)"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Banner-Geschwindigkeit"
+msgstr "Bannerbreite"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Gr??e des Banners begrenzen; f?r Bildschirmbreite 0 verwenden"
 
-#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
-#: src/prefs_message.c:223
+#: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189 src/prefs_message.c:223
 msgid "pixel(s)"
 msgstr "Pixel"
 
@@ -12031,9 +11843,8 @@ msgid "Select folders..."
 msgstr "Ordner w?hlen..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Ordnerfarbe"
+msgstr "Bannerfarben"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12051,9 +11862,8 @@ msgid "Foreground color"
 msgstr "Vordergrundfarbe"
 
 #: src/plugins/notification/notification_prefs.c:928
-#: src/plugins/notification/notification_prefs.c:1147
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
+#: src/plugins/notification/notification_prefs.c:1147 src/prefs_msg_colors.c:281
+#: src/prefs_msg_colors.c:302 src/prefs_msg_colors.c:323
 msgid "Background"
 msgstr "Hintergrund"
 
@@ -12069,16 +11879,14 @@ msgstr "Popup aktivieren"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Anzeigedauer des Popups:"
+msgstr "Anzeigedauer des Popups"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "Sekunden"
+msgstr "Sekunde(n)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12106,18 +11914,16 @@ msgid "Done"
 msgstr "Fertig"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Shell-Befehl"
+msgstr "Befehl ausw?hlen"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Befehl ausf?hren"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Auszuf?hrender Befehl:"
+msgstr "Auszuf?hrender Befehl"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12128,9 +11934,8 @@ msgid "Enable LCD"
 msgstr "LCD aktivieren"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Hostname:Port des LCDd-Servers:"
+msgstr "Hostname:Port des LCDd-Servers"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12188,7 +11993,6 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
 msgstr "Minimierung umschalten"
 
@@ -12294,8 +12098,7 @@ msgstr "Modifiziert:"
 msgid "Format:"
 msgstr "Format:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/plugins/pdf_viewer/poppler_viewer.c:721
 msgid "Optimized:"
 msgstr "Optimiert:"
 
@@ -12321,8 +12124,7 @@ msgstr "von %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Darstellung des PDFs schlug aus unbekanntem Grund fehl."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1721
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1721 src/plugins/pdf_viewer/poppler_viewer.c:1939
 msgid "Document Index"
 msgstr "Inhaltsverzeichnis"
 
@@ -12381,18 +12183,17 @@ msgstr "Zoomfaktor"
 #: src/plugins/pdf_viewer/poppler_viewer.c:2048
 #, c-format
 msgid ""
-"This plugin enables the viewing of PDF and PostScript attachments using the "
-"Poppler %s Lib and the gs tool.\n"
+"This plugin enables the viewing of PDF and PostScript attachments using the Poppler %s Lib and the "
+"gs tool.\n"
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"Dieses Plugin erm?glicht die Anzeige von PDF- und PostScript-Anh?ngen "
-"mithilfe der Poppler %s-Bibliothek und dem Programm gs.\n"
+"Dieses Plugin erm?glicht die Anzeige von PDF- und PostScript-Anh?ngen mithilfe der Poppler %s-"
+"Bibliothek und dem Programm gs.\n"
 "\n"
 "Jegliche R?ckmeldung ist willkommen: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
-#: src/plugins/pdf_viewer/poppler_viewer.c:2062
+#: src/plugins/pdf_viewer/poppler_viewer.c:2054 src/plugins/pdf_viewer/poppler_viewer.c:2062
 #: src/plugins/pdf_viewer/poppler_viewer.c:2082
 msgid "PDF Viewer"
 msgstr "PDF-Betrachter"
@@ -12400,16 +12201,15 @@ msgstr "PDF-Betrachter"
 #: src/plugins/pdf_viewer/poppler_viewer.c:2058
 #, c-format
 msgid ""
-"Warning: could not find ghostscript binary (gs) required for %s plugin to "
-"process PostScript attachments, only PDF attachments will be displayed. To "
-"enable PostScript support please install gs program.\n"
+"Warning: could not find ghostscript binary (gs) required for %s plugin to process PostScript "
+"attachments, only PDF attachments will be displayed. To enable PostScript support please install "
+"gs program.\n"
 "\n"
 "%s"
 msgstr ""
-"Warnung: konnte das von Plugin %s ben?tigte GhostScript-Binary gs f?r die "
-"Verarbeitung von PostScript-Anh?ngen finden, es werden nur PDF-Anh?nge "
-"angezeigt. Um die PostScript-Unterst?tzung zu aktivieren, m?ssen Sie das "
-"Programm gs installieren.\n"
+"Warnung: konnte das f?r Plugin %s erforderliche GhostScript-Binary (gs) f?r die Verarbeitung von "
+"PostScript-Anh?ngen finden, es werden nur PDF-Anh?nge angezeigt. Um die PostScript-Unterst?tzung "
+"zu aktivieren, m?ssen Sie das Programm gs installieren.\n"
 "\n"
 "%s"
 
@@ -12419,8 +12219,7 @@ msgstr "Perl-Filterregeln bearbeiten (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
-msgstr ""
-"Registrieren des \"address autocompletion hook\" im PGP-Plugin schlug fehl."
+msgstr "Registrieren des \"address autocompletion hook\" im PGP-Plugin schlug fehl."
 
 #: src/plugins/pgpcore/passphrase.c:86 src/plugins/pgpcore/prefs_gpg.c:116
 msgid "Passphrase"
@@ -12433,13 +12232,12 @@ msgstr "[keine Benutzer-ID]"
 #: src/plugins/pgpcore/passphrase.c:260
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sBitte geben Sie die Passphrase f?r "
-"den neuen Schl?ssel ein:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sBitte geben Sie die Passphrase f?r den neuen Schl?ssel ein:"
+"</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12450,26 +12248,23 @@ msgstr "Passphrasen stimmen nicht ?berein.\n"
 #: src/plugins/pgpcore/passphrase.c:266
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the new key:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Bitte wiederholen Sie die Passphrase "
-"f?r den neuen Schl?ssel:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Bitte wiederholen Sie die Passphrase f?r den neuen Schl?ssel:"
+"</span>\n"
 "\n"
 "%.*s\n"
 
 #: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%sbitte geben Sie die Passphrase ein "
-"f?r:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sbitte geben Sie die Passphrase ein f?r:</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12483,11 +12278,10 @@ msgstr "Schl?sselimport"
 
 #: src/plugins/pgpcore/pgp_viewer.c:122
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it from a keyserver?"
 msgstr ""
-"Dieser Schl?ssel ist nicht an Ihrem Ring. Soll Claws Mail versuchen, ihn von "
-"einem Schl?sselserver zu importieren?"
+"Dieser Schl?ssel ist nicht an Ihrem Ring. Soll Claws Mail versuchen, ihn von einem Schl?sselserver "
+"zu importieren?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:201
 msgid ""
@@ -12537,8 +12331,7 @@ msgstr "   Dieser Schl?ssel wurde in Ihren Schl?sselring importiert.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
-msgstr ""
-"   Dieser Schl?ssel konnte nicht in Ihren Schl?sselring importiert werden.\n"
+msgstr "   Dieser Schl?ssel konnte nicht in Ihren Schl?sselring importiert werden.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
@@ -12568,22 +12361,22 @@ msgstr "PGP/Core"
 
 #: src/plugins/pgpcore/plugin.c:71
 msgid ""
-"This plugin handles PGP core operations and provides address autocompletion "
-"from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
+"This plugin handles PGP core operations and provides address autocompletion from the GPG keyring. "
+"It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /Configuration/[Account "
+"Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 "Dieses Plugin stellt PGP-Grundfunktionen zu Verf?gung und eine automatische "
-"Adressvervollst?ndigung anhand des GPG-Schl?sselringes. Es wird von anderen "
-"Plugins benutzt, wie etwa PGP/Mime.\n"
+"Adressvervollst?ndigung anhand des GPG-Schl?sselringes. Es wird von anderen Plugins benutzt, wie "
+"etwa PGP/Mime.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/GPG "
-"und /Konfiguration/[Kontoeinstellungen]/Plugins/GPG\n"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/GPG und /Konfiguration/"
+"[Kontoeinstellungen]/Plugins/GPG\n"
 "\n"
 "Das Plugin verwendet die GPGME-Bibliothek als Schnittstelle zu GnuPG.\n"
 "\n"
@@ -12591,7 +12384,7 @@ msgstr ""
 
 #: src/plugins/pgpcore/plugin.c:101
 msgid "Core operations"
-msgstr "Kernoperationen"
+msgstr "Grundfunktionen"
 
 #: src/plugins/pgpcore/prefs_gpg.c:111
 msgid "Automatically check signatures"
@@ -12599,8 +12392,7 @@ msgstr "Digitale Signaturen automatisch pr?fen"
 
 #: src/plugins/pgpcore/prefs_gpg.c:114
 msgid "Use keyring for address autocompletion"
-msgstr ""
-"Schl?sselring f?r automatisches Vervollst?ndigen von Adressen verwenden"
+msgstr "Schl?sselring f?r automatisches Vervollst?ndigen von Adressen verwenden"
 
 #: src/plugins/pgpcore/prefs_gpg.c:119
 msgid "Use gpg-agent to manage passwords"
@@ -12618,14 +12410,13 @@ msgstr "Verf?llt nach"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Der Eintrag '0' speichert die Passphrase f?r die ganze Sitzung"
 
-#: src/plugins/pgpcore/prefs_gpg.c:153 src/plugins/rssyl/rssyl_prefs.c:154
-#: src/prefs_receive.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:153 src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_receive.c:159
 msgid "minute(s)"
 msgstr "Minute(n)"
 
 #: src/plugins/pgpcore/prefs_gpg.c:163
 msgid "Grab input while entering a passphrase"
-msgstr "Manuelle Eingabe einer Passphrase abgreifen"
+msgstr "Beim Eingeben einer Passphrase Eingabeger?te einfangen"
 
 #: src/plugins/pgpcore/prefs_gpg.c:170
 msgid "Display warning on start-up if GnuPG doesn't work"
@@ -12739,8 +12530,8 @@ msgstr ""
 "\n"
 "Vertrauen Sie diesem Schl?ssel gen?gend, um ihn dennoch zu verwenden?"
 
-#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:249 src/privacy.c:253 src/privacy.c:270
+#: src/privacy.c:274
 msgid "No signature found"
 msgstr "Keine Signatur gefunden"
 
@@ -12762,54 +12553,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-Core: Schl?ssel ist nicht verf?gbar, kein GPG-Agent aktiv."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "G?ltige Signatur von %s."
+msgstr "G?ltige Signatur von \"%s\" [uneingeschr?nkt vertrauensw?rdig]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "G?ltige Signatur von %s."
+msgstr "G?ltige Signatur von \"%s\" [vollst?ndig vertrauensw?rdig]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "G?ltige Signatur von %s."
+msgstr "G?ltige Signatur von \"%s\" [marginal vertrauensw?rdig]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "G?ltige Signatur von %s."
+msgstr "G?ltige Signatur von \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Verfallene Signatur von %s."
+msgstr "Verfallene Signatur von \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "G?ltige Signatur von %s, aber der Schl?ssel ist verfallen."
+msgstr "G?ltige Signatur von \"%s\", aber der Schl?ssel ist verfallen."
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "G?ltige Signatur von %s, aber der Schl?ssel wurde widerrufen."
+msgstr "G?ltige Signatur von \"%s\", aber der Schl?ssel wurde widerrufen."
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Ung?ltige Signatur von %s."
+msgstr "Ung?ltige Signatur von \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Schl?ssel 0x%s zum Pr?fen der Signatur nicht verf?gbar."
+msgstr "Schl?ssel 0x%s zum Pr?fen dieser Signatur nicht verf?gbar"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Die Signatur wurde nicht gepr?ft."
+msgstr "Die Signatur wurde nicht gepr?ft"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12873,8 +12663,7 @@ msgstr "Prim?rer Schl?ssel-Fingerabdruck:"
 #: src/plugins/pgpcore/sgpgme.c:385
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
-msgstr ""
-"ACHTUNG: Adresse des Unterzeichners \"%s\" passt nicht zum DNS-Eintrag\n"
+msgstr "ACHTUNG: Adresse des Unterzeichners \"%s\" passt nicht zum DNS-Eintrag\n"
 
 #: src/plugins/pgpcore/sgpgme.c:391
 #, c-format
@@ -12908,18 +12697,15 @@ msgstr "Fehler beim Setzen des privaten Schl?ssels: %s"
 #: src/plugins/pgpcore/sgpgme.c:703
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
-msgstr ""
-"Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig "
-"installiert."
+msgstr "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig installiert."
 
 #: src/plugins/pgpcore/sgpgme.c:709
 #, c-format
 msgid ""
-"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
-"version %s is required.\n"
+"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but version %s is required.\n"
 msgstr ""
-"Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' Version %s ist "
-"installiert, aber Version %s wird ben?tigt.\n"
+"Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' der Version %s ist installiert, aber Version "
+"%s ist erforderlich.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:717
 #, c-format
@@ -12936,11 +12722,9 @@ msgstr ""
 
 #: src/plugins/pgpcore/sgpgme.c:767
 msgid ""
-"You have to save the account's information with \"OK\" before being able to "
-"generate a key pair.\n"
+"You have to save the account's information with \"OK\" before being able to generate a key pair.\n"
 msgstr ""
-"Sie m?ssen die Kontodaten mit \"OK\" speichern, bevor Sie ein Schl?sselpaar "
-"erzeugen k?nnen.\n"
+"Sie m?ssen die Kontodaten mit \"OK\" speichern, bevor Sie ein Schl?sselpaar erzeugen k?nnen.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:772
 msgid "No PGP key found"
@@ -12948,12 +12732,12 @@ msgstr "kein PGP-Schl?ssel gefunden"
 
 #: src/plugins/pgpcore/sgpgme.c:773
 msgid ""
-"Claws Mail did not find a secret PGP key, which means that you won't be able "
-"to sign emails or receive encrypted emails.\n"
+"Claws Mail did not find a secret PGP key, which means that you won't be able to sign emails or "
+"receive encrypted emails.\n"
 "Do you want to create a new key pair now?"
 msgstr ""
-"Claws Mail konnte keinen privaten PGP-Schl?ssel finden, d.h. dass Sie weder "
-"E-Mails signieren noch verschl?sselte E-Mails empfangen k?nnen.\n"
+"Claws Mail konnte keinen privaten PGP-Schl?ssel finden, d.h. dass Sie weder E-Mails signieren noch "
+"verschl?sselte E-Mails empfangen k?nnen.\n"
 "M?chten Sie jetzt ein neues Schl?sselpaar erzeugen?"
 
 #: src/plugins/pgpcore/sgpgme.c:843 src/plugins/pgpcore/sgpgme.c:859
@@ -12962,12 +12746,10 @@ msgid "Couldn't generate a new key pair: %s"
 msgstr "Es konnte kein neues Schl?sselpaar erzeugt werden: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:850
-msgid ""
-"Generating your new key pair... Please move the mouse around to help "
-"generate entropy..."
+msgid "Generating your new key pair... Please move the mouse around to help generate entropy..."
 msgstr ""
-"Neues Schl?sselpaar wird erzeugt... Bitte die Maus bewegen, um beim Erzeugen "
-"von Entropy zu helfen..."
+"Neues Schl?sselpaar wird erzeugt... Bitte die Maus bewegen, um beim Erzeugen von Entropy zu "
+"helfen..."
 
 #: src/plugins/pgpcore/sgpgme.c:865
 msgid "Couldn't generate a new key pair: unknown error"
@@ -13099,11 +12881,11 @@ msgstr "Datensignierung schlug fehl, Inhalt fehlt."
 
 #: src/plugins/pgpinline/pgpinline.c:625
 msgid ""
-"Please note that attachments are not encrypted by the PGP/Inline system, nor "
-"are email headers, like Subject."
+"Please note that attachments are not encrypted by the PGP/Inline system, nor are email headers, "
+"like Subject."
 msgstr ""
-"Bitte beachten Sie, dass weder Anh?nge noch Kopfzeilen (wie Betreff) vom PGP/"
-"Inline-System verschl?sselt werden."
+"Bitte beachten Sie, dass weder Anh?nge noch Kopfzeilen (wie Betreff) vom PGP/Inline-System "
+"verschl?sselt werden."
 
 #: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
@@ -13130,26 +12912,22 @@ msgstr "PGP/inline"
 
 #: src/plugins/pgpinline/plugin.c:60
 msgid ""
-"This plugin handles the deprecated Inline method of signing and/or "
-"encrypting mails. You can decrypt mails, verify signatures or sign and "
-"encrypt your own mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or encrypting mails. You can "
+"decrypt mails, verify signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy "
+"and when composing a message from /Options/Privacy System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Dieses Plugin bietet die M?glichkeit, Mails mit dem veralteten Inline-"
-"Verfahren zu signieren oder zu verschl?sseln. Es kann E-Mails entschl?sseln, "
-"digitale Signaturen ?berpr?fen und eigene Mails signieren und "
-"verschl?sseln.\n"
+"Dieses Plugin bietet die M?glichkeit, Mails mit dem veralteten Inline-Verfahren zu signieren oder "
+"zu verschl?sseln. Es kann E-Mails entschl?sseln, digitale Signaturen ?berpr?fen und eigene Mails "
+"signieren und verschl?sseln.\n"
 "\n"
-"Es kann als Standard-Datenschutzsystem unter /Konfiguration/"
-"[Kontoeinstellungen]/Datenschutz und beim Schreiben einer Nachricht unter /"
-"Optionen/Datenschutzsystem ausgew?hlt werden.\n"
+"Es kann als Standard-Datenschutzsystem unter /Konfiguration/[Kontoeinstellungen]/Datenschutz und "
+"beim Schreiben einer Nachricht unter /Optionen/Datenschutzsystem ausgew?hlt werden.\n"
 "\n"
 "Das Plugin verwendet die GPGME-Bibliothek als Schnittstelle zu GnuPG.\n"
 "\n"
@@ -13177,12 +12955,9 @@ msgid "OpenPGP digital signature"
 msgstr "Digitale Signatur von OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:617
-msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
+msgid "Please note that email headers, like Subject, are not encrypted by the PGP/Mime system."
 msgstr ""
-"Bitte beachten Sie, dass Kopfzeilen (wie Betreff) vom PGP/Mime-System nicht "
-"verschl?sselt werden."
+"Bitte beachten Sie, dass Kopfzeilen (wie Betreff) vom PGP/Mime-System nicht verschl?sselt werden."
 
 #: src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
@@ -13194,31 +12969,27 @@ msgstr "PGP/MIME"
 
 #: src/plugins/pgpmime/plugin.c:60
 msgid ""
-"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify "
+"signatures or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy "
+"and when composing a message from /Options/Privacy System\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Dieses Plugin verarbeitet PGP/MIME signierte und/oder verschl?sselte Mails. "
-"Es kann E-Mails entschl?sseln, digitale Signaturen ?berpr?fen und eigene "
-"Mails signieren und verschl?sseln.\n"
+"Dieses Plugin verarbeitet PGP/MIME signierte und/oder verschl?sselte Mails. Es kann E-Mails "
+"entschl?sseln, digitale Signaturen ?berpr?fen und eigene Mails signieren und verschl?sseln.\n"
 "\n"
-"Das Plugin kann als Standard-Datenschutzsystem unter /Konfiguration/"
-"Kontoeinstellungen/Datenschutz und beim Schreiben einer Nachricht unter /"
-"Optionen/Datenschutzsystem ausgew?hlt werden.\n"
+"Das Plugin kann als Standard-Datenschutzsystem unter /Konfiguration/Kontoeinstellungen/Datenschutz "
+"und beim Schreiben einer Nachricht unter /Optionen/Datenschutzsystem ausgew?hlt werden.\n"
 "\n"
 "Das Plugin verwendet die GPGME-Bibliothek als Schnittstelle zu GnuPG.\n"
 "\n"
 "GPGME unterliegt dem Copyright 2001 von Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:358 src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "Python-Scripte"
 
@@ -13230,14 +13001,12 @@ msgstr "Python-Konsole ?ffnen..."
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
-#: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1195
-#: src/wizard.c:1610
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506 src/prefs_account.c:2528
+#: src/prefs_account.c:2792 src/wizard.c:1195 src/wizard.c:1610
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:733
+#: src/plugins/python/python_plugin.c:651 src/plugins/python/python_plugin.c:733
 msgid "Python"
 msgstr "Python"
 
@@ -13246,31 +13015,28 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registrieren des \"compose create hook\" im Python-Plugin schlug fehl."
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
-"Python code can be entered interactively into an embedded Python console, "
-"under Tools -> Show Python console, or stored in scripts.\n"
+"Python code can be entered interactively into an embedded Python console, under Tools -> Show "
+"Python console, or stored in scripts.\n"
 "\n"
-"These scripts are then available via the menu. You can assign keyboard "
-"shortcuts to them just like it is done with other menu items. You can also "
-"put buttons for script invocation into the toolbars using Claws Mail's "
-"builtin toolbar editor.\n"
+"These scripts are then available via the menu. You can assign keyboard shortcuts to them just like "
+"it is done with other menu items. You can also put buttons for script invocation into the toolbars "
+"using Claws Mail's builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into ~/.claws-mail/python-"
+"scripts/main.\n"
 "\n"
-"You can also provide scripts working on an open compose window by placing "
-"files into ~/.claws-mail/python-scripts/compose.\n"
+"You can also provide scripts working on an open compose window by placing files into ~/.claws-mail/"
+"python-scripts/compose.\n"
 "\n"
-"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that "
-"are automatically executed when certain events occur. Currently, the "
-"following files in this directory are recognised:\n"
+"The folder ~/.claws-mail/python-scripts/auto/ may contain some scripts that are automatically "
+"executed when certain events occur. Currently, the following files in this directory are "
+"recognised:\n"
 "\n"
 "compose_any\n"
-"Gets executed whenever a compose window is opened, no matter if that opening "
-"happened as a result of composing a new message, replying or forwarding a "
-"message.\n"
+"Gets executed whenever a compose window is opened, no matter if that opening happened as a result "
+"of composing a new message, replying or forwarding a message.\n"
 "\n"
 "startup\n"
 "Executed at plugin load\n"
@@ -13285,39 +13051,39 @@ msgid ""
 "\n"
 "in the interactive 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"
+"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 ""
 "Dieses Plugin erm?glicht die Integration von Python.\n"
-"Python-Code kann interaktiv in eine eingebettete Python-Konsole unter Extras "
-"-> Python-Konsole ?ffnen eingegeben oder in Scripten gespeichert werden.\n"
+"Python-Code kann interaktiv in eine eingebettete Python-Konsole unter \"Extras -> Python-Konsole "
+"?ffnen\" eingegeben oder in Scripten gespeichert werden.\n"
 "\n"
-"Diese Scripte sind ?ber das Men? verf?gbar. Sie k?nnen ihnen Tastenk?rzel "
-"zuweisen wie allen anderen Men?eintr?gen. Mit dem in Claws Mail integrierten "
-"Werkzeugleisteneditor k?nnen Sie den Werkzeugleisten auch Schaltfl?chen f?r "
-"den Aufruf von Scripten hinzuf?gen.\n"
+"Diese Scripte sind ?ber das Men? verf?gbar. Sie k?nnen ihnen Tastenk?rzel zuweisen wie allen "
+"anderen Men?eintr?gen. Mit dem in Claws Mail integrierten Werkzeugleisteneditor k?nnen Sie den "
+"Werkzeugleisten auch Schaltfl?chen f?r den Aufruf von Scripten hinzuf?gen.\n"
 "\n"
-"Scripte, die im Hauptfenster arbeiten sollen, sind in ~/.claws-mail/python-"
-"scripts/main zu speichern, Scripte f?r Editor-Fenster in ~/.claws-mail/"
-"python-scripts/compose.\n"
+"Scripte, die im Hauptfenster arbeiten sollen, sind in ~/.claws-mail/python-scripts/main zu "
+"speichern.\n"
+"\n"
+"Scripte, die im Editor-Fenster arbeiten sollen, sind in ~/.claws-mail/python-scripts/compose zu "
+"speichern.\n"
 "\n"
-"Der Ordner ~/.claws-mail/python-scripts/auto/ ist f?r Scripte vorgesehen, "
-"die automatisch ausgef?hrt werden, wenn bestimmte Ereignisse stattfinden. "
-"Gegenw?rtig werden folgende Dateien in diesem Verzeichnis erkannt:\n"
+"Der Ordner ~/.claws-mail/python-scripts/auto/ ist f?r Scripte vorgesehen, die beim Eintreten "
+"bestimmter Ereignisse automatisch ausgef?hrt werden. Gegenw?rtig werden folgende Dateien in diesem "
+"Verzeichnis erkannt:\n"
 "\n"
 " compose_any\n"
-"_Wird ausgef?hrt, wenn ein Editor-Fenster ge?ffnet wird ? unabh?ngig davon, "
-"ob die Nachricht beantwortet, weitergeleitet oder neu erstellt wird.\n"
+"_Wird ausgef?hrt, wenn ein Editor-Fenster ge?ffnet wird ? unabh?ngig davon, ob eine Nachricht neu "
+"erstellt, beantwortet oder weitergeleitet wird.\n"
 "\n"
 " startup\n"
-"Wird ausgef?hrt, wenn das Plugin gestartet wird.\n"
+"Wird beim Starten des Plugins ausgef?hrt.\n"
 "\n"
 " shutdown\n"
-"Wird ausgef?hrt, wenn das Plugin beendet wird.\n"
+"Wird beim Beenden des Plugins ausgef?hrt.\n"
 "\n"
 "\n"
 "Um die aktuelle API-Dokumentation aufzurufen, tippen Sie\n"
@@ -13326,10 +13092,9 @@ msgstr ""
 "\n"
 "in die interaktive Python-Konsole.\n"
 "\n"
-"Der Quellcode dieses Plugins enth?lt verschiedene Beispielscripte im "
-"\"examples\"-Unterverzeichnis. Falls Sie ein Script geschrieben haben, das "
-"Sie gern weitergeben m?chten, k?nnen Sie es an mich senden, damit es den "
-"Beispielen hinzugef?gt wird.\n"
+"Der Quellcode dieses Plugins enth?lt verschiedene Beispielscripte im \"examples\"-"
+"Unterverzeichnis. Falls Sie ein Script geschrieben haben, das Sie gern weitergeben m?chten, k?nnen "
+"Sie es an mich senden, damit es den Beispielen hinzugef?gt wird.\n"
 "\n"
 "R?ckmeldungen an <berndth at gmx.de> sind willkommen."
 
@@ -13380,18 +13145,17 @@ msgstr ""
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
-"This plugin allows you to create a mailbox tree where you can add newsfeeds "
-"in RSS 1.0, RSS 2.0 or Atom format.\n"
+"This plugin allows you to create a mailbox tree where you can add newsfeeds in RSS 1.0, RSS 2.0 or "
+"Atom format.\n"
 "\n"
-"Each newsfeed will create a folder with appropriate entries, fetched from "
-"the web. You can read them, and delete or keep old entries."
+"Each newsfeed will create a folder with appropriate entries, fetched from the web. You can read "
+"them, and delete or keep old entries."
 msgstr ""
-"Dieses Plugin erm?glicht Ihnen einen Mailboxbaum zu erzeugen, zu dem Sie "
-"Newsfeeds im RSS 1.0-, RSS 2.0- oder Atom-Format hinzuf?gen k?nnen.\n"
+"Dieses Plugin erm?glicht Ihnen einen Mailboxbaum zu erzeugen, zu dem Sie Newsfeeds im RSS 1.0-, "
+"RSS 2.0- oder Atom-Format hinzuf?gen k?nnen.\n"
 "\n"
-"Jeder Newsfeed erzeugt einen Ordner mit den entsprechenden Eintr?gen, die "
-"aus dem Web geholt werden. Sie k?nnen diese lesen, l?schen sowie alte "
-"Eintr?ge behalten."
+"Jeder Newsfeed erzeugt einen Ordner mit den entsprechenden Eintr?gen, die aus dem Web geholt "
+"werden. Sie k?nnen diese lesen, l?schen sowie alte Eintr?ge behalten."
 
 #: src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
@@ -13420,7 +13184,6 @@ msgid "'%c' can't be used in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail ben?tigt Netzwerkzugang, um den Feed zu aktualisieren."
@@ -13483,19 +13246,11 @@ msgstr "RSSyl: Konnte Feed von '%s' nicht verarbeiten\n"
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
-msgstr ""
-"RSSyl: Anwendung bricht ab, Aktualisierung des Feeds konnte nicht beendet "
-"werden: '%s'\n"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Benutze Authentifizierung"
+msgstr "RSSyl: Anwendung bricht ab, Aktualisierung des Feeds konnte nicht beendet werden: '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Benutze Authentifizierung"
+msgstr "HTTP-Basis-Authentifizierung "
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -13511,13 +13266,11 @@ msgstr "_Abgleichen"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
-"Aktualisiert Feed und l?scht Eintr?ge, die in der Feed-Quelle nicht mehr "
-"existieren."
+msgstr "Aktualisiert Feed und l?scht Eintr?ge, die in der Feed-Quelle nicht mehr existieren."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
-msgstr "Hole Kommentare wenn m?glich"
+msgstr "Hole Kommentare, wenn m?glich"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Always mark as new"
@@ -13540,15 +13293,11 @@ msgid "Ignore title rename"
 msgstr "Ignoriere ?nderung des Titels"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
-msgid ""
-"Enable this to keep current folder name, even if feed author changes title "
-"of the feed."
+msgid "Enable this to keep current folder name, even if feed author changes title of the feed."
 msgstr ""
-"Aktivieren, um den aktuellen Ordnername beizubehalten, selbst wenn sich der "
-"Titel des Feeds ?ndert"
+"Aktivieren, um den aktuellen Ordnername beizubehalten, selbst wenn sich der Titel des Feeds ?ndert"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:372
-#: src/plugins/vcalendar/vcal_prefs.c:518
+#: src/plugins/rssyl/rssyl_feed_props.c:372 src/plugins/vcalendar/vcal_prefs.c:518
 msgid "Verify SSL certificate validity"
 msgstr "?berpr?fe G?ltigkeit des SSL-Zertifikats"
 
@@ -13557,17 +13306,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>Quell-URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Benutzername:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Kennwort"
+msgstr "Benutzername"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13583,12 +13323,11 @@ msgid ""
 "<small>(Set to 0 to disable automatic refreshing for this feed)</small>"
 msgstr ""
 "<b>Aktualisierungszeit in Minuten:</b>\n"
-"<small>(auf 0 setzen, um das automatische Aktualisieren dieses Feeds zu "
-"deaktivieren)</small>"
+"<small>(auf 0 setzen, um das automatische Aktualisieren dieses Feeds zu deaktivieren)</small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "<b>Eintrag nicht als ungelesen markieren wenn er sich ?ndert:</b>"
+msgstr "<b>Eintrag nicht als ungelesen markieren, wenn er sich ?ndert:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:609
 msgid "_OK"
@@ -13641,26 +13380,23 @@ msgstr "Namen des neuen RSS-Ordnerbaumes eingeben."
 #: src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
 "Creation of folder tree failed.\n"
-"Maybe some files already exist, or you don't have the permission to write "
-"there?"
+"Maybe some files already exist, or you don't have the permission to write there?"
 msgstr ""
 "Das Erzeugen des Ordnerbaumes schlug fehl.\n"
-"Eventuell existieren einige Dateien bereits oder Sie haben nicht die n?tigen "
-"Rechte, um diese zu schreiben."
+"Eventuell existieren einige Dateien bereits oder Sie haben nicht die n?tigen Rechte, um diese zu "
+"schreiben."
 
 #: src/plugins/rssyl/rssyl.h:17
 msgid "My Feeds"
 msgstr "Meine Feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Pine-Datei ausw?hlen"
+msgstr "Cookie-Datei ausw?hlen"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Benutze vorgegebenen Zeitintervall zum Aktualisieren"
+msgstr "Standard-Intervall zum Aktualisieren"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
@@ -13679,13 +13415,12 @@ msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Pfad zur cookies.txt (Netscape-Format), die Ihre Cookies enth?lt."
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
 msgstr "Aktualisieren"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Sicherheit und Datenschutz"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -13696,12 +13431,8 @@ msgid "<b>Feed folder:</b>"
 msgstr "<b>Feed-Ordner:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
-msgid ""
-"Instead of using official title, you can enter a different folder name for "
-"the feed."
-msgstr ""
-"Anstatt des offiziellen Titels k?nnen Sie einen anderen Ordnername f?r den "
-"Feed verwenden"
+msgid "Instead of using official title, you can enter a different folder name for the feed."
+msgstr "Anstatt des offiziellen Titels k?nnen Sie einen anderen Ordnername f?r den Feed verwenden"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
@@ -13712,18 +13443,15 @@ msgstr "Feed-Eigenschaften nach Abonnieren _bearbeiten"
 msgid "Updating comments for '%s'..."
 msgstr "Aktualisiere Kommentare f?r %s..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1598
+#: src/plugins/rssyl/rssyl_update_feed.c:105 src/plugins/vcalendar/vcal_folder.c:1598
 msgid "401 (Authorisation required)"
 msgstr "401 (Anmeldung erforderlich)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1601
+#: src/plugins/rssyl/rssyl_update_feed.c:108 src/plugins/vcalendar/vcal_folder.c:1601
 msgid "403 (Unauthorised)"
 msgstr "403 (nicht autorisiert)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1604
+#: src/plugins/rssyl/rssyl_update_feed.c:111 src/plugins/vcalendar/vcal_folder.c:1604
 msgid "404 (Not found)"
 msgstr "404 (nicht gefunden)"
 
@@ -13780,50 +13508,44 @@ msgstr "Claws Mail ben?tigt Netzwerkzugang, um Ihre Feeds zu aktualisieren."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
-"Internal problem while upgrading storage format. This should not happen. "
-"Please report this, with debug output attached.\n"
+"Internal problem while upgrading storage format. This should not happen. Please report this, with "
+"debug output attached.\n"
 msgstr ""
-"Interner Fehler beim Aktualisieren des Speicherformats. Dies sollte nicht "
-"passieren. Bitte Melden Sie dies mit angeh?ngter Debug-Ausgabe.\n"
+"Interner Fehler beim Aktualisieren des Speicherformats. Dies sollte nicht passieren. Bitte Melden "
+"Sie dies mit angeh?ngter Debug-Ausgabe.\n"
 
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:911
+#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:911
 msgid "S/MIME"
 msgstr "S/MIME"
 
 #: src/plugins/smime/plugin.c:59
 msgid ""
-"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles S/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures "
+"or sign and encrypt your own mails.\n"
 "\n"
-"It can be selected as the Default Privacy System in /Configuration/[Account "
-"Preferences]/Privacy and when composing a message from /Options/Privacy "
-"System\n"
+"It can be selected as the Default Privacy System in /Configuration/[Account Preferences]/Privacy "
+"and when composing a message from /Options/Privacy System\n"
 "\n"
 "This plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and "
-"configured.\n"
+"This plugin also needs gpgsm, gnupg-agent and dirmngr installed and configured.\n"
 "\n"
-"Information about how to get S/MIME certificates working with GPGSM can be "
-"found at:\n"
+"Information about how to get S/MIME certificates working with GPGSM can be found at:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Dieses Plugin verarbeitet mit S/MIME signierte und/oder verschl?sselte Mail. "
-"Es kann E-Mails entschl?sseln, digitale Signaturen ?berpr?fen und eigene "
-"Mails signieren und verschl?sseln.\n"
+"Dieses Plugin verarbeitet mit S/MIME signierte und/oder verschl?sselte Mail. Es kann E-Mails "
+"entschl?sseln, digitale Signaturen ?berpr?fen und eigene Mails signieren und verschl?sseln.\n"
 "\n"
-"Es kann als Standard-Datenschutzsystem unter /Konfiguration/"
-"Kontoeinstellungen/Datenschutz und beim Schreiben einer Nachricht unter /"
-"Optionen/Datenschutzsystem ausgew?hlt werden.\n"
+"Es kann als Standard-Datenschutzsystem unter /Konfiguration/Kontoeinstellungen/Datenschutz und "
+"beim Schreiben einer Nachricht unter /Optionen/Datenschutzsystem ausgew?hlt werden.\n"
 "\n"
 "Dieses Plugin verwendet die GPGME-Bibliothek als Schnittstelle zu GnuPG.\n"
-"Dieses Plugin ben?tigt au?erdem gpgsm, gnupg-agent und dirmngr, die "
-"installiert und konfiguriert sein m?ssen.\n"
+"Dieses Plugin ben?tigt au?erdem gpgsm, gnupg-agent und dirmngr, die installiert und konfiguriert "
+"sein m?ssen.\n"
 "\n"
-"Informationen dar?ber, wie S/MIME Zertifikate in Verbindung mit GPGSM "
-"funktionieren, finden Sie unter:\n"
+"Informationen dar?ber, wie S/MIME Zertifikate in Verbindung mit GPGSM funktionieren, finden Sie "
+"unter:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
 "GPGME unterliegt dem Copyright 2001 von Werner Koch <dd9jn at gnu.org>"
@@ -13846,12 +13568,8 @@ msgid "Couldn't close temporary file"
 msgstr "Tempor?re Datei konnte nicht geschlossen werden"
 
 #: src/plugins/smime/smime.c:708
-msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
-msgstr ""
-"Bitte beachten, dass Kopfzeilen (wie Betreff) vom S/Mime-System nicht "
-"verschl?sselt werden."
+msgid "Please note that email headers, like Subject, are not encrypted by the S/MIME system."
+msgstr "Bitte beachten, dass Kopfzeilen (wie Betreff) vom S/Mime-System nicht verschl?sselt werden."
 
 #: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
@@ -13861,8 +13579,7 @@ msgstr "Melde Spam..."
 msgid "Report spam online..."
 msgstr "Spam online melden..."
 
-#: src/plugins/spam_report/spam_report.c:339
-#: src/plugins/spam_report/spam_report.c:377
+#: src/plugins/spam_report/spam_report.c:339 src/plugins/spam_report/spam_report.c:377
 #: src/plugins/spam_report/spam_report_prefs.c:80
 msgid "SpamReport"
 msgstr "SpamReport"
@@ -13899,8 +13616,7 @@ msgstr "Weiterleiten an:"
 msgid "Password:"
 msgstr "Kennwort:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin.c:77 src/plugins/spamassassin/spamassassin_gtk.c:649
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13922,21 +13638,15 @@ msgstr "SpamAssassin: Nachricht wird gefiltert..."
 
 #: src/plugins/spamassassin/spamassassin.c:372
 msgid ""
-"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
-"error is an unreachable spamd daemon. Please make sure spamd is running and "
-"accessible."
+"The SpamAssassin plugin couldn't filter a message. The probable cause of the error is an "
+"unreachable spamd daemon. Please make sure spamd is running and accessible."
 msgstr ""
-"Das SpamAssassin-Plugin konnte eine Nachricht nicht filtern. M?gliche "
-"Fehlerursache ist ein unerreichbarer spamd-Prozess. Bitte stellen Sie "
-"sicher, dass spamd aktiv und erreichbar ist."
+"Das SpamAssassin-Plugin konnte eine Nachricht nicht filtern. M?gliche Fehlerursache ist ein "
+"unerreichbarer spamd-Prozess. Bitte stellen Sie sicher, dass spamd aktiv und erreichbar ist."
 
 #: src/plugins/spamassassin/spamassassin.c:429
-msgid ""
-"Claws Mail needs network access in order to feed this mail(s) to the remote "
-"learner."
-msgstr ""
-"Claws Mail ben?tigt Zugang zum Netz, um Remote-Learner diese Mail(s)  zu "
-"senden."
+msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
+msgstr "Claws Mail ben?tigt Zugang zum Netz, um Remote-Learner diese Mail(s)  zu senden."
 
 #: src/plugins/spamassassin/spamassassin.c:574
 msgid "Failed to get username"
@@ -13944,35 +13654,28 @@ msgstr "Benutzername nicht abrufbar"
 
 #: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr ""
-"SpamAssassin-Plugin ist geladen, aber durch eigene Einstellungen "
-"deaktiviert.\n"
+msgstr "SpamAssassin-Plugin ist geladen, aber durch eigene Einstellungen deaktiviert.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:620
 msgid ""
-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using a SpamAssassin server. You will need a "
-"SpamAssassin Server (spamd) running somewhere.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam "
+"using a SpamAssassin server. You will need a SpamAssassin Server (spamd) running somewhere.\n"
 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"
-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten "
-"mittels SpamAssassin auf Spam pr?fen. Es wird ein aktiver SpamAssassin-"
-"Server (spamd) ben?tigt.\n"
+"Dieses Plugin kann von IMAP-, LOCAL- oder POP3-Konten empfangene Nachrichten mittels SpamAssassin "
+"auf Spam pr?fen. Es wird ein aktiver SpamAssassin-Server (spamd) ben?tigt.\n"
 "\n"
-"Es kann auch benutzt werden, um Mails als Spam oder Nicht-Spam zu "
-"markieren.\n"
+"Es kann auch benutzt werden, um Mails als Spam oder Nicht-Spam zu markieren.\n"
 "\n"
-"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem "
-"besonderen Ordner gespeichert werden.\n"
+"Wenn eine Nachricht als Spam erkannt wird, kann sie gel?scht oder in einem besonderen Ordner "
+"gespeichert werden.\n"
 "\n"
-"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/"
-"SpamAsassin"
+"Die Einstellungen befinden sich in /Konfiguration/Einstellungen/Plugins/SpamAsassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -14023,12 +13726,8 @@ msgid "Path of Unix socket"
 msgstr "Pfad des Unix Sockets"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:387
-msgid ""
-"Maximum time allowed for checking. If the check takes longer it will be "
-"aborted."
-msgstr ""
-"Zeitlimit f?r die ?berpr?fung. Nach Ablauf dieser Zeit wird die ?berpr?fung "
-"abgebrochen."
+msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
+msgstr "Zeitlimit f?r die ?berpr?fung. Nach Ablauf dieser Zeit wird die ?berpr?fung abgebrochen."
 
 #: src/plugins/tnef_parse/tnef_parse.c:65
 #, c-format
@@ -14043,8 +13742,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:122 src/plugins/tnef_parse/tnef_parse.c:129
 msgid "Failed to write the part data."
 msgstr "Schreiben des Datenteils schlug fehl."
 
@@ -14060,8 +13758,7 @@ msgstr "Verarbeiten der VTask-Daten schlug fehl."
 msgid "Failed to parse VCard data."
 msgstr "Verarbeiten der VCard-Daten schlug fehl."
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:399 src/plugins/tnef_parse/tnef_parse.c:423
 msgid "TNEF Parser"
 msgstr "TNEF-Parser"
 
@@ -14069,26 +13766,24 @@ msgstr "TNEF-Parser"
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
-"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
-"Hand <yerase at yerot.com>"
+"The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall Hand <yerase at yerot.com>"
 msgstr ""
-"Dieses Claws Mail-Plugin erm?glicht es Ihnen, Anh?nge des application/ms-"
-"tnef-Typs zu lesen.\n"
+"Dieses Claws Mail-Plugin erm?glicht es Ihnen, Anh?nge des application/ms-tnef-Typs zu lesen.\n"
 "\n"
-"Das Plugin verwendet die Ytnef-Bibliothek mit Copyright 2002-2007 von "
-"Randall Hand <yerase at yerot.com>"
+"Das Plugin verwendet die Ytnef-Bibliothek mit Copyright 2002-2007 von Randall Hand <yerase at yerot."
+"com>"
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "Dieses Treffen bearbeiten..."
+msgstr "Dieses Treffen b_earbeiten..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "Dieses Treffen absagen..."
+msgstr "Dieses Treffen a_bsagen..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "Dieses Treffen erstellen..."
+msgstr "N_eues Treffen erstellen..."
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -14103,8 +13798,7 @@ msgid "Show"
 msgstr "Zeigen"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:560
-#: src/prefs_matcher.c:336
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:560 src/prefs_matcher.c:336
 msgid "days"
 msgstr "Tag(en)"
 
@@ -14203,34 +13897,30 @@ msgstr "vCalendar"
 
 #: src/plugins/vcalendar/plugin.c:69
 msgid ""
-"This plugin enables vCalendar message handling like that produced by "
-"Evolution or Outlook.\n"
+"This plugin enables vCalendar message handling like that produced by Evolution or Outlook.\n"
 "\n"
-"When loaded, it will create a vCalendar mailbox in the Folder List, which "
-"will be populated by meetings that you have accepted or created.\n"
-"Meeting requests that you receive will be presented in an appropriate form "
-"and you will be able to accept or decline them.\n"
-"To create a meeting right-click on the vCalendar or Meetings folder and "
-"choose \"New meeting...\".\n"
+"When loaded, it will create a vCalendar mailbox in the Folder List, which will be populated by "
+"meetings that you have accepted or created.\n"
+"Meeting requests that you receive will be presented in an appropriate form and you will be able to "
+"accept or decline them.\n"
+"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 "
-"meetings and calendars, publish your free/busy information and retrieve that "
-"information from others."
+"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 ""
-"Das Plugin aktiviert die Verwaltung von vCalendar-Nachrichten, die "
-"beispielsweise von Evolution oder Outlook erzeugt werden.\n"
+"Das Plugin aktiviert die Verwaltung von vCalendar-Nachrichten, die beispielsweise von Evolution "
+"oder Outlook erzeugt werden.\n"
 "\n"
-"Es erzeugt beim Laden eine vCalendar-Mailbox in Ihrem Ordnerbaum, in der von "
-"Ihnen erstellte oder akzeptierte Treffen gesammelt werden.\n"
-"Anfragen zu Treffen die Sie erhalten, werden in einer passenden Form "
-"angezeigt und Sie haben die M?glichkeit, diese zu akzeptieren oder "
-"abzulehnen.\n"
-"Um ein Treffen zu erstellen, klicken Sie mit der rechten Maustaste auf den "
-"vCalendar- oder Versammlungs-Ordner und w?hlen \"Neues Treffen...\".\n"
+"Es erzeugt beim Laden eine vCalendar-Mailbox in Ihrem Ordnerbaum, in der von Ihnen erstellte oder "
+"akzeptierte Treffen gesammelt werden.\n"
+"Anfragen zu Treffen die Sie erhalten, werden in einer passenden Form angezeigt und Sie haben die "
+"M?glichkeit, diese zu akzeptieren oder abzulehnen.\n"
+"Um ein Treffen zu erstellen, klicken Sie mit der rechten Maustaste auf den vCalendar- oder "
+"Versammlungs-Ordner und w?hlen \"Neues Treffen...\".\n"
 "\n"
-"Sie k?nnen au?erdem entfernte WebCal-Feeds zu abonnieren, Ihre Treffen und "
-"Kalender exportieren, Ihre free/busy-Informationen ver?ffentlichen und "
-"selbige von anderen abrufen."
+"Sie k?nnen au?erdem entfernte WebCal-Feeds zu abonnieren, Ihre Treffen und Kalender exportieren, "
+"Ihre free/busy-Informationen ver?ffentlichen und selbige von anderen abrufen."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -14242,8 +13932,7 @@ msgstr "Aus Nachricht ein Treffen erstellen..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
-msgid ""
-"You are about to create %d meetings, one by one. Do you want to continue?"
+msgid "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Sie wollen %d einzelne Treffen erstellen. M?chten Sie fortfahren?"
 
 #: src/plugins/vcalendar/vcalendar.c:139
@@ -14299,17 +13988,13 @@ msgstr "%s <span weight=\"bold\">(dieses Ereignis wiederholt sich)</span>"
 
 #: src/plugins/vcalendar/vcalendar.c:570
 #, c-format
-msgid ""
-"%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
+msgid "%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
 msgstr ""
-"%s <span weight=\"bold\">(dieses Ereignis ist Teil eines sich wiederholenden "
-"Ereignisses)</span>"
+"%s <span weight=\"bold\">(dieses Ereignis ist Teil eines sich wiederholenden Ereignisses)</span>"
 
 #: src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
-msgstr ""
-"Sie haben eine Antwort auf einen unbekannten Vorschlag f?r ein Treffen "
-"erhalten."
+msgstr "Sie haben eine Antwort auf einen unbekannten Vorschlag f?r ein Treffen erhalten."
 
 #: src/plugins/vcalendar/vcalendar.c:753
 #, c-format
@@ -14380,25 +14065,21 @@ msgstr "Webseite ansehen"
 msgid "You are already busy at this time."
 msgstr "Zu dieser Zeit sind Sie bereits besch?ftigt."
 
-#: src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcalendar.c:1265 src/plugins/vcalendar/vcal_meeting_gtk.c:1740
 msgid "Event:"
 msgstr "Veranstaltung:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1266 src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: src/plugins/vcalendar/vcalendar.c:1267
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
+#: src/plugins/vcalendar/vcalendar.c:1267 src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
 msgid "Location:"
 msgstr "Ort:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/plugins/vcalendar/vcalendar.c:1268 src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
 msgid "Summary:"
 msgstr "Zusammenfassung:"
@@ -14411,8 +14092,7 @@ msgstr "Beginn:"
 msgid "Ending:"
 msgstr "Ende:"
 
-#: src/plugins/vcalendar/vcalendar.c:1272
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
+#: src/plugins/vcalendar/vcalendar.c:1272 src/plugins/vcalendar/vcal_meeting_gtk.c:1723
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
 msgid "Attendees:"
 msgstr "Teilnehmer:"
@@ -14544,16 +14224,14 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1851
-#: src/plugins/vcalendar/vcal_folder.c:1854
+#: src/plugins/vcalendar/vcal_folder.c:1851 src/plugins/vcalendar/vcal_folder.c:1854
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Ordner %s konnte nicht erstellt werden."
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr ""
-"Claws Mail ben?tigt Zugang zum Netz, um den WebCal-Feed zu aktualisieren."
+msgstr "Claws Mail ben?tigt Zugang zum Netz, um den WebCal-Feed zu aktualisieren."
 
 #: src/plugins/vcalendar/vcal_folder.c:1903
 #, c-format
@@ -14566,8 +14244,7 @@ msgstr "Neues Abonnement"
 
 #: src/plugins/vcalendar/vcal_folder.c:1915
 msgid "Claws Mail needs network access in order to update the subscription."
-msgstr ""
-"Claws Mail ben?tigt Zugang zum Netz, um dieses Abonnement zu aktualisieren."
+msgstr "Claws Mail ben?tigt Zugang zum Netz, um dieses Abonnement zu aktualisieren."
 
 #: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "Subscribe to WebCal"
@@ -14611,7 +14288,7 @@ msgstr "Gruppe"
 
 #: src/plugins/vcalendar/vcal_manager.c:144
 msgid "resource"
-msgstr "Quelle"
+msgstr "Ressource"
 
 #: src/plugins/vcalendar/vcal_manager.c:145
 msgid "room"
@@ -14673,8 +14350,7 @@ msgstr ""
 "Die folgende(n) Person(en) sind zur Zeit des Treffens besch?ftigt:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780 src/plugins/vcalendar/vcal_meeting_gtk.c:869
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:955
 msgid "You"
 msgstr "Sie"
@@ -14754,13 +14430,11 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"It isn't possible to have this meeting with everyone in the previous or next "
-"6 hours."
+"It isn't possible to have this meeting with everyone in the previous or next 6 hours."
 msgstr ""
 "\n"
 "\n"
-"Ein Treffen mit allen ist in den n?chsten oder vergangenen 6 Stunden nicht "
-"m?glich."
+"Ein Treffen mit allen ist in den n?chsten oder vergangenen 6 Stunden nicht m?glich."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:817
 #, c-format
@@ -14772,8 +14446,7 @@ msgstr "w?re verf?gbar %s oder %s"
 msgid "would be available %s"
 msgstr "w?re verf?gbar %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:821 src/plugins/vcalendar/vcal_meeting_gtk.c:882
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:952
 msgid "not available"
 msgstr "nicht verf?gbar"
@@ -14796,8 +14469,7 @@ msgstr ", und ist in den vergangenen oder n?chsten 6 Stunden nicht verf?gbar."
 msgid "available"
 msgstr "verf?gbar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:887 src/plugins/vcalendar/vcal_meeting_gtk.c:1136
 msgid "Free/busy retrieval failed"
 msgstr "Holen des free/busy-Status schlug fehl"
 
@@ -14822,19 +14494,15 @@ msgstr "Abholen geplant f?r %s..."
 msgid "Available"
 msgstr "Verf?gbar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158 src/plugins/vcalendar/vcal_meeting_gtk.c:1165
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
 msgid "Everyone is available."
 msgstr "Alle sind verf?gbar."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
-msgid ""
-"Everyone seems available, but some free/busy information failed to be "
-"retrieved."
+msgid "Everyone seems available, but some free/busy information failed to be retrieved."
 msgstr ""
-"Alle sind scheinen verf?gbar, aber einige free/busy-Informationen konnten "
-"nicht abgerufen werden."
+"Alle sind scheinen verf?gbar, aber einige free/busy-Informationen konnten nicht abgerufen werden."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
 msgid ""
@@ -14856,8 +14524,7 @@ msgstr "Verf?gbarkeit pr?fen"
 msgid "<b>Starts at:</b> "
 msgstr "<b>beginnt um:</b> "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604 src/plugins/vcalendar/vcal_meeting_gtk.c:1628
 msgid "<b> on:</b>"
 msgstr "<b>am:</b>"
 
@@ -14874,8 +14541,7 @@ msgstr "neues Treffen"
 msgid "%s - Edit meeting"
 msgstr "%s - Treffen bearbeiten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1744
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720 src/plugins/vcalendar/vcal_meeting_gtk.c:1744
 msgid "Time:"
 msgstr "Zeit:"
 
@@ -14950,8 +14616,7 @@ msgstr "Die free/busy-Informationen konnten nicht exportiert werden."
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:2263
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
-msgstr ""
-"Die free/busy-Informationen konnten nicht nach '%s' exportiert werden.\n"
+msgstr "Die free/busy-Informationen konnten nicht nach '%s' exportiert werden.\n"
 
 #: src/plugins/vcalendar/vcal_prefs.c:266
 msgid "Reminders"
@@ -14973,22 +14638,13 @@ msgstr "Kalender-Export"
 msgid "Automatically export calendar to"
 msgstr "Exportiere Kalender automatisch nach "
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
+#: src/plugins/vcalendar/vcal_prefs.c:319 src/plugins/vcalendar/vcal_prefs.c:425
 msgid "You can export to a local file or URL"
 msgstr "Sie k?nnen in eine lokale Datei oder zu einer URL exportieren"
 
 #: src/plugins/vcalendar/vcal_prefs.c:321
 msgid "Specify a local file or URL (http://server/path/file.ics)"
-msgstr ""
-"Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file."
-"ics)"
-
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Benutzer-ID"
+msgstr "Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file.ics)"
 
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
@@ -15004,8 +14660,7 @@ msgstr "Claws-Kalender in XFCEs Orage-Kalender anmelden."
 
 #: src/plugins/vcalendar/vcal_prefs.c:392
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
-msgstr ""
-"Erlaubt Orage (Version 4.4 oder h?her), den Claws Mail-Kalender zu sehen."
+msgstr "Erlaubt Orage (Version 4.4 oder h?her), den Claws Mail-Kalender zu sehen."
 
 #: src/plugins/vcalendar/vcal_prefs.c:404
 msgid "Free/Busy information"
@@ -15017,14 +14672,11 @@ msgstr "Exportiere frei/besch?ftigt-Status automatisch nach "
 
 #: src/plugins/vcalendar/vcal_prefs.c:427
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
-msgstr ""
-"Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file."
-"ifb)"
+msgstr "Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file.ifb)"
 
 #: src/plugins/vcalendar/vcal_prefs.c:457
 msgid "Command to run after free/busy status export"
-msgstr ""
-"Nach dem Export der frei/besch?ftigt-Informationen auszuf?hrender Befehl"
+msgstr "Nach dem Export der frei/besch?ftigt-Informationen auszuf?hrender Befehl"
 
 #: src/plugins/vcalendar/vcal_prefs.c:484
 msgid "Get free/busy status of others from"
@@ -15033,12 +14685,11 @@ msgstr "Frei/Besch?ftigt-Status anderer Personen holen von"
 #: src/plugins/vcalendar/vcal_prefs.c:492
 #, c-format
 msgid ""
-"Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
-"left part of the email address, %d for the domain"
+"Specify a local file or URL (http://server/path/file.ifb). Use %u for the left part of the email "
+"address, %d for the domain"
 msgstr ""
-"Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file."
-"ifb). Benutzen Sie %u f?r den linken Teil der E-Mailadresse und %d f?r die "
-"Domain."
+"Angabe einer lokalen Datei oder einer URL (http://user:pass at server/path/file.ifb). Benutzen Sie %u "
+"f?r den linken Teil der E-Mailadresse und %d f?r die Domain."
 
 #: src/plugins/vcalendar/vcal_prefs.c:506
 msgid "SSL options"
@@ -15046,7 +14697,7 @@ msgstr "SSL-Einstellungen"
 
 #: src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Ben?tigten APOP-Zeitstempel nicht in Begr??ung gefunden\n"
+msgstr "Erforderlicher APOP-Zeitstempel nicht in Begr??ung gefunden\n"
 
 #: src/pop.c:159
 msgid "Timestamp syntax error in greeting\n"
@@ -15095,8 +14746,7 @@ msgstr "Fehler bei der POP3-Sitzung\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-Befehl nicht unterst?tzt\n"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1450 src/prefs_account.c:2434
-#: src/wizard.c:1506
+#: src/prefs_account.c:335 src/prefs_account.c:1450 src/prefs_account.c:2434 src/wizard.c:1506
 msgid "POP3"
 msgstr "POP3"
 
@@ -15136,10 +14786,6 @@ msgstr "Vollst?ndiger Name"
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Serverdaten"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Automatisch konfigurieren"
@@ -15228,11 +14874,11 @@ msgstr "Gr??enbeschr?nkung beim Empfangen"
 
 #: src/prefs_account.c:1499
 msgid ""
-"Messages over this limit will be partially retrieved. When selecting them "
-"you will be able to download them fully or delete them."
+"Messages over this limit will be partially retrieved. When selecting them you will be able to "
+"download them fully or delete them."
 msgstr ""
-"Nachrichten ?ber diesem Limit werden teilweise abgerufen. Wenn Sie sie "
-"ausw?hlen, k?nnen sie vollst?ndig heruntergeladen oder gel?scht werden."
+"Nachrichten ?ber diesem Limit werden teilweise abgerufen. Wenn Sie sie ausw?hlen, k?nnen sie "
+"vollst?ndig heruntergeladen oder gel?scht werden."
 
 #: src/prefs_account.c:1539 src/prefs_account.c:2464
 msgid "NNTP"
@@ -15246,14 +14892,6 @@ msgstr "H?chstzahl herunterzuladender Artikel"
 msgid "unlimited if 0 is specified"
 msgstr "unbegrenzt, wenn 0 angegeben"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Authentifizierungsverfahren"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatisch"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
@@ -15272,9 +14910,7 @@ msgstr "Bandbreiteneffizienter Modus (l?dt keine ferngelegenen Marken)"
 
 #: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
-msgstr ""
-"Dieser Modus nutzt weniger Bandbreite, kann aber bei manchen Servern "
-"langsamer sein."
+msgstr "Dieser Modus nutzt weniger Bandbreite, kann aber bei manchen Servern langsamer sein."
 
 #: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
@@ -15288,8 +14924,8 @@ msgstr "Filtern ?ber Plugins bei Empfang m?glich"
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Abrufen' ?berpr?ft dieses Konto auf neue Nachrichten"
 
-#: src/prefs_account.c:1718 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1974 src/prefs_matcher.c:1996
+#: src/prefs_account.c:1718 src/prefs_customheader.c:208 src/prefs_matcher.c:623
+#: src/prefs_matcher.c:1974 src/prefs_matcher.c:1996
 msgid "Header"
 msgstr "Kopfzeile"
 
@@ -15307,19 +14943,17 @@ msgstr "Kopfzeile f?r \"User Agent\" einf?gen"
 
 #: src/prefs_account.c:1733
 msgid "Add user-defined header"
-msgstr "Nutzerdefinierte Kopfzeile einf?gen"
+msgstr "Benutzerdefinierte Kopfzeile einf?gen"
 
 #: src/prefs_account.c:1748
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Authentifizierung (SMTP AUTH)"
 
 #: src/prefs_account.c:1833
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
+msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
 msgstr ""
-"Wenn diese Felder leer bleiben, werden die selbe User-ID und das selbe "
-"Kennwort wie beim Empfang verwendet."
+"Wenn diese Felder leer bleiben, werden die selbe User-ID und das selbe Kennwort wie beim Empfang "
+"verwendet."
 
 #: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
@@ -15357,30 +14991,26 @@ msgstr "Automatisch folgende Adressen eintragen"
 msgid "Spell check dictionaries"
 msgstr "W?rterb?cher f?r Rechtschreibung"
 
-#: src/prefs_account.c:2065 src/prefs_folder_item.c:1092
-#: src/prefs_spelling.c:163
+#: src/prefs_account.c:2065 src/prefs_folder_item.c:1092 src/prefs_spelling.c:163
 msgid "Default dictionary"
 msgstr "Standard-W?rterbuch"
 
-#: src/prefs_account.c:2078 src/prefs_folder_item.c:1126
-#: src/prefs_spelling.c:176
+#: src/prefs_account.c:2078 src/prefs_folder_item.c:1126 src/prefs_spelling.c:176
 msgid "Default alternate dictionary"
 msgstr "Alternatives Standard-W?rterbuch"
 
-#: src/prefs_account.c:2164 src/prefs_account.c:3288
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1442
-#: src/prefs_folder_item.c:1833 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+#: src/prefs_account.c:2164 src/prefs_account.c:3288 src/prefs_compose_writing.c:370
+#: src/prefs_folder_item.c:1442 src/prefs_folder_item.c:1833 src/prefs_quote.c:119
+#: src/prefs_quote.c:237 src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account.c:2179 src/prefs_folder_item.c:1470 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2179 src/prefs_folder_item.c:1470 src/prefs_quote.c:134 src/toolbar.c:409
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1498 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_account.c:2194 src/prefs_filtering_action.c:191 src/prefs_folder_item.c:1498
+#: src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -15398,18 +15028,15 @@ msgstr "Nachrichten immer verschl?sseln"
 
 #: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
-msgstr ""
-"Nachrichten stets signieren, wenn eine signierte Nachricht beantwortet wird"
+msgstr "Nachrichten stets signieren, wenn eine signierte Nachricht beantwortet wird"
 
 #: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
-msgstr ""
-"Nachrichten stets verschl?sseln, wenn eine verschl?sselte Nachricht "
-"beantwortet wird"
+msgstr "Nachrichten stets verschl?sseln, wenn eine verschl?sselte Nachricht beantwortet wird"
 
 #: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
-msgstr "Nachrichten zus?tzlich zum fremden mit eigenem Schl?ssel chiffrieren"
+msgstr "Nachrichten zus?tzlich zum fremden mit eigenem Schl?ssel verschl?sseln"
 
 #: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
@@ -15498,11 +15125,9 @@ msgstr "Domain-Name"
 
 #: src/prefs_account.c:2721
 msgid ""
-"The domain name will be used in the generated Message-ID, and when "
-"connecting to SMTP servers."
+"The domain name will be used in the generated Message-ID, and when connecting to SMTP servers."
 msgstr ""
-"Der Domain-Name wird in der erzeugten Message-ID und beim Verbinden mit SMTP-"
-"Servern verwendet"
+"Der Domain-Name wird in der erzeugten Message-ID und beim Verbinden mit SMTP-Servern verwendet"
 
 #: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
@@ -15513,12 +15138,10 @@ msgid "Move deleted mails to trash and expunge immediately"
 msgstr "Gel?schte Mails in den Papierkorb schieben und sofort l?schen."
 
 #: src/prefs_account.c:2745
-msgid ""
-"Moves deleted mails to trash instead of using the \\Deleted flag without "
-"expunging."
+msgid "Moves deleted mails to trash instead of using the \\Deleted flag without expunging."
 msgstr ""
-"Verschiebt gel?schte Mails in den Papierkorb, statt die \\Gel?scht-Merker zu "
-"setzen, ohne zu l?schen."
+"Verschiebt gel?schte Mails in den Papierkorb, statt die \\Gel?scht-Merker zu setzen, ohne zu "
+"l?schen."
 
 #: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
@@ -15654,9 +15277,8 @@ msgstr "Obige neue Aktion zur Liste hinzuf?gen"
 msgid "Replace the selected action in list with the action above"
 msgstr "In der Liste markierte Aktion durch Obige ersetzen"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:781 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616 src/prefs_filtering.c:486
+#: src/prefs_matcher.c:781 src/prefs_template.c:320 src/prefs_toolbar.c:1056
 msgid "Re_move"
 msgstr "Entfernen"
 
@@ -15680,10 +15302,9 @@ msgstr "Markierte Aktion aufw?rts bewegen"
 msgid "Move selected action down"
 msgstr "Markierte Aktion abw?rts bewegen"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:900
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704 src/prefs_filtering.c:836
+#: src/prefs_filtering.c:838 src/prefs_filtering.c:839 src/prefs_filtering.c:949
+#: src/prefs_matcher.c:900 src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Neu)"
 
@@ -15743,21 +15364,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "M?chten Sie wirklich alle Aktionen entfernen?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 #: 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 "Der Eintrag wurde nicht gespeichert. Trotzdem schlie?en?"
 
 #: 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:2127
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499 src/prefs_filtering.c:1521
+#: src/prefs_matcher.c:2127 src/prefs_template.c:574 src/prefs_template.c:599
+#: src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 
@@ -15787,8 +15407,7 @@ msgstr "<span weight=\"bold\">Beginnt mit:</span>"
 
 #: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
-msgstr ""
-"um Nachrichtenk?rper oder Auswahl zur Standardeingabe des Befehls zu leiten"
+msgstr "um Nachrichtenk?rper oder Auswahl zur Standardeingabe des Befehls zu leiten"
 
 #: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
@@ -15796,9 +15415,7 @@ msgstr "um Texteingabe des Benutzers zur Standardeingabe des Befehls zu leiten"
 
 #: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
-msgstr ""
-"um verborgene Texteingabe des Benutzers zur Standardeingabe des Befehls zu "
-"leiten"
+msgstr "um verborgene Texteingabe des Benutzers zur Standardeingabe des Befehls zu leiten"
 
 #: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
@@ -15806,14 +15423,11 @@ msgstr "<span weight=\"bold\">Endet mit:</span>"
 
 #: src/prefs_actions.c:983
 msgid "to replace message body or selection with command's standard output"
-msgstr ""
-"um Nachrichtentext oder Auswahl durch die Standardausgabe des Befehls zu "
-"ersetzen"
+msgstr "um Nachrichtentext oder Auswahl durch die Standardausgabe des Befehls zu ersetzen"
 
 #: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
-msgstr ""
-"um die Standardausgabe des Befehls einzuf?gen, ohne alten Text zu ersetzen"
+msgstr "um die Standardausgabe des Befehls einzuf?gen, ohne alten Text zu ersetzen"
 
 #: src/prefs_actions.c:985
 msgid "to run command asynchronously"
@@ -15828,8 +15442,7 @@ msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "f?r die Datei der gew?hlten Nachricht im RFC822/2822-Format "
 
 #: src/prefs_actions.c:988
-msgid ""
-"for the list of the files of the selected messages in RFC822/2822 format"
+msgid "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "f?r die Dateiliste der ausgew?hlten Nachrichten im RFC822/2822-Format"
 
 #: src/prefs_actions.c:989
@@ -15862,14 +15475,13 @@ msgstr "Aktionen"
 
 #: src/prefs_actions.c:1005
 msgid ""
-"The Actions feature is a way for the user to launch external commands to "
-"process a complete message file or just one of its parts."
+"The Actions feature is a way for the user to launch external commands to process a complete "
+"message file or just one of its parts."
 msgstr ""
-"?ber Aktionen hat der Benutzer die M?glichkeit, externe Befehle auszuf?hren, "
-"die eine Nachricht ganz oder teilweise bearbeiten."
+"?ber Aktionen hat der Benutzer die M?glichkeit, externe Befehle auszuf?hren, die eine Nachricht "
+"ganz oder teilweise bearbeiten."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695 src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "d_uplizieren"
 
@@ -15877,8 +15489,7 @@ msgstr "d_uplizieren"
 msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074 src/prefs_filtering.c:1132
 msgid "Action string is not valid."
 msgstr "Zeichenfolge der Aktion ist ung?ltig."
 
@@ -15892,12 +15503,11 @@ msgstr "Am %d\\nschrieb %f:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:302 src/prefs_quote.c:85
 msgid ""
-"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
-"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
+"\\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\\nBeginn der weitergeleiteten Nachricht:\\n\\n?d{Datum: %d\\n}?f{Von: %f"
-"\\n}?t{An: %t\\n}?c{Cc: %c\\n}?n{Newsgruppen: %n\\n}?s{Betreff: %s\\n}\\n\\n"
-"%M"
+"\\n\\nBeginn der weitergeleiteten Nachricht:\\n\\n?d{Datum: %d\\n}?f{Von: %f\\n}?t{An: %t\\n}?"
+"c{Cc: %c\\n}?n{Newsgruppen: %n\\n}?s{Betreff: %s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:442
 msgid "%x(%a) %H:%M"
@@ -15997,16 +15607,16 @@ msgstr "Schreiben"
 
 #: src/prefs_customheader.c:183
 msgid "Custom header configuration"
-msgstr "Einrichtung nutzerdefinierter Kopfzeilen"
+msgstr "Einrichtung benutzerdefinierter Kopfzeilen"
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
+#: src/prefs_customheader.c:506 src/prefs_display_header.c:599 src/prefs_matcher.c:1595
+#: src/prefs_matcher.c:1610
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
 #: src/prefs_customheader.c:516
 msgid "This Header name is not allowed as a custom header."
-msgstr "Dieser Name ist als nutzerdefinierte Kopfzeile nicht erlaubt"
+msgstr "Dieser Name ist als benutzerdefinierte Kopfzeile nicht erlaubt"
 
 #: src/prefs_customheader.c:563
 msgid "Choose a PNG file"
@@ -16042,8 +15652,7 @@ msgstr "Das Bild ist nicht im richtigen Format (XBM)."
 
 #: src/prefs_customheader.c:614
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
-msgstr ""
-"konnte `compface` nicht aufrufen. Es muss sich in Ihrem $PATH befinden."
+msgstr "konnte `compface` nicht aufrufen. Es muss sich in Ihrem $PATH befinden."
 
 #: src/prefs_customheader.c:620
 #, c-format
@@ -16064,7 +15673,7 @@ msgstr "Soll diese Kopfzeile wirklich gel?scht werden?"
 
 #: src/prefs_customheader.c:877
 msgid "Current custom headers"
-msgstr "Aktuelle nutzerdefinierte Kopfzeilen"
+msgstr "Aktuelle benutzerdefinierte Kopfzeilen"
 
 #: src/prefs_display_header.c:250
 msgid "Displayed header configuration"
@@ -16113,14 +15722,13 @@ msgstr "Befehl f?r 'Darstellen als Text'"
 
 #: src/prefs_ext_prog.c:210
 msgid ""
-"This option enables MIME parts to be displayed in the message view via a "
-"script when using the 'Display as text' contextual menu item"
+"This option enables MIME parts to be displayed in the message view via a script when using the "
+"'Display as text' contextual menu item"
 msgstr ""
-"Diese Option erlaubt, MIME-Teile mit einem Script anzuzeigen, wenn 'Anzeigen "
-"als Text' in der Nachrichtenansicht gew?hlt wird."
+"Diese Option erlaubt, MIME-Teile mit einem Script anzuzeigen, wenn 'Anzeigen als Text' in der "
+"Nachrichtenansicht gew?hlt wird."
 
-#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138 src/prefs_message.c:354
 msgid "Message View"
 msgstr "Nachrichtenansicht"
 
@@ -16147,8 +15755,7 @@ msgstr "Verbergen"
 msgid "Message flags"
 msgstr "Nachrichten-Merker"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
-#: src/summaryview.c:2791
+#: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78 src/summaryview.c:2791
 msgid "Mark"
 msgstr "Markieren"
 
@@ -16168,8 +15775,8 @@ msgstr "Als _Spam markieren"
 msgid "Mark as ham"
 msgstr "Als N_icht-Spam markieren"
 
-#: 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/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438 src/toolbar.c:205
+#: src/toolbar.c:438 src/toolbar.c:2088
 msgid "Execute"
 msgstr "Ausf?hren"
 
@@ -16187,8 +15794,8 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summary_column.c:87 src/summaryview.c:447
+#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629 src/prefs_summary_column.c:87
+#: src/summaryview.c:447
 msgid "Score"
 msgstr "Bewertung"
 
@@ -16201,8 +15808,8 @@ msgid "Set score"
 msgstr "Bewertung setzen"
 
 #: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:449
+#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633 src/prefs_summary_column.c:89
+#: src/summaryview.c:449
 msgid "Tags"
 msgstr "Marken"
 
@@ -16230,8 +15837,7 @@ msgstr "Filtern beenden"
 msgid "Action configuration"
 msgstr "Aktionskonfiguration"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886 src/prefs_matcher.c:586
 msgid "Rule"
 msgstr "Regel"
 
@@ -16271,8 +15877,7 @@ msgstr "Name der Marke ist leer."
 msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169 src/quote_fmt.c:79
 msgid "literal %"
 msgstr "Symbol f?r %"
 
@@ -16280,8 +15885,7 @@ msgstr "Symbol f?r %"
 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht ge?ndert werden)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179 src/quote_fmt.c:87
 msgid "new line"
 msgstr "neue Zeile"
 
@@ -16299,12 +15903,11 @@ msgstr "Filteraktion: 'Ausf?hren'"
 
 #: src/prefs_filtering_action.c:1276
 msgid ""
-"'Execute' allows you to send a message or message element to an external "
-"program or script.\n"
+"'Execute' allows you to send a message or message element to an external program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"'Ausf?hren' erm?glicht Ihnen, eine Nachricht oder einen Teil davon an ein "
-"externes Programm oder Skript zu senden.\n"
+"'Ausf?hren' erm?glicht Ihnen, eine Nachricht oder einen Teil davon an ein externes Programm oder "
+"Skript zu senden.\n"
 "Folgende Symbole k?nnen verwendet werden:"
 
 #: src/prefs_filtering_action.c:1422
@@ -16331,8 +15934,7 @@ msgstr "Aktuelle Aktionsliste"
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867 src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -16458,26 +16060,24 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Ausgeblendete Spalten"
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406
-#: src/prefs_summaries.c:545 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:290 src/prefs_summaries.c:406 src/prefs_summaries.c:545
+#: src/prefs_summary_column.c:304
 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
-#: 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_folder_column.c:329 src/prefs_msg_colors.c:494 src/prefs_summary_column.c:343
+#: src/prefs_toolbar.c:1064
 msgid " Use default "
 msgstr " Standard verwenden "
 
-#: src/prefs_folder_item.c:268 src/prefs_folder_item.c:876
-#: src/prefs_folder_item.c:1402
+#: src/prefs_folder_item.c:268 src/prefs_folder_item.c:876 src/prefs_folder_item.c:1402
 msgid ""
-"<i>These preferences will not be saved as this folder is a top-level folder. "
-"However, you can set them for the whole mailbox tree by using \"Apply to "
-"subfolders\".</i>"
+"<i>These preferences will not be saved as this folder is a top-level folder. However, you can set "
+"them for the whole mailbox tree by using \"Apply to subfolders\".</i>"
 msgstr ""
-"<i>Diese Einstellungen werden nicht gespeichert, da dies ein Ordner oberster "
-"Ebene ist. Sie k?nnen aber auf die ganze Mailbox-Ordnerstruktur mit der "
-"Schaltfl?che \"auf Unterordner anwenden\" ?bertragen werden.</i>"
+"<i>Diese Einstellungen werden nicht gespeichert, da dies ein Ordner oberster Ebene ist. Sie k?nnen "
+"aber auf die ganze Mailbox-Ordnerstruktur mit der Schaltfl?che \"auf Unterordner anwenden\" "
+"?bertragen werden.</i>"
 
 #: src/prefs_folder_item.c:280 src/prefs_folder_item.c:888
 msgid ""
@@ -16537,23 +16137,21 @@ msgstr "Auf neue Nachrichten ?berpr?fen"
 
 #: src/prefs_folder_item.c:482
 msgid ""
-"Turn this option on if mail is delivered directly to this folder by server "
-"side filtering on IMAP or by an external application"
+"Turn this option on if mail is delivered directly to this folder by server side filtering on IMAP "
+"or by an external application"
 msgstr ""
-"Aktiviere diese Option, wenn Mails durch serverseitiges Filtern oder externe "
-"Anwendungen direkt in den Ordner zugestellt werden."
+"Aktiviere diese Option, wenn Mails durch serverseitiges Filtern oder externe Anwendungen direkt in "
+"den Ordner zugestellt werden."
 
 #: src/prefs_folder_item.c:502
 msgid "Select the HTML part of multipart messages"
 msgstr "Den HTML-Teil w?hlen, wenn Nachrichten 'multipart/alternative' sind"
 
 #: src/prefs_folder_item.c:519
-msgid ""
-"\"Default\" will follow global preference (found in /Preferences/Message "
-"View/Text Options)"
+msgid "\"Default\" will follow global preference (found in /Preferences/Message View/Text Options)"
 msgstr ""
-"\"Standard\" ?bernimmt die globalen Einstellungen (aus Konfiguration/"
-"Nachrichtenansicht/Text-Einstellungen)"
+"\"Standard\" ?bernimmt die globalen Einstellungen (aus Konfiguration/Nachrichtenansicht/Text-"
+"Einstellungen)"
 
 #: src/prefs_folder_item.c:529
 msgid "Synchronise for offline use"
@@ -16581,13 +16179,10 @@ msgstr "Empfangsbest?tigung anfordern"
 
 #: src/prefs_folder_item.c:912
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr ""
-"Kopie ausgehender Nachrichten in diesem Ordner speichern anstatt in "
-"'Gesendet'"
+msgstr "Kopie ausgehender Nachrichten in diesem Ordner speichern anstatt in 'Gesendet'"
 
-#: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
-#: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
-#: src/prefs_folder_item.c:1018
+#: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948 src/prefs_folder_item.c:972
+#: src/prefs_folder_item.c:995 src/prefs_folder_item.c:1018
 msgid "Default "
 msgstr "Standard"
 
@@ -16605,9 +16200,7 @@ msgstr "Zwischenspeicher verwerfen"
 
 #: src/prefs_folder_item.c:1685
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr ""
-"M?chten Sie lokal zwischengespeicherte Daten f?r diesen Ordner wirklich "
-"verwerfen?"
+msgstr "M?chten Sie lokal zwischengespeicherte Daten f?r diesen Ordner wirklich verwerfen?"
 
 #: src/prefs_folder_item.c:1687
 msgid "+Discard"
@@ -16632,8 +16225,7 @@ msgstr "Nachricht"
 
 #: src/prefs_fonts.c:126
 msgid "Derive small and bold fonts from Folder and Message Lists font"
-msgstr ""
-"Kleine und fette Schriftarten der Ordner- und Nachrichtenansicht ?bernehmen"
+msgstr "Kleine und fette Schriftarten der Ordner- und Nachrichtenansicht ?bernehmen"
 
 #: src/prefs_fonts.c:136
 msgid "Small"
@@ -16651,8 +16243,7 @@ msgstr "Zum Drucken andere Schriftart verwenden"
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:678
-#: src/prefs_themes.c:365
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:678 src/prefs_themes.c:365
 msgid "Display"
 msgstr "Anzeige"
 
@@ -16712,14 +16303,13 @@ msgstr "Protokoll der Filter-/Verarbeitungsregeln aktivieren"
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
-"Caution: enabling this option will slow down the filtering/processing, this "
-"might be critical when applying many rules upon thousands of messages."
+"Caution: enabling this option will slow down the filtering/processing, this might be critical when "
+"applying many rules upon thousands of messages."
 msgstr ""
 "Wenn aktiviert, werden Filter- und Verarbeitungsregeln protokolliert.\n"
 "Das Protokoll ist unter 'Extras/Filterprotokoll' verf?gbar.\n"
-"Vorsicht: das Aktivieren dieser Option verlangsamt das Filtern/Verarbeiten. "
-"Dies k?nnte kritisch sein, wenn viele Regeln auf tausende Nachrichten "
-"angewandt werden."
+"Vorsicht: das Aktivieren dieser Option verlangsamt das Filtern/Verarbeiten. Dies k?nnte kritisch "
+"sein, wenn viele Regeln auf tausende Nachrichten angewandt werden."
 
 # GUI adapted
 #: src/prefs_logging.c:187
@@ -16770,23 +16360,22 @@ msgstr "Hoch"
 #: src/prefs_logging.c:238
 msgid ""
 "Select the level of detail of the logging.\n"
-"Choose Low to see when rules are applied, which conditions match or don't "
-"match and what actions are performed.\n"
-"Choose Medium to see more details about the message that is being processed, "
-"and why rules are skipped.\n"
-"Choose High to explicitly show the reason why all rules are processed or "
-"skipped, and why all conditions are matched or not matched.\n"
+"Choose Low to see when rules are applied, which conditions match or don't match and what actions "
+"are performed.\n"
+"Choose Medium to see more details about the message that is being processed, and why rules are "
+"skipped.\n"
+"Choose High to explicitly show the reason why all rules are processed or skipped, and why all "
+"conditions are matched or not matched.\n"
 "Caution: the higher the level, the greater the impact on performance."
 msgstr ""
 "Auswahl der Detailstufe der Protokollierung:\n"
-"W?hlen Sie 'Niedrig' um zu sehen, wann Regeln greifen, welche Bedingungen "
-"zutreffen oder nicht und welche Aktionen ausgef?hrt werden.\n"
-"W?hlen Sie 'Mittel',um mehr Details ?ber die verarbeitete Nachricht zu sehen "
-"und warum Regeln ?bersprungen werden.\n"
-"W?hlen Sie 'Hoch' um exakt zu sehen, warum Regeln greifen oder ?bersprungen "
-"und warum Bedingungen zutreffen oder nicht.\n"
-"Vorsicht: Je h?her die gew?hlte Stufe, desto gr??er die Beeintr?chtigung der "
-"Leistung."
+"W?hlen Sie 'Niedrig' um zu sehen, wann Regeln greifen, welche Bedingungen zutreffen oder nicht und "
+"welche Aktionen ausgef?hrt werden.\n"
+"W?hlen Sie 'Mittel',um mehr Details ?ber die verarbeitete Nachricht zu sehen und warum Regeln "
+"?bersprungen werden.\n"
+"W?hlen Sie 'Hoch' um exakt zu sehen, warum Regeln greifen oder ?bersprungen und warum Bedingungen "
+"zutreffen oder nicht.\n"
+"Vorsicht: Je h?her die gew?hlte Stufe, desto gr??er die Beeintr?chtigung der Leistung."
 
 #: src/prefs_logging.c:280
 msgid "Disk log"
@@ -16904,8 +16493,8 @@ msgstr "Beantwortet"
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6290 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:397 src/summaryview.c:6290 src/toolbar.c:416 src/toolbar.c:934
+#: src/toolbar.c:1978
 msgid "Spam"
 msgstr "Spam"
 
@@ -17065,13 +16654,13 @@ msgstr "Die Adresse(n) in der Kopfzeile '%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 ""
 "Adressbuch/Ordnerpfad ist nicht gesetzt.\n"
 "\n"
-"Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss '%s' in "
-"der Adressbuch/Ordner Auswahl gew?hlt werden."
+"Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss '%s' in der Adressbuch/Ordner "
+"Auswahl gew?hlt werden."
 
 #: src/prefs_matcher.c:1842
 msgid "Headers part"
@@ -17166,13 +16755,13 @@ msgstr "Treffertyp: 'Test'"
 
 #: src/prefs_matcher.c:2191
 msgid ""
-"'Test' allows you to test a message or message element using an external "
-"program or script. The program will return either 0 or 1.\n"
+"'Test' allows you to test a message or message element using an external program or script. The "
+"program will return either 0 or 1.\n"
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"'Test' erlaubt, eine Nachricht oder Teile dieser mit einem externen Programm "
-"oder Script zu testen. Das Programm sollte 0 oder 1 zur?ck geben.\n"
+"'Test' erlaubt, eine Nachricht oder Teile dieser mit einem externen Programm oder Script zu "
+"testen. Das Programm sollte 0 oder 1 zur?ck geben.\n"
 "\n"
 "Die folgenden Symbole k?nnen verwendet werden:"
 
@@ -17280,8 +16869,7 @@ msgstr "Sind mehr als 3 Zitatebenen vorhanden, wiederholen sich die Farben"
 msgid "1st Level"
 msgstr "1. Ebene"
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216 src/prefs_msg_colors.c:242
 msgid "Text"
 msgstr "Text"
 
@@ -17347,11 +16935,11 @@ msgstr "Ordnerliste"
 
 #: src/prefs_msg_colors.c:380
 msgid ""
-"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"
 msgstr ""
-"Farbe f?r den Zielordner w?hlen der verwendet wird, wenn die Option "
-"'Verschieben oder L?schen von Nachrichten sofort ausf?hren' ausgeschaltet ist"
+"Farbe f?r den Zielordner w?hlen der verwendet wird, wenn die Option 'Verschieben oder L?schen von "
+"Nachrichten sofort ausf?hren' ausgeschaltet ist"
 
 #: src/prefs_msg_colors.c:384
 msgid "Target folder"
@@ -17485,18 +17073,17 @@ msgstr "Tastenk?rzel"
 
 #: src/prefs_other.c:500
 msgid "Enable customisable keyboard shortcuts"
-msgstr "Nutzerdefinierte Tastenk?rzel m?glich"
+msgstr "Benutzerdefinierte Tastenk?rzel m?glich"
 
 #: src/prefs_other.c:503
 msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
+"If checked, you can change the keyboard shortcuts of most of the menu items by focusing on the "
+"menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
-"Wenn aktiviert, k?nnen die meisten Tastenk?rzel der Men?s durch Anvisieren "
-"des Eintrages und Dr?cken einer Tastenkombination ge?ndert werden.\n"
-"Diese Option muss deaktiviert sein, um alle bestehenden Tastenk?rzel zu "
-"sch?tzen."
+"Wenn aktiviert, k?nnen die meisten Tastenk?rzel der Men?s durch Anvisieren des Eintrages und "
+"Dr?cken einer Tastenkombination ge?ndert werden.\n"
+"Diese Option muss deaktiviert sein, um alle bestehenden Tastenk?rzel zu sch?tzen."
 
 #: src/prefs_other.c:510
 msgid " Choose preset keyboard shortcuts... "
@@ -17548,12 +17135,11 @@ msgstr ""
 
 #: src/prefs_other.c:583
 msgid ""
-"Use the 'shred' program to overwrite files with random data before deleting "
-"them. This slows down deletion. Be sure to read shred's man page for caveats."
+"Use the 'shred' program to overwrite files with random data before deleting them. This slows down "
+"deletion. Be sure to read shred's man page for caveats."
 msgstr ""
-"Das Programm 'shred' verwenden, um Dateien vor dem L?schen mit Zufallsdaten "
-"zu ?berschreiben. Dies verlangsamt den Vorgang. Sie sollten die "
-"Handbuchseite von 'shred' lesen."
+"Das Programm 'shred' verwenden, um Dateien vor dem L?schen mit Zufallsdaten zu ?berschreiben. Dies "
+"verlangsamt den Vorgang. Sie sollten die Handbuchseite von 'shred' lesen."
 
 #: src/prefs_other.c:587
 msgid "Synchronise offline folders as soon as possible"
@@ -17673,12 +17259,9 @@ msgid "Outgoing encoding"
 msgstr "Ausgehende Zeichenkodierung"
 
 #: src/prefs_send.c:205
-msgid ""
-"If 'Automatic' is selected, the optimal encoding for the current locale will "
-"be used"
+msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
 msgstr ""
-"Wenn 'Automatisch' gew?hlt ist, wird die beste Kodierung f?r die aktuell "
-"Lokalisierung verwendet"
+"Wenn 'Automatisch' gew?hlt ist, wird die beste Kodierung f?r die aktuell Lokalisierung verwendet"
 
 #: src/prefs_send.c:220
 msgid "Automatic (Recommended)"
@@ -17745,9 +17328,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisch (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Kyrillisch (KOI8-R)"
+msgstr "Kyrillisch (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -17810,15 +17392,12 @@ msgid "Transfer encoding"
 msgstr "?bertragungskodierung"
 
 #: src/prefs_send.c:282
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters"
+msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
 msgstr ""
-"?bertragungskodierung ausw?hlen, die verwendet wird, wenn der "
-"Nachrichtenk?rper Nicht-ASCII-Zeichen enth?lt."
+"?bertragungskodierung ausw?hlen, die verwendet wird, wenn der Nachrichtenk?rper Nicht-ASCII-"
+"Zeichen enth?lt."
 
-#: src/prefs_send.c:359 src/send_message.c:499 src/send_message.c:503
-#: src/send_message.c:508
+#: src/prefs_send.c:359 src/send_message.c:499 src/send_message.c:503 src/send_message.c:508
 msgid "Sending"
 msgstr "Senden"
 
@@ -17864,9 +17443,7 @@ msgstr "Farbe falsch geschriebener W?rter"
 
 #: src/prefs_spelling.c:220
 msgid "Pick color for misspelled word. Use black to underline"
-msgstr ""
-"W?hlen Sie die Farbe f?r falsch geschriebene W?rter (Schwarz zum "
-"Unterstreichen)."
+msgstr "W?hlen Sie die Farbe f?r falsch geschriebene W?rter (Schwarz zum Unterstreichen)."
 
 #: src/prefs_spelling.c:337
 msgid "Spell Checking"
@@ -17948,8 +17525,7 @@ msgstr "das Jahr als Dezimalzahl"
 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone, deren Name oder Abk?rzung"
 
-#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
-#: src/prefs_summaries.c:519
+#: src/prefs_summaries.c:191 src/prefs_summaries.c:239 src/prefs_summaries.c:519
 msgid "Date format"
 msgstr "Datumsformat"
 
@@ -18024,12 +17600,10 @@ msgid "Execute immediately when moving or deleting messages"
 msgstr "Verschieben oder L?schen von Nachrichten sofort ausf?hren"
 
 #: src/prefs_summaries.c:476
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
+msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
 msgstr ""
-"Pausiert das Verschieben, Kopieren und L?schen von Nachrichten, bis 'Extras/"
-"Ausf?hren' aufgerufen wird"
+"Pausiert das Verschieben, Kopieren und L?schen von Nachrichten, bis 'Extras/Ausf?hren' aufgerufen "
+"wird"
 
 #: src/prefs_summaries.c:479
 msgid "Mark message as read"
@@ -18057,8 +17631,7 @@ msgstr "Hilfe zum Datumsformat"
 
 #: src/prefs_summaries.c:557
 msgid "Confirm before marking all messages in a folder as read"
-msgstr ""
-"Best?tigen, bevor alle Mails in einem Ordner als gelesen markiert werden"
+msgstr "Best?tigen, bevor alle Mails in einem Ordner als gelesen markiert werden"
 
 #: src/prefs_summaries.c:560
 msgid "Translate header names"
@@ -18066,11 +17639,9 @@ msgstr "Kopfzeilennamen ?bersetzen"
 
 #: src/prefs_summaries.c:562
 msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Die Anzeige der Standardkopfzeilen (wie 'From:', 'Subject:') wird in Ihre "
-"Sprache ?bersetzt."
+"The display of standard headers (such as 'From:', 'Subject:') will be translated into your "
+"language."
+msgstr "Die Anzeige der Standardkopfzeilen (wie 'From:', 'Subject:') wird in Ihre Sprache ?bersetzt."
 
 #: src/prefs_summaries.c:679
 msgid "Summaries"
@@ -18135,12 +17706,10 @@ msgid "This name is used as the Menu item"
 msgstr "Dieser Name wird als Men?eintrag benutzt"
 
 #: src/prefs_template.c:82
-msgid ""
-"Override composing account's From header. This doesn't change the composing "
-"account."
+msgid "Override composing account's From header. This doesn't change the composing account."
 msgstr ""
-"?berschreibt die Kopfzeile 'Von:' des Kontos. Dies ?ndert nicht das Konto, "
-"von dem aus geschrieben wird."
+"?berschreibt die Kopfzeile 'Von:' des Kontos. Dies ?ndert nicht das Konto, von dem aus geschrieben "
+"wird."
 
 #: src/prefs_template.c:309
 msgid "Append the new template above to the list"
@@ -18207,10 +17776,8 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Das \"Bcc\"-Feld der Vorlage enth?lt eine ung?ltige E-Mailadresse."
 
 #: src/prefs_template.c:835
-msgid ""
-"The \"Reply-To\" field of the template contains an invalid email address."
-msgstr ""
-"Das \"Reply-To\"-Feld der Vorlage enth?lt eine ung?ltige E-Mailadresse."
+msgid "The \"Reply-To\" field of the template contains an invalid email address."
+msgstr "Das \"Reply-To\"-Feld der Vorlage enth?lt eine ung?ltige E-Mailadresse."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -18565,20 +18132,14 @@ msgid "An error happened during SMTP session."
 msgstr "W?hrend der SMTP-Sitzung ist ein Fehler aufgetreten."
 
 #: src/procmsg.c:1653
-msgid ""
-"No specific account has been found to send, and an error happened during "
-"SMTP session."
-msgstr ""
-"Kein Konto zum Senden gefunden; und w?hrend der SMTP-Sitzung trat ein Fehler "
-"auf."
+msgid "No specific account has been found to send, and an error happened during SMTP session."
+msgstr "Kein Konto zum Senden gefunden; und w?hrend der SMTP-Sitzung trat ein Fehler auf."
 
 #: src/procmsg.c:1661
-msgid ""
-"Couldn't determine sending information. Maybe the email hasn't been "
-"generated by Claws Mail."
+msgid "Couldn't determine sending information. Maybe the email hasn't been generated by Claws Mail."
 msgstr ""
-"Es fehlen Informationen zum Senden. M?glicherweise wurde diese Mail nicht "
-"mit Claws Mail erstellt."
+"Es fehlen Informationen zum Senden. M?glicherweise wurde diese E-Mail nicht mit Claws Mail "
+"erstellt."
 
 #: src/procmsg.c:1683
 msgid "Couldn't create temporary file for news sending."
@@ -18732,42 +18293,35 @@ msgid ""
 "symbols (or their long equivalent)"
 msgstr ""
 "<span style=\"oblique\">expr</span> einf?gen, wenn x gesetzt ist, wobei x\n"
-"ein Symbol aus [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt] ist "
-"(oder\n"
+"ein Symbol aus [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt] ist (oder\n"
 "deren lange Entsprechung)"
 
 #: src/quote_fmt.c:91
 msgid ""
-"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
-"of\n"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
 "<span style=\"oblique\">expr</span> einf?gen, wenn x nicht gesetzt ist,\n"
-"wobei x ein Symbol aus [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, "
-"ABt]\n"
+"wobei x ein Symbol aus [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "ist (oder deren lange Entsprechung)"
 
 #: src/quote_fmt.c:92
 msgid ""
 "insert file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to insert"
 msgstr ""
 "Datei einf?gen:\n"
-"<span style=\"oblique\">sub_expr</span> wird als Pfad der einzuf?genden "
-"Datei interpretiert"
+"<span style=\"oblique\">sub_expr</span> wird als Pfad der einzuf?genden Datei interpretiert"
 
 #: src/quote_fmt.c:93
 msgid ""
 "insert program output:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
-"get\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\n"
 "the output from"
 msgstr ""
 "Programmausgaben einf?gen:\n"
-"<span style=\"oblique\">sub_expr</span> wird als eine Befehlszeile "
-"interpretiert,\n"
+"<span style=\"oblique\">sub_expr</span> wird als eine Befehlszeile interpretiert,\n"
 "von der die Ausgabe gelesen werden soll."
 
 #: src/quote_fmt.c:94
@@ -18783,12 +18337,10 @@ msgstr ""
 #: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
-"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
-"to attach"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to attach"
 msgstr ""
 "Datei anh?ngen:\n"
-"<span style=\"oblique\">sub_expr</span> wird als Pfad der anzuh?ngenden "
-"Datei interpretiert"
+"<span style=\"oblique\">sub_expr</span> wird als Pfad der anzuh?ngenden Datei interpretiert"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18835,12 +18387,9 @@ msgid "Use template when composing new messages"
 msgstr "Vorlage zum Verfassen neuer Nachrichten verwenden"
 
 #: src/quote_fmt.c:197
-msgid ""
-"Override From header. This doesn't change the account used to compose the "
-"new message."
+msgid "Override From header. This doesn't change the account used to compose the new message."
 msgstr ""
-"Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem die neue "
-"Nachricht geschrieben wird."
+"Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem die neue Nachricht geschrieben wird."
 
 #: src/quote_fmt.c:299
 msgid "Use template when replying to messages"
@@ -18848,9 +18397,7 @@ msgstr "Vorlage zum Antworten auf Nachrichten verwenden"
 
 #: src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
-msgstr ""
-"Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem aus "
-"geantwortet wird."
+msgstr "Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem aus geantwortet wird."
 
 #: src/quote_fmt.c:334 src/quote_fmt.c:464
 msgid "Quotation mark"
@@ -18862,21 +18409,15 @@ msgstr "Vorlage zum Weiterleiten von Nachrichten verwenden"
 
 #: src/quote_fmt.c:453
 msgid "Override From header. This doesn't change the account used to forward."
-msgstr ""
-"Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem aus "
-"weitergeleitet wird."
+msgstr "Kopfzeile 'Von' ?berschreiben. ?ndert nicht das Konto, von dem aus weitergeleitet wird."
 
 #: src/quote_fmt.c:545
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
 #: src/quote_fmt.c:563
-msgid ""
-"The \"From\" field of the \"New message\" template contains an invalid email "
-"address."
-msgstr ""
-"Das Feld \"Von\" der Vorlage f?r \"Neue Nachricht\" enth?lt eine ung?ltige E-"
-"Mailadresse."
+msgid "The \"From\" field of the \"New message\" template contains an invalid email address."
+msgstr "Das Feld \"Von\" der Vorlage f?r \"Neue Nachricht\" enth?lt eine ung?ltige E-Mailadresse."
 
 #: src/quote_fmt.c:566
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
@@ -18888,8 +18429,7 @@ msgstr "Das Feld \"Zitat-Zeichen\" der Vorlage f?r \"Antworten\" ist ung?ltig.
 
 #: src/quote_fmt.c:603
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
-msgstr ""
-"Das Feld \"Anf?hrungszeichen\" der Vorlage f?r \"Weiterleiten\" ist ung?ltig."
+msgstr "Das Feld \"Anf?hrungszeichen\" der Vorlage f?r \"Weiterleiten\" ist ung?ltig."
 
 #: src/quote_fmt_parse.y:509
 #, c-format
@@ -18917,7 +18457,7 @@ msgstr "Fehler beim Ausf?hren des Befehls: %s"
 
 #: src/send_message.c:348
 msgid "Connecting"
-msgstr "Verbinden..."
+msgstr "Verbinden"
 
 #: src/send_message.c:353
 msgid "Doing POP before SMTP..."
@@ -19096,13 +18636,10 @@ msgstr "Keine weiteren ungelesenen Nachrichten"
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1858 src/summaryview.c:1910 src/summaryview.c:1953
-#: src/summaryview.c:2005 src/summaryview.c:2084
-msgid ""
-"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
-msgstr ""
-"Interner Fehler: Unerwarteter Wert f?r 'prefs_common."
-"next_unread_msg_dialog'\n"
+#: src/summaryview.c:1858 src/summaryview.c:1910 src/summaryview.c:1953 src/summaryview.c:2005
+#: src/summaryview.c:2084
+msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+msgstr "Interner Fehler: Unerwarteter Wert f?r 'prefs_common.next_unread_msg_dialog'\n"
 
 #: src/summaryview.c:1866
 msgid "No unread messages."
@@ -19303,8 +18840,7 @@ msgstr "_?berschreiben"
 
 #: src/summaryview.c:4866
 #, c-format
-msgid ""
-"You are about to print %d messages, one by one. Do you want to continue?"
+msgid "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Sie sind dabei, %d Nachrichten zu drucken. M?chten Sie fortfahren?"
 
 #: src/summaryview.c:5345
@@ -19335,10 +18871,6 @@ msgstr ""
 "Einige Filterregeln geh?ren zu einem bestimmtem Konto.\n"
 "Bitte w?hlen was mit diesen geschehen soll:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filtern"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtern l?uft..."
@@ -19357,8 +18889,7 @@ msgstr "Beobachteter Diskurs"
 
 #: src/summaryview.c:6296
 msgid "Replied but also forwarded - click to see reply"
-msgstr ""
-"Beantwortet, aber auch weitergeleitet - klicken, um die Antwort zu sehen"
+msgstr "Beantwortet, aber auch weitergeleitet - klicken, um die Antwort zu sehen"
 
 #: src/summaryview.c:6298
 msgid "Replied - click to see reply"
@@ -19481,8 +19012,7 @@ msgstr "     - Zum Speichern "
 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 
-#: src/textview.c:982 src/textview.c:994 src/textview.c:1006
-#: src/textview.c:1016
+#: src/textview.c:982 src/textview.c:994 src/textview.c:1006 src/textview.c:1016
 msgid " (Shortcut key: '"
 msgstr " (Tastenk?rzel: ')"
 
@@ -20003,20 +19533,14 @@ msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Mailbox-Name:</span>"
 
 #: src/wizard.c:1030
-msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
-msgstr ""
-"Sie k?nnen auch einen absoluten Pfad angeben, z.B.: \"/home/white/Documents/"
-"Mail\""
+msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
+msgstr "Sie k?nnen auch einen absoluten Pfad angeben, z.B.: \"/home/white/Documents/Mail\""
 
 #: src/wizard.c:1101
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
 msgstr ""
-"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
-"B.: \"mail.example.com:25\""
+"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z.B.: \"mail.example."
+"com:25\""
 
 #: src/wizard.c:1104
 msgid "<span weight=\"bold\">SMTP server address:</span>"
@@ -20030,8 +19554,7 @@ msgstr "Benutze Authentifizierung"
 msgid "<span size=\"small\">(empty to use the same as receive)</span>"
 msgstr ""
 "SMTP-Benutzername:\n"
-"<span size=\"small\">(leer lassen, um den selben wie beim Empfang zu "
-"verwenden)</span>"
+"<span size=\"small\">(leer lassen, um den selben wie beim Empfang zu verwenden)</span>"
 
 #: src/wizard.c:1132
 msgid "SMTP username:"
@@ -20070,12 +19593,10 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: src/wizard.c:1541
-msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
 msgstr ""
-"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
-"B.: \"mail.example.com:110\""
+"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z.B.: \"mail.example."
+"com:110\""
 
 #: src/wizard.c:1546
 msgid "<span weight=\"bold\">Username:</span>"
@@ -20113,9 +19634,8 @@ msgstr "Willkommen zu Claws Mail"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
-"We will begin by defining some basic information about you and your most "
-"common mail options so that you can start to use Claws Mail in less than "
-"five minutes."
+"We will begin by defining some basic information about you and your most common mail options so "
+"that you can start to use Claws Mail in less than five minutes."
 msgstr ""
 "Willkommen im Claws Mail Setup-Assistenten.\n"
 "\n"
@@ -20156,216 +19676,3 @@ msgid ""
 msgstr ""
 "Claws Mail ist jetzt bereit.\n"
 "Zum Starten 'Speichern' klicken."
-
-#~ msgid "E-mail client"
-#~ msgstr "Email-Programm"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Schlankes und sehr schnelles GTK+-basiertes Email-Programm"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "schlank;schnell;gui;erweiterbar;plugin;pop;pop3;imap;imap4;nntp;news;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr ""
-#~ "Claws Mail ist ein schnelles, m?chtiges und enorm konfigurierbares Email-"
-#~ "Programm"
-
-#~ 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 ""
-#~ "Es ist stark konfigurierbar und handhabt problemlos hunderttausende "
-#~ "Emails. Nachrichten werden in einem offenen Format verarbeitet und k?nnen "
-#~ "einfach "
-
-#~ 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 ""
-#~ "Eine Menge zus?tzlicher Funktionen werden durch Plugins bereitgestellt, "
-#~ "beispielsweise PGP-Signaturen und -Verschl?sselung, ein RSS-Aggregator, "
-#~ "ein Kalender, m?chtige Spam-Filter, Integration von Perl und Python, "
-#~ "Darstellung von HTML- und PDF-Inhalten und Etliches mehr."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr ""
-#~ "Zeigt auf manchen Laptops mithilfe von LEDs neue Mails im Posteingang an"
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr ""
-#~ "Erlaubt das Speichern von Adressen versendeter Mails in einem definierten "
-#~ "Ordner im Adressbuch"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "Packt alte Ordner als .tar- oder .zip-Datei"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "Entfernt Anh?nge von Emails"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr ""
-#~ "Warnt, wenn in einer Nachricht ein Anhang erw?hnt wird, aber keine Datei "
-#~ "angeh?ngt ist."
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "?berpr?ft alle ?ber IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten "
-#~ "auf SPAM unter der Verwendung von Bogofilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "?berpr?ft alle ?ber IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten "
-#~ "auf SPAM unter der Verwendung von Bsfilter"
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "?berpr?ft alle ?ber IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten "
-#~ "auf Viren unter der Verwendung von clamd (ClamAV)"
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr "Zeigt HTML Emails mithilfe der WebKit-Bibliothek an"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "Erg?nzt folgende Kopfzeilen: UIDL, Name des Claws Mail-Kontos, POP-"
-#~ "Server, Benutzer-ID und Zeitpunkt des Herunterladens."
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Stellt eine Schnittstelle zu Googles Diensten bereit"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Stellt GeoLocation-Funktionen bereit"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr ""
-#~ "Zeigt libravatar/gravatar-Profilbilder an beziehungsweise dynamisch "
-#~ "generierte oder vordefinierte Alternativen."
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Direkte Unterst?tzung von Mailboxen im mbox-Format"
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr ""
-#~ "Schreibt nach dem Empfang neuer Nachrichten eine Zusammenfassung der "
-#~ "Kopfzeilen in eine Logdatei"
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Informiert den Nutzer auf verschiedene Arten ?ber neue und ungelesene "
-#~ "Nachrichten"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "Zeigt PDF- und PostScript-Anh?ngen mithilfe der Poppler-Bibliothek und "
-#~ "GhostScript an."
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr "Stellt die ganze Kraft von Perl f?r Email-Filter bereit"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "Stellt Kernfunktionen von PGP zur Verf?gung und ist eine Abh?ngigkeit der "
-#~ "Plugins PGP/Inline und PGP/MIME"
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Verarbeitet PGP/Inline signierte und/oder verschl?sselte Emails"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Verarbeitet PGP/MIME signierte und/oder verschl?sselte Emails"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Erm?glicht Python-Scripting. Code kann in einer eingebetteten "
-#~ "Kommandozeile eingegeben oder gespeichert werden"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "Lesen Sie Ihre RSS.Feeds"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Verarbeitet S/MIME signierte und/oder verschl?sselte Emails"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Meldet Spam an verschiedene Stellen"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "?berpr?ft alle ?ber IMAP-, LOCAL- oder POP-Konten kommenden Nachrichten "
-#~ "auf SPAM unter der Verwendung von SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "Liest Anh?nge des application/ms-tnef-Typs"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "Erm?glicht die Handhabung von vCalendar-Nacrichten und webCal-"
-#~ "Abonnements. Verf?gt ?ber einen Kalender-Import"
-
-#~ msgid "_Subject:"
-#~ msgstr "Betreff:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Adressen aus 'An'-Feld speichern"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Adressen aus 'Cc'-Feld speichern"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Adressen aus 'Bcc'-Feld speichern"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "Stylesheet:"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData-Plugin: Authentifiziert\n"
-
-#~ msgid "slow"
-#~ msgstr "langsam"
-
-#~ msgid "fast"
-#~ msgstr "schnell"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Bannerbreite in Pixeln (0 f?r Bildschirmgr??e)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Popup aktivieren"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Standardintervall f?r Aktualisierung in Minuten"
-
-#~ msgid "Use this"
-#~ msgstr "Dieses benutzen"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "E-Mail konnte nicht verschl?sselt werden: %s"
diff --git a/po/he.po b/po/he.po
index 35f3f9c..d6b0151 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,14 +1,14 @@
 # Hebrew translation for claws mail.
-# Copyright (C) 1999-2014 The Claws Mail Team
+# Copyright (C) 1999-2015 The Claws Mail Team
 # This file is distributed under the same license as the claws mail package.
-# Isratine Citizen <genghiskhan at gmx.ca>, 2012 - 2014.
+# Isratine Citizen <genghiskhan at gmx.ca>, 2012 - 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-05-31 17:08+0200\n"
+"POT-Creation-Date: 2015-07-12 07:58+0100\n"
+"PO-Revision-Date: 2015-07-12 18:57+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team: Rahut <translators at lists.claws-mail.org>\n"
 "Language: he\n"
@@ -16,18 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Language: en_US\n"
-"X-Source-Language: C\n"
+"X-Generator: Poedit 1.6.10\n"
+"X-Language: he\n"
+"X-Source-Language: en\n"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
-"?????? ??? ?????? ????? ??????.\n"
-"???? ?? ?? ?????? ?????? ???? ????? ????????."
+"???? ??? ?????? ????? ??????.\n"
+"???? ????? ?? ???? ????? ???? ????? ???????."
 
 #: src/account.c:437
 msgid "Can't create folder."
@@ -45,7 +44,7 @@ msgid ""
 "indicates the default account."
 msgstr ""
 "??????? '??? ????' ?????? ?????? ???? ??????? ???? ????, ???? ??????\n"
-"????? ???? ??????? ?????. ????? ???? ???? ?? ?????? ??????."
+"????? ???? ??????? ?????. ???? ???? ???? ?? ?????? ??????."
 
 #: src/account.c:812
 msgid " _Set as default account "
@@ -83,13 +82,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'??? ????' ?????? ???? ???? ???????? ???????"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -148,7 +148,7 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"?? ???? ?????? ???? fork ??? ???? ?? ?????? ????:\n"
+"?? ???? ?????? ???? ?? ?????? ????:\n"
 "%s\n"
 "%s"
 
@@ -284,7 +284,7 @@ msgstr "??? ??? ???? ?? ?????? ????? ?? ?? ?????
 
 #: src/addrcustomattr.c:191
 msgid "Reset to default"
-msgstr "????? ?? ????? ????"
+msgstr "????? ?????? ????"
 
 #: src/addrcustomattr.c:192
 msgid ""
@@ -310,7 +310,7 @@ msgstr "?_?? ???"
 
 #: src/addrcustomattr.c:214
 msgid "_Reset to default"
-msgstr "_??? ?? ????? ????"
+msgstr "_??? ?????? ????"
 
 #: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
@@ -319,7 +319,7 @@ msgstr "?? ????? ???? ?????."
 #: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "???? ???? ?????"
+msgstr "????? ???? ?????"
 
 #: src/addrcustomattr.c:476
 msgid "New attribute name:"
@@ -369,11 +369,11 @@ msgstr "???? ???? ??????"
 
 #: src/addrduplicates.c:793 src/addressbook.c:1433 src/addressbook.c:1486
 msgid "Delete address(es)"
-msgstr "????? ????(?)?"
+msgstr "????? ??????"
 
 #: src/addrduplicates.c:794 src/addressbook.c:1487
 msgid "Really delete the address(es)?"
-msgstr "???? ????? ?? ?????(?)??"
+msgstr "???? ????? ?? ????????"
 
 #: src/addrduplicates.c:842
 msgid "Delete address"
@@ -385,7 +385,7 @@ msgstr "???? ????? ?? ???? ?????-???? ????? ???
 
 #: src/addressadd.c:185 src/prefs_filtering_action.c:201
 msgid "Add to address book"
-msgstr "????? ?? ???? ??????"
+msgstr "????? ????? ??????"
 
 #: src/addressadd.c:207
 msgid "Contact"
@@ -413,7 +413,7 @@ msgstr ""
 
 #: src/addressadd.c:535 src/addressbook.c:3209 src/addressbook.c:3260
 msgid "Add address(es)"
-msgstr "???? ????(?)?"
+msgstr "???? ??????"
 
 #: src/addressadd.c:536
 msgid "Can't add the specified address"
@@ -431,7 +431,7 @@ msgstr "???_?"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "?_????"
 
@@ -474,10 +474,14 @@ msgid "_Delete book"
 msgstr "_??? ???"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "?_???"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_????"
 
@@ -491,11 +495,12 @@ msgstr "_????"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
-msgstr "??_??"
+msgstr "?_???"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "?_???"
 
@@ -513,31 +518,31 @@ msgstr "_???? ??"
 
 #: src/addressbook.c:444
 msgid "Import _LDIF file..."
-msgstr "????? ???? _LDIF..."
+msgstr "??? ???? _LDIF..."
 
 #: src/addressbook.c:445
 msgid "Import M_utt file..."
-msgstr "????? ???? _Mutt..."
+msgstr "??? ???? _Mutt..."
 
 #: src/addressbook.c:446
 msgid "Import _Pine file..."
-msgstr "????? ???? _Pine..."
+msgstr "??? ???? _Pine..."
 
 #: src/addressbook.c:448
 msgid "Export _HTML..."
-msgstr "????? _HTML..."
+msgstr "??? _HTML..."
 
 #: src/addressbook.c:449
 msgid "Export LDI_F..."
-msgstr "????? LDI_F..."
+msgstr "??? LDI_F..."
 
 #: src/addressbook.c:451
 msgid "Find duplicates..."
-msgstr "????? ????????..."
+msgstr "??? ????????..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "????? ??????? ???????..."
+msgstr "???? ??????? ???????..."
 
 #: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
 #: src/messageview.c:339
@@ -592,7 +597,7 @@ msgstr "????? ???? ??"
 
 #: src/addressbook.c:519 src/importldif.c:130
 msgid "Error writing to file"
-msgstr "????? ?????? ?? ????"
+msgstr "????? ?????? ?????"
 
 #: src/addressbook.c:520 src/importldif.c:131
 msgid "Error opening directory"
@@ -604,7 +609,7 @@ msgstr "?? ???? ????"
 
 #: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
-msgstr "????? ???????? ?? ??? LDAP"
+msgstr "????? ???????? ???? LDAP"
 
 #: src/addressbook.c:532
 msgid "Error initializing LDAP"
@@ -612,7 +617,7 @@ msgstr "????? ?????? LDAP"
 
 #: src/addressbook.c:533
 msgid "Error binding to LDAP server"
-msgstr "????? ?????? ?? ??? LDAP"
+msgstr "????? ?????? ???? LDAP"
 
 #: src/addressbook.c:534
 msgid "Error searching LDAP database"
@@ -649,7 +654,7 @@ msgstr "???? ???? ???"
 # if it was this, it would be ???? ??
 #: src/addressbook.c:542
 msgid "Another contact exists with that key"
-msgstr "???? ??? ??? ??? ?? ????? ???"
+msgstr "???? ??? ??? ??? ?? ????? ???"
 
 #: src/addressbook.c:543
 msgid "Strong(er) authentication required"
@@ -686,7 +691,7 @@ msgstr "??? ?????? ??????. ???? ?????? ??? ????
 
 #: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
-msgstr "??? ?????? ?????? ?? ??? ????? ?????."
+msgstr "??? ?????? ?????? ???? ????? ?????."
 
 #: src/addressbook.c:2906
 #, c-format
@@ -697,7 +702,7 @@ msgstr "??? ?????? ????? ?? ?????? ??????? ??? 
 #: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
 #: src/toolbar.c:415
 msgid "Delete"
-msgstr "?????"
+msgstr "???"
 
 #: src/addressbook.c:2918
 #, c-format
@@ -706,7 +711,7 @@ msgid ""
 "contains will be moved into the parent folder."
 msgstr ""
 "??? ?????? ????? ?? '%s'? ?? ???? ?? ??????? ????, ??????? ??? ????? ?????? "
-"?? ??? ?????? ?????."
+"???? ??????? ????."
 
 #: src/addressbook.c:2921 src/imap_gtk.c:363 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:157
@@ -828,12 +833,10 @@ msgid "Folder"
 msgstr "??????"
 
 #: src/addressbook.c:4897
-#, fuzzy
 msgid "vCard"
 msgstr "vCard"
 
 #: src/addressbook.c:4909 src/addressbook.c:4921
-#, fuzzy
 msgid "JPilot"
 msgstr "JPilot"
 
@@ -959,21 +962,20 @@ msgstr "????? ?????"
 
 #: src/addrindex.c:1827
 msgid "Address(es) update"
-msgstr "????(?)? ??????(?)"
+msgstr "?????? ??????"
 
 #: src/addrindex.c:1828
 msgid "Update failed. Changes not written to Directory."
-msgstr "????? ????. ??????? ?? ????? ?? ????."
+msgstr "????? ????. ??????? ?? ????? ?????."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "?????"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868
-#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4871
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:732
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4871
 msgid "Warning"
 msgstr "?????"
 
@@ -984,7 +986,7 @@ msgstr "?????"
 
 #: src/alertpanel.c:196 src/gtk/progressdialog.c:94
 msgid "_View log"
-msgstr "_??? ???? ??????"
+msgstr "_??? ????"
 
 #: src/alertpanel.c:347
 msgid "Show this message next time"
@@ -1056,15 +1058,15 @@ msgstr "?????"
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
-msgstr "????? ?? ????? %s ?(%s), ???? ????? ?? ??? ?????? %s."
+msgstr "???? ?? ???? %s ?(%s), ???? ????? ?? ??? ????? %s."
 
 #: src/common/plugin.c:436
 msgid "Plugin already loaded"
-msgstr "????? ??? ?????"
+msgstr "???? ??? ????"
 
 #: src/common/plugin.c:447
 msgid "Failed to allocate memory for Plugin"
-msgstr "??? ?????? ?????? ???? ?????"
+msgstr "??? ?????? ?????? ???? ????"
 
 #: src/common/plugin.c:481
 msgid "This module is not licensed under a GPL v3 or later compatible license."
@@ -1079,22 +1081,22 @@ msgstr "????? ?? ????? ???? Claws Mail GTK1."
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
-msgstr "????? ?? Claws Mail ??????? ???? ???? ?? ????? ??????? '%s' ????? ???."
+msgstr "????? ?? Claws Mail ??????? ???? ???? ?? ????? ?????? '%s' ???? ???."
 
 #: src/common/plugin.c:775
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
-msgstr "????? ?? Claws Mail ??????? ???? ???? ?? ????? ??????? ????? ???."
+msgstr "????? ?? Claws Mail ??????? ???? ???? ?? ????? ?????? ???? ???."
 
 #: src/common/plugin.c:784
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
-msgstr "????? ?? Claws Mail ??????? ???? ???? ??? ???? ?????? '%s'."
+msgstr "????? ?? Claws Mail ??????? ???? ???? ??? ???? ????? '%s'."
 
 #: src/common/plugin.c:786
 msgid "Your version of Claws Mail is too old for the plugin."
-msgstr "????? ?? Claws Mail ??????? ???? ???? ??? ???? ??????."
+msgstr "????? ?? Claws Mail ??????? ???? ???? ??? ???? ?????."
 
 #: src/common/session.c:183 src/imap.c:1189
 msgid "SSL handshake failed\n"
@@ -1488,7 +1490,7 @@ msgstr "?????"
 
 #: src/compose.c:570
 msgid "_Add..."
-msgstr "??_???..."
+msgstr "??_??..."
 
 #: src/compose.c:571 src/mh_gtk.c:369 src/plugins/mailmbox/plugin_gtk.c:302
 #: src/plugins/rssyl/rssyl_cb_menu.c:320
@@ -1517,7 +1519,7 @@ msgstr "_???"
 
 #: src/compose.c:590
 msgid "Send _later"
-msgstr "??? _????? ????"
+msgstr "??? _????"
 
 #: src/compose.c:593
 msgid "_Attach file"
@@ -1539,15 +1541,15 @@ msgstr "???? ?_????"
 msgid "_Print"
 msgstr "??_??"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "??_?"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "?_?? ???"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_????"
 
@@ -1570,6 +1572,7 @@ msgid "_Unwrapped"
 msgstr "_?? ?????"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "??? ?_??"
 
@@ -1595,19 +1598,19 @@ msgstr "??? ???? ?????"
 
 #: src/compose.c:625
 msgid "Move to beginning of line"
-msgstr "??? ?? ????? ????"
+msgstr "??? ?????? ????"
 
 #: src/compose.c:626
 msgid "Move to end of line"
-msgstr "??? ?? ??? ????"
+msgstr "??? ???? ????"
 
 #: src/compose.c:627
 msgid "Move to previous line"
-msgstr "??? ?? ???? ?????"
+msgstr "??? ????? ?????"
 
 #: src/compose.c:628
 msgid "Move to next line"
-msgstr "??? ?? ???? ???"
+msgstr "??? ????? ????"
 
 #: src/compose.c:629
 msgid "Delete a character backward"
@@ -1631,9 +1634,10 @@ msgstr "??? ????"
 
 #: src/compose.c:634
 msgid "Delete to end of line"
-msgstr "??? ?? ??? ????"
+msgstr "??? ?? ??? ????"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_???"
 
@@ -1663,7 +1667,7 @@ msgstr "?_??? ??????? ???? ????? ??? ????? ????
 
 #: src/compose.c:649
 msgid "_Forward to next misspelled word"
-msgstr "_???? ???? ?? ????? ???? ??? ????? ????? ????"
+msgstr "_???? ???? ????? ???? ??? ????? ????? ????"
 
 #: src/compose.c:657
 msgid "Reply _mode"
@@ -1873,8 +1877,7 @@ msgstr "???? ????:"
 msgid "Reply-To:"
 msgstr "????-??:"
 
-#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931
-#: src/gtk/headers.h:33
+#: src/compose.c:2607 src/compose.c:4929 src/compose.c:4931 src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "?????? ??????:"
 
@@ -1932,7 +1935,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "??? ??? ?????"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_???"
 
@@ -2031,7 +2034,7 @@ msgstr "????? ???? ????? ????"
 msgid "Send later"
 msgstr "??? ????"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2041,7 +2044,7 @@ msgstr ""
 "\n"
 "???? ???? ????? ?????."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2051,7 +2054,7 @@ msgstr ""
 "\n"
 "?? ???? ?????? ????? ???? ????? ?? ????."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2115,72 +2118,76 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 "???? %d ???? ?? ???? ???? ????? (998 ????).\n"
-"??????? ?? ?????? ?????? ?????? ??????? ?? ??????.\n"
+"??????? ?? ?????? ?????? ?????? ??????? ??????.\n"
 "\n"
 "????? ????? ????"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "?? ???? ?????? ?????? ?? ??????: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "????? ?????"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+?_???"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
-msgstr "??? ????? ???? ??? ????? ????!"
+msgstr "??? ????? ???? ????? ????? ????!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "????? ???? ???? NNTP: ????? ???? ???? ?????."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "????? %s ?? ???? ???. ???????"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "??? ?????"
 
 # check
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "????? ?? ?????"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "???? %s ?????"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
-msgstr "???? ?? ???_? ??????"
+msgstr "???? ????_? ??????"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "??? ?????? ?????"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "???????? ????? ?? <tab> ?????? ???????? ???? ???? ??????"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "????? Mime"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "????"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "???? ????? ?? "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2191,24 +2198,23 @@ msgstr "???? ????? ?? "
 msgid "_Browse"
 msgstr "   _????   "
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "_?????"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "?_??????"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "?_????"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "????:"
+msgstr "_????:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2217,25 +2223,24 @@ msgstr ""
 "???? ???? ?? ???? ??? ??????.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "???: <i>%s</i>"
+msgstr ""
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "???:"
+msgstr "_????:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "????? ?????? ???? ????? ??"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "????? ???? ??????"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2244,69 +2249,69 @@ msgstr ""
 "????? ??????? '%s' ?? ????? ???? ??????. ?? ???? ???????? ????? ?? ?????? ?? "
 "????? ??."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_???"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "??? ?????? ???? ????? ????? %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "????? ????? From ?? ?????."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "????? ????? To ?? ?????."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "????? ????? Cc ?? ?????."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "????? ????? Bcc ?? ?????."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 #, fuzzy
 msgid "Template Reply-To format error."
-msgstr "????? ????? To ?? ?????."
+msgstr "????? ????? From ?? ?????."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "????? ????? ???? ?? ?????."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "????? MIME ????."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "???? ???? ???? ?? ????? ???."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "????????"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "????? MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "?????"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "????"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "?? ????"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2317,15 +2322,15 @@ msgstr ""
 "????? ?? ???? ???????\n"
 "process group id: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ????? ?? ????? ??."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "?? ???? ?????? ????? ????? ????."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2336,15 +2341,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "?? ???? ?????? ????? ?????."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "?? ???? ?????? ????? ?????"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2352,24 +2357,24 @@ msgstr ""
 "?? ???? ?????? ????? ?????.\n"
 "??? ?????? ???? ????? ?? ???? ?? ???? ???"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_????? ?????"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_??? ????"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "????? ????"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "???? '%s' ?? ??? ???? ??????."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2378,80 +2383,79 @@ msgstr ""
 "???? '%s' ???? ????? ??????\n"
 "???? ?????? ??????, ????? ???? ????? ?? ?????."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "????? ?????"
 
 # ???? ?????. ??? ?????
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "????? ?? ?????. ???? ?????"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_???"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
-msgstr "_???? ?? ??????"
+msgstr "_???? ???????"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "????? ???????"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "????? ?? ?????. ????? ??????? ????????"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_?? ?????"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
-msgstr "+_???? ?? ??????"
+msgstr "+_???? ???????"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "??? ?????? ????? ?? ?????? '%s'?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "???? ?????"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10393 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:775 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_????"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_???"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "???? ?? ?????"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
-"??? ?????? ???? ?? ??????? ?? ?????/?????? ?? ??? ??? ??????, ?? ????? ?? "
-"???????"
+"??? ?????? ???? ?? ??????? ?? ?????/?????? ???? ??? ??????, ?? ????? ???????"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_???"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "????? ????? ????? ????? %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2488,7 +2492,7 @@ msgstr "????"
 
 #: src/crash.c:257
 msgid "Save..."
-msgstr "?????..."
+msgstr "????..."
 
 #: src/crash.c:262
 msgid "Create bug report"
@@ -2657,7 +2661,7 @@ msgstr "????? ???? ??????"
 
 #: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
-msgstr " ???? ???? "
+msgstr " ??? ???? "
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
 #: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:1959
@@ -2733,7 +2737,7 @@ msgstr "????? ????? JPilot"
 
 #: src/editjpilot.c:281
 msgid "Additional e-Mail address item(s)"
-msgstr "????(?) ????? ????? ????(??)"
+msgstr "????? ????? ????? ??????"
 
 #: src/editjpilot.c:372
 msgid "Add New JPilot Entry"
@@ -2758,33 +2762,33 @@ msgstr "???? ?????"
 
 #: src/editldap_basedn.c:198
 msgid "Available Search Base(s)"
-msgstr "????(?) ????? ??????"
+msgstr "????? ????? ??????"
 
 #: src/editldap_basedn.c:288
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "?? ???? ?????? ????? ????(?) ????? ???? ??? - ??? ??? ?????"
+msgstr "?? ???? ?????? ????? ????? ????? ???? ??? - ??? ??? ?????"
 
 #: src/editldap_basedn.c:292 src/editldap.c:281
 msgid "Could not connect to server"
-msgstr "?? ???? ?????? ???? ?? ???"
+msgstr "?? ???? ?????? ???? ????"
 
 #: src/editldap.c:152
 msgid "A Name must be supplied."
-msgstr "???? ???? ???? ??."
+msgstr "???? ???? ??."
 
 #: src/editldap.c:164
 msgid "A Hostname must be supplied for the server."
-msgstr "???? ???? ???? ?? ???? ???? ????."
+msgstr "???? ???? ?? ???? ???? ????."
 
 #: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
-msgstr "???? ???? ?????? ????? ????? LDAP ??? ?????."
+msgstr "???? ???? ?? ????? ????? ????? LDAP ??? ?????."
 
 # Connected to server successfully
-# ???? ?? ??? ??????
+# ???? ???? ??????
 #: src/editldap.c:278
 msgid "Connected successfully to server"
-msgstr "???? ?????? ?? ???"
+msgstr "???? ?????? ????"
 
 #: src/editldap.c:336 src/editldap.c:974
 msgid "Edit LDAP Server"
@@ -2819,7 +2823,7 @@ msgid ""
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"???? ????? ?????? ?? ??? LDAP ???? ?? TLS. ?? ????? ????, ??? ???? ????? ?? "
+"???? ????? ?????? ???? LDAP ???? ?? TLS. ?? ????? ????, ??? ???? ????? ?? "
 "?????? ??????? ???? ldap.conf (???? TLS_CACERTDIR ??? TLS_REQCERT)."
 
 #: src/editldap.c:479
@@ -2828,7 +2832,7 @@ msgid ""
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"???? ????? ?????? ?? ??? LDAP ???? ?? SSL. ?? ????? ????, ??? ???? ????? ?? "
+"???? ????? ?????? ???? LDAP ???? ?? SSL. ?? ????? ????, ??? ???? ????? ?? "
 "?????? ??????? ???? ldap.conf (???? TLS_CACERTDIR ??? TLS_REQCERT)."
 
 #: src/editldap.c:491
@@ -2841,7 +2845,7 @@ msgstr " ???? ??? "
 
 #: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
-msgstr "??? ?? ???? ?? ??? ????? ?? ?????? ?? ????."
+msgstr "??? ?? ???? ?? ??? ????? ?? ?????? ????."
 
 #: src/editldap.c:511
 msgid ""
@@ -2881,7 +2885,7 @@ msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
-"?? ???? ?? ???? ?????? ?? ??? ????? ????? ????? ?? ??? ????? ???????? ????? "
+"?? ???? ?? ???? ?????? ???? ????? ????? ????? ?? ??? ????? ???????? ????? "
 "????? ????? ?? ?? ?? ?????."
 
 #: src/editldap.c:600
@@ -2927,16 +2931,17 @@ msgstr "???? ???? '??????' ????? ?????"
 
 #: src/editldap.c:648
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using "
+"\"begins-with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
-"??????? ???? ???? ??????? ?????? ?????? ??? ??????? ???? ????? \"begins-with"
-"\" ?? ??????? \"contains\". ??? ?? ?????? ?? ??? ????? ????? \"contains\"; "
-"????? ????? ?? ???? ???? ???? ??? ??????. ??? ?? ????? ????? ?? ?????, ????? "
-"????? ?????? ????? \"begins-with\" ???? ?? ???????? ???? ????? ?????? ?????."
+"??????? ???? ???? ??????? ?????? ?????? ??? ??????? ???? ????? "
+"\"begins-with\" ?? ??????? \"contains\". ??? ?? ?????? ?? ??? ????? ????? "
+"\"contains\"; ????? ????? ?? ???? ???? ???? ??? ??????. ??? ?? ????? ????? "
+"?? ?????, ????? ????? ?????? ????? \"begins-with\" ???? ?? ???????? ???? "
+"????? ?????? ?????."
 
 #: src/editldap.c:701
 msgid "Bind DN"
@@ -2949,9 +2954,9 @@ msgid ""
 "as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
 "performing a search."
 msgstr ""
-"?? ????? ?? ????? LDAP ?????? ???????? ?? ????. ?? ???? ?????? ?? ????? "
-"????? ??????. ????? ??????? ?? ?? ????? ??: \"cn=user,dc=claws-mail,dc=org"
-"\". ?? ???? ???? ??? ??? ????? ?????."
+"?? ????? ?? ????? LDAP ?????? ???????? ????. ?? ???? ?????? ?? ????? ????? "
+"??????. ????? ??????? ?? ?? ????? ??: \"cn=user,dc=claws-mail,dc=org\". ?? "
+"???? ???? ??? ??? ????? ?????."
 
 #: src/editldap.c:717
 msgid "Bind Password"
@@ -3086,7 +3091,7 @@ msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
 msgstr ""
-"?? ???? ?????? ????? ???? ??? ??? ???? HTML:\n"
+"?? ???? ?????? ????? ???? ??? ????? HTML:\n"
 "%s"
 
 #: src/exphtmldlg.c:192 src/expldifdlg.c:202
@@ -3186,7 +3191,7 @@ msgstr "??? ??????? ????? ???"
 
 #: src/exphtmldlg.c:592
 msgid "Export Address Book to HTML File"
-msgstr "????? ???? ?????? ?? ???? HTML"
+msgstr "????? ???? ?????? ????? HTML"
 
 #: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:1021
 msgid "File Info"
@@ -3312,14 +3317,14 @@ msgid ""
 "Distinguished Name\" (or RDN) to create the DN. Please select one of the "
 "available RDN options that will be used to create the DN."
 msgstr ""
-"???? LDIF ???? ???? ?????? ?????? ????? ??? ?????? ?? ??? ??? LDAP. ?? ????? "
+"???? LDIF ???? ???? ?????? ?????? ????? ??? ?????? ???? ??? LDAP. ?? ????? "
 "?????? ???? ???? LDIF ????? ????? ?????? ?? ??? \"?? ?????\" (?? DN). ?????? "
-"?????? ?? \"?? ????? ????\" (?? RDN) ??? ????? DN. ??? ??? ??? ?? ???????? "
-"RDN ??????? ?????? ?????? DN."
+"?????? ?? \"?? ????? ????\" (?? RDN) ??? ????? DN. ??? ??? ??? ????????? RDN "
+"??????? ?????? ?????? DN."
 
 #: src/expldifdlg.c:544
 msgid "Use DN attribute if present in data"
-msgstr "????? ?????? DN ?? ???? ???? ??????"
+msgstr "????? ?????? DN ?? ???? ???? ??????"
 
 #: src/expldifdlg.c:549
 msgid ""
@@ -3346,7 +3351,7 @@ msgstr ""
 
 #: src/expldifdlg.c:656
 msgid "Export Address Book to LDIF File"
-msgstr "????? ???? ?????? ?? ???? LDIF"
+msgstr "????? ???? ?????? ????? LDIF"
 
 # ?????? ???? ?????
 #: src/expldifdlg.c:722
@@ -3355,7 +3360,7 @@ msgstr "?? ?????"
 
 #: src/export.c:113 src/summaryview.c:8128
 msgid "Export to mbox file"
-msgstr "????? ?? ???? mbox"
+msgstr "????? ????? mbox"
 
 #: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
@@ -3400,7 +3405,7 @@ msgstr "???? ?????? ?Claws Mail"
 
 #: src/exporthtml.c:1069 src/exportldif.c:606
 msgid "Name already exists but is not a directory."
-msgstr "?? ??? ???? ?? ???? ????."
+msgstr "??? ???? ?? ?? ???? ????."
 
 #: src/exporthtml.c:1072 src/exportldif.c:609
 msgid "No permissions to create directory."
@@ -3437,37 +3442,42 @@ msgid "rule is not account-based\n"
 msgstr "??? ???? ?????-?????\n"
 
 #: src/filtering.c:607
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
 "??? ???? ?????-????? [????=%d, ??='%s'], ???? ?? ?????? ??? ??? ???? ??? "
-"????? ??? ????? ??????"
+"????? ??? ????? ??????\n"
 
 #: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
 #: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
 #: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#, fuzzy
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "????? ?????? SSL ?? ????? (non-blocking)"
 
 #: src/filtering.c:617
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
+"??? ???? ?????-?????, ???? ???? ?? ?????? ??? ????? ??? ??? ????? ??????\n"
 
+# , ?
 #: src/filtering.c:624
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
+"??? ???? ?????-????? [id=%d, name='%s'], ???? ???? ?? ?????? ??? ????? ??? "
+"??? ????? ?????? [id=%d, name='%s']\n"
 
 #: src/filtering.c:643
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
-msgstr ""
+msgstr "??????? ?????-?????, ?? ?????? ???? ?????? ?? ???? ????? ??? ????\n"
 
 #: src/filtering.c:649
 #, c-format
@@ -3475,26 +3485,30 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
+"??? ???? ?????-????? [id=%d, name='%s'], ???? ?? ?????? ???? ?????? ?? ???? "
+"?????\n"
 
 #: src/filtering.c:667
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr ""
+msgstr "??? ???? ?????-????? [id=%d, name='%s'], ???? ?? ???? ?????\n"
 
 #: src/filtering.c:672
 msgid "rule is account-based, skipped on user request\n"
-msgstr ""
+msgstr "??? ???? ?????-?????, ???? ?? ???? ?????\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 ""
+"??? ???? ?????-????? [id=%d, name='%s'], ???? ???? ????? ????? [id=%d, "
+"name='%s']\n"
 
 #: src/filtering.c:700
 msgid "rule is account-based, not matching current account\n"
-msgstr ""
+msgstr "??? ???? ?????-?????, ???? ???? ????? ?????\n"
 
 #: src/filtering.c:712
 #, c-format
@@ -3502,64 +3516,65 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
+"??? ???? ?????-????? [id=%d, name='%s'], ????? ????? [id=%d, name='%s']\n"
 
 #: src/filtering.c:752
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "??? ???? ?????? [ %s ]\n"
 
 #: src/filtering.c:757
 msgid "action could not apply\n"
-msgstr ""
+msgstr "????? ?? ????? ????? ????? ?????\n"
 
 #: src/filtering.c:759
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "?? ???? ????? ???? ???? ????? [ %s ]\n"
 
 #: src/filtering.c:810
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "??? ???? ??? '%s'? [ %s ]\n"
 
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "??? ???? ??? <unnamed>? [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "??? ?????? '%s' [ %s ]\n"
 
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "??? ?????? <unnamed>? [ %s ]\n"
 
 #: src/filtering.c:874
 msgid "undetermined"
-msgstr ""
+msgstr "?? ????"
 
 #: src/filtering.c:878
 msgid "incorporation"
-msgstr ""
+msgstr "?????"
 
 #: src/filtering.c:882
 msgid "manually"
-msgstr ""
+msgstr "????"
 
 #: src/filtering.c:886
 msgid "folder processing"
-msgstr ""
+msgstr "????? ??????"
 
 #: src/filtering.c:890
 msgid "pre-processing"
-msgstr ""
+msgstr "????-?????"
 
 #: src/filtering.c:894
 msgid "post-processing"
-msgstr ""
+msgstr "????-?????"
 
 #: src/filtering.c:911
 #, c-format
@@ -3636,9 +3651,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "??? ?????? ?? %s ???? ????? ????????...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "?????? ?? ????? ?????? ??? ????? ???? ?????."
+msgstr "?? ?????? ?? ???? ?????? ?? ??????? ?? ?????."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3649,10 +3663,10 @@ msgstr "????? ??????"
 msgid "NewFolder"
 msgstr "??????_????"
 
-#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
-#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
-#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
+#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216 src/imap_gtk.c:272
+#: src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:425
+#: src/plugins/rssyl/rssyl_cb_menu.c:208
 #: src/plugins/vcalendar/vcal_folder.c:2042
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -3678,9 +3692,8 @@ msgid "Mark all re_ad"
 msgstr "??? ?? ???? ???? ?_????"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "??? ?? ???? ????? ??????"
+msgstr "??? _????????? ?? ???? ????? ??????"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3688,7 +3701,7 @@ msgstr "?_?? ???? ?????"
 
 #: src/folderview.c:240 src/mainwindow.c:546
 msgid "_Search folder..."
-msgstr "_????? ??????..."
+msgstr "_??? ??????..."
 
 #: src/folderview.c:242
 msgid "Process_ing..."
@@ -3696,11 +3709,11 @@ msgstr "_?????..."
 
 #: src/folderview.c:243
 msgid "Empty _trash..."
-msgstr "????? _????..."
+msgstr "???? _????..."
 
 #: src/folderview.c:244
 msgid "Send _queue..."
-msgstr "????? _???..."
+msgstr "??? _???..."
 
 # ????
 #: src/folderview.c:387 src/folderview.c:434
@@ -3729,103 +3742,111 @@ msgstr "???"
 msgid "Setting folder info..."
 msgstr "??? ????? ???? ??????..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "??? ?? ???? ????? ??????"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"??? ??? ???? ?? ?????? ???? ?? ?? ????? ??????? ?? ???????? ????? ??? ???? "
+"?????"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "??? ??? ???? ?? ?????? ???? ?? ?? ????? ??????? ?? ???? ?????"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "??? ?? ???? ????? ??????"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "??? ???? ?????? %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "??? ???? ?????? %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "??? ???? ?? ??????"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "????? ?????? ?? ?? ??????? ???? ?? ?? ???????? ????????. ??? ?????? ???????"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "??? ???? ???? ?? ??????..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "??? ???? ?? ??????..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "?? ???? ?????? ????? ?????? %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "??? ???? ???? ?????? ????? ??? ???????..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "??? ???? ?????? %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "??? ???? ?????? %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "?????? ?? ???? ????? ??????."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "????? ????"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "????? ?? ??????? ??????"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_??? ????"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "????? ????????"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "??? ???? ???? ????????. ??????"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "????? ?????? ??????"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "????? ?? ??????? ????????"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_???"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "????? ?????? ??????? ????? ????? ?????? ??????."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3834,64 +3855,64 @@ msgstr ""
 "????? ?????? ??????? ????? ????? ?????? ??????:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "??? ??? ???? ?? ?????? ?????? ?? ?????? '%s' ???? '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
-msgstr "??? ??? ???? ?? ?????? ????? ?? ?????? '%s' ?? ?????? ???? ?? '%s'?"
+msgstr "??? ??? ???? ?? ?????? ????? ?? ?????? '%s' ??????? ???? ?? '%s'?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "????? ??????"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "????? ??????"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "??? ????? ?? %s ?? %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "??? ????? ?? %s ?? %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "???? ???? ???? ????."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "??? ?????? ?????? ?????? ?? ??? ?? ??????."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "??? ?????? ?????? ?????? ?? ??? ?? ??????."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "?????? ?? ????? ?????? ??? ????? ???? ?????."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "????? ?????!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "????? ?????!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "????? ????? ???? ?????? %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "?????? ???? ????? ?????? ?? ?????? ?????? ????."
 
@@ -3968,7 +3989,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"??? ????? ????? ????? ?? ????? ?????? ?? Claws Mail users:\n"
+"????? ????? ????? ????? ?????? ?????? ?? Claws Mail users:\n"
 
 # ???? ????? ?????? ????????
 #: src/gtk/about.c:142
@@ -3980,11 +4001,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"?Claws Mail ???? ????? ?????? ??????? ??? ?????? GPL. ?? ?????? ????? ??????? "
-"Claws Mail ???????? ????? ?? ??????:\n"
+"?Claws Mail ???? ????? ?????? ??????? ??? ?????? GPL. ?? ?????? ????? "
+"??????? Claws Mail ???????? ????? ?? ??????:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -3994,7 +4014,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"?????? ?????? (C) ?1999-2014\\n????? Claws Mail\n"
+"?????? ?????? (C) ?1999-2015\n"
+"????? Claws Mail\n"
 "  ??? Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:161
@@ -4062,7 +4083,7 @@ msgstr "???? ?????"
 
 #: src/gtk/about.c:337
 msgid "Icons"
-msgstr "???????"
+msgstr "??????"
 
 #: src/gtk/about.c:356
 msgid "Contributors"
@@ -4212,13 +4233,12 @@ msgid "About Claws Mail"
 msgstr "????? Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"?????? ?????? (C) ?1999-2014\n"
+"?????? ?????? (C) ?1999-2015\n"
 "????? Claws Mail\n"
 "??? Hiroyuki Yamamoto"
 
@@ -4359,7 +4379,7 @@ msgstr ""
 
 #: src/gtk/gtkaspell.c:1800
 msgid "Change to..."
-msgstr "????? ??..."
+msgstr "??? ??..."
 
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
@@ -4378,9 +4398,10 @@ msgstr "???? ???? ??"
 msgid "Add to personal dictionary"
 msgstr "???? ?????? ????"
 
+# Replace BY
 #: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
-msgstr "????? ??..."
+msgstr "???? ??..."
 
 #: src/gtk/gtkaspell.c:1916
 #, c-format
@@ -4474,8 +4495,7 @@ 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:2173
-#: src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2173 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "??????"
 
@@ -4924,15 +4944,15 @@ msgstr "?????? ????? ?????? ???????"
 
 #: src/gtk/icon_legend.c:122
 msgid "Icon Legend"
-msgstr "???? ?????"
+msgstr "???? ?????"
 
 #: src/gtk/icon_legend.c:140
 msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"
 msgstr ""
-"<span weight=\"bold\">??????? ????? ?????? ????? ???? ?? ?????? ???????:</"
-"span>"
+"<span weight=\"bold\">?????? ????? ?????? ????? ???? ?? ?????? "
+"???????:</span>"
 
 # check
 #: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
@@ -4950,8 +4970,7 @@ msgstr "??? ????? ???? %s:"
 msgid "Input password:"
 msgstr "??? ?????:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271 src/gtk/inputdialog.c:283
 msgid "Input password"
 msgstr "??? ?????"
 
@@ -4975,7 +4994,7 @@ msgid ""
 "corrupted, malformed or part of some DoS attempt.</span>"
 msgstr ""
 "<span><b>?????:</b> ????? URL ?? ???? ????? ??? ??????\n"
-"?????? ??? ??????. ????? ?? ????? ?????\n"
+"?????? ?????? ??????. ????? ?? ????? ?????\n"
 "??????, ????? ?? ??? ???? ?????? ????? DoS.</span>"
 
 #: src/gtk/pluginwindow.c:164 src/gtk/pluginwindow.c:169
@@ -4994,11 +5013,11 @@ msgstr "?????: "
 
 #: src/gtk/pluginwindow.c:168
 msgid "Plugin is not functional."
-msgstr "????? ???? ???????????."
+msgstr "???? ???? ??????????."
 
 #: src/gtk/pluginwindow.c:201
 msgid "Select the Plugins to load"
-msgstr "????? ?????? ??????"
+msgstr "????? ????? ??????"
 
 #: src/gtk/pluginwindow.c:216
 #, c-format
@@ -5022,6 +5041,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5035,15 +5055,15 @@ msgstr ""
 #: src/plugins/spamassassin/spamassassin_gtk.c:648
 #: src/plugins/vcalendar/vcal_prefs.c:680 src/prefs_toolbar.c:944
 msgid "Plugins"
-msgstr "??????"
+msgstr "??????"
 
 #: src/gtk/pluginwindow.c:337
 msgid "Load..."
-msgstr "?????..."
+msgstr "???..."
 
 #: src/gtk/pluginwindow.c:338
 msgid "Unload"
-msgstr "?????"
+msgstr "????"
 
 #: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:221
 msgid "Description"
@@ -5052,23 +5072,23 @@ msgstr "?????"
 #: src/gtk/pluginwindow.c:374
 #, c-format
 msgid ""
-"For more information about plugins see the <a href=\"%s\"><span underline="
-"\"none\">Claws Mail website</span></a>."
+"For more information about plugins see the <a href=\"%s\"><span "
+"underline=\"none\">Claws Mail website</span></a>."
 msgstr ""
-"????? ???? ????? ????? ?? ??? <a href=\"%s\"><span underline=\"none\">??? "
-"??????? Claws Mail</span></a>."
+"????? ???? ????? ???? ?? ??? <a href=\"%s\"><span underline=\"none\">??? ??? "
+"Claws Mail</span></a>."
 
 #: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
-msgstr "??? ??? ??? ????? ????? ??? ?? ????"
+msgstr "??? ??? ??? ????? ???? ??? ?? ????"
 
 #: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
-msgstr "????? ?????? ??????"
+msgstr "????? ????? ?????"
 
 #: src/gtk/pluginwindow.c:482
 msgid "Loaded plugins"
-msgstr "?????? ???????"
+msgstr "?????? ???????"
 
 #: src/gtk/prefswindow.c:674
 msgid "Page Index"
@@ -5078,11 +5098,12 @@ msgstr "???? ????"
 msgid "_Hide"
 msgstr "??_??"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "?????"
 
@@ -5133,7 +5154,7 @@ msgstr "?????? ??????? S ???? ????"
 
 #: src/gtk/quicksearch.c:462
 msgid "true if execute \"S\" succeeds"
-msgstr "?true ???? ???? \"S\" ??????"
+msgstr "?true ???? ????? \"S\" ??????"
 
 #: src/gtk/quicksearch.c:463
 msgid "messages originating from user S"
@@ -5149,14 +5170,12 @@ msgid "messages which have attachments"
 msgstr "?????? ??? ??????? ???????"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "?????? ??? ?????? S ???? ????? X-Label"
+msgstr "?????? ??? ?????? S ???? ???? ??? ?? ?? ?????"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "?????? ??? ?????? S ???? ????? X-Label"
+msgstr "?????? ??? ?????? S ???? ???? ?? ???? ?????"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5237,7 +5256,7 @@ msgstr "?????? ??? ?????? ?????? S"
 
 #: src/gtk/quicksearch.c:487
 msgid "messages which have tag(s)"
-msgstr "?????(??) ??(?) ?? ???(?)?"
+msgstr "?????? ??? ?? ?????"
 
 #: src/gtk/quicksearch.c:488
 msgid "marked messages"
@@ -5304,9 +5323,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "???? ????? ????? ?????. ??? ???? ?????? ????."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "???/?????/????/????"
+msgstr "???/?????/????/?????/????"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5400,7 +5418,7 @@ msgid ""
 "\n"
 msgstr ""
 "????? ?????? ???? %s, ?? ?????? ????? ?? %s.\n"
-"??? ???? ????? ????? ??? ?? ??? ????.\n"
+"??? ???? ????? ????? ??? ???? ????.\n"
 "\n"
 
 #: src/gtk/sslcertwindow.c:338
@@ -5756,8 +5774,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"????????? CRAM-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ??????? CRAM-MD5 "
-"SASL ???? ??????."
+"????????? CRAM-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ?????? CRAM-MD5 "
+"SASL ???? ?????."
 
 #: src/imap.c:946
 msgid ""
@@ -5768,8 +5786,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"????????? DIGEST-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ??????? DIGEST-"
-"MD5 SASL ???? ??????."
+"????????? DIGEST-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ?????? "
+"DIGEST-MD5 SASL ???? ?????."
 
 #: src/imap.c:952
 #, fuzzy
@@ -5781,8 +5799,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"????????? CRAM-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ??????? CRAM-MD5 "
-"SASL ???? ??????."
+"????????? CRAM-MD5 ?????? ?? ?? libetpan ???? ?? ????? SASL ?????? CRAM-MD5 "
+"SASL ???? ?????."
 
 #: src/imap.c:959
 #, c-format
@@ -5808,7 +5826,7 @@ msgstr "????? IMAP4 ?? %s ?????. ??? ???? ?????...\n"
 #: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387
 #: src/imap.c:4567 src/imap.c:5376
 msgid "Claws Mail needs network access in order to access the IMAP server."
-msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ???? ?? ??? IMAP."
+msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ???? ???? IMAP."
 
 #: src/imap.c:1130 src/inc.c:818 src/news.c:387 src/send_message.c:278
 msgid "Insecure connection"
@@ -5825,7 +5843,7 @@ msgstr ""
 "????? ?? ????? ????? ?????? ??????? ????? SSL, ?? SSL ???? ???? ??? build ?? "
 "?? Claws Mail. \n"
 "\n"
-"??? ?? ?????? ?????? ?????? ?? ??? ??? ???????? ?? ???? ???????."
+"??? ?? ?????? ?????? ?????? ???? ??? ???????? ?? ???? ???????."
 
 #: src/imap.c:1137 src/inc.c:825 src/news.c:394 src/send_message.c:285
 msgid "Con_tinue connecting"
@@ -5834,17 +5852,17 @@ msgstr "?_??? ???????"
 #: src/imap.c:1147
 #, c-format
 msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
-msgstr "????? '%s': ??? ????? ?? ??? IMAP4: ?%s:%d..."
+msgstr "????? '%s': ??? ????? ???? IMAP4: ?%s:%d..."
 
 #: src/imap.c:1195
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
-msgstr "??? ?????? ???? ?? ??? IMAP4: ?%s:%d"
+msgstr "??? ?????? ???? ???? IMAP4: ?%s:%d"
 
 #: src/imap.c:1198
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "??? ?????? ???? ?? ??? IMAP4: ?%s:%d\n"
+msgstr "??? ?????? ???? ???? IMAP4: ?%s:%d\n"
 
 #: src/imap.c:1231 src/imap.c:4052
 msgid "Can't start TLS session.\n"
@@ -5853,12 +5871,12 @@ msgstr "??? ?????? ?????? ??? TLS.\n"
 #: src/imap.c:1294
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
-msgstr "?? ???? ?????? ?????? ?? ??? IMAP ?%s.\n"
+msgstr "?? ???? ?????? ?????? ???? IMAP ?%s.\n"
 
 #: src/imap.c:1297
 #, c-format
 msgid "Couldn't login to IMAP server %s."
-msgstr "?? ???? ?????? ?????? ?? ??? IMAP ?%s."
+msgstr "?? ???? ?????? ?????? ???? IMAP ?%s."
 
 #: src/imap.c:1715
 msgid "Adding messages..."
@@ -5929,12 +5947,11 @@ msgid "Can't refresh capabilities.\n"
 msgstr "??? ?????? ????? ??????.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
-msgstr ""
-"????? ?? %s ????: ??? ????? TLS, ?? Claws Mail ???? ??? ????? OpenSSL.\n"
+msgstr "????? ?? %s ????: ??? ????? TLS, ?? Claws Mail ???? ??? ????? TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -5964,25 +5981,25 @@ msgstr ""
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
 msgid "Create _new folder..."
-msgstr "????? ?????? _????..."
+msgstr "??? ?????? _????..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
 #: src/plugins/mailmbox/plugin_gtk.c:60
 msgid "_Rename folder..."
-msgstr "_????? ?? ??????..."
+msgstr "_??? ?? ??????..."
 
 #: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
 msgid "M_ove folder..."
-msgstr "?_???? ??????..."
+msgstr "?_??? ??????..."
 
 #: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "Cop_y folder..."
-msgstr "?_???? ??????..."
+msgstr "?_??? ??????..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
-msgstr "_????? ??????..."
+msgstr "_??? ??????..."
 
 #: src/imap_gtk.c:71 src/news_gtk.c:59
 msgid "Synchronise"
@@ -5998,11 +6015,11 @@ msgstr "?_?????"
 
 #: src/imap_gtk.c:77
 msgid "_Subscribe..."
-msgstr "_?????..."
+msgstr "_?????..."
 
 #: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
-msgstr "_????? ?????..."
+msgstr "_??? ?????..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:64
@@ -6029,7 +6046,7 @@ msgid ""
 msgstr ""
 "??? ?? ??? ?? ?????? ????:\n"
 "(?? ?????? ????? ?????? ??? ????? ?????? ????\n"
-"???? ???? ????, ???? '/' ?? ?? ???????)"
+"???? ???? ????, ???? '/' ??? ???????)"
 
 #: src/imap_gtk.c:200 src/mh_gtk.c:148
 msgid "Inherit properties from parent folder"
@@ -6133,8 +6150,8 @@ msgstr "??????"
 msgid "unsubscribe"
 msgstr "???? ?? ?????"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
-#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440 src/prefs_folder_item.c:1468
+#: src/prefs_folder_item.c:1496
 msgid "Apply to subfolders"
 msgstr "??? ?? ?????? ????"
 
@@ -6168,7 +6185,7 @@ msgid ""
 "Import mbox file to the Inbox folder?"
 msgstr ""
 "?????? ??? ???? ??????.\n"
-"??? ????? ???? mbox ?? ?????? '???? ????'?"
+"??? ????? ???? mbox ??????? '???? ????'?"
 
 #: src/import.c:229
 msgid "Can't find the destination folder."
@@ -6277,7 +6294,7 @@ msgstr "????? ??????"
 
 #: src/importldif.c:833
 msgid "Select the LDIF field for import into the address book."
-msgstr "??? ??? LDIF ?????? ?? ??? ???? ??????."
+msgstr "??? ??? LDIF ?????? ???? ???? ??????."
 
 #: src/importldif.c:835
 msgid " Modify "
@@ -6309,7 +6326,7 @@ msgstr "????? ???? MUTT"
 
 #: src/importmutt.c:204
 msgid "Import MUTT file into Address Book"
-msgstr "????? ???? MUTT ?? ??? ???? ??????"
+msgstr "????? ???? MUTT ???? ???? ??????"
 
 #: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
@@ -6325,7 +6342,7 @@ msgstr "????? ???? Pine"
 
 #: src/importpine.c:203
 msgid "Import Pine file into Address Book"
-msgstr "????? ???? Pine ?? ??? ???? ??????"
+msgstr "????? ???? Pine ???? ???? ??????"
 
 #: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
@@ -6368,7 +6385,7 @@ msgstr "???? (??? ?????? ?????)"
 msgid "Connection failed"
 msgstr "????? ????"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "????? ????"
 
@@ -6400,19 +6417,20 @@ msgstr "?%s: ????? ??? ?????? ?????"
 #: src/inc.c:832
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
-msgstr "????? '%s': ??? ????? ?? ??? POP3: ?%s:%d..."
+msgstr "????? '%s': ??? ????? ???? POP3: ?%s:%d..."
 
 #: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "??? ?????? ?????? ?? ??? POP3: ?%s:%d"
+msgstr "??? ?????? ?????? ???? POP3: ?%s:%d"
 
 #: src/inc.c:854
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "??? ?????? ?????? ?? ??? POP3: ?%s:%d\n"
+msgstr "??? ?????? ?????? ???? POP3: ?%s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "??? ????..."
 
@@ -6530,8 +6548,8 @@ msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
-"??? ??? ???. ???? ???? ????? ?? ??? ????? ??? ????? ??? ???? ??????/?????/"
-"?????."
+"??? ??? ???. ???? ???? ????? ?? ??? ????? ??? ????? ??? ???? "
+"??????/?????/?????."
 
 #: src/inc.c:1227
 #, c-format
@@ -6557,7 +6575,6 @@ msgid "On_ly once"
 msgstr "_?? ??? ???"
 
 #: src/ldapupdate.c:1056
-#, fuzzy
 msgid "Some SN"
 msgstr "?SN ?????"
 
@@ -6571,7 +6588,7 @@ msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
-"???? '%s' ??? ????.\n"
+"???? '%s' ??? ????.\n"
 "??? ?????? ????? ??????."
 
 # ????
@@ -6607,8 +6624,8 @@ msgid ""
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
-"????? ????? ???? ?? ????? ?? ???? ???? ????, ?? ?? ????? ???? ??? ??? ????? "
-"?? ?? ?? IMAP ????? ?? ?????? ?? News, ????? ???? ???? ????? ????? ???."
+"????? ????? ???? ?? ????? ????? ???? ????, ?? ?? ????? ???? ??? ??? ????? ?? "
+"?? ?? IMAP ????? ?? ?????? ?? News, ????? ???? ???? ????? ????? ???."
 
 #: src/main.c:388
 msgid "Migration of configuration"
@@ -6661,7 +6678,7 @@ msgid_plural ""
 "more information:\n"
 "%s"
 msgstr[0] ""
-"?????? ???? ???? ???????. ???? ?? ????? ??????? ????? ????:\n"
+"????? ??? ??? ???????. ???? ?? ????? ??????? ????? ????:\n"
 "%s"
 msgstr[1] ""
 "??????? ????? ???? ???????. ???? ?? ????? ??????? ????? ????:\n"
@@ -6674,7 +6691,7 @@ msgid ""
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
 "?Claws Mail ???? ???? ???? ??????, ?? ?? ???? ????. ????? ?? ?? ??? ????? "
-"IMAP ????. ????? ??????? \"??? ???? ?? ??????\" ?????? ????? ?? ?????? ????? "
+"IMAP ????. ????? ??????? \"??? ???? ?? ??????\" ?????? ????? ?? ?????? ???? "
 "????? ????? ??? ?????."
 
 #: src/main.c:1476
@@ -6684,7 +6701,7 @@ msgid ""
 "plugin and try again."
 msgstr ""
 "?Claws Mail ???? ???? ???? ??????, ?? ?? ??? ??????. ????? ?? ?? ?????? ?? "
-"??? ????? ??????? ??????. ??? ???? ???? ?? ?????? ???? ???."
+"??? ???? ?????? ?????. ??? ???? ???? ?? ????? ???? ???."
 
 #: src/main.c:1726
 msgid "Missing filename\n"
@@ -6708,17 +6725,15 @@ msgid "Missing required 'To:' header\n"
 msgstr "????? 'To:' ????? ????\n"
 
 #: src/main.c:1905
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr "cli"
+msgstr "??????: %s [??????]...\n"
 
 #: src/main.c:1907
-#, fuzzy
 msgid "  --compose [address]    open composition window"
-msgstr "cli"
+msgstr "?  --compose [?????]      ????? ???? ???"
 
 #: src/main.c:1908
-#, fuzzy
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6727,43 +6742,44 @@ msgid ""
 "                         content format: headers first (To: required) until "
 "an\n"
 "                         empty line, then mail body until end of file."
-msgstr "cli"
+msgstr ""
+"?  --compose-from-file ????\n"
+"?                         ???? ???? ???? ???? ?? ????? ????;\n"
+"?                         standard input ???? ?????? ???? ?? ???? - ?????;\n"
+"?                         ?? (To: ????) ???? ?????? :????? ????\n"
+"?                         ???? ??? ?? ???? ??? ?? ,???? ???."
 
 #: src/main.c:1913
-#, fuzzy
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
-msgstr "cli"
+msgstr "?  --subscribe [uri]      ???? ???? ???? URI ?? ?????"
 
 #: src/main.c:1914
-#, fuzzy
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
-msgstr "cli"
+msgstr ""
+"?  --attach 1???? [2????]...\n"
+"?                         ??????? ????? ?? ????? ???? ???\n"
+"?                         ???????"
 
 #: src/main.c:1917
-#, fuzzy
 msgid "  --receive              receive new messages"
-msgstr "cli"
+msgstr "?  --receive              ????? ?????? ???"
 
 #: src/main.c:1918
-#, fuzzy
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr "cli"
+msgstr "?  --receive-all          ???????? ??? ????? ?????? ???"
 
 #: src/main.c:1919
-#, fuzzy
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "cli"
+msgstr "?  --cancel-receiving     ?????? ???? ???"
 
 #: src/main.c:1920
-#, fuzzy
 msgid "  --cancel-sending       cancel sending of messages"
-msgstr "cli"
+msgstr "?  --cancel-sending       ?????? ????? ???"
 
 #: src/main.c:1921
-#, fuzzy
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6772,95 +6788,85 @@ msgid ""
 "g: tag\n"
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
-msgstr "cli"
+msgstr ""
 
 #: src/main.c:1928
-#, fuzzy
 msgid "  --send                 send all queued messages"
-msgstr "cli"
+msgstr "?  --send                 ??????? ?????? ??????? ?? ?? ???"
 
 #: src/main.c:1929
-#, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
-msgstr "cli"
+msgstr "?  --status [??????]...   ??????? ?? ?? ????? ????? ?? ???"
 
 #: src/main.c:1930
-#, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
-msgstr "cli"
+msgstr ""
+"?  --status-full [??????]...\n"
+"?                         ?????? ?? ?? ?????? ?? ???"
 
 #: src/main.c:1932
-#, fuzzy
 msgid "  --statistics           show session statistics"
-msgstr "cli"
+msgstr "?  --statistics           ??? ?????????? ???"
 
 #: src/main.c:1933
-#, fuzzy
 msgid "  --reset-statistics     reset session statistics"
-msgstr "cli"
+msgstr "?  --reset-statistics     ??? ?????????? ???"
 
 #: src/main.c:1934
-#, fuzzy
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
-msgstr "cli"
+msgstr ""
+"?  --select ??????[/???]  ??????? ??????/????? ?? ????\n"
+"?                         'folder/sub_folder' ??? ?????? ?? id ??? ??????"
 
 #: src/main.c:1936
-#, fuzzy
 msgid "  --online               switch to online mode"
-msgstr "cli"
+msgstr "?  --online               ????? ???? ????"
 
 #: src/main.c:1937
-#, fuzzy
 msgid "  --offline              switch to offline mode"
-msgstr "cli"
+msgstr "?  --offline              ????? ?? ???? ????"
 
 #: src/main.c:1938
-#, fuzzy
 msgid "  --exit --quit -q       exit Claws Mail"
-msgstr "cli"
+msgstr "?  --exit --quit -q       Claws Mail ???? ??"
 
 #: src/main.c:1939
-#, fuzzy
 msgid "  --debug                debug mode"
-msgstr "cli"
+msgstr "?  --debug                ????? ???"
 
 #: src/main.c:1940
-#, fuzzy
 msgid "  --toggle-debug         toggle debug mode"
-msgstr "cli"
+msgstr "?  --toggle-debug         ????? ??? ????"
 
 #: src/main.c:1941
-#, fuzzy
 msgid "  --help -h              display this help and exit"
-msgstr "cli"
+msgstr "?  --help -h              ??? ?? ???? ?? ????"
 
 #: src/main.c:1942
-#, fuzzy
 msgid "  --version -v           output version information and exit"
-msgstr "cli"
+msgstr "?  --version -v           ??? ????? ???? ????"
 
 #: src/main.c:1943
-#, fuzzy
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
-msgstr "cli"
+msgstr "?  --version-full -V      ??? built-in ??????? ???? ???? ????"
 
 #: src/main.c:1944
-#, fuzzy
 msgid "  --config-dir           output configuration directory"
-msgstr "cli"
+msgstr "?  --config-dir           ????? ?????? ????"
 
 #: src/main.c:1945
-#, fuzzy
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
-msgstr "cli"
+msgstr ""
+"?  --alternate-config-dir [????]\n"
+"?                         ??????? ????? ??????? ?????"
 
 #: src/main.c:1995
 msgid "Unknown option\n"
@@ -6913,19 +6919,19 @@ msgstr "?MH..."
 
 #: src/mainwindow.c:518
 msgid "Change mailbox order..."
-msgstr "????? ??? ???? ????..."
+msgstr "??? ??? ???? ????..."
 
 #: src/mainwindow.c:521
 msgid "_Import mbox file..."
-msgstr "??_??? ???? mbox..."
+msgstr "?_?? ???? mbox..."
 
 #: src/mainwindow.c:522
 msgid "_Export to mbox file..."
-msgstr "????_? ?? ???? mbox..."
+msgstr "??_? ????? mbox..."
 
 #: src/mainwindow.c:523
 msgid "_Export selected to mbox file..."
-msgstr "????? ?_????(?)? ?? ???? mbox..."
+msgstr "??? ?_?????? ????? mbox..."
 
 #: src/mainwindow.c:525
 msgid "Empty all _Trash folders"
@@ -6933,11 +6939,11 @@ msgstr "???? ?? ?????? _????"
 
 #: src/mainwindow.c:528 src/messageview.c:218
 msgid "_Save email as..."
-msgstr "_????? ????? ???..."
+msgstr "_???? ????? ???..."
 
 #: src/mainwindow.c:529 src/messageview.c:219
 msgid "_Save part as..."
-msgstr "_????? ???? ???..."
+msgstr "_???? ???? ???..."
 
 #: src/mainwindow.c:532 src/messageview.c:220
 msgid "Page setup..."
@@ -6945,7 +6951,7 @@ msgstr "???? ????..."
 
 #: src/mainwindow.c:533 src/messageview.c:221
 msgid "_Print..."
-msgstr "_?????..."
+msgstr "_????..."
 
 #: src/mainwindow.c:535
 msgid "Synchronise folders"
@@ -6965,7 +6971,7 @@ msgstr "_??? ?????"
 
 #: src/mainwindow.c:545
 msgid "_Find in current message..."
-msgstr "_????? ???? ????? ??????..."
+msgstr "_??? ???? ????? ??????..."
 
 #: src/mainwindow.c:547
 msgid "_Quick search"
@@ -7021,7 +7027,7 @@ msgstr "????? _?????"
 
 #: src/mainwindow.c:572 src/messageview.c:234
 msgid "_Next message"
-msgstr "????? _???"
+msgstr "????? ?_???"
 
 #: src/mainwindow.c:574 src/messageview.c:236
 msgid "P_revious unread message"
@@ -7029,7 +7035,7 @@ msgstr "????? ??_??? ??? ?????"
 
 #: src/mainwindow.c:575 src/messageview.c:237
 msgid "N_ext unread message"
-msgstr "????? ?_?? ??? ?????"
+msgstr "????? ??_?? ??? ?????"
 
 #: src/mainwindow.c:577 src/messageview.c:239
 msgid "Previous ne_w message"
@@ -7037,7 +7043,7 @@ msgstr "????? _???? ?????"
 
 #: src/mainwindow.c:578 src/messageview.c:240
 msgid "Ne_xt new message"
-msgstr "????? ?_??? ???"
+msgstr "????? ?_??? ????"
 
 #: src/mainwindow.c:580 src/messageview.c:242
 msgid "Previous _marked message"
@@ -7045,7 +7051,7 @@ msgstr "????? _?????? ?????"
 
 #: src/mainwindow.c:581 src/messageview.c:243
 msgid "Next m_arked message"
-msgstr "????? ?_????? ???"
+msgstr "????? ?_????? ????"
 
 #: src/mainwindow.c:583 src/messageview.c:245
 msgid "Previous _labeled message"
@@ -7053,7 +7059,7 @@ msgstr "????? ????_?? ?????"
 
 #: src/mainwindow.c:584 src/messageview.c:246
 msgid "Next la_beled message"
-msgstr "????? ?????_? ???"
+msgstr "????? ?????_? ????"
 
 #: src/mainwindow.c:586 src/messageview.c:248
 msgid "Previous opened message"
@@ -7061,7 +7067,7 @@ msgstr "????? ????? ?????"
 
 #: src/mainwindow.c:587 src/messageview.c:249
 msgid "Next opened message"
-msgstr "????? ????? ???"
+msgstr "????? ????? ????"
 
 #: src/mainwindow.c:589 src/messageview.c:251
 msgid "Parent message"
@@ -7069,7 +7075,7 @@ msgstr "????? ????"
 
 #: src/mainwindow.c:591 src/messageview.c:253
 msgid "Next unread _folder"
-msgstr "_?????? ??? ??? ?????"
+msgstr "_?????? ???? ??? ?????"
 
 #: src/mainwindow.c:592 src/messageview.c:254
 msgid "_Other folder..."
@@ -7077,7 +7083,7 @@ msgstr "?????? _????..."
 
 #: src/mainwindow.c:594 src/messageview.c:256 src/mimeview.c:201
 msgid "Next part"
-msgstr "??? ??"
+msgstr "??? ???"
 
 #: src/mainwindow.c:595 src/messageview.c:257 src/mimeview.c:202
 msgid "Previous part"
@@ -7093,7 +7099,7 @@ msgstr "???? ?????"
 
 #: src/mainwindow.c:600 src/messageview.c:260
 msgid "Next line"
-msgstr "???? ???"
+msgstr "???? ????"
 
 #: src/mainwindow.c:601 src/messageview.c:261 src/printing.c:481
 msgid "Previous page"
@@ -7101,7 +7107,7 @@ msgstr "???? ????"
 
 #: src/mainwindow.c:602 src/messageview.c:262 src/printing.c:488
 msgid "Next page"
-msgstr "???? ??"
+msgstr "???? ???"
 
 #: src/mainwindow.c:620 src/messageview.c:280
 msgid "Decode"
@@ -7121,7 +7127,7 @@ msgstr "???? ?????"
 
 #: src/mainwindow.c:631 src/messageview.c:289
 msgid "View as text"
-msgstr "??? ???? ?????"
+msgstr "??? ???? ????"
 
 #: src/mainwindow.c:632 src/messageview.c:290 src/toolbar.c:403
 msgid "Open"
@@ -7129,7 +7135,7 @@ msgstr "???"
 
 #: src/mainwindow.c:634 src/messageview.c:292
 msgid "Open with..."
-msgstr "????? ???????..."
+msgstr "??? ?????..."
 
 #: src/mainwindow.c:638 src/messageview.c:295
 msgid "Quotes"
@@ -7226,19 +7232,19 @@ msgstr "??????? ?? ?????"
 
 #: src/mainwindow.c:684
 msgid "M_ove..."
-msgstr "?_????..."
+msgstr "?_???..."
 
 #: src/mainwindow.c:685
 msgid "_Copy..."
-msgstr "??_???..."
+msgstr "??_??..."
 
 #: src/mainwindow.c:686
 msgid "Move to _trash"
-msgstr "???? ?? _????"
+msgstr "???? ?_????"
 
 #: src/mainwindow.c:687
 msgid "_Delete..."
-msgstr "_?????..."
+msgstr "_???..."
 
 #: src/mainwindow.c:688
 msgid "Cancel a news message"
@@ -7317,7 +7323,7 @@ msgstr "????? ?????"
 
 #: src/mainwindow.c:726 src/messageview.c:315
 msgid "Add sender to address boo_k"
-msgstr "???? ???? ?? ???? _??????"
+msgstr "???? ???? ????? _??????"
 
 #: src/mainwindow.c:728
 msgid "C_ollect addresses"
@@ -7377,7 +7383,7 @@ msgstr "??? ??? ?????"
 # ??? ????
 #: src/mainwindow.c:750 src/messageview.c:332
 msgid "List _URLs..."
-msgstr "????? ?????? _URL..."
+msgstr "???? ?????? _URL..."
 
 #: src/mainwindow.c:757
 msgid "Ch_eck for new messages in all folders"
@@ -7395,11 +7401,10 @@ msgstr "??????? ??????"
 msgid "In all folders"
 msgstr "??? ???????"
 
-# ????? ?? ?????
 # ??_?
 #: src/mainwindow.c:763
 msgid "E_xecute"
-msgstr "??_?? ?? ?????"
+msgstr "_???"
 
 # ???? ?????? ?????
 #: src/mainwindow.c:764
@@ -7432,11 +7437,11 @@ msgstr "_?????? ???? ????? ?????..."
 
 #: src/mainwindow.c:781
 msgid "Create _new account..."
-msgstr "????? ????? _???..."
+msgstr "??? ????? _???..."
 
 #: src/mainwindow.c:782
 msgid "_Edit accounts..."
-msgstr "_????? ???????..."
+msgstr "_???? ???????..."
 
 #: src/mainwindow.c:785
 msgid "P_references..."
@@ -7468,7 +7473,7 @@ msgstr "?_????..."
 
 #: src/mainwindow.c:793
 msgid "Plu_gins..."
-msgstr "_??????..."
+msgstr "_??????..."
 
 #: src/mainwindow.c:796
 msgid "_Manual"
@@ -7481,7 +7486,7 @@ msgstr "_???? ??????? (??????)"
 
 #: src/mainwindow.c:798
 msgid "Icon _Legend"
-msgstr "_???? ?????"
+msgstr "_???? ?????"
 
 #: src/mainwindow.c:800
 msgid "Set as default client"
@@ -7493,7 +7498,7 @@ msgstr "??? _????????"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "???? _?????"
 
 #: src/mainwindow.c:809
 msgid "_Message view"
@@ -7546,19 +7551,19 @@ msgstr "???? ?? ??? _3"
 
 #: src/mainwindow.c:826
 msgid "Text _below icons"
-msgstr "????? ??? _??????"
+msgstr "???? ??? _?????"
 
 #: src/mainwindow.c:827
 msgid "Text be_side icons"
-msgstr "????? ?_?? ??????"
+msgstr "???? ?_?? ?????"
 
 #: src/mainwindow.c:828
 msgid "_Icons only"
-msgstr "_?????? ????"
+msgstr "_????? ????"
 
 #: src/mainwindow.c:829
 msgid "_Text only"
-msgstr "_????? ????"
+msgstr "_???? ????"
 
 #: src/mainwindow.c:836
 msgid "_Standard"
@@ -7648,21 +7653,21 @@ msgstr "_????? ???????"
 
 #: src/mainwindow.c:1302 src/summaryview.c:6244
 msgid "Apply tags..."
-msgstr "???? ?????..."
+msgstr "??? ?????..."
 
 #: src/mainwindow.c:1945
 msgid "Some error(s) happened. Click here to view log."
 msgstr "????? ?????? ???????. ???? ??? ?????? ?????."
 
-# ????? ?? ?????? ?????? ?? ??? ?? ?????
+# ????? ?? ???? ?????? ???? ?? ?????
 #: src/mainwindow.c:1960
 msgid "You are online. Click the icon to go offline"
-msgstr "??? ?????. ???? ?? ?????? ??? ????? ???? ????????"
+msgstr "??? ?????. ???? ?? ???? ??? ????? ???? ????????"
 
-# ????? ?? ?????? ?????? ?? ??? ?????
+# ????? ?? ???? ?????? ???? ?????
 #: src/mainwindow.c:1963
 msgid "You are offline. Click the icon to go online"
-msgstr "??? ????????. ???? ?? ?????? ??? ????? ???? ?????"
+msgstr "??? ????????. ???? ?? ???? ??? ????? ???? ?????"
 
 #: src/mainwindow.c:1977
 msgid "Select account"
@@ -7888,7 +7893,7 @@ msgstr "????? ?? ???? mbox"
 
 #: src/mbox.c:555
 msgid "This file already exists. Do you want to overwrite it?"
-msgstr "???? ?? ??? ????. ??? ?????? ????????"
+msgstr "???? ?? ??? ????. ??? ?????? ????????"
 
 #: src/mbox.c:556 src/messageview.c:1848 src/mimeview.c:1844
 #: src/prefs_themes.c:533 src/textview.c:3053
@@ -7914,7 +7919,7 @@ msgstr "????? ???? ????? ??????"
 
 #: src/message_search.c:180
 msgid "Find text:"
-msgstr "??? ?????:"
+msgstr "??? ????:"
 
 #: src/message_search.c:328 src/summary_search.c:779
 msgid "Search failed"
@@ -8016,7 +8021,7 @@ msgstr "??? %s ??????."
 
 #: src/messageview.c:1912
 msgid "Only the first megabyte of text is shown."
-msgstr "?? ???? ???? ?????? ?? ????? ???? ????."
+msgstr "?? ???? ???? ?????? ?? ???? ???? ????."
 
 #: src/messageview.c:1943
 msgid ""
@@ -8089,7 +8094,7 @@ msgstr ""
 msgid "Return Receipt Notification"
 msgstr "??? ????? ?????"
 
-# ?????? ????? ?? ???? ??????? ??? ?????? ??????
+# ?????? ????? ????? ??????? ??? ?????? ??????
 #: src/messageview.c:2097
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
@@ -8098,7 +8103,7 @@ msgid ""
 "notification:"
 msgstr ""
 "?????? ??? ???? ????? ????? ?? ????? ?????? ?? ??? ??? ??????????.\n"
-"??? ??? ????? ????? ?????? ?????? ??? ????? ????? ????? ?????:"
+"??? ??? ????? ????? ?????? ?????? ????? ????? ????? ????? ?????:"
 
 #: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
 msgid "_Cancel"
@@ -8110,7 +8115,7 @@ msgstr "_??? ?????"
 
 #: src/messageview.c:2168
 msgid "Cannot print: the message doesn't contain text."
-msgstr "??? ?????? ??????: ?????? ?? ????? ?????."
+msgstr "??? ?????? ??????: ?????? ?? ????? ????."
 
 #: src/messageview.c:2931
 msgid ""
@@ -8134,7 +8139,7 @@ msgid ""
 "  Message has been deleted or moved to another folder"
 msgstr ""
 "\n"
-"  ????? ????? ?? ?????? ?? ?????? ????"
+"  ????? ????? ?? ?????? ??????? ????"
 
 #: src/messageview.c:2973 src/messageview.c:2979 src/summaryview.c:4201
 #: src/summaryview.c:6972
@@ -8156,15 +8161,18 @@ msgstr "??? ???? ??????..."
 
 #: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "Remove _mailbox..."
-msgstr "???? _???? ????..."
+msgstr "??? _???? ????..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "??? ?????? ????? ?? ??????? '%s'."
+msgstr ""
+"??? ?????? ????? ?? ??????? '%s'\n"
+"\n"
+"%s."
 
 # ?? ??????
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
@@ -8186,23 +8194,23 @@ msgstr "_???"
 
 #: src/mimeview.c:195
 msgid "Open _with..."
-msgstr "????? ?????..."
+msgstr "??? ?????..."
 
 #: src/mimeview.c:197
 msgid "Send to..."
-msgstr "????? ??..."
+msgstr "??? ??..."
 
 #: src/mimeview.c:198
 msgid "_Display as text"
-msgstr "_??? ???? ?????"
+msgstr "_??? ???? ????"
 
 #: src/mimeview.c:199
 msgid "_Save as..."
-msgstr "_????? ???..."
+msgstr "_???? ???..."
 
 #: src/mimeview.c:200
 msgid "Save _all..."
-msgstr "????? _??????..."
+msgstr "???? _???..."
 
 #: src/mimeview.c:273
 msgid "MIME Type"
@@ -8218,26 +8226,26 @@ msgstr "??? ???? ???"
 msgid "Check again"
 msgstr "????? ????"
 
-# ???? ?????? ?? ??????
+# ???? ?????? ?? ????
 #: src/mimeview.c:1065
 #, c-format
 msgid "%s Click the icon to check it."
-msgstr "?%s ??? ?? ?????? ??? ??????."
+msgstr "?%s ??? ?? ???? ??? ??????."
 
 #: src/mimeview.c:1067
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
-msgstr "?%s ??? ?? ?????? ?? ??? '%s' ??? ??????."
+msgstr "?%s ??? ?? ???? ?? ??? '%s' ??? ??????."
 
 #: src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
-msgstr "????? ??? ????? ?????. ??? ?? ?????? ??? ????? ???."
+msgstr "????? ??? ????? ?????. ??? ?? ???? ??? ????? ???."
 
 #: src/mimeview.c:1079
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
-msgstr "????? ??? ????? ?????. ??? ?? ?????? ?? ??? '%s' ??? ????? ???."
+msgstr "????? ??? ????? ?????. ??? ?? ???? ?? ??? '%s' ??? ????? ???."
 
 #: src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8245,11 +8253,10 @@ msgstr "??? ???? ?????..."
 
 #: src/mimeview.c:1360
 msgid "Go back to email"
-msgstr "???? ?? ?????"
+msgstr "???? ??????"
 
 #: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
-#: src/mimeview.c:2080 src/mimeview.c:2192
-#: src/plugins/fancy/fancy_viewer.c:424
+#: src/mimeview.c:2080 src/mimeview.c:2192 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "?? ???? ?????? ????? ???? ?? ????? ????? ?????: %s"
@@ -8257,7 +8264,7 @@ msgstr "?? ???? ?????? ????? ???? ?? ????? ????
 #: src/mimeview.c:1841 src/textview.c:3051
 #, c-format
 msgid "Overwrite existing file '%s'?"
-msgstr "???? ???? ???? '%s'?"
+msgstr "?????? ???? ???? '%s'?"
 
 #: src/mimeview.c:1883 src/plugins/archive/archiver_prefs.c:126
 msgid "Select destination folder"
@@ -8283,7 +8290,7 @@ msgstr ""
 
 #: src/mimeview.c:2226
 msgid "Execute untrusted binary?"
-msgstr "?????? ?? ????? ?????? ?? ??????"
+msgstr "????? ?????? ?? ??????"
 
 # BUG: Delete the word (could) probably.  It could, not probably could
 # compromission (French?)
@@ -8294,8 +8301,8 @@ msgid ""
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"????? ?? ???? ???? ?? ????? (executable). ????? ?? ????? ?? ??????? ?? "
-"??????? ???? ?????? ?????? ???? ?? ?????.\n"
+"????? ?? ???? ???? ?? ????? (executable). ???? ?? ??????? ?? ??????? ???? "
+"?????? ?????? ???? ?? ?????.\n"
 "\n"
 "??? ????? ?? ?????? ????? ?? ???? ???"
 
@@ -8325,7 +8332,7 @@ msgstr "????? NNTP ?? %s:%d ?????.\n"
 #: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "????? '%s': ??? ????? ?? ??? NNTP: ?%s:%d...\n"
+msgstr "????? '%s': ??? ????? ???? NNTP: ?%s:%d...\n"
 
 #: src/news.c:356
 #, c-format
@@ -8353,7 +8360,7 @@ msgstr "????? ?????? ?? %s:%d...\n"
 
 #: src/news.c:490
 msgid "Claws Mail needs network access in order to access the News server."
-msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ???? ?? ??? ?????."
+msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ???? ???? ?????."
 
 #: src/news.c:861
 #, c-format
@@ -8403,7 +8410,7 @@ msgstr ""
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_????? ?? ????? ????..."
+msgstr "_????? ?????? ????..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
@@ -8530,7 +8537,7 @@ msgstr "???? ???? ????? ??????? ?????"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:867
 msgid "This plugin handles various ACPI mail LEDs."
-msgstr "????? ?? ????? ??????? ???? LED ??????? ?? ACPI."
+msgstr "???? ?? ???? ??????? ???? LED ??????? ?? ACPI."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:888
 msgid "Laptop LED"
@@ -8543,7 +8550,7 @@ msgstr "??? ?????? hook ????? ??? ?????"
 
 #: src/plugins/address_keeper/address_keeper.c:292
 msgid "Keeps all recipient addresses in an addressbook folder."
-msgstr "???? ?? ?? ?????? ????? ??????? ???? ??????."
+msgstr "???? ?? ?? ?????? ???? ??????? ???? ??????."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
@@ -8552,13 +8559,12 @@ msgid "Address Keeper"
 msgstr "???? ??????"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "???? ???? ??????"
+msgstr "????? ???? ??????"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
-msgstr "???? ?? ??????"
+msgstr "???? ???????"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:119
 msgid "Address book path where addresses are kept"
@@ -8571,11 +8577,11 @@ msgstr "???? ???? ?????? ???? ??????? ??????"
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
-msgstr "?????..."
+msgstr "???..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "???? ?????? ?????? ?????"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8590,10 +8596,9 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "???? ?????? ???????? ???? ?????? 'Bcc'"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
-msgstr "???? ?????? ??????? ?? ???????? ????????? ?????: (??? ??? ????):"
+msgstr "???? ?????? ??????? ?? ???????? ????????? ????? (??? ??? ????)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -8601,7 +8606,7 @@ msgstr "?????? ????"
 
 #: src/plugins/archive/archiver.c:54
 msgid "Create Archive..."
-msgstr "????? ??????..."
+msgstr "??? ??????..."
 
 #: src/plugins/archive/archiver.c:122
 #, c-format
@@ -8631,9 +8636,9 @@ msgid ""
 "Default options can be set in /Configuration/Preferences/Plugins/Mail "
 "Archiver"
 msgstr ""
-"????? ?? ?????? ?????? ????????? ?? Claws Mail.\n"
+"???? ?? ????? ?????? ????????? ?? Claws Mail.\n"
 "\n"
-"?? ?????? ?? ????? ?????? ???? ??????? ???? ???????, ??? ????? ??, ????? "
+"?? ????? ?? ????? ?????? ???? ??????? ???? ???????, ??? ????? ??, ????? "
 "?????? ???? ???????. ?????? ???? ?????? ?????? ??? ????? ?????? MD5 ?????? "
 "?????? ???? ?? ???? ???? ???????. ???? ???????? ????? ???? ?????? ?? ??.\n"
 "\n"
@@ -8651,7 +8656,7 @@ msgstr ""
 "\n"
 "??? ?????? ?? ????? ?????????? ???? ?? /????/??? ??????\n"
 "\n"
-"???????? ??????? ?????? ?????? ???? /?????/??????/??????/?????? ????"
+"???????? ??????? ?????? ?????? ???? /?????/??????/??????/?????? ????"
 
 #: src/plugins/archive/archiver.c:152
 msgid "Archiver"
@@ -8677,7 +8682,7 @@ msgstr "?? ????? ?????? ???????"
 #: src/plugins/archive/archiver_gtk.c:512
 #, c-format
 msgid "%s: Exists. Continue anyway?"
-msgstr "?%s: ????. ?????? ????? ????"
+msgstr "?%s: ????. ?????? ????? ????"
 
 #: src/plugins/archive/archiver_gtk.c:515
 #, c-format
@@ -8762,7 +8767,7 @@ msgstr "???? ??????"
 
 #: src/plugins/archive/archiver_gtk.c:781
 msgid "Folder Size"
-msgstr "???? ?????"
+msgstr "???? ??????"
 
 #: src/plugins/archive/archiver_gtk.c:790
 msgid "Compression level"
@@ -8819,16 +8824,16 @@ msgstr "??? ????????? ?? Archiver"
 
 #: src/plugins/archive/archiver_gtk.c:1012
 msgid "Folder to archive"
-msgstr "????? ????? ???????"
+msgstr "?????? ????? ???????"
 
 #: src/plugins/archive/archiver_gtk.c:1019
 msgid "Folder which is the root of the archive"
-msgstr "????? ???? ????? ?? ???????"
+msgstr "?????? ???? ????? ?? ???????"
 
 # ?????
 #: src/plugins/archive/archiver_gtk.c:1024
 msgid "Click this button to select a folder which is to be root of the archive"
-msgstr "???? ?? ???? ?? ??? ????? ????? ????? ???? ???????"
+msgstr "???? ?? ???? ?? ??? ????? ?????? ????? ???? ???????"
 
 #: src/plugins/archive/archiver_gtk.c:1030
 msgid "Name for archive"
@@ -8927,7 +8932,7 @@ msgid ""
 msgstr ""
 "??? ??????? ?? ??? ?????? ????? ???????? ???? ?? ???? ???? ???????.\n"
 "???? ????? ????: ?????_??@?????@????.\n"
-"???? ????? ?? ??????? ?? 96 ?????"
+"???? ????? ???????? ?? 96 ?????"
 
 #: src/plugins/archive/archiver_gtk.c:1186
 msgid ""
@@ -8935,7 +8940,7 @@ msgid ""
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
 "??? ??????? ?? ??? ????? ???? ???? ???? ???????\n"
-"?????? ?? ?????? ????? ????: IMAP4,? mbox ????? ??? POP3"
+"?????? ?? ????? ???? ????: IMAP4,? mbox ????? ??? POP3"
 
 #: src/plugins/archive/archiver_gtk.c:1190
 msgid "Selection options"
@@ -9077,7 +9082,7 @@ msgstr "?????? ?? ??? ??? ?????."
 
 #: src/plugins/att_remover/att_remover.c:494
 msgid "Remove attachments..."
-msgstr "???? ???????..."
+msgstr "??? ???????..."
 
 #: src/plugins/att_remover/att_remover.c:506
 #: src/plugins/att_remover/att_remover.c:566
@@ -9092,7 +9097,7 @@ msgid ""
 "Warning: this operation will be completely un-cancellable and the deleted "
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
-"????? ?? ????? ??????? ???? ?????? ????.\n"
+"???? ?? ???? ??????? ???? ?????? ????.\n"
 "\n"
 "?????: ????? ?? ???? ????? ???? ?????? ????? ????????? ??????? ????? ???, "
 "??????, ??????."
@@ -9105,13 +9110,13 @@ msgstr "????? ?????"
 #, c-format
 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"
+"attached. Mention appears on line %d, which begins with text: <span "
+"weight=\"bold\">%.20s</span>...\n"
 "\n"
 "%s it anyway?"
 msgstr ""
 "????? ????? ????? ???? ????, ?? ??? ???? ?????. ????? ????? ????? %d, "
-"??????? ?? ?????: <span weight=\"bold\">%.20s</span>...\n"
+"??????? ?? ????: <span weight=\"bold\">%.20s</span>...\n"
 "\n"
 "?%s ????? ????"
 
@@ -9131,16 +9136,15 @@ msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
 msgstr ""
-"???? ????? ???? ?????? ?????? ?? ????? ????? ?????? ????? ???? ???? ?????."
+"???? ????? ???? ?????? ?????? ?????? ????? ????? ????? ???? ???? ?????."
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:52
 msgid "attach"
 msgstr "???"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "??? ???? ???????? ????????? ????? ???? ????? (??? ??? ????):"
+msgstr "??? ?? ???????? ????????? ????? ???? ????? (??? ??? ????)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9173,8 +9177,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "?? ????? ??????? ????? ???? ????? ?? ?????? ???? ?? ??????"
 
-#: 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 "??????"
 
@@ -9218,10 +9221,10 @@ msgid ""
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bogofilter "
 "with a few hundred spam and ham messages."
 msgstr ""
-"?????? Bogofilter ?? ???? ???? ?????. ????? ?????? ?? ?????? ??? ??? ?? ???? "
+"????? Bogofilter ?? ??? ???? ?????. ????? ?????? ?? ?????? ??? ??? ?? ??? "
 "??? ????.\n"
-"???? ????? ????? ??????? \"/???/??? ???? ????\" ??? \"/???/??? ???? ????????"
-"\" ???? ???? ?? Bogofilter ?? ??? ???? ?????? ???? ??????? ?????????."
+"???? ????? ????? ??????? \"/???/??? ???? ????\" ??? \"/???/??? ???? "
+"????????\" ???? ???? ?? Bogofilter ?? ??? ???? ?????? ???? ??????? ?????????."
 
 #: src/plugins/bogofilter/bogofilter.c:619
 #, c-format
@@ -9229,7 +9232,7 @@ msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr ""
-"?????? Bogofilter ?? ???? ???? ?????. ?????? `%s %s %s` ?? ???? ????? ?????."
+"????? Bogofilter ?? ??? ???? ?????. ?????? `%s %s %s` ?? ???? ????? ?????."
 
 #: src/plugins/bogofilter/bogofilter.c:766
 msgid "Bogofilter: learning from message..."
@@ -9271,7 +9274,7 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"????? ?? ????? ????? ?? ?? ??????? ???????? ?? ????? IMAP, LOCAL ?? POP ???? "
+"???? ?? ???? ????? ?? ?? ??????? ???????? ???? ????? IMAP, LOCAL ?? POP ???? "
 "???? ??????? Bogofilter. ???? ?????? Bogofilter ????? ?????.\n"
 "\n"
 "???? ???? ??????? ?? Bogofilter ????? ?????? ????, ???? ????? ?? ??? ????? "
@@ -9281,16 +9284,14 @@ msgstr ""
 "???? ????? ????? ???? ???? ?? ????? ?????? ?? ?????? ??????? ?????? ????? "
 "?????.\n"
 "\n"
-"???? ????? ???????? ???? /?????/??????/??????/Bogofilter"
+"???? ????? ???????? ???? /?????/??????/??????/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "????? ????"
 
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "????? ????"
@@ -9320,19 +9321,16 @@ msgid "KB"
 msgstr "???"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "????? ????"
+msgstr "??? ????"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "???? ???? ????"
+msgstr "???? ???? ????..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "????? ???? ????"
+msgstr "??? ?? ???? ????"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9414,7 +9412,7 @@ msgstr "????? Bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:303
 msgid "Path to bogofilter executable"
-msgstr "???? ?? ???? ?? ????? ?? bogofilter"
+msgstr "???? ????? ?? ????? ?? bogofilter"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
@@ -9443,19 +9441,18 @@ msgid ""
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
 "a few hundred spam and ham messages."
 msgstr ""
-"?????? Bsfilter ?? ???? ???? ?????. ????? ?????? ?? ?????? ??? ??? ?? ???? "
-"??? ????.\n"
-"???? ????? ????? ??????? \"/???/??? ???? ????\" ??? \"/???/??? ???? ????????"
-"\" ???? ???? ?? Bsfilter ?? ??? ???? ?????? ???? ??????? ?????????."
+"????? Bsfilter ?? ??? ???? ?????. ????? ?????? ?? ?????? ??? ??? ?? ??? ??? "
+"????.\n"
+"???? ????? ????? ??????? \"/???/??? ???? ????\" ??? \"/???/??? ???? "
+"????????\" ???? ???? ?? Bsfilter ?? ??? ???? ?????? ???? ??????? ?????????."
 
 #: src/plugins/bsfilter/bsfilter.c:400
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
-msgstr "?????? Bsfilter ?? ???? ???? ?????. ?????? `%s` ?? ???? ????? ?????."
+msgstr "????? Bsfilter ?? ??? ???? ?????. ?????? `%s` ?? ???? ????? ?????."
 
-# (??????) ?????(?)
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
 msgstr "?Bsfilter: ??? ???? ???? ?????..."
@@ -9477,17 +9474,17 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"????? ?? ????? ????? ?? ?? ??????? ???????? ?? ????? IMAP, LOCAL ?? POP ???? "
+"???? ?? ???? ????? ?? ?? ??????? ???????? ???? ????? IMAP, LOCAL ?? POP ???? "
 "???? ??????? Bsfilter. ???? ?????? Bsfilter ????? ?????.\n"
 "\n"
-"???? ???? ??????? ?? Bsfilter ????? ?????? ????, ???? ????? ?? ??? ????? ??? "
+"???? ???? ??????? ?? Bsfilter ????? ?????? ????, ???? ????? ?? ??? ????? ??? "
 "???? ?????? ???? ??????? ????????? ????? ??????? \"/???/??? ??? ????\" ??? "
 "\"/???/??? ???? ????????\".\n"
 "\n"
 "???? ????? ????? ???? ???? ?? ????? ?????? ?? ?????? ??????? ?????? ????? "
 "?????.\n"
 "\n"
-"???? ????? ???????? ???? /?????/??????/??????/Bsfilter"
+"???? ????? ???????? ???? /?????/??????/??????/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
 #: src/plugins/spamassassin/spamassassin_gtk.c:408
@@ -9508,7 +9505,7 @@ msgstr "????? Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:226
 msgid "Path to bsfilter executable"
-msgstr "???? ?? ???? ?? ????? ?? bsfilter"
+msgstr "???? ????? ?? ????? ?? bsfilter"
 
 #: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:553
@@ -9604,25 +9601,25 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
-"????? ?? ????? ?? Clam ???? ????? ??? ????? ?? ?? ??????? ???????? ?????? "
+"???? ?? ???? ?? Clam ???? ????? ??? ????? ?? ?? ??????? ???????? ???? ????? "
 "IMAP, ?LOCAL ?? POP.\n"
 "\n"
-"???? ???? ?????? ????? ???? ????? ?? ???? ?????? ?? ?????? ?? ??? ?????? ??? "
+"???? ???? ?????? ????? ???? ????? ?? ???? ?????? ?? ?????? ???? ?????? ??? "
 "???????.\n"
 "\n"
-"?????? ?????? ?? ?????? ?? clamd ??? a\n"
+"?????? ????? ?? ????? ?? clamd ??? a\n"
 "?socket ?? ?? ?????? ????????? ???????\n"
 "???? ?????? ???? ??????? .claws-mail\n"
 "????? ?????? clamav-daemon ???? ?????\n"
 "????? ??? unix socket. ?? ????????\n"
-"????? ?????? ??? ?????? ????? ?????\n"
+"????? ?????? ??? ?????? ?????\n"
 "??????? ???.\n"
 "\n"
 "??? ?????? ?????? ?????? ???????? ?????? ??\n"
 "????? clamav-daemon ????? ??? socket\n"
 "?? TCP ?????? ????? ????? ???? clamd.\n"
 "\n"
-"???? ????? ???????? ???? /?????/??????/??????/Clam ???? ?????"
+"???? ????? ???????? ???? /?????/??????/??????/Clam ???? ?????"
 
 #: src/plugins/clamd/clamav_plugin.c:367
 msgid "Virus detection"
@@ -9679,8 +9676,8 @@ msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
 msgstr ""
-"???? ??? ?? clamd.conf. ???? ???? ?? ???? ??? ??? ?????? ?????? ???? ?? "
-"????? ????????"
+"???? ??? ?? clamd.conf. ???? ???? ?? ???? ??? ??? ?????? ????? ???? ?? ????? "
+"????????"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:336
 msgid "Br_owse"
@@ -9790,10 +9787,10 @@ msgid ""
 "\n"
 "It is not really useful."
 msgstr ""
-"????? ?? ???? ???? ????? ????? ?? ???? ???? ????? ???? Claws Mail. ?? ?????? "
-"?? (hook) ???? ???? ??? ????? ???? ?? stdout.\n"
+"???? ?V ???? ???? ????? ????? ?? ???? ???? ???? ???? Claws Mail. ?? ?????? "
+"?? (hook) ???? ???? ??? ????? ???? ?? stdout.\n"
 "\n"
-"?? ?? ???? ???????."
+"?? ?? ???? ??????."
 
 #: src/plugins/fancy/fancy_prefs.c:146
 msgid "Display images"
@@ -9821,11 +9818,11 @@ msgstr "??? ???????? Java ???????"
 
 #: src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
-msgstr "???? ????????? ??????? ??????"
+msgstr "???? ????????? ??????? ??????"
 
 #: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render embedded objects using plugins"
-msgstr "???? ????????? ??????? ??????? ??????"
+msgstr "???? ????????? ??????? ??????? ??????"
 
 #: src/plugins/fancy/fancy_prefs.c:169
 msgid "Open in viewer (remote content is enabled)"
@@ -9844,9 +9841,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "????? ??????? ?????? ?? GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "????? ???????:"
+msgstr "????? ???????"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9862,7 +9858,7 @@ msgid ""
 msgstr ""
 "????? ???? ????? ????? ?????? ?????? ?????? ???????.\n"
 "???? ????? ???? ????? ???? ???????, ?? ????? ??? ???\n"
-"???? ????. ???? ?? ??????, ???????, ???????? ?????? ??\n"
+"???? ????. ???? ?? ??????, ???????, ???????? ???? ??\n"
 "???????? Java ????? ?????? ?????? ???? ???? ????? ?????\n"
 "???? ??????."
 
@@ -9873,7 +9869,7 @@ msgstr "???? ????? ?? ???? ?????"
 #: src/plugins/fancy/fancy_prefs.c:276
 #, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "???? ?????? ?? ?????, ????? ????:"
+msgstr "???? ?????? ????? ???? ??? ????? ???????"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -9881,7 +9877,7 @@ msgstr "??? ???? ????? ??????"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "?CSS ????? ?? ???? ??? ???? HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -9892,9 +9888,8 @@ msgid "Bro_wse"
 msgstr "   _????   "
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "????? ?????"
+msgstr "??? ?????? ?????"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -9914,7 +9909,7 @@ msgstr "???? Javascript"
 
 #: src/plugins/fancy/fancy_viewer.c:478
 msgid "Enable Plugins"
-msgstr "???? ??????"
+msgstr "???? ??????"
 
 #: src/plugins/fancy/fancy_viewer.c:480
 msgid "Enable Java"
@@ -9988,16 +9983,16 @@ msgstr "?Fancy ???? HTML"
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
-"By default all remote content is blocked. Options can be found in /"
-"Configuration/Preferences/Plugins/Fancy"
+"By default all remote content is blocked. Options can be found in "
+"/Configuration/Preferences/Plugins/Fancy"
 msgstr ""
-"????? ?? ?????? ???? HTML ??????? ??????? WebKit %d.%d.%d library.\n"
-"????? ???? ?? ???? ????? ???? ????. ???? ????? ???????? ???? /?????/??????/"
-"??????/Fancy"
+"???? ?? ????? ???? HTML ??????? ??????? WebKit %d.%d.%d library.\n"
+"????? ???? ?? ???? ????? ???? ????. ???? ????? ???????? ???? "
+"/?????/??????/??????/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:151
 msgid "failed to write Fetchinfo configuration to file\n"
-msgstr "??? ?????? ????? Fetchinfo ?? ????\n"
+msgstr "??? ?????? ????? Fetchinfo ?????\n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:200
@@ -10017,10 +10012,10 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
-"????? ?? ???? ?? ??????? ???????. ?? ????? ?????? ??????? ???? ????? ?????: "
+"???? ?? ???? ?? ??????? ???????. ?? ???? ?????? ??????? ???? ????? ?????: "
 "UIDL, ?? ????? Claws Mail, ??? POP, ???? ????? ??? ??? ?????.\n"
 "\n"
-"???????? ?????? ?????? ???? /?????/??????/??????/Fetchinfo"
+"???????? ?????? ?????? ???? /?????/??????/??????/Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:236
 msgid "Mail marking"
@@ -10031,9 +10026,8 @@ msgid "Add fetchinfo headers"
 msgstr "???? ?????? fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "????? ???? ??????"
+msgstr "?????? ??????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10043,6 +10037,7 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"????? ?? ?????? X-FETCH-UIDL ?? ???? ????? (listing) ?????? ?? ????? (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10050,7 +10045,7 @@ msgstr "?? ?????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "????? ?? ?????? X-FETCH-ACCOUNT ?? ?? ??????"
 
 # ????
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
@@ -10059,7 +10054,7 @@ msgstr "??? ????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "????? ?? ?????? X-FETCH-SERVER ?? ???? ?????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10067,7 +10062,7 @@ msgstr "???? ?????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "????? ?? ?????? X-FETCH-USERID ?? ???? (ID) ??????"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10078,11 +10073,11 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"????? ?? ?????? X-FETCH-TIME ?? ?????? ???? ?? ????? ????? ?????? RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "????? GData: ????? ?????: %s\n"
+msgstr "???? GData: ????? ?????"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10094,30 +10089,33 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"???? ????? ???? Claws Mail ??? ???? ???? ?????? ???? ??? Google ??? ?????? "
+"????? GData.\n"
+"\n"
+"??? ????? ????? ??? Google ?????? ?? ????? ???. ???? ?????? ?? ??????, ??? "
+"???? ??? ?????. ??? ?? ???? ???? ??? ??? ?????? ???? Claws Mail ???? ?????? "
+"???? ??? Google ???."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "???"
+msgstr "??? 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "??? ??? ??? ????? ???? ????? Google ???? ?????"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "???"
+msgstr "??? 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "????"
+msgstr "??? ???:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "????? GData: ????? ?????? ???? ???? ???: %s\n"
+msgstr "???? GData: ????? ?????? ???? ???? ???: %s\n"
 
 # improve
 #: src/plugins/gdata/cm_gdata_contacts.c:340
@@ -10131,45 +10129,42 @@ msgstr[1] "????? %d ??"
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
-msgstr[0] "??? ??? 1 ?? ??????"
-msgstr[1] "%d ???? ??? ?? ??????"
+msgstr[0] "??? ??? 1 ??????"
+msgstr[1] "%d ???? ??? ??????"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:352
 msgid "GData plugin: Starting async contacts query\n"
-msgstr "????? GData: ????? ??? ?????? ??? ??? async\n"
+msgstr "???? GData: ????? ??? ?????? ??? ??? async\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:373
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "????? GData: ????? ?????? ???? ??????: %s\n"
+msgstr "???? GData: ????? ?????? ???? ??????: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:410
 msgid "GData plugin: Groups received\n"
-msgstr "????? GData: ?????? ??????\n"
+msgstr "???? GData: ?????? ??????\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Starting async groups query\n"
-msgstr "????? GData: ????? ??? ?????? ?????? async\n"
+msgstr "???? GData: ????? ??? ?????? ?????? async\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "????? GData: ????? ?????: %s\n"
+msgstr "???? GData: ????? ?????: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "????? GData: ????? ?????: %s\n"
+msgstr "???? GData: ????? ????\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "????? GData: ????? ??? ????? async\n"
+msgstr "???? GData: ??? ????? ????? ?????\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "????? GData: ????? ??? ????? async\n"
+msgstr "???? GData: ????? ??? ?????, ??? ???? ?????\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
@@ -10178,21 +10173,20 @@ msgid ""
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "????? GData: ????? ?????: %s\n"
+msgstr "???? GData: ????? ????? ?????: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "????? GData: ????? ?????: %s\n"
+msgstr "???? GData: ????? ????? ???\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "????? GData: ????? ??? ????? async\n"
+msgstr "???? GData: ??? ???? ????? ?????\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "?????"
 
@@ -10221,15 +10215,15 @@ msgid ""
 "GData Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"????? GData: ??? ?????? ????? ????? ?? ????\n"
+"???? GData: ??? ?????? ????? ???? ?????\n"
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr "??? ?????? hook ????? ????? ?????? GData"
+msgstr "??? ?????? hook ????? ????? ????? GData"
 
 #: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "??? ?????? hook ??? ???????? ?????? GData"
+msgstr "??? ?????? hook ??? ???????? ????? GData"
 
 #: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -10241,13 +10235,13 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"????? ?? ????? ???? ?? ????????? GData ???? Claws Mail.\n"
+"???? ?? ???? ???? ????????? GData ???? Claws Mail.\n"
 "\n"
 "????????? GData ????? ???? ??????? Google.\n"
-"???? ?????, ????????? ?????? ??? ?????? ???? ??? Google ?? ??? ???????? "
-"????? ?????.\n"
+"???? ?????, ????????? ?????? ??? ?????? ???? ??? Google ???? ???????? ????? "
+"?????.\n"
 "\n"
-"???? ?? <berndth at gmx.de> ????? ?????."
+"???? ????? <berndth at gmx.de> ????? ?????."
 
 # ?????????? GeoLocation
 #: src/plugins/gdata/gdata_plugin.c:187
@@ -11251,7 +11245,7 @@ msgstr "?? ???? ??????? ????? ????? ??????: %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
-msgstr "??? ?????? hook ?? messageview_show ?????? GeoLocation"
+msgstr "??? ?????? hook ?? messageview_show ????? GeoLocation"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11269,17 +11263,17 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
-"????? ?? ????? ???????????? ?? GeoLocation ???? Claws Mail.\n"
+"???? ?? ???? ???????????? ?? GeoLocation ???? Claws Mail.\n"
 "\n"
 "?????: ????? ?? ???? ????? ????? ?????? ?? ????? ???????? ?? ???? ???? "
-"?????? ?????? ???? ?? ?? ???? ?? ?????. ??????? ??? ?????? ?? ??? ????? ?? "
+"?????? ?????? ???? ?? ?? ???? ?? ?????. ??????? ??? ?????? ?? ??? ???? ?? "
 "???? ???? ?? ?????? ????. ??????, ????? ?????? ????? ?????? ?????? ???? ???? "
 "???? ?????? ????, ?? ????? ???? ?????? ????? ???? ????? ????? ????? ?? ???? "
 "?? ????? ?????? ????? ?? ?? ???? ?????.\n"
-"???? ???? ???, ??? ?? ????? ??????? ?? ????? ??, ??? ????? ?? ???? ?? ??? "
-"?????? ?? ??/?? ???? ???.\n"
+"???? ???? ???, ?? ?? ????? ??????? ?? ???? ??, ??? ?? ???? ????? ?? ???? ?? "
+"??? ?????? ?? ??/?? ???? ???.\n"
 "\n"
-"???? ?? <berndth at gmx.de> ????? ????? (?? ???? ?????? ???? ???????? ?? "
+"???? ????? <berndth at gmx.de> ????? ????? (?? ???? ?????? ???? ???????? ?? "
 "???????)."
 
 #: src/plugins/geolocation/geolocation_plugin.c:900
@@ -11327,20 +11321,19 @@ msgstr ""
 "???? ?????? ?????? libravatar ???? ?????? ????. ???? ????\n"
 "????? libravatar ?????? http://www.libravatar.org/. ?????\n"
 "??? ?? ????? gravatar.com ?? ?? ????? libravatar one, ??? ??\n"
-"??????? (???? ??????? ??????? ???? ?????? ?????? ?????).\n"
-"???? ????? ????? ???? ???? ???? ????:\n"
-"/?????/??????/??????/Libravatar.\n"
+"??????? (???? ??????? ??????? ???? ?????? ?????? ????).\n"
+"???? ????? ???? ???? ???? ???? ????:\n"
+"/?????/??????/??????/Libravatar.\n"
 "\n"
-"????? ?? ?????? ??????? ???? libcurl ??? ????? ??????, ?? ???\n"
-"??? ?????? ?????? ??? ??? ?? ???? ????? curl(1) ??? ????? ??\n"
+"???? ?? ????? ??????? ???? libcurl ??? ????? ??????, ?? ???\n"
+"??? ?????? ?????? ??? ??? ?? ???? ????? curl(1) ?????? ??\n"
 "????? 'http_proxy'. ???? ???? ????? ??? ?????? ????? README.\n"
 "\n"
-"???? ?? <ricardo at mones.org> ????? ?????.\n"
+"???? ????? <ricardo at mones.org> ????? ?????.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">????? ?????? ???:</span>"
+msgstr "<span color=\"red\">????? ?????? ?????????? ?????</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11355,18 +11348,16 @@ msgid "Using %s in %d files, %d directories and %d others"
 msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "????? ?????"
+msgstr "??? ????? ???"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "??? ??? ???? ?? ?????? ????? ?? ????? ???"
+msgstr "??? ??? ???? ?? ?????? ????? ?? ?? ???? ?????? ?????????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "??? ????? ?????? ??????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11378,7 +11369,7 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">????? ??? ???? ??????!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11392,16 +11383,16 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">????? ?????? ????? ???.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
-msgstr "????? ??????? ??_?????"
+msgstr "????? ?????? ??_?????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:214
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
-msgstr "???? ?????? ????? ??? ????? ???? ????? ????? ???? ??? ????"
+msgstr "???? ????? ????? ????? ????? ???? ????? ????? ???? ??? ????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
 msgid "Cache refresh interval"
@@ -11418,7 +11409,7 @@ msgstr "??? ???????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:306
 msgid "Identicon"
-msgstr "?????-?????"
+msgstr "???-?????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:307
 msgid "MonsterID"
@@ -11473,15 +11464,15 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
-msgstr "_??? ?????? ?????? ?? ????? ?????"
+msgstr "_??? ?????? ?????? ?????? ?????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:383
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
-"???? ??? ?????? ?????? ?????? ???? ??? libravatar ?? ?????? ?????? ????? "
-"???? gravatar.com"
+"???? ??? ?????? ?????? ?????? ???? ??? libravatar ??????? ?????? ????? ???? "
+"gravatar.com"
 
 #: src/plugins/libravatar/libravatar_prefs.c:392
 msgid "_Enable federated servers"
@@ -11492,9 +11483,8 @@ msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "??? ????? ?????? ???? ??? ???? libravatar ?? ????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "????? ??? ???\n"
+msgstr "????? ??? ????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -11510,11 +11500,11 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
-msgstr "????? ?????"
+msgstr "????? ???"
 
 #: src/plugins/libravatar/libravatar_prefs.c:459
 msgid "Default missing icon mode"
-msgstr "??? ????? ???? ?????"
+msgstr "??? ??? ??? ?????"
 
 #: src/plugins/libravatar/libravatar_prefs.c:463
 msgid "Network"
@@ -11526,7 +11516,7 @@ msgstr "?????? ???? ???? (!etPan)"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr "???? ????? ?????? ????? ???? ?????? ?? mbox."
+msgstr "??? ???? ?????? ????? ???? ?????? mbox."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
@@ -11555,6 +11545,270 @@ msgstr ""
 "?? ?????? ??? ????? ??? '%s' ?????.\n"
 "??? ??? ???? ?? ?????? ??????"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "??? ???? ????? Sieve ?????\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "???? ????? Sieve ????? ?? ?????\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "?????"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "?????: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "?TLS ????"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "????? ????? ???? SIEVE\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, fuzzy, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "????? ????? ???? SMTP\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:930
+#, fuzzy
+msgid "Sieve: retrying auth\n"
+msgstr "??? ???? SMTP AUTH ?????\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "???? ????? ?? ?????"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_???"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "_??? ?????"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "???_?"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "?? ????? ????? ???? ?????"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "??? ?????..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "???? ?????"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "????? ?? ????. ???? ?? ???????? ??? ??????"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "???_?"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "????? ???? ??????."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "??? ????..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "??? ???? ?????..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "????? ?? ????. ????? ?? ???????? ?????????"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_????"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - ???? Sieve %s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "???? ????? Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "??? ?? ???? ????? ????? Sieve ???."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "??? ?? ??? ???? ??????."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "??? ??? ???? ?? ?????? ????? ?? ????? '%s'?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "??? ????"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "????"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "?????? ???? ????? ????? ???? ??? ???? ????."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "?? ????? ??????"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "??? ???? ???????..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "??? ?????..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "????? ?????? Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "??? ?????? ? Sieve, ???? ??? ???? ?????? ?????."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "??? ????? Sieve..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "??? ????? sieve ???? ??????? ???????? ManageSieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "???? Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "???? ???"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "?? ???"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr "????? ????? ?? ????? ????? ??????? ????? ???? ????"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "???? ??"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "????? ????? ?? ????? ?????? ????"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "??? TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "????? ?????? TLS ???? ?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "???? TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "??? ?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "????? ????? ????? ??? ???? ????? ???? ????"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "???? ?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "???? ?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "???? ?????"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "????????"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "???? ???? Sieve ????? ??????."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "??? Sieve ???? ????."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr ""
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "?NewMail"
@@ -11579,7 +11833,7 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"????? ?? ????? ????? ????? ?? ???? ???? ???? ?? ???? ????? ???? ????.\n"
+"???? ?? ???? ????? ????? ????? ???? ???? ?? ???? ????? ???? ????.\n"
 "\n"
 "????? ???? ??? ?~/Mail/NewLog\n"
 "\n"
@@ -11620,39 +11874,39 @@ msgstr "?????"
 
 #: src/plugins/notification/notification_plugin.c:221
 msgid "The Notification plugin needs threading support."
-msgstr "????? ????? ????? ?????? ?????."
+msgstr "???? ????? ???? ?????? ?????."
 
 #: src/plugins/notification/notification_plugin.c:228
 msgid "Failed to register folder item update hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ???? ?????? ?????? ?????"
+msgstr "??? ?????? hook ????? ???? ?????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ?????? ?????? ?????"
+msgstr "??? ?????? hook ????? ?????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:246
 msgid "Failed to register msginfo update hook in the Notification plugin"
-msgstr "??? ?????? hook ????? msginfo ?????? ?????"
+msgstr "??? ?????? hook ????? msginfo ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:256
 msgid "Failed to register offline switch hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ??? ???????? ?????? ?????"
+msgstr "??? ?????? hook ????? ??? ???????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ???? ???? ?????? ?????"
+msgstr "??? ?????? hook ????? ???? ???? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
-msgstr "??? ?????? hook ??? ?????? ?????? ?????"
+msgstr "??? ?????? hook ??? ?????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ????? ????? ?????? ?????"
+msgstr "??? ?????? hook ????? ????? ????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
-msgstr "??? ?????? hook ????? ????? ?????? ?????"
+msgstr "??? ?????? hook ????? ????? ????? ?????"
 
 #: src/plugins/notification/notification_plugin.c:422
 msgid ""
@@ -11663,10 +11917,10 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"????? ?? ????? ????? ??????? ?????? ?????? ????? ??? ??? ????.\n"
-"????? ?? ????? ?????? ????? ???? ???? ??? ??????? ?? ?? ??? ??????.\n"
+"???? ?? ???? ????? ??????? ?????? ?????? ????? ??? ??? ????.\n"
+"???? ?? ???? ?????? ????? ???? ???? ??? ??????? ?? ?? ??? ??????.\n"
 "\n"
-"???? ?? <berndth at gmx.de> ????? ?????."
+"???? ????? <berndth at gmx.de> ????? ?????."
 
 #: src/plugins/notification/notification_plugin.c:447
 msgid "Various tools"
@@ -11796,7 +12050,7 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"????? ?????: ??? ?????? ????? ????? ?? ????\n"
+"???? ?????: ??? ?????? ????? ???? ?????\n"
 
 #: src/plugins/notification/notification_prefs.c:608
 msgid "Include folder types"
@@ -11811,14 +12065,12 @@ msgid "News folders"
 msgstr "?????? ?????"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "?????? RSS"
+msgstr "?????? RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "?????? ??? ???"
+msgstr "?????? vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11863,25 +12115,21 @@ msgstr "?? ???? ?? ????"
 msgid "Banner speed"
 msgstr "?????? ????"
 
-# ??????
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "???? ???? ?? ??????:"
+msgstr "???? ???? ?? ??????"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "???? ???? ?? ?????? (0 ???? ??? ?????)"
+msgstr "???? ?? ????? ?? ?????? ??????, 0 ???? ??? ?????"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "?????? ????"
+msgstr "???? ????"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "???? ???? ????, ????? ???? 0 ????? ???"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11908,12 +12156,11 @@ msgstr "???? ?? ?????? ??????"
 #: src/plugins/notification/notification_prefs.c:1386
 #: src/plugins/notification/notification_prefs.c:1621
 msgid "Select folders..."
-msgstr "????? ??????..."
+msgstr "??? ??????..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "??? ??????"
+msgstr "??? ????"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -11949,14 +12196,12 @@ msgstr "???? ???? ??????"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "????? ??? ???? ??????:"
+msgstr "????? ??? ???? ??????"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
 msgstr "?????"
 
@@ -11986,31 +12231,28 @@ msgid "Done"
 msgstr "????"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "????? ?????"
+msgstr "??? ?????"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "???? ?????"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "????? ?????:"
+msgstr "????? ??????"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
-msgstr "???? ????? ???? ?????? ????"
+msgstr "???? ????? ???? ?????? ????"
 
 #: src/plugins/notification/notification_prefs.c:1465
 msgid "Enable LCD"
 msgstr "???? LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "?? ????:???? ?? ??? LCDd:"
+msgstr "?? ????:???? ?? ??? LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12022,7 +12264,7 @@ msgstr "???? ??? ?????"
 
 #: src/plugins/notification/notification_prefs.c:1593
 msgid "Close to tray"
-msgstr "???? ?? ???"
+msgstr "???? ????"
 
 #: src/plugins/notification/notification_prefs.c:1601
 msgid "Hide when iconified"
@@ -12040,7 +12282,7 @@ msgstr "???? ?????? ??????"
 
 #: src/plugins/notification/notification_prefs.c:1865
 msgid "Add to Indicator Applet"
-msgstr "???? ?? ??????? ?????"
+msgstr "???? ???????? ?????"
 
 #: src/plugins/notification/notification_prefs.c:1879
 msgid "Hide mainwindow when minimized"
@@ -12072,7 +12314,7 @@ msgstr "<alt>N"
 #: src/plugins/notification/notification_prefs.c:1971
 #, fuzzy
 msgid "Toggle minimize"
-msgstr "????? ??? ??????:"
+msgstr "?????"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12269,8 +12511,8 @@ msgid ""
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"????? ?? ?????? ???? ??????? ?? ?? PDF ??? PostScript ??????? ??????? "
-"Poppler %s ??? ????? ???? gs.\n"
+"???? ?? ????? ???? ??????? ?? ?? PDF ??? PostScript ??????? ??????? Poppler "
+"%s ??? ????? ???? gs.\n"
 "\n"
 "?? ???? ????? ?????: iwkse at claws-mail.org"
 
@@ -12290,7 +12532,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"?????: ?? ???? ?????? ????? ?????? ghostscript ?(gs) ????? ???? ????? %s ??? "
+"?????: ?? ???? ?????? ????? ?????? ghostscript ?(gs) ????? ???? ???? %s ??? "
 "???? ?????? PostScript, ?? ?????? PDF ?????. ??? ????? ????? PostScript ?? "
 "?????? ?????? gs.\n"
 "\n"
@@ -12298,7 +12540,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr "????? ???? ????? Perl? (ext)..."
+msgstr "???? ???? ????? Perl? (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12320,7 +12562,7 @@ msgid ""
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%s??? ??? ?? ????? ?????? ???? ????? "
+"<span weight=\"bold\" size=\"larger\">%s??? ??? ????? ????? ???? ????? "
 "????:</span>\n"
 "\n"
 "%.*s\n"
@@ -12337,7 +12579,7 @@ msgid ""
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">??? ??? ???? ?? ????? ?????? ???? "
+"<span weight=\"bold\" size=\"larger\">??? ??? ???? ?? ?????? ????? ???? "
 "????? ????:</span>\n"
 "\n"
 "%.*s\n"
@@ -12345,13 +12587,12 @@ msgstr ""
 #: src/plugins/pgpcore/passphrase.c:270
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase "
+"for:</span>\n"
 "\n"
 "%.*s\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">%s??? ??? ?? ????? ?????? ????:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%s??? ??? ????? ????? ????:</span>\n"
 "\n"
 "%.*s\n"
 
@@ -12416,11 +12657,11 @@ msgstr ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:186
 msgid "   This key has been imported to your keyring.\n"
-msgstr "   ???? ?? ???? ?? ????? ??????? ???.\n"
+msgstr "   ???? ?? ???? ?????? ??????? ???.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:188
 msgid "   This key couldn't be imported to your keyring.\n"
-msgstr "   ???? ?? ?? ??? ????? ?????? ?? ????? ??????? ???.\n"
+msgstr "   ???? ?? ?? ??? ???? ?????? ?????? ??????? ???.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
@@ -12456,20 +12697,20 @@ msgid ""
 "This plugin handles PGP core operations and provides address autocompletion "
 "from the GPG keyring. It is used by other plugins, like PGP/Mime.\n"
 "\n"
-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and "
+"/Configuration/[Account Preferences]/Plugins/GPG\n"
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"????? ?? ????? ?????? ???? PGP ?????? ????? ????? ???????? ???? ????? ?????? "
-"GPG, ?? ?????? ?? ??? ????? ????, ??? PGP/Mime.\n"
+"???? ?? ???? ?????? ???? PGP ????? ????? ????? ???????? ???? ????? ?????? "
+"GPG, ?? ????? ?? ??? ???? ???, ??? PGP/Mime.\n"
 "\n"
-"???? ????? ???????? ???? /?????/??????/??????/GPG ??? /?????/[?????? ?????]/"
-"??????/GPG\n"
+"???? ????? ???????? ???? /?????/??????/??????/GPG ??? /?????/[?????? "
+"?????]/??????/GPG\n"
 "\n"
-"?????? ???? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
+"????? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
@@ -12483,7 +12724,7 @@ msgstr "???? ?????? ????????"
 
 #: src/plugins/pgpcore/prefs_gpg.c:114
 msgid "Use keyring for address autocompletion"
-msgstr "????? ?????? ?????? ??? ????? ????? ????????"
+msgstr "????? ?????? ?????? ????? ????? ????? ????????"
 
 # ????? ?????
 #: src/plugins/pgpcore/prefs_gpg.c:119
@@ -12500,7 +12741,7 @@ msgstr "????? ????"
 
 #: src/plugins/pgpcore/prefs_gpg.c:149
 msgid "Setting to '0' will store the passphrase for the whole session"
-msgstr "????? ?? '0' ????? ?? ????? ?????? ??? ????"
+msgstr "????? ?? '0' ????? ?? ?????? ????? ??? ????"
 
 #: src/plugins/pgpcore/prefs_gpg.c:153 src/plugins/rssyl/rssyl_prefs.c:154
 #: src/prefs_receive.c:159
@@ -12619,7 +12860,7 @@ msgid ""
 msgstr ""
 "???? ????? ?? ???? ????? ???????.\n"
 "?? ???? ?????? ?? ?????? ????? ???? ??, ????\n"
-"???? ??????? ??? ???? ?? ??????? ???? ??????? ?????.\n"
+"???? ??????? ??? ???? ??????? ???? ??????? ?????.\n"
 "\n"
 "???? ????: ???? ?%s, ???? ?????? %s &lt;%s&gt;\n"
 "\n"
@@ -12632,7 +12873,7 @@ msgstr "?? ????? ?????"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "?? ?????"
 
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
@@ -12648,54 +12889,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "?PGP Core: ??? ?????? ????? ???? - ??? ???? gpg-agent ????? ???."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "????? ???? ??? %s."
+msgstr "????? ???? ??? \"%s\" [?????]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "????? ???? ??? %s."
+msgstr "????? ???? ??? \"%s\" [????]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "????? ???? ??? %s."
+msgstr "????? ???? ??? \"%s\" [?????]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "????? ???? ??? %s."
+msgstr "????? ???? ??? \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "????? ????? ??? %s."
+msgstr "????? ????? ??? \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "????? ???? ??? %s ?? ????? ???."
+msgstr "????? ???? ??? %s, ?? ????? ???"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "????? ???? ??? %s ?? ????? ????."
+msgstr "????? ???? ??? %s, ?? ????? ????"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "????? ??? ??? %s."
+msgstr "????? ??? ??? \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "???? 0x%s ?? ???? ?????? ????? ??."
+msgstr "???? 0x%s ?? ???? ?????? ????? ??"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "?????? ?? ?????."
+msgstr "?????? ?? ?????"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12743,7 +12983,7 @@ msgstr "                    ????? ????? (uid) ?\"%s\" (?????:
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "?????"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
@@ -12864,7 +13104,7 @@ msgstr ""
 "??? ??????? ???? ??? ??????. ????? ????? ??? ???:\n"
 "%s\n"
 "\n"
-"??? ?????? ?????? ?? ??? ???????"
+"??? ?????? ?????? ???? ???????"
 
 #: src/plugins/pgpcore/sgpgme.c:873
 msgid "Key generated"
@@ -12888,15 +13128,15 @@ msgstr "???? ????"
 
 #: src/plugins/pgpinline/pgpinline.c:161
 msgid "Not a text part"
-msgstr "?? ???? ?????"
+msgstr "?? ???? ????"
 
 #: src/plugins/pgpinline/pgpinline.c:172 src/plugins/pgpinline/pgpinline.c:324
 msgid "Couldn't get text data."
-msgstr "?? ???? ?????? ????? ????? ?????."
+msgstr "?? ???? ?????? ????? ????? ????."
 
 #: src/plugins/pgpinline/pgpinline.c:190
 msgid "Couldn't convert text data to any sane charset."
-msgstr "?? ???? ?????? ????? ???? ????? ?? ?? ???? ????? ?????? ?????."
+msgstr "?? ???? ?????? ????? ???? ???? ?? ?? ???? ????? ?????? ?????."
 
 #: src/plugins/pgpinline/pgpinline.c:198 src/plugins/pgpinline/pgpinline.c:520
 #: src/plugins/pgpinline/pgpinline.c:659 src/plugins/pgpinline/pgpinline.c:715
@@ -12922,7 +13162,7 @@ msgstr "?? ???? ?????? ????? ???? ?????? %s"
 #: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
-msgstr "?? ???? ?????? ????? ?? ???? ?????? %s"
+msgstr "?? ???? ?????? ????? ????? ?????? %s"
 
 #: src/plugins/pgpinline/pgpinline.c:378 src/plugins/pgpinline/pgpinline.c:379
 #: src/plugins/pgpinline/pgpinline.c:380
@@ -13023,13 +13263,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"?????? ????? ????? Inline ??????? ?? ????? ?/?? ????? ????. ???????? ????? "
+"????? ???? ????? Inline ??????? ?? ????? ?/?? ????? ????. ???????? ????? "
 "???? ?????, ???? ?????? ?? ????? ??????? ?? ????? ???.\n"
 "\n"
-"?? ????? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
+"?? ????? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
 "????? ????? ???? /????????/????? ??????\n"
 "\n"
-"?????? ???? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
+"????? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
@@ -13052,12 +13292,12 @@ msgstr "?? ???? ?????? ????? ???? ????: %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "????? ????????? OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the PGP/"
-"Mime system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"PGP/Mime system."
 msgstr ""
 "????? ???: ?????? ?? ?????, ???? ????, ???? ??????? ?? ??? ?????? PGP/Mime."
 
@@ -13083,43 +13323,41 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"?????? ????? ????? PGP/MIME ???? ?/?? ?????. ???????? ????? ???? ?????, ???? "
+"????? ???? ????? PGP/MIME ???? ?/?? ?????. ???????? ????? ???? ?????, ???? "
 "?????? ?? ????? ??????? ?? ????? ???.\n"
 "\n"
-"?? ????? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
+"?? ????? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
 "????? ????? ???? /????????/????? ??????\n"
 "\n"
-"?????? ???? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
+"????? ????? ??????? GPGME ???? ????? ???? GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:358 src/plugins/python/python_plugin.c:502
 msgid "Python scripts"
 msgstr "?????? Python"
 
 #: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
-msgstr "???? ???? Python..."
+msgstr "??? ???? Python..."
 
 #: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
-msgstr "?????"
+msgstr "????"
 
 #: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2506
 #: src/prefs_account.c:2528 src/prefs_account.c:2792 src/wizard.c:1195
 #: src/wizard.c:1610
 msgid "Browse"
-msgstr "   ????   "
+msgstr "   ????   "
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:733
+#: src/plugins/python/python_plugin.c:651 src/plugins/python/python_plugin.c:733
 msgid "Python"
 msgstr "Python"
 
 #: src/plugins/python/python_plugin.c:657
 msgid "Failed to register \"compose create hook\" in the Python plugin"
-msgstr "??? ??????  \"hook ????? ?????\" ?????? Python"
+msgstr "??? ??????  \"hook ????? ?????\" ????? Python"
 
 #: src/plugins/python/python_plugin.c:738
 msgid ""
@@ -13132,8 +13370,8 @@ msgid ""
 "put buttons for script invocation into the toolbars using Claws Mail's "
 "builtin toolbar editor.\n"
 "\n"
-"You can provide scripts working on the main window by placing files into ~/."
-"claws-mail/python-scripts/main.\n"
+"You can provide scripts working on the main window by placing files into "
+"~/.claws-mail/python-scripts/main.\n"
 "\n"
 "You can also provide scripts working on an open compose window by placing "
 "files into ~/.claws-mail/python-scripts/compose.\n"
@@ -13173,23 +13411,23 @@ msgid "Python integration"
 msgstr "????? Python"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"?? ???? ?????? ????? ???? mbox:\n"
-"%s\n"
+"?? ????? ?????? ????? ???? feeds.xml ???:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: ????? ????? ????? '%s' ?????? ????? ????.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "?? ???? ?????? ????? ???? ???? %s: %s\n"
+msgstr "RSSyl: ?? ????? ?????? ????? ???? OPML ??? '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
@@ -13218,21 +13456,20 @@ msgid ""
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
-"????? ?? ????? ?? ????? ?? ???? ???? ???? ?? ???????? ?????? ????? ????? "
+"???? ?? ???? ?? ????? ?? ???? ???? ???? ?? ???????? ?????? ????? ????? "
 "?????? ?? RSS 1.0, ?RSS 2.0 ?? Atom.\n"
 "\n"
-"?? ???? ????? ????? ????? ?? ??????? ????????, ??? ????? ???? ????. ???????? "
-"??????, ??? ????? ?? ????? ?????? ?????."
+"?? ???? ????? ????? ?????? ?? ??????? ????????, ??? ????? ???? ????. "
+"???????? ??????, ??? ????? ?? ????? ?????? ?????."
 
 #: src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
 msgstr "???? RSS"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(???? ???)"
+msgstr "(???)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -13247,31 +13484,28 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "??? ????? URL ?? ???? ?????? ???? ?????? ??????:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "?'%c' ?? ???? ?????? ??? ??????."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "?Claws Mail ???? ????? ??? ?????? ?? ??? ????? ?? ?????."
 msgstr[1] "?Claws Mail ???? ????? ??? ?????? ?? ??? ????? ?? ???????."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
-msgstr "???? ????? ?? ?? ?????? '%s'?\n"
+msgstr "???? ????? ?? ?? ??????? '%s'?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
-msgstr "??? ?? ?????"
+msgstr "??? ?? ????"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
-msgstr "????? ???? ?.opml"
+msgstr "????? ???? OPML"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
 #, fuzzy, c-format
@@ -13279,19 +13513,19 @@ msgid "Couldn't create folder for new feed '%s'."
 msgstr "?? ???? ?????? ????? ???? ???? ?????? ?????."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "?RSSyl: ????? ??? ???? %s\n"
+msgstr "RSSyl: ??? ???? ???? ???: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: ???? ??? ????: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
-msgstr "?RSSyl: ????? ??? ???? %s\n"
+msgstr "RSSyl: ??? ????? ????: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
@@ -13299,51 +13533,44 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "?RSSyl: ????? ???? ??????: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "?RSSyl: ????? ??? ???? %s\n"
+msgstr "RSSyl: ????? ?????? ???? ??? '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "?RSSyl: ????? ??? ???? %s\n"
+msgstr "RSSyl: ?? ???? ???? ???? ??? '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "?? ???? ?????? ????? ?????/???? ?? '%s'\n"
+msgstr "RSSyl: ??? ?????? ???? ???? ??? '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "????? ??????"
-
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "????? ??????"
+msgstr "????? HTTP Basic"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "????? ??????? ????? ??????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "???? ?? ??????"
+msgstr "???? ?????? ?????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "?_??"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
+msgstr "???? ????, ????? ?????? ??? ??? ?? ?????? ????? ????"
 
 # ?? ????
 #: src/plugins/rssyl/rssyl_feed_props.c:314
@@ -13351,29 +13578,24 @@ msgid "Fetch comments if possible"
 msgstr "???? ?????? ????? ?????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
-msgstr "??? ???? ???? ?? ????"
+msgstr "??? ???? ???? ???"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
-msgstr "?? ?? ?????? ????"
+msgstr "?? ?? ????? ?????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
-msgstr "????? ?? ???? ???? ?? ????"
+msgstr "?? ???? ?? ??? ???? ???"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "???? ????? ???? ???? ?????"
 
-# ??? ???? ????
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "????? ?????"
+msgstr "????? ?????? ?? ?????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
@@ -13391,17 +13613,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>?URL ????:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "?? ?????:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "?????"
+msgstr "?? ?????"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13420,9 +13633,8 @@ msgstr ""
 "<small>(???? ?? 0 ??? ????? ????? ??????? ???? ???? ??)</small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "<b>?? ???? ?????, ?? ????? ???? ?? ????:</b>"
+msgstr "<b>?? ???? ?????, ?? ????? ???? ????:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:609
 msgid "_OK"
@@ -13437,45 +13649,40 @@ msgid "_Refresh feed"
 msgstr "_???? ????"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
-msgstr "?_?????? ????..."
+msgstr "_??????? ????"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
-msgstr "_????? ??..."
+msgstr "_??? ??..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "??? ????? ?????????"
+msgstr "_???? ?????????"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
-msgstr "????? ?? ???? _???..."
+msgstr "????? ????? _???..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
-msgstr "?_???? ????? ????..."
+msgstr "??? ?????? _????..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
-msgstr "????? ????? ??????..."
+msgstr "??? ????? ??????..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "??? ?????"
+msgstr "??? ??"
 
-# ??????
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
-msgstr "????? ?? ????? RSS"
+msgstr "????? ?? ?????? RSS"
 
 #: src/plugins/rssyl/rssyl_gtk.c:127
 msgid "Enter name for a new RSS folder tree."
-msgstr "??? ?? ???? ?? ????? RSS."
+msgstr "??? ?? ???? ?? ?????? RSS."
 
 #: src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
@@ -13483,7 +13690,7 @@ msgid ""
 "Maybe some files already exist, or you don't have the permission to write "
 "there?"
 msgstr ""
-"????? ?? ?? ????? ?????.\n"
+"????? ?? ?? ?????? ?????.\n"
 "????? ?? ??? ?? ?????? ??? ??????, ?? ???? ?? ?? ??????? ????? ???"
 
 #: src/plugins/rssyl/rssyl.h:17
@@ -13491,50 +13698,44 @@ msgid "My Feeds"
 msgstr "??????? ???"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "????? ???? Pine"
+msgstr "??? ???? ??????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "????? ??????? ????? ??????"
+msgstr "?????? ????? ??????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "???? ?? ?? ??????? ??? ?????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "??? ???? ????? SSL ??????? ?????"
+msgstr "??? ???? ?????? SSL ??????? ?????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
-msgstr "???? ?? ???? ??????"
+msgstr "???? ????? ??????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:184
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
-msgstr "???? ?? ???? cookies.txt ?????-Netscape ??? ???? ??????"
+msgstr "???? ????? cookies.txt ?????-Netscape ??? ???? ??????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "?????"
+msgstr "?????"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "????? ???????"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "????? ?? ???? _???..."
+msgstr "????? ????? ????"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> ????:</b>"
+msgstr "<b>?????? ????:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
@@ -13544,12 +13745,12 @@ msgstr ""
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_???? ??????? ???? ???? ?????"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "??? ????? ????? ???? %s..."
+msgstr "??? ????? ?????? ???? '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
 #: src/plugins/vcalendar/vcal_folder.c:1598
@@ -13567,9 +13768,9 @@ msgid "404 (Not found)"
 msgstr "404 (?? ????)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "????? %ld"
+msgstr "????? %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -13587,11 +13788,13 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"?? ???? ???? ???? ???\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
-msgstr "??? ????? ???? '%s'..."
+msgstr "??? ????? ???? '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:246
 #, c-format
@@ -13601,11 +13804,14 @@ msgid ""
 "\n"
 "Please contact developers, this should not happen."
 msgstr ""
+"?? ????? ?????? ???? ???? ???\n"
+"<b>%s</b>\n"
+"\n"
+"??? ??? ??? ?? ???????, ?? ?? ???? ??????."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
-msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ????? ?? ?????."
+msgstr "?Claws Mail ???? ????? ??? ?????? ?? ??? ????? ?? ?????? ???."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
@@ -13638,14 +13844,14 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"?????? ????? ????? S/MIME ???? ?/?? ?????. ???????? ????? ???? ?????, ???? "
+"????? ???? ????? S/MIME ???? ?/?? ?????. ???????? ????? ???? ?????, ???? "
 "?????? ?? ????? ??????? ?? ????? ???.\n"
 "\n"
-"?? ????? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
+"?? ???? ?????? ?????? ?????? ?????? ???? /?????/[?????? ?????]/?????? ???? "
 "????? ????? ???? /????????/????? ??????\n"
 "\n"
-"????? ?? ???? ????? ??????? GPGME ???? ????? ????.\n"
-"????? ?? ????? ?? gpgsm, ?gnupg-agent ??? dirmngr ??????? ????????.\n"
+"????? ?? ????? ??????? GPGME ???? ????? ????.\n"
+"???? ?? ???? ?? gpgsm, ?gnupg-agent ??? dirmngr ??????? ????????.\n"
 "\n"
 "???? ????? ???? ???? ????? ?????? S/MIME ??????? ?? GPGSM ???? ?????? ???:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
@@ -13663,7 +13869,7 @@ msgstr "?? ???? ?????? ????? ???? ????"
 
 #: src/plugins/smime/smime.c:462 src/plugins/smime/smime.c:477
 msgid "Couldn't write to temporary file"
-msgstr "?? ???? ?????? ????? ?? ???? ????"
+msgstr "?? ???? ?????? ????? ????? ????"
 
 #: src/plugins/smime/smime.c:488
 msgid "Couldn't close temporary file"
@@ -13671,8 +13877,8 @@ msgstr "?? ???? ?????? ????? ???? ????"
 
 #: src/plugins/smime/smime.c:708
 msgid ""
-"Please note that email headers, like Subject, are not encrypted by the S/"
-"MIME system."
+"Please note that email headers, like Subject, are not encrypted by the "
+"S/MIME system."
 msgstr ""
 "????? ???: ?????? ?? ?????, ???? ????, ???? ??????? ?? ??? ?????? S/MIME."
 
@@ -13699,7 +13905,7 @@ msgid ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 msgstr ""
-"????? ?? ?????? ?? ???? ?? ????? ??????.\n"
+"???? ?? ????? ?? ???? ?????? ??????.\n"
 "?????? ?? ?????? ????? ?????? ???:\n"
 "\n"
 " * spam-signal.fr\n"
@@ -13729,15 +13935,15 @@ msgstr "?SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin.c:169
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
-msgstr "?????? SpamAssassin ?? ???? ?????? ?? spamd.\n"
+msgstr "????? SpamAssassin ?? ??? ?????? ?? spamd.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin filtering failed.\n"
-msgstr "????? ?? ????? SpamAssassin ????.\n"
+msgstr "????? ?? ???? SpamAssassin ????.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:238
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
-msgstr "?????? SpamAssassin ??????? ?? ??? ????????.\n"
+msgstr "????? SpamAssassin ???? ?????? ?? ??? ????????.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:243
 msgid "SpamAssassin: filtering message..."
@@ -13749,7 +13955,7 @@ msgid ""
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
-"?????? SpamAssassin ?? ???? ???? ?????. ????? ?????? ?? ?????? ??? ???? ???? "
+"????? SpamAssassin ?? ??? ???? ?????. ????? ?????? ?? ?????? ??? ???? ???? "
 "spamd ????? ???? ?????. ??? ???? ???? ?? ????? spamd ???? ???? ?????."
 
 # BUG: from the remote learner? to > from
@@ -13769,7 +13975,7 @@ msgstr "??? ????? ?? ?????"
 
 #: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr "????? SpamAssassin ????? ?? ??????? ?????????.\n"
+msgstr "???? SpamAssassin ???? ?? ?????? ?????????.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:620
 msgid ""
@@ -13784,15 +13990,15 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"????? ?? ????? ????? ?? ?? ??????? ???????? ???? ????? IMAP, LOCAL ?? POP "
-"???? ???? ??????? ??? SpamAssassin. ?? ??? SpamAssassin ?(spamd) ????? ???? "
-"???? ????.\n"
+"???? ?? ???? ????? ?? ?? ??????? ???????? ???? ????? IMAP, LOCAL ?? POP ???? "
+"???? ??????? ??? SpamAssassin. ?? ??? SpamAssassin ?(spamd) ????? ???? ???? "
+"????.\n"
 "\n"
-"???? ?????? ?????? ?? ?????? ?????? ???? ???? ?? ?????????.\n"
+"???? ?????? ????? ?? ?????? ?????? ???? ???? ?? ?????????.\n"
 "\n"
 "???? ????? ????? ???? ?? ????? ?????? ?? ?????? ??????? ?????? ????? ?????.\n"
 "\n"
-"???? ????? ???????? ???? /?????/??????/??????/SpamAssassin"
+"???? ????? ???????? ???? /?????/??????/??????/SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
@@ -13808,7 +14014,7 @@ msgstr "Unix Socket"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:269
 msgid "Enable SpamAssassin plugin"
-msgstr "???? ????? SpamAssassin"
+msgstr "???? ???? SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:273
 msgid "Transport"
@@ -13890,22 +14096,22 @@ msgid ""
 "The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
 "Hand <yerase at yerot.com>"
 msgstr ""
-"????? Claws Mail ?? ????? ?? ????? ?????? application/ms-tnef.\n"
+"???? Claws Mail ?? ???? ?? ????? ?????? application/ms-tnef.\n"
 "\n"
 "The plugin uses the Ytnef library, which is copyright 2002-2007 by Randall "
 "Hand <yerase at yerot.com>"
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "?_???? ???? ??..."
+msgstr "?_??? ???? ??..."
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "_????? ???? ??..."
+msgstr "_??? ???? ??..."
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
-msgstr "?_???? ???? ???..."
+msgstr "_??? ???? ???..."
 
 #: src/plugins/vcalendar/common-views.c:67
 msgid "_Go to today"
@@ -13920,8 +14126,7 @@ msgid "Show"
 msgstr "???"
 
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:560
-#: src/prefs_matcher.c:336
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:560 src/prefs_matcher.c:336
 msgid "days"
 msgstr "????"
 
@@ -14035,17 +14240,17 @@ msgid ""
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
-"????? ?? ?????? ????? ??????? vCalendar ??? ??? ??????? ?? ??? Evolution ?? "
+"???? ?? ????? ????? ??????? vCalendar ??? ??? ??????? ?? ??? Evolution ?? "
 "Outlook.\n"
 "\n"
-"???? ?? ?????, ?? ????? ???? ???? vCalendar ???? ????? ??????, ??? ?????? "
+"???? ?? ????, ?? ????? ???? ???? vCalendar ???? ????? ??????, ??? ?????? "
 "??????? ??? ????? ?? ????? ????.\n"
 "????? ???? ??????? ????? ????? ???? ????? ?? ?????? ????? ?? ??????.\n"
 "??? ????? ???? ????-???? ?? ?????? vCalendar ?? ?????? ?????? ???? \"???? "
 "???...\".\n"
 "\n"
-"???????? ???? ???? ?? ?????? ?? ????? webCal,????? ?? ??????? ??? ??? ??? "
-"???, ????? ???? ?????/???? ?????? ?? ???? ?? ??????."
+"???????? ???? ???? ?? ?????? ?????? webCal,????? ?? ??????? ??? ??? ??? ???, "
+"????? ???? ?????/???? ?????? ?? ???? ?? ??????."
 
 #: src/plugins/vcalendar/plugin.c:102
 msgid "Calendar"
@@ -14053,7 +14258,7 @@ msgstr "??? ???"
 
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
-msgstr "????? ???? ???? ?????..."
+msgstr "??? ???? ???? ?????..."
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
@@ -14099,7 +14304,7 @@ msgstr "???? ????."
 
 #: src/plugins/vcalendar/vcalendar.c:494
 msgid "You have been invited to a meeting."
-msgstr "?????? ?? ????."
+msgstr "?????? ?????."
 
 #: src/plugins/vcalendar/vcalendar.c:502
 msgid "A meeting to which you had been invited has been cancelled."
@@ -14148,7 +14353,7 @@ msgstr "????? - ????? ?? ???? ?? ???? ??? ???."
 # ??????? ????
 #: src/plugins/vcalendar/vcalendar.c:982
 msgid "Send a notification to the attendees"
-msgstr "??? ????? ?? ???????"
+msgstr "??? ????? ???????"
 
 #: src/plugins/vcalendar/vcalendar.c:991
 msgid "Cancel meeting"
@@ -14180,11 +14385,11 @@ msgstr "????"
 
 #: src/plugins/vcalendar/vcalendar.c:1220
 msgid "Edit meeting..."
-msgstr "????? ????..."
+msgstr "???? ????..."
 
 #: src/plugins/vcalendar/vcalendar.c:1221
 msgid "Cancel meeting..."
-msgstr "????? ????..."
+msgstr "??? ????..."
 
 #: src/plugins/vcalendar/vcalendar.c:1222
 msgid "Launch website"
@@ -14241,15 +14446,15 @@ msgstr "???? _???..."
 
 #: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
-msgstr "??_??? ??? ???..."
+msgstr "?_?? ??? ???..."
 
 #: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
-msgstr "_????? ?? webCal..."
+msgstr "_????? ?? webCal..."
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
-msgstr "_????? ??..."
+msgstr "_??? ??..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
@@ -14478,7 +14683,7 @@ msgstr "???"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Add..."
-msgstr "?????..."
+msgstr "????..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
@@ -14787,21 +14992,14 @@ msgstr "????? ??? ???"
 msgid "Automatically export calendar to"
 msgstr "??? ??? ??? ???????? ??"
 
-#: src/plugins/vcalendar/vcal_prefs.c:319
-#: src/plugins/vcalendar/vcal_prefs.c:425
+#: src/plugins/vcalendar/vcal_prefs.c:319 src/plugins/vcalendar/vcal_prefs.c:425
 msgid "You can export to a local file or URL"
-msgstr "???????? ????? ?? ???? ????? ?? ????? URL"
+msgstr "???????? ????? ????? ????? ?? ????? URL"
 
 #: src/plugins/vcalendar/vcal_prefs.c:321
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "???? ???? ????? ?? ????? URL ?(http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "???? ?????"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "???? ?????? webcal ???? ?????"
@@ -14944,10 +15142,6 @@ msgstr "?? ???"
 msgid "Mail address"
 msgstr "?????? ????"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "???? ???"
-
 # ????????
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
@@ -15057,14 +15251,6 @@ msgstr "???? ???? ?? ?????? ??????"
 msgid "unlimited if 0 is specified"
 msgstr "??? ????? ?? 0 ?????"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "???? ?????"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "????????"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "???? ??? IMAP"
@@ -15084,8 +15270,7 @@ msgstr "??? ????-??-?????? (???? ????? ?? ????? 
 
 #: src/prefs_account.c:1619
 msgid "This mode uses less bandwidth, but can be slower with some servers."
-msgstr ""
-"??? ?? ???? ????? ????? ???? ??, ?? ???? ????? ??? ???? ?? ????? ???????."
+msgstr "??? ?? ????? ????? ???? ??, ?? ???? ????? ??? ???? ?? ????? ???????."
 
 #: src/prefs_account.c:1626
 msgid "Filter messages on receiving"
@@ -15093,7 +15278,7 @@ msgstr "??? ?????? ??? ????"
 
 #: src/prefs_account.c:1633
 msgid "Allow filtering using plugins on receiving"
-msgstr "??? ????? ??????? ?????? ??? ????"
+msgstr "??? ????? ??????? ?????? ??? ????"
 
 #: src/prefs_account.c:1637
 msgid "'Get Mail' checks for new messages on this account"
@@ -15132,7 +15317,7 @@ msgid ""
 "will be used."
 msgstr ""
 "???? ????? ??? ?????? ?????, ????? ????? ????? ???? ????? ?????? ????? ??? "
-"?????? ??? ????."
+"?????? ????? ????."
 
 #: src/prefs_account.c:1844
 msgid "Authenticate with POP3 before sending"
@@ -15169,7 +15354,7 @@ msgstr "???? ???????? ?? ??????? ?????"
 
 #: src/prefs_account.c:2055
 msgid "Spell check dictionaries"
-msgstr "??????? ??? ????? ????"
+msgstr "??????? ?????? ????"
 
 #: src/prefs_account.c:2065 src/prefs_folder_item.c:1092
 #: src/prefs_spelling.c:163
@@ -15186,17 +15371,17 @@ msgstr "????? ????? ?????"
 #: src/prefs_folder_item.c:1833 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
 msgid "Compose"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_account.c:2179 src/prefs_folder_item.c:1470 src/prefs_quote.c:134
 #: src/toolbar.c:409
 msgid "Reply"
-msgstr "????"
+msgstr "???"
 
 #: src/prefs_account.c:2194 src/prefs_filtering_action.c:191
 #: src/prefs_folder_item.c:1498 src/prefs_quote.c:149 src/toolbar.c:413
 msgid "Forward"
-msgstr "?????"
+msgstr "???"
 
 #: src/prefs_account.c:2241
 msgid "Default privacy system"
@@ -15212,20 +15397,19 @@ msgstr "???? ?????? ????"
 
 #: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
-msgstr "???? ?????? ???? ??? ???? ?? ????? ?????"
+msgstr "???? ?????? ???? ??? ???? ?????? ?????"
 
 #: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
-msgstr "???? ?????? ???? ??? ???? ?? ????? ??????"
+msgstr "???? ?????? ???? ??? ???? ?????? ??????"
 
 #: src/prefs_account.c:2280
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "???? ?????? ?????? ?? ????? ????? ??? ????? ??? ?? ????"
 
-# ???? ????
 #: src/prefs_account.c:2282
 msgid "Save sent encrypted messages as clear text"
-msgstr "???? ?????? ??????? ??? ????? ???? ????? ????"
+msgstr "???? ?????? ??????? ??? ????? ???? ???? ????"
 
 # ?? ????? ????? ??????
 #: src/prefs_account.c:2438 src/prefs_account.c:2453 src/prefs_account.c:2467
@@ -15322,14 +15506,14 @@ msgstr "????? ?????? ?????? ?? ???"
 # ????
 #: src/prefs_account.c:2743
 msgid "Move deleted mails to trash and expunge immediately"
-msgstr "???? ???? ???? ?? ???? ?????? ??????? ?????"
+msgstr "???? ???? ???? ????? ?????? ??????? ?????"
 
 #: src/prefs_account.c:2745
 msgid ""
 "Moves deleted mails to trash instead of using the \\Deleted flag without "
 "expunging."
 msgstr ""
-"???? ???? ???? ?? ???? ????? ????? ????? ???? ?\\Deleted? ??? ???? ??????."
+"???? ???? ???? ????? ????? ????? ????? ???? ?\\Deleted? ??? ???? ??????."
 
 #: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
@@ -15436,7 +15620,7 @@ msgstr "????????:"
 #: src/prefs_account.c:4204
 #, c-format
 msgid "%s (plugin not loaded)"
-msgstr "%s (????? ?? ?????)"
+msgstr "%s (???? ?? ????)"
 
 #: src/prefs_actions.c:223
 msgid "Actions configuration"
@@ -15461,7 +15645,7 @@ msgstr "???? ????? ?????"
 
 #: src/prefs_actions.c:327
 msgid "Append the new action above to the list"
-msgstr "??? ?? ?????? ???? ?? ??????"
+msgstr "??? ?? ?????? ???? ??????"
 
 # ????? ??????
 #: src/prefs_actions.c:335
@@ -15559,21 +15743,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr "??? ??? ???? ?? ?????? ????? ?? ?? ????????"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "????? ?? ?????"
 
 #: 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 "????? ?? ?????. ????? ????? ????"
 
 #: 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:2127
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2127 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+???? _?????"
 
@@ -15603,15 +15786,15 @@ msgstr "<span weight=\"bold\">?????? ??:</span>"
 
 #: src/prefs_actions.c:979
 msgid "to send message body or selection to command's standard input"
-msgstr "?????? ??? ????? ?? ????? ?? ??? ???? ?? ?????"
+msgstr "?????? ??? ????? ?? ????? ???? ???? ?? ?????"
 
 #: src/prefs_actions.c:980
 msgid "to send user provided text to command's standard input"
-msgstr "?????? ????? ????? ????? ?? ??? ???? ?? ?????"
+msgstr "?????? ???? ????? ????? ???? ???? ?? ?????"
 
 #: src/prefs_actions.c:981
 msgid "to send user provided hidden text to command's standard input"
-msgstr "?????? ????? ????? ????? ????? ?? ??? ???? ?? ?????"
+msgstr "?????? ???? ????? ????? ????? ???? ???? ?? ?????"
 
 #: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">End with:</span>"
@@ -15623,7 +15806,7 @@ msgstr "?????? ??? ????? ?? ????? ?? ??? ???? ??
 
 #: src/prefs_actions.c:984
 msgid "to insert command's standard output without replacing old text"
-msgstr "???? ??? ???? ?? ????? ??? ????? ????? ???"
+msgstr "???? ??? ???? ?? ????? ??? ????? ???? ???"
 
 # ?? ?????
 #: src/prefs_actions.c:985
@@ -15636,7 +15819,7 @@ msgstr "<span weight=\"bold\">?????:</span>"
 
 #: src/prefs_actions.c:987
 msgid "for the file of the selected message in RFC822/2822 format "
-msgstr "???? ????? ?? ?????? ????? ?????? RFC822/2822 "
+msgstr "???? ????? ?? ????? ????? ?????? RFC822/2822 "
 
 #: src/prefs_actions.c:988
 msgid ""
@@ -15657,11 +15840,11 @@ msgstr "???? ??????? ????? ????? ????? (???? ??
 
 #: src/prefs_actions.c:992
 msgid "for the text selection"
-msgstr "???? ????? ??????"
+msgstr "???? ????? ?????"
 
 #: src/prefs_actions.c:993
 msgid "apply filtering actions between {} to selected messages"
-msgstr "??? ????? ?????? ??? {} ?? ?????? ??????"
+msgstr "??? ????? ?????? ??? {} ??????? ??????"
 
 # ?????? ?????
 # Ready for literal data
@@ -15681,8 +15864,7 @@ msgstr ""
 "????? ??????? ???? ??? ???? ?????? ???? ?????? ???????? ??? ???? ???? ????? "
 "???? ?? ?? ??? ??? ???????."
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695 src/prefs_template.c:1121
 msgid "D_uplicate"
 msgstr "?_?????"
 
@@ -15706,12 +15888,13 @@ msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "???? %d\\n???? ?? ??? %f ??????:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:302 src/prefs_quote.c:85
+#, qt-format
 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"
+"\\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????? ????? ??????:\\n\\n?d{?????: %d\\n}?f{???: %f\\n}?t{??: %t\\n}?"
-"c{????: %c\\n}?n{?????? ??????: %n\\n}?s{????: %s\\n}\\n\\n%M"
+"\\n\\n????? ????? ??????:\\n\\n?d{?????: %d\\n}?f{???: %f\\n}?t{??: "
+"%t\\n}?c{????: %c\\n}?n{?????? ??????: %n\\n}?s{????: %s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:442
 msgid "%x(%a) %H:%M"
@@ -15744,7 +15927,7 @@ msgstr "??? ???????? ???? ??????? ??????"
 
 #: src/prefs_compose_writing.c:152
 msgid "Automatically save message to Drafts folder every"
-msgstr "???? ???????? ?? ?????? ?? ?????? ??????"
+msgstr "???? ???????? ?????? ??????? ?????? ??"
 
 #: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
 msgid "characters"
@@ -15795,7 +15978,7 @@ msgstr "???? ?? ????? 'From' ??? ?????? ????"
 # ?????
 #: src/prefs_compose_writing.c:233
 msgid "When dropping files into the Compose window"
-msgstr "??? ????? ????? ?? ??? ???? ??????"
+msgstr "??? ????? ????? ???? ???? ?????"
 
 #: src/prefs_compose_writing.c:242
 msgid "Ask"
@@ -15803,11 +15986,11 @@ msgstr "???"
 
 #: src/prefs_compose_writing.c:243 src/toolbar.c:427
 msgid "Insert"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_compose_writing.c:244 src/toolbar.c:428
 msgid "Attach"
-msgstr "?????"
+msgstr "???"
 
 #: src/prefs_compose_writing.c:371
 msgid "Writing"
@@ -15836,7 +16019,7 @@ msgstr "????? ???? XBM"
 
 #: src/prefs_customheader.c:567
 msgid "Choose a text file"
-msgstr "????? ???? ?????"
+msgstr "????? ???? ????"
 
 #: src/prefs_customheader.c:580
 msgid "This file isn't an image."
@@ -15929,7 +16112,7 @@ msgstr "???? ???????"
 
 #: src/prefs_ext_prog.c:197
 msgid "Command for 'Display as text'"
-msgstr "????? ???? '??? ???? ?????'"
+msgstr "????? ???? '??? ???? ????'"
 
 #: src/prefs_ext_prog.c:210
 msgid ""
@@ -15937,10 +16120,9 @@ msgid ""
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 "?????? ?? ????? ????? MIME ????? ?????? ???? ????? ????? ???? ?????? ???? "
-"??????? ????? ?????? ?????? '??? ???? ?????'"
+"??????? ????? ?????? ?????? '??? ???? ????'"
 
-#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_ext_prog.c:269 src/prefs_image_viewer.c:138 src/prefs_message.c:354
 msgid "Message View"
 msgstr "????? ?????"
 
@@ -15950,15 +16132,15 @@ msgstr "????? ????????"
 
 #: src/prefs_filtering_action.c:175
 msgid "Move"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_filtering_action.c:176
 msgid "Copy"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_filtering_action.c:178
 msgid "Hide"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
@@ -15970,29 +16152,29 @@ msgstr "???? ?????"
 #: src/prefs_filtering_action.c:179 src/prefs_summary_column.c:78
 #: src/summaryview.c:2791
 msgid "Mark"
-msgstr "?????"
+msgstr "???"
 
 #: src/prefs_filtering_action.c:183
 msgid "Mark as read"
-msgstr "????? ???? ?????"
+msgstr "??? ???? ?????"
 
 #: src/prefs_filtering_action.c:184
 msgid "Mark as unread"
-msgstr "????? ???? ?? ?????"
+msgstr "??? ???? ?? ?????"
 
 #: src/prefs_filtering_action.c:185
 msgid "Mark as spam"
-msgstr "????? ???? ????"
+msgstr "??? ???? ????"
 
 #: src/prefs_filtering_action.c:186
 msgid "Mark as ham"
-msgstr "????? ???? ????????"
+msgstr "??? ???? ????????"
 
-# ????? ?????
+# ?????
 #: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
 #: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
 msgid "Execute"
-msgstr "?????"
+msgstr "???"
 
 #: src/prefs_filtering_action.c:189
 msgid "Color label"
@@ -16001,11 +16183,11 @@ msgstr "??? ?????"
 #: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 #: src/prefs_filtering_action.c:193
 msgid "Resend"
-msgstr "????? ??????"
+msgstr "??? ????"
 
 #: src/prefs_filtering_action.c:193
 msgid "Redirect"
-msgstr "?????? ????"
+msgstr "????? ????"
 
 #: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
 #: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
@@ -16094,8 +16276,7 @@ msgstr "?? ???? ???? ???."
 msgid "No action was defined."
 msgstr "?? ????? ?? ??????."
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2169 src/quote_fmt.c:79
 msgid "literal %"
 msgstr "% ??????"
 
@@ -16103,8 +16284,7 @@ msgstr "% ??????"
 msgid "filename (should not be modified)"
 msgstr "?? ???? (?? ???? ????? ???? ??????)"
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2179 src/quote_fmt.c:87
 msgid "new line"
 msgstr "???? ????"
 
@@ -16127,7 +16307,7 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"?'Execute' ???? ?? ????? ????? ?? ????? ?? ????? ?? ?????? ??????? ?? ?????.\n"
+"?'Execute' ???? ?? ????? ????? ?? ????? ?? ????? ??????? ??????? ?? ?????.\n"
 "?????? ????? ?????? ??????:"
 
 #: src/prefs_filtering_action.c:1422
@@ -16154,8 +16334,7 @@ msgstr "????? ????? ??????"
 msgid "Filtering/Processing configuration"
 msgstr "????? ?????/?????"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:867 src/prefs_filtering.c:981
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "????"
@@ -16166,15 +16345,15 @@ msgstr "????"
 
 #: src/prefs_filtering.c:424
 msgid " D_efine... "
-msgstr " ?_????... "
+msgstr " ?_???... "
 
 #: src/prefs_filtering.c:446
 msgid " De_fine... "
-msgstr " ??_???... "
+msgstr " ??_??... "
 
 #: src/prefs_filtering.c:475
 msgid "Append the new rule above to the list"
-msgstr "??? ?? ???? ???? ?? ??????"
+msgstr "??? ?? ???? ???? ??????"
 
 #: src/prefs_filtering.c:484
 msgid "Replace the selected rule in list with the rule above"
@@ -16186,7 +16365,7 @@ msgstr "????? ???? ????? ???? ??????"
 
 #: src/prefs_filtering.c:532
 msgid "Move the selected rule to the top"
-msgstr "???? ???? ????? ?? ????"
+msgstr "???? ???? ????? ????"
 
 #: src/prefs_filtering.c:535
 msgid "Page u_p"
@@ -16214,7 +16393,7 @@ msgstr "???? ???? ????? ???? ??? ???"
 
 #: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
-msgstr "???? ???? ????? ?? ??????"
+msgstr "???? ???? ????? ??????"
 
 #: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
 msgid "Condition string is not valid."
@@ -16362,7 +16541,7 @@ msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
 msgstr ""
-"???? ?? ?????? ?? ?? ???? ???? ?????? ?? ?????? ?? ?? ??? ????? ??? ??? ??  "
+"???? ?? ?????? ?? ?? ???? ???? ?????? ??????? ?? ?? ??? ????? ??? ??? ?? "
 "IMAP ?? ?? ??? ????? ??????"
 
 #: src/prefs_folder_item.c:502
@@ -16374,8 +16553,8 @@ msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
-"\"????? ????\" ????? ??? ????? ??????? (????? ???? /??????/????? ?????/"
-"???????? ?????)"
+"\"????? ????\" ????? ??? ????? ??????? (????? ???? /??????/????? "
+"?????/???????? ????)"
 
 #: src/prefs_folder_item.c:529
 msgid "Synchronise for offline use"
@@ -16404,7 +16583,7 @@ msgstr "??? ???? ?????"
 
 #: src/prefs_folder_item.c:912
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "???? ???? ?? ?????? ?????? ?? ?????? ?? ????? ???? ????"
+msgstr "???? ???? ?? ?????? ?????? ??????? ?? ????? ???? ????"
 
 #: src/prefs_folder_item.c:925 src/prefs_folder_item.c:948
 #: src/prefs_folder_item.c:972 src/prefs_folder_item.c:995
@@ -16688,9 +16867,8 @@ msgid "headers part"
 msgstr "???? ??????"
 
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "????? ????"
+msgstr "???? ??????"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -16874,7 +17052,7 @@ msgstr "?? ????? ??? ?????"
 #: src/prefs_matcher.c:1622
 #, c-format
 msgid "the address(es) in header '%s'"
-msgstr "?????(?)? ???? ????? '%s'"
+msgstr "??????? ???? ????? '%s'"
 
 #: src/prefs_matcher.c:1623
 #, c-format
@@ -16886,17 +17064,16 @@ msgid ""
 msgstr ""
 "???? ???/?????? ???? ?????.\n"
 "\n"
-"?? ?????? ?????? %s ?? ??? ?? ???? ???????, ???? ????? '%s' ???? ?????? "
-"?????? ?? ???/??????."
+"?? ?????? ?????? %s ???? ?? ???? ???????, ???? ????? '%s' ???? ?????? ?????? "
+"?? ???/??????."
 
 #: src/prefs_matcher.c:1842
 msgid "Headers part"
 msgstr "???? ??????"
 
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "?? ?????"
+msgstr "???? ??????"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -16988,8 +17165,8 @@ msgid ""
 "\n"
 "The following symbols can be used:"
 msgstr ""
-"?'Test' ???? ?? ????? ????? ?? ????? ?? ????? ??????? ????? ??????? ?? ?????. "
-"??????? ????? 0 ?? 1.\n"
+"?'Test' ???? ?? ????? ????? ?? ????? ?? ????? ??????? ????? ??????? ?? "
+"?????. ??????? ????? 0 ?? 1.\n"
 "\n"
 "?????? ????? ?????? ??????:"
 
@@ -17024,11 +17201,11 @@ msgstr "?????? HTML"
 
 #: src/prefs_message.c:159
 msgid "Render HTML messages as text"
-msgstr "???? ?????? HTML ???? ?????"
+msgstr "???? ?????? HTML ???? ????"
 
 #: src/prefs_message.c:162
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "???? ?????? HTML-???? ????? ????? ???? ?????"
+msgstr "???? ?????? HTML-???? ????? ???? ???? ?????"
 
 #: src/prefs_message.c:165
 msgid "Select the HTML part of multipart/alternative messages"
@@ -17064,15 +17241,15 @@ msgstr "?????"
 
 #: src/prefs_message.c:242
 msgid "Collapse quoted text on double click"
-msgstr "???? ????? ????? ?????? ?????"
+msgstr "???? ???? ????? ?????? ?????"
 
 #: src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
-msgstr "?????? ?? ????? ??? ???? ????? ?????: "
+msgstr "?????? ?????? ??? ???? ????? ?????: "
 
 #: src/prefs_message.c:355
 msgid "Text Options"
-msgstr "???????? ?????"
+msgstr "???????? ????"
 
 #: src/prefs_msg_colors.c:147
 msgid "Message view"
@@ -17080,7 +17257,7 @@ msgstr "????? ?????"
 
 #: src/prefs_msg_colors.c:154
 msgid "Enable coloration of message text"
-msgstr "???? ????? ?? ????? ??????"
+msgstr "???? ????? ?? ???? ??????"
 
 #: src/prefs_msg_colors.c:162
 msgid "Quote"
@@ -17101,7 +17278,7 @@ msgstr "??? ??????"
 #: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
 #: src/prefs_msg_colors.c:242
 msgid "Text"
-msgstr "?????"
+msgstr "????"
 
 #: src/prefs_msg_colors.c:204
 msgctxt "Tooltip"
@@ -17128,7 +17305,7 @@ msgstr "???? ??? ???? ???? ??? ??????"
 
 #: src/prefs_msg_colors.c:263
 msgid "Enable coloration of text background"
-msgstr "???? ????? ?? ??? ????? ?? ?????"
+msgstr "???? ????? ?? ??? ????? ?? ????"
 
 #: src/prefs_msg_colors.c:279
 msgctxt "Tooltip"
@@ -17278,7 +17455,7 @@ msgstr ""
 
 #: src/prefs_other.c:479
 msgid "Add address to destination when double-clicked"
-msgstr "???? ????? ?? ??? ??????-?????"
+msgstr "???? ????? ???? ??????-?????"
 
 #: src/prefs_other.c:482
 msgid "On exit"
@@ -17392,7 +17569,7 @@ msgstr "?????? ?????? ???????"
 
 #: src/prefs_receive.c:126
 msgid "Use external program for receiving mail"
-msgstr "????? ??????? ??????? ??? ???? ????"
+msgstr "????? ??????? ??????? ????? ???? ????"
 
 #: src/prefs_receive.c:142
 msgid "Automatic checking"
@@ -17433,7 +17610,7 @@ msgstr "????? ???? ???? ???"
 # ?????? ??????
 #: src/prefs_receive.c:201
 msgid "Go to Inbox"
-msgstr "???? ?? ?????? ???? ????"
+msgstr "???? ??????? ???? ????"
 
 # ???? ?? ?????? ???????
 #: src/prefs_receive.c:203
@@ -17472,7 +17649,7 @@ msgstr "????"
 
 #: src/prefs_send.c:161
 msgid "Save sent messages to Sent folder"
-msgstr "???? ?????? ?????? ?? ?????? ???? ????"
+msgstr "???? ?????? ?????? ??????? ???? ????"
 
 #: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
@@ -17565,9 +17742,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "?????? (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "?????? (KOI8-R)"
+msgstr "?????? (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -17767,8 +17943,7 @@ msgstr "???? ???? ???? ??????"
 msgid "the time zone or name or abbreviation"
 msgstr "???? ???? ?? ?????"
 
-#: src/prefs_summaries.c:191 src/prefs_summaries.c:239
-#: src/prefs_summaries.c:519
+#: src/prefs_summaries.c:191 src/prefs_summaries.c:239 src/prefs_summaries.c:519
 msgid "Date format"
 msgstr "????? ?????"
 
@@ -17838,16 +18013,16 @@ msgstr "???? ????? ????? ????? ????"
 msgid "Thread using subject in addition to standard headers"
 msgstr "??? ????? ????? ???? ????? ??????? ?????????"
 
-# ????? ?????
+# ????? ?????
 #: src/prefs_summaries.c:474
 msgid "Execute immediately when moving or deleting messages"
 msgstr "????? ????? ??? ????? ?? ????? ?? ??????"
 
 #: src/prefs_summaries.c:476
 msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr "????? ?????, ????? ?????? ?? ?????? ?? ????? '????/???? ?? ?????'"
+"Defers moving, copying and deleting of messages until you choose "
+"'Tools/Execute'"
+msgstr "????? ?????, ????? ?????? ?? ?????? ?? ????? '????/???'"
 
 #: src/prefs_summaries.c:479
 msgid "Mark message as read"
@@ -17886,7 +18061,7 @@ msgstr "???? ???? ??????"
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
-msgstr "?????? ?? ?????? ????????? (???? ':From', ?':Subject') ?????? ?? ????."
+msgstr "?????? ?? ?????? ????????? (???? ':From', ?':Subject') ?????? ?????."
 
 #: src/prefs_summaries.c:679
 msgid "Summaries"
@@ -17957,7 +18132,7 @@ msgstr "???? ????? ??? ?? ????? ?????. ??? ?? ??
 
 #: src/prefs_template.c:309
 msgid "Append the new template above to the list"
-msgstr "??? ?? ?????? ???? ?? ??????"
+msgstr "??? ?? ?????? ???? ??????"
 
 #: src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
@@ -17973,7 +18148,7 @@ msgstr "??? ???? ?? ????? ??????"
 
 #: src/prefs_template.c:370
 msgid "Move the selected template to the top"
-msgstr "???? ?????? ?????? ?? ????"
+msgstr "???? ?????? ?????? ????"
 
 #: src/prefs_template.c:380
 msgid "Move the selected template up"
@@ -18021,10 +18196,9 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "???? \"Bcc\" ?? ?????? ???? ????? ????? ?????."
 
 #: src/prefs_template.c:835
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "???? \"To\" ?? ?????? ???? ????? ????? ?????."
+msgstr "???? \"Reply-To\" ?? ?????? ???? ????? ????? ?????."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -18169,7 +18343,7 @@ msgstr "%d ??????? ?????? (%d ?????, %d ?????, 1 ????
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
-msgstr "????? ????? ???? %d ??????"
+msgstr "????? ????? ???? %d ?????"
 
 #: src/prefs_themes.c:714
 msgid "No info file available for this theme"
@@ -18182,7 +18356,7 @@ msgstr "?????: ?? ???? ?????? ????? ??? ?????"
 #: src/prefs_themes.c:756
 #, c-format
 msgid "%d files (%d icons), size: %s"
-msgstr "%d ????? (%d ??????), ????: %s"
+msgstr "%d ????? (%d ?????), ????: %s"
 
 #: src/prefs_themes.c:804
 msgid "Selector"
@@ -18222,11 +18396,11 @@ msgstr ""
 
 #: src/prefs_toolbar.c:177
 msgid "Item has no icon defined."
-msgstr "????? ??? ????? ??????."
+msgstr "????? ??? ??? ?????."
 
 #: src/prefs_toolbar.c:178
 msgid "Item has no text defined."
-msgstr "????? ??? ????? ?????."
+msgstr "????? ??? ???? ?????."
 
 #: src/prefs_toolbar.c:916
 msgid "Toolbar item"
@@ -18254,11 +18428,11 @@ msgstr "????? ?????? ?????"
 
 #: src/prefs_toolbar.c:991
 msgid "Toolbar text"
-msgstr "????? ???? ????"
+msgstr "???? ???? ????"
 
 #: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
 msgid "Icon"
-msgstr "?????"
+msgstr "???"
 
 #: src/prefs_toolbar.c:1042
 msgid "A_dd"
@@ -18282,7 +18456,7 @@ msgstr "???? ?????"
 
 #: src/prefs_toolbar.c:1405
 msgid "Icon text"
-msgstr "????? ?????"
+msgstr "???? ???"
 
 #: src/prefs_toolbar.c:1414
 msgid "Mapped event"
@@ -18290,7 +18464,7 @@ msgstr "????? ?????"
 
 #: src/prefs_toolbar.c:1711
 msgid "Toolbar item icon"
-msgstr "????? ???? ???? ????"
+msgstr "??? ???? ???? ????"
 
 #: src/prefs_wrapping.c:80
 msgid "Auto wrapping"
@@ -18302,7 +18476,7 @@ msgstr "???? ?????"
 
 #: src/prefs_wrapping.c:82
 msgid "Wrap pasted text"
-msgstr "???? ????? ?????"
+msgstr "???? ???? ?????"
 
 #: src/prefs_wrapping.c:83
 msgid "Auto indent"
@@ -18310,7 +18484,7 @@ msgstr "??? ????????"
 
 #: src/prefs_wrapping.c:89
 msgid "Wrap text at"
-msgstr "???? ????? ????? ??"
+msgstr "???? ???? ????? ??"
 
 #: src/prefs_wrapping.c:154
 msgid "Wrapping"
@@ -18570,7 +18744,8 @@ msgid ""
 "to insert"
 msgstr ""
 "??? ????:\n"
-"?<span style=\"oblique\">?sub_expr</span> ???? ????? ???? ????? ?? ????? ??????"
+"?<span style=\"oblique\">?sub_expr</span> ???? ????? ???? ????? ?? ????? "
+"??????"
 
 # ????? ?? ????
 #: src/quote_fmt.c:93
@@ -18592,7 +18767,7 @@ msgid ""
 msgstr ""
 "??? ??? ?????:\n"
 "?<span style=\"oblique\">?sub_expr</span> ???? ????? ?????? ??\n"
-"????? ????-?????"
+"???? ????-?????"
 
 #: src/quote_fmt.c:95
 msgid ""
@@ -18601,7 +18776,8 @@ msgid ""
 "to attach"
 msgstr ""
 "??? ????:\n"
-"<span style=\"oblique\">?sub_expr</span> ???? ????? ???? ????? ?? ????? ??????"
+"<span style=\"oblique\">?sub_expr</span> ???? ????? ???? ????? ?? ????? "
+"??????"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18612,7 +18788,7 @@ msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
-"????? ??? ???? ????? ?? ??? ?? ?????? ??\n"
+"???? ??? ???? ????? ?? ??? ?? ?????? ??\n"
 "??????? ????"
 
 #: src/quote_fmt.c:99
@@ -18620,7 +18796,7 @@ msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
-"????? ??? ???? ????? ?? ??? ?? ?????? (??\n"
+"???? ??? ???? ????? ?? ??? ?? ?????? (??\n"
 "??????) ????"
 
 #: src/quote_fmt.c:100
@@ -18698,7 +18874,7 @@ msgstr "???? \"???? ??????\" ?? ?????? \"?????\" ??
 #: src/quote_fmt_parse.y:509
 #, c-format
 msgid "Enter text to replace '%s'"
-msgstr "??? ????? ?????? '%s'"
+msgstr "??? ???? ?????? '%s'"
 
 #: src/quote_fmt_parse.y:510
 msgid "Enter variable"
@@ -18712,21 +18888,21 @@ msgstr "???? ??? ????? ??????? ?????: %s\n"
 #: src/send_message.c:166
 #, c-format
 msgid "Couldn't execute command: %s"
-msgstr "?? ???? ?????? ?????? ????? ?? ?????: %s"
+msgstr "?? ???? ?????? ???? ?????: %s"
 
 #: src/send_message.c:201
 #, c-format
 msgid "Error occurred while executing command: %s"
-msgstr "????? ????? ????? ????? ????? ?? ?????: %s"
+msgstr "????? ????? ????? ????? ?????: %s"
 
 #: src/send_message.c:348
 msgid "Connecting"
 msgstr "????? ???"
 
-# ????? ????? ????
+# ????? ????
 #: src/send_message.c:353
 msgid "Doing POP before SMTP..."
-msgstr "???? POP ???? SMTP..."
+msgstr "????? POP ???? SMTP..."
 
 #: src/send_message.c:356
 msgid "POP before SMTP"
@@ -18735,7 +18911,7 @@ msgstr "POP ???? SMTP"
 #: src/send_message.c:361
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "????? '%s': ??? ????? ?? ??? SMTP: ?%s:%d..."
+msgstr "????? '%s': ??? ????? ???? SMTP: ?%s:%d..."
 
 #: src/send_message.c:418
 msgid "Mail sent successfully."
@@ -18915,7 +19091,7 @@ msgstr "??? ?????? ??? ?????."
 
 #: src/summaryview.c:1898
 msgid "No unread message found. Go to next folder?"
-msgstr "?? ????? ?????? ??? ?????. ????? ?? ?????? ????"
+msgstr "?? ????? ?????? ??? ?????. ????? ??????? ?????"
 
 #: src/summaryview.c:1940 src/summaryview.c:1992
 msgid "No more new messages"
@@ -18931,7 +19107,7 @@ msgstr "??? ?????? ?????."
 
 #: src/summaryview.c:1993
 msgid "No new message found. Go to next folder?"
-msgstr "?? ????? ?????? ?????. ????? ?? ?????? ????"
+msgstr "?? ????? ?????? ?????. ????? ??????? ?????"
 
 #: src/summaryview.c:2030 src/summaryview.c:2071
 msgid "No more marked messages"
@@ -18947,7 +19123,7 @@ msgstr "??? ?????? ???????."
 
 #: src/summaryview.c:2072
 msgid "No marked message found. Go to next folder?"
-msgstr "?? ????? ?????? ???????. ????? ?? ?????? ????"
+msgstr "?? ????? ?????? ???????. ????? ??????? ?????"
 
 #: src/summaryview.c:2109 src/summaryview.c:2134
 msgid "No more labeled messages"
@@ -19140,10 +19316,6 @@ msgstr ""
 "?????? ????? ??????? ??? ?????? ??????.\n"
 "??? ??? ?? ????? ?? ????? ???:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_???"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "??? ????..."
@@ -19203,15 +19375,15 @@ msgstr ""
 
 #: src/summaryview.c:8045
 msgid "Go back to the folder list (You have unread messages)"
-msgstr "???? ?? ????? ??????? (?? ?? ?????? ??? ?????)"
+msgstr "???? ?????? ?????? (?? ?? ?????? ??? ?????)"
 
 #: src/summaryview.c:8050
 msgid "Go back to the folder list"
-msgstr "???? ?? ????? ???????"
+msgstr "???? ?????? ??????"
 
 #: src/textview.c:232
 msgid "_Open in web browser"
-msgstr "_??? ?????? ???"
+msgstr "_??? ???? ????? ???"
 
 #: src/textview.c:233
 msgid "Copy this _link"
@@ -19219,11 +19391,11 @@ msgstr "???? _????? ??"
 
 #: src/textview.c:240
 msgid "_Reply to this address"
-msgstr "_???? ?? ????? ??"
+msgstr "_??? ?????? ??"
 
 #: src/textview.c:241
 msgid "Add to _Address book"
-msgstr "???? ?? ???_? ??????"
+msgstr "???? ????_? ??????"
 
 #: src/textview.c:242
 msgid "Copy this add_ress"
@@ -19235,7 +19407,7 @@ msgstr "_??? ?????"
 
 #: src/textview.c:249
 msgid "_Save image..."
-msgstr "_????? ?????..."
+msgstr "_???? ?????..."
 
 #: src/textview.c:722
 #, c-format
@@ -19279,7 +19451,7 @@ msgstr "  ??????? ????? ?????? ?????? ?? ??? ??\n
 # ????? ??????
 #: src/textview.c:975
 msgid "  by right-clicking the icon or list item:"
-msgstr "  ?? ??? ?????-????? ?? ?????? ?? ?????? ??????:"
+msgstr "  ?? ??? ?????-????? ?? ???? ?? ?????? ??????:"
 
 #: src/textview.c:979
 msgid "     - To save, select "
@@ -19287,20 +19459,19 @@ msgstr "     - ??????, ??? "
 
 #: src/textview.c:980
 msgid "'Save as...'"
-msgstr "'????? ???...'"
+msgstr "'???? ???...'"
 
-#: src/textview.c:982 src/textview.c:994 src/textview.c:1006
-#: src/textview.c:1016
+#: src/textview.c:982 src/textview.c:994 src/textview.c:1006 src/textview.c:1016
 msgid " (Shortcut key: '"
 msgstr " (??? ????? ???: '"
 
 #: src/textview.c:990
 msgid "     - To display as text, select "
-msgstr "     - ????? ???? ?????, ??? "
+msgstr "     - ????? ???? ????, ??? "
 
 #: src/textview.c:991
 msgid "'Display as text'"
-msgstr "'??? ???? ?????'"
+msgstr "'??? ???? ????'"
 
 #: src/textview.c:1002
 msgid "     - To open with an external program, select "
@@ -19324,7 +19495,7 @@ msgstr "     - ?? "
 
 #: src/textview.c:1015
 msgid "'Open with...'"
-msgstr "'????? ???????...'"
+msgstr "'??? ?????...'"
 
 #: src/textview.c:1127
 #, c-format
@@ -19333,7 +19504,7 @@ msgid ""
 "    %s\n"
 "Exit code %d\n"
 msgstr ""
-"?????? ?????? ???????? ???? ????? ?????:\n"
+"?????? ?????? ???????? ???? ???? ?????:\n"
 "    %s\n"
 "??? ????? %d\n"
 
@@ -19370,39 +19541,39 @@ msgstr "_??? URL"
 
 #: src/toolbar.c:192 src/toolbar.c:1930
 msgid "Receive Mail from all Accounts"
-msgstr "???? ???? ??? ????????"
+msgstr "??? ???? ??? ????????"
 
 #: src/toolbar.c:193 src/toolbar.c:1935
 msgid "Receive Mail from current Account"
-msgstr "???? ???? ???? ????? ?????"
+msgstr "??? ???? ???? ????? ?????"
 
 #: src/toolbar.c:194 src/toolbar.c:1939
 msgid "Send Queued Messages"
-msgstr "????? ?????? ??????"
+msgstr "??? ?????? ??????"
 
 #: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
 msgid "Compose Email"
-msgstr "????? ?????"
+msgstr "???? ?????"
 
 #: src/toolbar.c:196
 msgid "Compose News"
-msgstr "????? ?????"
+msgstr "???? ?????"
 
 #: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
 msgid "Reply to Message"
-msgstr "???? ??????"
+msgstr "??? ??????"
 
 #: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
 msgid "Reply to Sender"
-msgstr "???? ?????"
+msgstr "??? ?????"
 
 #: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
 msgid "Reply to All"
-msgstr "???? ?????"
+msgstr "??? ?????"
 
 #: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
 msgid "Reply to Mailing-list"
-msgstr "???? ??????-?????"
+msgstr "??? ??????-?????"
 
 #: src/toolbar.c:201 src/toolbar.c:1951
 msgid "Open email"
@@ -19410,81 +19581,79 @@ msgstr "??? ?????"
 
 #: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
 msgid "Forward Message"
-msgstr "????? ?????"
+msgstr "??? ?????"
 
 #: src/toolbar.c:203 src/toolbar.c:2080
 msgid "Trash Message"
-msgstr "????? ?????"
+msgstr "???? ?????"
 
 #: src/toolbar.c:204 src/toolbar.c:2084
 msgid "Delete Message"
-msgstr "????? ?????"
+msgstr "??? ?????"
 
-# ???? ??
 #: src/toolbar.c:206 src/toolbar.c:2092
 msgid "Go to Previous Unread Message"
-msgstr "???? ?? ????? ????? ??? ?????"
+msgstr "???? ?????? ????? ??? ?????"
 
 #: src/toolbar.c:207 src/toolbar.c:2096
 msgid "Go to Next Unread Message"
-msgstr "???? ?? ????? ??? ??? ?????"
+msgstr "???? ?????? ???? ??? ?????"
 
 #: src/toolbar.c:210 src/toolbar.c:421
 msgid "Print"
-msgstr "?????"
+msgstr "????"
 
 #: src/toolbar.c:211
 msgid "Learn Spam or Ham"
-msgstr "????? ???? ???? ?? ????????"
+msgstr "??? ???? ???? ?? ????????"
 
 #: src/toolbar.c:212
 msgid "Open folder/Go to folder list"
-msgstr "????? ??????/???? ?? ????? ??????"
+msgstr "??? ??????/???? ?????? ??????"
 
 #: src/toolbar.c:215 src/toolbar.c:2102
 msgid "Send Message"
-msgstr "????? ?????"
+msgstr "??? ?????"
 
 #: src/toolbar.c:216 src/toolbar.c:2106
 msgid "Put into queue folder and send later"
-msgstr "???? ???? ?????? ??? ?????? ?????"
+msgstr "??? ???? ?????? ??? ???? ?????"
 
 #: src/toolbar.c:217 src/toolbar.c:2110
 msgid "Save to draft folder"
-msgstr "????? ?? ?????? ?????"
+msgstr "???? ??????? ?????"
 
-# ?????
 #: src/toolbar.c:218 src/toolbar.c:2114
 msgid "Insert file"
-msgstr "????? ????"
+msgstr "??? ????"
 
 #: src/toolbar.c:219 src/toolbar.c:2118
 msgid "Attach file"
-msgstr "????? ????"
+msgstr "??? ????"
 
 #: src/toolbar.c:220 src/toolbar.c:2122
 msgid "Insert signature"
-msgstr "????? ?????"
+msgstr "??? ?????"
 
 #: src/toolbar.c:221 src/toolbar.c:2126
 msgid "Replace signature"
-msgstr "????? ?????"
+msgstr "???? ?????"
 
 #: src/toolbar.c:222 src/toolbar.c:2130
 msgid "Edit with external editor"
-msgstr "????? ??????? ???? ??????"
+msgstr "???? ????? ???? ??????"
 
 #: src/toolbar.c:223 src/toolbar.c:2134
 msgid "Wrap long lines of current paragraph"
-msgstr "????? ????? ?????? ?? ???? ??????"
+msgstr "???? ????? ?????? ?? ???? ??????"
 
 #: src/toolbar.c:224 src/toolbar.c:2138
 msgid "Wrap all long lines"
-msgstr "????? ?? ?????? ???????"
+msgstr "???? ?? ?? ?????? ???????"
 
 #: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
 msgid "Check spelling"
-msgstr "????? ????"
+msgstr "???? ????"
 
 #: src/toolbar.c:229
 msgid "Claws Mail Actions Feature"
@@ -19492,19 +19661,19 @@ msgstr "????? ?????? Claws Mail"
 
 #: src/toolbar.c:230 src/toolbar.c:2163
 msgid "Cancel receiving"
-msgstr "????? ????"
+msgstr "??? ????"
 
 #: src/toolbar.c:232 src/toolbar.c:2171
 msgid "Cancel receiving/sending"
-msgstr "????? ????/?????"
+msgstr "??? ????/?????"
 
 #: src/toolbar.c:233 src/toolbar.c:1943
 msgid "Close window"
-msgstr "????? ????"
+msgstr "???? ????"
 
 #: src/toolbar.c:235
 msgid "Claws Mail Plugins"
-msgstr "?????? Claws Mail"
+msgstr "?????? Claws Mail"
 
 #: src/toolbar.c:379 src/toolbar.c:414
 msgctxt "Toolbar"
@@ -19515,7 +19684,6 @@ msgstr "????"
 msgid "Folders"
 msgstr "??????"
 
-# ???
 #: src/toolbar.c:404
 msgid "Get Mail"
 msgstr "??? ????"
@@ -19556,7 +19724,7 @@ msgstr "?????"
 
 #: src/toolbar.c:429
 msgid "Insert sig."
-msgstr "??? ??."
+msgstr "??? ?????"
 
 #: src/toolbar.c:430
 msgid "Replace sig."
@@ -19568,7 +19736,7 @@ msgstr "????"
 
 #: src/toolbar.c:432
 msgid "Wrap para."
-msgstr "???? ??."
+msgstr "???? ????"
 
 #: src/toolbar.c:433
 msgid "Wrap all"
@@ -19600,7 +19768,7 @@ msgstr "??? ????????"
 
 #: src/toolbar.c:1925
 msgid "Go to folder list"
-msgstr "???? ?? ????? ??????"
+msgstr "???? ?????? ??????"
 
 #: src/toolbar.c:1931
 msgid "Receive Mail from selected Account"
@@ -19628,7 +19796,7 @@ msgstr "??? ???? _????????"
 
 #: src/toolbar.c:1997
 msgid "Reply to Message options"
-msgstr "???????? ???? ?? ?????"
+msgstr "???????? ???? ??????"
 
 #: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
 msgid "_Reply with quote"
@@ -19640,15 +19808,15 @@ msgstr "???? ??? _?????"
 
 #: src/toolbar.c:2014
 msgid "Reply to Sender options"
-msgstr "???????? ???? ?? ????"
+msgstr "???????? ???? ?????"
 
 #: src/toolbar.c:2031
 msgid "Reply to All options"
-msgstr "???????? ???? ?? ????"
+msgstr "???????? ???? ?????"
 
 #: src/toolbar.c:2048
 msgid "Reply to Mailing-list options"
-msgstr "???????? ???? ?? ?????-?????"
+msgstr "???????? ???? ??????-?????"
 
 #: src/toolbar.c:2065
 msgid "Forward Message options"
@@ -19678,7 +19846,7 @@ msgstr "??? ???"
 #: src/wizard.c:521
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
-msgstr "???? ???? ?? Claws Mail"
+msgstr "?????? ????? ?? Claws Mail"
 
 # ??? ?
 # ???? ??
@@ -19731,17 +19899,17 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"???? ???? ?? Claws Mail\n"
+"?????? ????? ?? Claws Mail\n"
 "-----------------------\n"
 "\n"
 "??? ??????? ?? ?????? ???????? ????? ???? ?? ?? ????? ??\n"
 "????? '??? ????' ????? ???? ?????.\n"
 "\n"
-"?Claws Mail ???? ?????? ?????? ???? ??????? ??? ??????,\n"
-"???? ????-???? ????? ?????? (??? ??????? Bogofilter ??\n"
+"?Claws Mail ???? ?????? ?????? ???? ??????? ??? ??????,\n"
+"???? ????-???? ????? ?????? (??? ??????? Bogofilter ??\n"
 "?SpamAssassin), ???? ?? ?????? (??? PGP/Mime), ????\n"
 "?RSS, ??? ???, ???? ???? ????. ???????? ??????? ????\n"
-"?????? '/?????/??????'.\n"
+"?????? '/?????/??????'.\n"
 "\n"
 "???????? ????? ?? ?????? ?????? ???????\n"
 "?????? '/?????/?????? ???? ????? ?????' ??????\n"
@@ -19815,15 +19983,15 @@ msgstr "<span weight=\"bold\">?? ???? ????:</span>"
 
 #: src/wizard.c:1030
 msgid ""
-"You can also specify an absolute path, for example: \"/home/john/Documents/"
-"Mail\""
+"You can also specify an absolute path, for example: "
+"\"/home/john/Documents/Mail\""
 msgstr ""
 "???????? ?? ????? ?? ????? ??????, ??????: \"/home/john/Documents/Mail\""
 
 #: src/wizard.c:1101
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:25\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:25\""
 msgstr "???????? ????? ???? ???? ?? ??? ?????? ????: \"mail.example.com:25\""
 
 #: src/wizard.c:1104
@@ -19850,7 +20018,7 @@ msgstr "????? SMTP:"
 
 #: src/wizard.c:1156
 msgid "Use SSL to connect to SMTP server"
-msgstr "????? ?????? SSL ???????? ?? ??? SMTP"
+msgstr "????? ?????? SSL ???????? ???? SMTP"
 
 #: src/wizard.c:1167 src/wizard.c:1582
 msgid "Use SSL via STARTTLS"
@@ -19878,8 +20046,8 @@ msgstr "IMAP"
 
 #: src/wizard.c:1541
 msgid ""
-"You can specify the port number by appending it at the end: \"mail.example."
-"com:110\""
+"You can specify the port number by appending it at the end: "
+"\"mail.example.com:110\""
 msgstr ""
 "???????? ????? ?? ???? ????? ?? ??? ?????? ????: \"mail.example.com:110\""
 
@@ -19889,7 +20057,7 @@ msgstr "<span weight=\"bold\">?? ?????:</span>"
 
 #: src/wizard.c:1571
 msgid "Use SSL to connect to receiving server"
-msgstr "????? ?????? SSL ??? ?????? ?? ??? ????"
+msgstr "????? ?????? SSL ??? ?????? ???? ????"
 
 #: src/wizard.c:1636
 msgid "IMAP server directory:"
@@ -19913,7 +20081,7 @@ msgstr "??? ?????? Claws Mail"
 
 #: src/wizard.c:1807
 msgid "Welcome to Claws Mail"
-msgstr "???? ???? ?? Claws Mail"
+msgstr "?????? ????? ?? Claws Mail"
 
 #: src/wizard.c:1815
 msgid ""
@@ -19923,7 +20091,7 @@ msgid ""
 "common mail options so that you can start to use Claws Mail in less than "
 "five minutes."
 msgstr ""
-"???? ???? ?? ??? ?????? Claws Mail.\n"
+"?????? ????? ???? ?????? Claws Mail.\n"
 "\n"
 "????? ????? ?????? ???? ????? ???????? ????????? ???? ???? ?????? ????? ??? "
 "?????? ?????? ?????? ?????? ?? Claws Mail ???? ???? ???? ????."
@@ -19992,15 +20160,12 @@ msgstr ""
 #~ msgid "messages which contain header S"
 #~ msgstr "?????? ??????? ????? S"
 
-#, fuzzy
 #~ msgid "ldapsvr_retrieve_item_person->Unknown status: %d"
 #~ msgstr "?ldapsvr_retrieve_item_person->??? ?? ????: %d"
 
-#, fuzzy
 #~ msgid "ldapsvr_update_book: Could not clean cache\n"
 #~ msgstr "?ldapsvr_update_book: ?? ???? ?????? ????? ?????"
 
-#, fuzzy
 #~ msgid "ldapsvr_update_book->Unknown status: %s\n"
 #~ msgstr "?ldapsvr_update_book->??? ?? ????: %s\n"
 
@@ -20160,6 +20325,3 @@ msgstr ""
 # ????? ???
 #~ msgid "Use this"
 #~ msgstr "??? ?? ??"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "?? ???? ?????? ?????? ?? ??????: %s"
diff --git a/po/hu.po b/po/hu.po
index 1f344fc..2a8ce07 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,27 +9,26 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.10.0\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-05-24 00:05+0100\n"
+"POT-Creation-Date: 2015-07-12 10:28+0200\n"
+"PO-Revision-Date: 2015-07-18 23:18+0200\n"
 "Last-Translator: rezso <rezso at rezso.net>\n"
-"Language-Team:  <NONE>\n"
+"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 1.8.2\n"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 "N?h?ny szerkeszt?ablak nyitva van.\n"
-"Z?rd be az ablakokat a fi?kok m?dos?t?sa el?tt!"
+"Z?rd be a szerkesztablakokat a fi?kok m?dos?t?sa el?tt!"
 
 # src/folderview.c:1567 src/folderview.c:1814
 #: src/account.c:437
@@ -96,13 +95,14 @@ msgstr "A 'Levelek fogad?sa' minden bejel?lt fi?kot ellen?riz"
 # src/editjpilot.c:295 src/editldap.c:298 src/editvcard.c:210
 # src/mimeview.c:150 src/prefs_folder_item.c:164 src/select-keys.c:299
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -235,19 +235,16 @@ msgid "Action's user argument"
 msgstr "A m?velet felhaszn?l?i argumentuma"
 
 #: src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
-msgstr "Egy mappa nem m?solhat? az almapp?j?ba."
+msgstr "Egy mappa nem m?solhat? ?nmag?ba vagy az almapp?iba."
 
 #: src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr "Nem lehet beilleszteni. A c?l c?mjegyz?k csak olvashat?."
+msgstr "Egy c?mjegyz?k nem m?solhat? ?nmag?ba."
 
 #: src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
-msgstr "Egy mappa nem helyezhet? ?t az almapp?j?ba."
+msgstr "Egy mappa nem helyezhet? ?t ?nmag?ba vagy az almapp?iba."
 
 # src/addressbook.c:3099
 #: src/addr_compl.c:685 src/addressbook.c:4873
@@ -490,7 +487,7 @@ msgstr "_C?mjegyz?k"
 # src/mainwindow.c:436
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "S_zerkeszt?s"
 
@@ -543,6 +540,8 @@ msgstr "C?mjegyz?k _t?rl?se"
 
 # src/mimeview.c:117 src/summaryview.c:387
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Ment?s"
 
@@ -551,6 +550,8 @@ msgstr "_Ment?s"
 # src/inc.c:550 src/message_search.c:135 src/prefs_actions.c:1648
 # src/prefs_filter.c:198 src/summary_search.c:201
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Bez?r?s"
 
@@ -566,12 +567,13 @@ msgstr "Ki_v?g?s"
 # src/summaryview.c:355
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_M?sol?s"
 
 # src/compose.c:463
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Beilleszt?s"
 
@@ -1109,16 +1111,15 @@ msgid "Update failed. Changes not written to Directory."
 msgstr "A friss?t?s nem siker?lt. A v?ltoz?sok nem lettek a c?mjegyz?kbe ?rva."
 
 # src/alertpanel.c:120 src/compose.c:4590 src/main.c:410
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Megjegyz?s"
 
 # src/alertpanel.c:133 src/main.c:245
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:868
-#: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
-#: src/summaryview.c:4871
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
+#: src/messageview.c:855 src/messageview.c:868 src/plugins/pgpcore/sgpgme.c:732
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4871
 msgid "Warning"
 msgstr "Figyelmeztet?s"
 
@@ -1139,9 +1140,9 @@ msgid "Show this message next time"
 msgstr "Mutasd ezt az ?zenetet legk?zelebb"
 
 #: src/avatars.c:102
-#, fuzzy
 msgid "Failed to register avatars internal rendering hook"
-msgstr "Az avatar k?p megjelen?t?si szab?lyl?nc regisztr?l?sa nem siker?lt"
+msgstr ""
+"Az avatar k?p bels? megjelen?t?si szab?lyl?nc regisztr?l?sa nem siker?lt"
 
 #: src/browseldap.c:218
 msgid "Browse Directory Entry"
@@ -1737,16 +1738,16 @@ msgstr "_Nyomtat?s"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Visszavon?s"
 
 # src/colorlabel.c:46
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Ism?tl?s"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Kiv?g?s"
 
@@ -1772,6 +1773,7 @@ msgstr "_Nem t?rdelt"
 
 # src/summaryview.c:390
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Mi_ndent kijel?l"
 
@@ -1853,6 +1855,7 @@ msgstr "T?rl?s a sor v?g?ig"
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Keres?s"
 
@@ -2196,7 +2199,7 @@ msgid "Are you sure?"
 msgstr "Biztos vagy benne?"
 
 # src/compose.c:3946 src/compose.c:5131
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Besz?r?s"
 
@@ -2313,7 +2316,7 @@ msgid "Send later"
 msgstr "K?ld?s k?s?bb"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2324,7 +2327,7 @@ msgstr ""
 "A karakterk?szlet ?talak?t?sa nem siker?lt."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2335,7 +2338,7 @@ msgstr ""
 "A c?mzett titkos?t? kulcsa nem hozz?f?rhet?."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2405,78 +2408,83 @@ msgstr ""
 "\n"
 "Elk?ld?d ?gy?"
 
+# src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Az e-mail nem titkos?that?: %s"
+
 # src/inc.c:462
-#: src/compose.c:5903
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Titkos?t?si figyelmeztet?s"
 
 # src/send.c:375
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+F_olytat?s"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Nincs el?rhet? fi?k az ?zenetk?ld?shez!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A kiv?lasztott fi?k nem NNTP: a k?ld?s nem lehets?ges."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s csatol?s m?r nem l?tezik. Kihagy?s?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
-#: src/toolbar.c:2167
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231 src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "A k?ld?s f?lbeszak?t?sa"
 
 # src/summaryview.c:349
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Csatol?s kihagy?sa"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Eredeti %s r?sz"
 
 # src/summaryview.c:369
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Felv?tel a _c?mjegyz?kbe"
 
 # src/account.c:672
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Bejegyz?s tartalm?nak t?rl?se"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Haszn?ld a <TAB> billenty?t az automatikus kieg?sz?t?shez a c?mjegyz?kb?l"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "MIME t?pus"
 
 # src/compose.c:3461 src/mimeview.c:149 src/prefs_summary_column.c:73
 # src/select-keys.c:297 src/summaryview.c:401
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "M?ret"
 
 # src/prefs_common.c:1065
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Elk?ld?tt ?zenet ment?se:"
 
 # src/colorlabel.c:51
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2489,27 +2497,25 @@ msgstr "_B?ng?sz?s"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "_Fejl?c"
 
 # src/mimeview.c:196
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Csatol?sok"
 
 # src/prefs_common.c:826 src/select-keys.c:324
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "_Egyebek"
 
-# src/headerview.c:57 src/prefs_template.c:172 src/summary_search.c:162
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "T?rgy:"
+msgstr "_T?rgy:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2518,27 +2524,25 @@ msgstr ""
 "Helyes?r?s-ellen?rz? nem ind?that?.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Felad?: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-# src/compose.c:3512 src/headerview.c:54 src/summary_search.c:148
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Felad?:"
+msgstr "_Felad?:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Az e-mailhez haszn?land? fi?k"
 
 # src/editaddress.c:460
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "A haszn?lt felad? c?m."
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2548,85 +2552,84 @@ msgstr ""
 "titkos?tani."
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Nincs"
 
 # src/prefs_template.c:438
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Hiba a sablon t?rzs?nek %d. sor?ban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Felad? form?tum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "C?mzett form?tum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "M?solatot kap form?tum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Titkos m?solatot kap form?tum hiba a sablonban."
 
 # src/prefs_template.c:438
-#: src/compose.c:8753
-#, fuzzy
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
-msgstr "C?mzett form?tum hiba a sablonban."
+msgstr "V?laszc?m form?tum hiba a sablonban."
 
 # src/compose.c:1157
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "T?rgy form?tum hiba a sablonban."
 
 # src/compose.c:4280
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "?rv?nytelen MIME t?pus."
 
 # src/compose.c:4298
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "A f?jl nem l?tezik vagy ?res."
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Tulajdons?gok"
 
 # src/compose.c:3460 src/compose.c:4384
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "MIME t?pus"
 
 # src/compose.c:4386
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "K?dol?s"
 
 # src/compose.c:4409 src/prefs_folder_item.c:177
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "El?r?si ?t"
 
 # src/compose.c:4410
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "F?jln?v"
 
 # src/compose.c:4587
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2637,17 +2640,17 @@ msgstr ""
 "Processz le?ll?t?sa?\n"
 "Processzcsoport azonos?t?: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Az e-mail elk?ld?s?hez h?l?zati kapcsolat kell."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Az ?zenet nem tehet? sorba a k?ld?shez."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2659,16 +2662,16 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "A v?zlat nem menthet?."
 
 # src/prefs_actions.c:683
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "A v?zlat nem menthet?."
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2689,26 +2692,26 @@ msgstr ""
 # src/prefs_display_header.c:192 src/prefs_summary_column.c:310
 # src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
 # src/summaryview.c:588 src/summaryview.c:2671
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_M?gsem l?p ki"
 
 # src/compose.c:5095
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_E-mail eldob?sa"
 
 # src/compose.c:5055 src/compose.c:5069
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "F?jl kiv?laszt?sa"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' f?jl nem olvashat?."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2718,72 +2721,72 @@ msgstr ""
 "nem ?rv?nyes karaktereket tartalmaz, a besz?r?s hib?s lehet."
 
 # src/compose.c:5093
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "?zenet eldob?sa"
 
 # src/compose.c:5094
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Az ?zenet megv?ltozott. Elveted?"
 
 # src/compose.c:5095
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "Elvet?s"
 
 # src/compose.c:5095
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Ment?s a V?zlatokhoz"
 
 # src/mimeview.c:798 src/summaryview.c:2664
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "M?dos?t?sok ment?se"
 
 # src/compose.c:5094
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Az ?zenet megv?ltozott. Mented az utols? m?dos?t?sokat?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Nincs ment?s"
 
 # src/compose.c:5095
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+_Ment?s a V?zlatokhoz"
 
 # src/compose.c:5128
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Alkalmazni k?v?nod a(z) '%s' sablont?"
 
 # src/compose.c:5130
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Sablon alkalmaz?sa"
 
 # src/compose.c:5131
-#: src/compose.c:10375 src/prefs_actions.c:329
-#: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
-#: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
+#: src/compose.c:10393 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:775 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "Cse_re"
 
 # src/compose.c:3946 src/compose.c:5131
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "Besz?r?s"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Besz?r?s vagy csatol?s?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2792,17 +2795,17 @@ msgstr ""
 "szeretn?d elk?ldeni?"
 
 # src/compose.c:3954
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Csatol?s"
 
 # src/compose.c:1145
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Id?zet form?tum hiba a(z) %d. sorban."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3495,7 +3498,7 @@ msgstr "?j VCard bejegyz?s hozz?ad?sa"
 
 #: src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Kliens tan?s?tv?ny be?ll?t?sa nem lehets?ges.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3982,11 +3985,11 @@ msgstr ""
 #: src/filtering.c:752
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "m?velet alkalmaz?sa [ %s ]\n"
 
 #: src/filtering.c:757
 msgid "action could not apply\n"
-msgstr ""
+msgstr "a m?velet nem alkalmazhat?\n"
 
 #: src/filtering.c:759
 #, c-format
@@ -3995,59 +3998,53 @@ msgstr ""
 
 # src/summaryview.c:371
 #: src/filtering.c:810
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Feldolgoz?si _szab?lyok futtat?sa"
+msgstr "feldolgoz?si szab?ly: '%s' [ %s ]\n"
 
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "feldolgoz?si szab?ly <n?vtelen> [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "letiltott szab?ly: '%s' [ %s ]\n"
 
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "letiltott szab?ly: <n?vtelen> [ %s ]\n"
 
 #: src/filtering.c:874
-#, fuzzy
 msgid "undetermined"
-msgstr "Nem defini?lt"
+msgstr "meghat?rozatlan"
 
 # src/mainwindow.c:666
 #: src/filtering.c:878
-#, fuzzy
 msgid "incorporation"
-msgstr "sz?r? l?trehoz?sakor"
+msgstr "egyes?t?s"
 
 # src/mainwindow.c:684
 #: src/filtering.c:882
-#, fuzzy
 msgid "manually"
-msgstr "K?zik?ny_v"
+msgstr "manu?lisan"
 
 # src/mainwindow.c:647
 #: src/filtering.c:886
-#, fuzzy
 msgid "folder processing"
-msgstr "Fel_dolgoz?si szab?lyok futtat?sa"
+msgstr "mappafeldolgoz?s"
 
 # src/summaryview.c:388
 #: src/filtering.c:890
-#, fuzzy
 msgid "pre-processing"
-msgstr "_El?feldolgoz?s..."
+msgstr "el?feldolgoz?s"
 
 # src/summaryview.c:388
 #: src/filtering.c:894
-#, fuzzy
 msgid "post-processing"
-msgstr "_Ut?feldolgoz?s..."
+msgstr "ut?feldolgoz?s"
 
 #: src/filtering.c:911
 #, c-format
@@ -4059,10 +4056,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"?zenet sz?r?se (%s%s%s)\n"
+"%s?zenet f?jl: %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: src/filtering.c:913 src/filtering.c:922
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: src/filtering.c:920
 #, c-format
@@ -4070,6 +4073,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"?zenet sz?r?se (%s%s%s)\n"
+"%s?zenet f?jl: %s\n"
 
 # src/foldersel.c:223 src/folderview.c:875 src/prefs_folder_item.c:206
 #: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
@@ -4130,9 +4135,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "%s szinkroniz?ci?ja kapcsolat n?lk?li munk?hoz...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Mappa ?thelyez?se csak azonos postafi?kon bel?l lehets?ges."
+msgstr "A mappa neve nem kezd?dhet vagy v?gz?dhet ponttal."
 
 # src/foldersel.c:146
 #: src/foldersel.c:247
@@ -4146,10 +4150,10 @@ msgid "NewFolder"
 msgstr "?j mappa"
 
 # src/folderview.c:1548 src/folderview.c:1619 src/folderview.c:1795
-#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216
-#: src/imap_gtk.c:272 src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264
-#: src/news_gtk.c:315 src/plugins/mailmbox/plugin_gtk.c:255
-#: src/plugins/mailmbox/plugin_gtk.c:425 src/plugins/rssyl/rssyl_cb_menu.c:208
+#: src/foldersel.c:595 src/imap_gtk.c:210 src/imap_gtk.c:216 src/imap_gtk.c:272
+#: src/imap_gtk.c:277 src/mh_gtk.c:155 src/mh_gtk.c:264 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:425
+#: src/plugins/rssyl/rssyl_cb_menu.c:208
 #: src/plugins/vcalendar/vcal_folder.c:2042
 #, c-format
 msgid "'%c' can't be included in folder name."
@@ -4177,11 +4181,9 @@ msgstr "'%s' mappa nem hozhat? l?tre."
 msgid "Mark all re_ad"
 msgstr "?sszes megjel?l?se _olvasottk?nt"
 
-# src/summaryview.c:366
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "?_sszes megjel?l?se olvasottk?nt"
+msgstr "?sszes megjel?l?se olvasottk?nt rekurz?_van"
 
 # src/summaryview.c:371
 #: src/folderview.c:239
@@ -4237,123 +4239,131 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Mappa inform?ci? be?ll?t?sa..."
 
-# src/summaryview.c:364
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "?sszes megjel?l?se olvasottk?nt"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Val?ban olvasottk?nt szeretn?d megjel?lni az ?sszes levelet a mapp?ban ?s az "
+"almapp?iban?"
 
 # src/prefs_customheader.c:540
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Biztosan meg akarod jel?lni olvasottk?nt a mappa ?sszes ?zenet?t?"
 
+# src/summaryview.c:364
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "?sszes megjel?l?se olvasottk?nt"
+
 # src/folderview.c:606 src/mainwindow.c:2712 src/setup.c:81
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "%s%c%s mappa ?tvizsg?l?sa..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s mappa ?tvizsg?l?sa..."
 
 # src/folderview.c:224 src/folderview.c:240
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Mappafa friss?t?se"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "A mappafa ?jra?p?t?se t?r?lni fogja a helyi gyors?t?t?rakat. Folytatod?"
 
 # src/folderview.c:659
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa friss?t?se..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Mappafa ?tvizsg?l?sa..."
 
 # src/compose.c:2898
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "%s mappa nem vizsg?lhat?\n"
 
 # src/folderview.c:749
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "?j ?zenetek _keres?se az ?sszes mapp?ban..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "%s mappa bez?r?sa..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "%s mappa megnyit?sa..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "A mappa nem volt megnyithat?."
 
 # src/mainwindow.c:1229
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Kuka ?r?t?se"
 
 # src/mainwindow.c:1230
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Minden ?zenet t?rl?se a kuk?b?l?"
 
 # src/mainwindow.c:1229
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Kuka ?r?t?se"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Kapcsolat n?lk?li jelz?s"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Kapcsolat n?lk?l dolgozol. Kapcsol?dsz?"
 
 # src/mainwindow.c:1822
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "V?rakoz? ?zenet(ek) k?ld?se"
 
 # src/mainwindow.c:1822
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "?sszes v?rakoz? ?zenet k?ld?se?"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_K?ld?s"
 
 # src/main.c:623 src/mainwindow.c:2337
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Hiba t?rt?nt a v?rakoz? ?zenetek k?ld?se k?zben."
 
 # src/main.c:623 src/mainwindow.c:2337
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4363,72 +4373,72 @@ msgstr ""
 "%s"
 
 # src/prefs_customheader.c:540
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Biztos, hogy '%s' mapp?t '%s' mapp?ba akarod m?solni?"
 
 # src/prefs_customheader.c:540
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Biztos, hogy '%s' mapp?t '%s' almapp?jak?nt akarod l?trehozni?"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Mappa m?sol?sa"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Mappa ?thelyez?se"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s m?sol?sa ide: %s..."
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s ?thelyez?se %s-ba(be)..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "A forr?s ?s a c?l megegyezik."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Egy mappa nem m?solhat? az almapp?j?ba."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "Egy mappa nem helyezhet? ?t az almapp?j?ba."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Mappa ?thelyez?se csak azonos postafi?kon bel?l lehets?ges."
 
 # src/message_search.c:183 src/summary_search.c:300
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "M?sol?s sikertelen!"
 
 # src/message_search.c:183 src/summary_search.c:300
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "?thelyez?s sikertelen!"
 
 # src/mainwindow.c:666
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s mappa be?ll?t?sainak feldolgoz?sa"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "A c?lmappa csak almapp?k t?rol?s?ra haszn?lhat?."
 
@@ -4532,7 +4542,6 @@ msgstr ""
 "Mail projectet, itt megteheted:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4542,8 +4551,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
-"A Claws Mail Csapat\n"
+"Copyright (C) 1999-2015\n"
+"A Claws Mail Team\n"
 " ?s Hiroyuki Yamamoto"
 
 # src/prefs_account.c:792
@@ -4769,14 +4778,13 @@ msgid "About Claws Mail"
 msgstr "A Claws Mail n?vjegye"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
-"A Claws Mail Csapat\n"
+"Copyright (C) 1999-2015\n"
+"A Claws Mail Team\n"
 "?s Hiroyuki Yamamoto"
 
 # src/mainwindow.c:1062
@@ -5010,13 +5018,12 @@ msgstr ""
 
 #: src/gtk/gtkutils.c:1909
 msgid "Failed."
-msgstr ""
+msgstr "Sikertelen."
 
 # src/mainwindow.c:666
 #: src/gtk/gtkutils.c:1972
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Be?ll?t?sok"
+msgstr "Be?ll?t?sok..."
 
 # src/prefs_summary_column.c:72 src/summaryview.c:400
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
@@ -5677,6 +5684,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5739,11 +5747,12 @@ msgid "_Hide"
 msgstr "_Elrejt?s"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Fi?k"
 
@@ -5811,14 +5820,12 @@ msgid "messages which have attachments"
 msgstr "mell?kleteket tartalmaz? ?zenetek"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "az X-Label fejl?cben S-t tartalmaz? ?zenetek"
+msgstr "b?rmely fejl?c n?vben vagy ?rt?kben S-t tartalmaz? ?zenetek"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "az X-Label fejl?cben S-t tartalmaz? ?zenetek"
+msgstr "b?rmely fejl?c ?rt?kben S-t tartalmaz? ?zenetek"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5974,9 +5981,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "Hiba t?rt?nt a keres?s k?zben. Ellen?rizd a logf?jlokat."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Felad?, c?mzett, t?rgy, c?mke"
+msgstr "Felad?/C?mzett/M?solat/T?rgy/C?mke"
 
 # src/prefs_account.c:670 src/prefs_common.c:808
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
@@ -6471,7 +6477,6 @@ msgstr ""
 "lett telep?tve, ?s a DIGEST-MD5 SASL plugin telep?tve van."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -6480,8 +6485,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"A CRAM-MD5 bel?p?s csak akkor m?k?dik, ha a libetpan SASL t?mogat?ssal lett "
-"telep?tve, ?s a CRAM-MD5 SASL plugin telep?tve van."
+"SCRAM-SHA-1 azonos?t?s csak akkor el?rhet?, ha a libetpan SASL t?mogat?st "
+"tartalmaz, ?s a SCRAM SASL plugin telep?tve van."
 
 #: src/imap.c:959
 #, c-format
@@ -6649,13 +6654,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "A lehet?s?gek nem friss?thet?ek.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
-"A kapcsol?d?s %s szerverhez nem siker?lt: a szerver TLS-t k?vetel, de a "
-"Claws Mail OpenSSL t?mogat?s n?lk?l lett ford?tva.\n"
+"Kapcsol?d?s ehhez: %s sikertelen: a szerver TLS-t k?vetel meg, de a Claws "
+"Mail nem tartalmaz TLS t?mogat?st.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6881,8 +6886,8 @@ msgstr "feliratkoz?s"
 msgid "unsubscribe"
 msgstr "leiratkoz?s"
 
-#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440
-#: src/prefs_folder_item.c:1468 src/prefs_folder_item.c:1496
+#: src/imap_gtk.c:569 src/prefs_folder_item.c:1440 src/prefs_folder_item.c:1468
+#: src/prefs_folder_item.c:1496
 msgid "Apply to subfolders"
 msgstr "Alkalmaz?s az almapp?kra"
 
@@ -7155,7 +7160,7 @@ msgid "Connection failed"
 msgstr "Kapcsol?d?s sikertelen"
 
 # src/inc.c:466
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Azonos?t?s nem siker?lt"
 
@@ -7210,7 +7215,8 @@ msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem siker?lt a kapcsol?d?s a POP3 szerverhez: %s:%d\n"
 
 # src/inc.c:764
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Azonos?t?s..."
 
@@ -8455,7 +8461,7 @@ msgstr "Kapcsolat n?lk?li _m?d"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "Me_n?s?v"
 
 # src/prefs_common.c:818
 #: src/mainwindow.c:809
@@ -9222,14 +9228,16 @@ msgstr "?zenetek t?rl?se..."
 msgid "Remove _mailbox..."
 msgstr "_Postal?da t?rl?se..."
 
-# src/folderview.c:1704
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "'%s' mappa nem t?vol?that? el."
+msgstr ""
+"'%s' mappa nem t?vol?that? el\n"
+"\n"
+"%s."
 
 # src/folderview.c:1751
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
@@ -9327,8 +9335,7 @@ msgstr "Vissza az e-mailhez"
 
 # src/mimeview.c:757 src/mimeview.c:811 src/mimeview.c:830 src/mimeview.c:854
 #: src/mimeview.c:1763 src/mimeview.c:1852 src/mimeview.c:2044
-#: src/mimeview.c:2080 src/mimeview.c:2192
-#: src/plugins/fancy/fancy_viewer.c:424
+#: src/mimeview.c:2080 src/mimeview.c:2192 src/plugins/fancy/fancy_viewer.c:424
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "A t?bbr?szes ?zenet egy darabja nem menthet?: %s"
@@ -9663,11 +9670,9 @@ msgstr "Minden c?mzett c?m?nek elment?se egy c?mjegyz?k mapp?ba."
 msgid "Address Keeper"
 msgstr "C?mment?"
 
-# src/addressbook.c:493 src/compose.c:3994 src/prefs_common.c:1959
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "C?mjegyz?k el?r?si ?tja"
+msgstr "C?mjegyz?k helye"
 
 # src/folderview.c:1695
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
@@ -9691,7 +9696,7 @@ msgstr "Kiv?laszt?s..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "C?mek elment?se fejl?cmez?k alapj?n"
 
 # src/prefs_account.c:1807
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
@@ -9709,12 +9714,10 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "A 'Bcc' (titkos m?solat) fejl?cekben szerepl? c?mek ment?se"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
-"Az al?bbi regul?ris kifejez?sekre illeszked? c?mek kihagy?sa (soronk?nt "
-"egy): "
+"Az al?bbi regul?ris kifejez?sekre illeszked? c?mek kihagy?sa (soronk?nt egy)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -10302,10 +10305,8 @@ msgid "attach"
 msgstr "csatol?s"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr ""
-"A k?vetkez? regul?ris kifejez?sek k?z?l egyre illeszkedik (soronk?nt egy):"
+msgstr "Az al?bbiak k?z?l egy regul?ris kifejez?s illeszkedik (soronk?nt egy)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -10343,8 +10344,7 @@ msgstr ""
 "?tir?ny?t?sakor"
 
 # src/compose.c:3964 src/prefs_common.c:1186
-#: 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 "Al??r?sok"
 
@@ -10461,15 +10461,13 @@ msgstr ""
 "A be?ll?t?sok a /Be?ll?t?sok/K?z?s be?ll?t?sok/Pluginek/Bogofilter "
 "men?pontban tal?lhat?ak."
 
-#: src/plugins/bogofilter/bogofilter.c:1043
-#: src/plugins/bsfilter/bsfilter.c:674
+#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:674
 #: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Spamsz?r?s"
 
 # src/send.c:391
-#: src/plugins/bogofilter/bogofilter.c:1044
-#: src/plugins/bsfilter/bsfilter.c:675
+#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:675
 #: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Spam tan?t?s"
@@ -10501,23 +10499,17 @@ msgstr "Az enn?l nagyobb ?zenetek nem lesznek ellen?rizve"
 msgid "KB"
 msgstr "KB"
 
-# src/folderview.c:1695
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "C?mke t?rl?se"
+msgstr "Spam t?rl?se"
 
-# src/mimeview.c:798 src/summaryview.c:2664
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Spam ment?se ide:"
+msgstr "Spam ment?se ide..."
 
-# src/summaryview.c:364
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Megjel?l?s mint spam"
+msgstr "Csak megjel?l?s, mint spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -11053,11 +11045,9 @@ msgstr "Proxy"
 msgid "Use GNOME's proxy settings"
 msgstr "A GNOME proxy be?ll?t?sok haszn?lata"
 
-# src/prefs_filter.c:353
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Proxy haszn?lata:"
+msgstr "Proxy haszn?lata"
 
 # src/mainwindow.c:667
 #: src/plugins/fancy/fancy_prefs.c:237
@@ -11084,7 +11074,6 @@ msgid "Enable loading of remote content"
 msgstr "T?voli tartalom bet?lt?s?nek enged?lyez?se"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
 msgstr "Egy linkre kattint?skor alap?rtelmez?sben:"
 
@@ -11095,7 +11084,7 @@ msgstr "Megnyit?s k?ls? b?ng?sz?vel"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "A f?jlban szerepl? st?luslap lesz alkalmazva minden HTML r?szre"
 
 # src/colorlabel.c:51
 #: src/plugins/fancy/fancy_prefs.c:308
@@ -11107,9 +11096,8 @@ msgid "Bro_wse"
 msgstr "_B?ng?sz?s"
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "St?luslap"
+msgstr "St?luslap kiv?laszt?sa"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -11257,11 +11245,9 @@ msgstr "Megjel?l?s"
 msgid "Add fetchinfo headers"
 msgstr "Fetchinfo fejl?cek hozz?ad?sa"
 
-# src/editaddress.c:460
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "A haszn?lt felad? c?m."
+msgstr "Hozz?adand? fejl?cek"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -11271,6 +11257,8 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"X-FETCH-UIDL fejl?c hozz?ad?sa az ?zenet egyedi ID listing azonos?t?j?val "
+"(POP3)"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
@@ -11279,7 +11267,7 @@ msgstr "Fi?kn?v"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "X-FETCH-ACCOUNT fejl?c hozz?ad?sa a fi?k nev?vel"
 
 # src/prefs_account.c:670 src/prefs_common.c:808
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
@@ -11288,7 +11276,7 @@ msgstr "Szerver"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "X-FETCH-SERVER fejl?c hozz?ad?sa a fogad? szerverrel"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
@@ -11297,7 +11285,7 @@ msgstr "Felhaszn?l? azonos?t?"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "X-FETCH-USERID fejl?c hozz?ad?sa a felhaszn?l? azonos?t?val"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -11308,11 +11296,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"X-FETCH-TIME fejl?c hozz?ad?sa az ?zenet v?teli d?tum?val ?s idej?vel RFC822 "
+"form?tumban"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "GData plugin: Azonos?t?si hiba: %s\n"
+msgstr "GData plugin: Azonos?t?s sz?ks?ges"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -11325,27 +11314,21 @@ msgid ""
 "list."
 msgstr ""
 
-# src/prefs_common.c:1721
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "L?p?s"
+msgstr "1. l?p?s:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 
-# src/prefs_common.c:1721
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "L?p?s"
+msgstr "2. l?p?s:"
 
-# src/addressbook.c:3035 src/prefs_common.c:824
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Csatol?"
+msgstr "K?d:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -11384,24 +11367,21 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "GData plugin: A csoportok aszinkron lek?rdez?s?nek ind?t?sa\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData plugin: Azonos?t?si hiba: %s\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "GData plugin: Azonos?t?si hiba: %s\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData plugin: Aszinkron azonos?t?s ind?t?sa\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData plugin: Aszinkron azonos?t?s ind?t?sa\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
@@ -11410,22 +11390,21 @@ msgid ""
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData plugin: Azonos?t?si hiba: %s\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData plugin: Azonos?t?si hiba: %s\n"
+msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData plugin: Aszinkron azonos?t?s ind?t?sa\n"
+msgstr ""
 
 # src/prefs_account.c:1138
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Azonos?t?s"
 
@@ -11494,7 +11473,7 @@ msgstr "GData integr?ci?"
 #: src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Tal?lt hely: (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:369
@@ -11504,297 +11483,285 @@ msgstr ""
 # src/addressbook.c:2431 src/addressbook.c:2531
 #. TRANSLATORS: The IP address is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "C?m index olvas?sa nem siker?lt"
+msgstr "Az IP c?m hely?nek meghat?roz?sa nem siker?lt"
 
 # src/editaddress.c:741 src/editaddress.c:743
 #: src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "Felad? keresztneve"
+msgstr "K?s?rlet a felad? hely?nek meghat?roz?s?ra"
 
 #: src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: src/plugins/geolocation/geolocation_plugin.c:529
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Egyes?lt Arab Em?rs?gek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:530
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afganiszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:531
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua ?s Barbuda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:532
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: src/plugins/geolocation/geolocation_plugin.c:533
 msgid "Albania"
-msgstr ""
+msgstr "Alb?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:534
 msgid "Armenia"
-msgstr ""
+msgstr "?rm?nyorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:535
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Holland Antill?k"
 
 #: src/plugins/geolocation/geolocation_plugin.c:536
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: src/plugins/geolocation/geolocation_plugin.c:537
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarktisz"
 
 #: src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argent?na"
 
 #: src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikai Szamoa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:540
 msgid "Austria"
-msgstr ""
+msgstr "Ausztria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:541
 msgid "Australia"
-msgstr ""
+msgstr "Ausztr?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:542
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:543
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdzs?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:544
 msgid "Bosnia And Herzegovina"
-msgstr ""
+msgstr "Bosznia - Hercegovina"
 
 #: src/plugins/geolocation/geolocation_plugin.c:545
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: src/plugins/geolocation/geolocation_plugin.c:546
 msgid "Bangladesh"
-msgstr ""
+msgstr "Banglades"
 
 #: src/plugins/geolocation/geolocation_plugin.c:547
 msgid "Belgium"
-msgstr ""
+msgstr "Belgium"
 
 #: src/plugins/geolocation/geolocation_plugin.c:548
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: src/plugins/geolocation/geolocation_plugin.c:549
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulg?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:550
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrein"
 
 #: src/plugins/geolocation/geolocation_plugin.c:551
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:552
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: src/plugins/geolocation/geolocation_plugin.c:553
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:554
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam ?llam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:555
 msgid "Bolivia"
-msgstr ""
+msgstr "Bol?via"
 
 #: src/plugins/geolocation/geolocation_plugin.c:556
 msgid "Brazil"
-msgstr ""
+msgstr "Braz?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:557
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahama-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:558
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhut?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:559
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet-sziget"
 
 #: src/plugins/geolocation/geolocation_plugin.c:560
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:561
 msgid "Belarus"
-msgstr ""
+msgstr "Feh?roroszorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:562
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: src/plugins/geolocation/geolocation_plugin.c:563
 msgid "Canada"
-msgstr ""
+msgstr "Kanada"
 
 #: src/plugins/geolocation/geolocation_plugin.c:564
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Cocos (Keeling) -szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:565
 msgid "Central African Republic"
-msgstr ""
+msgstr "K?z?p-afrikai K?zt?rsas?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:566
 msgid "Congo"
-msgstr ""
+msgstr "Kong?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:567
 msgid "Switzerland"
-msgstr ""
+msgstr "Sv?jc"
 
 #: src/plugins/geolocation/geolocation_plugin.c:568
 msgid "Cote D'Ivoire"
-msgstr ""
+msgstr "Cote D'Ivoire"
 
 #: src/plugins/geolocation/geolocation_plugin.c:569
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cook-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:570
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #: src/plugins/geolocation/geolocation_plugin.c:571
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
-# src/prefs_common.c:950
 #: src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "K?nai"
+msgstr "K?na"
 
-# src/prefs_common.c:2447
 #: src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Sz?n"
+msgstr "Kolumbia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:575
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: src/plugins/geolocation/geolocation_plugin.c:576
 msgid "Cape Verde"
-msgstr ""
+msgstr "Z?ld-foki-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:577
 msgid "Christmas Island"
-msgstr ""
+msgstr "Kar?csony-sziget"
 
 #: src/plugins/geolocation/geolocation_plugin.c:578
 msgid "Cyprus"
-msgstr ""
+msgstr "Ciprus"
 
 #: src/plugins/geolocation/geolocation_plugin.c:579
 msgid "Czech Republic"
-msgstr ""
+msgstr "Cseh K?zt?rsas?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:580
 msgid "Germany"
-msgstr ""
+msgstr "N?metorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:581
 msgid "Djibouti"
-msgstr ""
+msgstr "Dzsibuti"
 
-# src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
-# src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
 #: src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "Kijel?l?s visszavon?sa"
+msgstr "D?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
-msgstr ""
+msgstr "Dominika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:584
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikai K?zt?rsas?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:585
 msgid "Algeria"
-msgstr ""
+msgstr "Alg?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:586
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: src/plugins/geolocation/geolocation_plugin.c:587
 msgid "Estonia"
-msgstr ""
+msgstr "?sztorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:588
 msgid "Egypt"
-msgstr ""
+msgstr "Egyiptom"
 
-# src/prefs_common.c:1093
 #: src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Nyugat-eur?pai"
+msgstr "Nyugat-Szahara"
 
 #: src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:591
 msgid "Spain"
-msgstr ""
+msgstr "Spanyolorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:592
 msgid "Ethiopia"
-msgstr ""
+msgstr "Eti?pia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:593
 msgid "Finland"
-msgstr ""
+msgstr "Finnorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:594
 msgid "Fiji"
-msgstr ""
+msgstr "Fidzsi-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:595
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Falkland-szigetek (Malvinas)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:596
 msgid "Micronesia, Federated States Of"
@@ -11802,87 +11769,68 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:597
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Fer?er"
 
-# src/addressadd.c:240 src/addressbook.c:1660 src/compose.c:2339
-# src/compose.c:4413 src/compose.c:5095 src/compose.c:5131
-# src/editaddress.c:199 src/editaddress.c:671 src/editbook.c:221
-# src/editgroup.c:367 src/editjpilot.c:345 src/editldap.c:244
-# src/editldap_basedn.c:213 src/editvcard.c:240 src/export.c:188
-# src/foldersel.c:192 src/grouplistdialog.c:242 src/import.c:193
-# src/importldif.c:762 src/inputdialog.c:203 src/main.c:412 src/main.c:420
-# src/mainwindow.c:2183 src/mimeview.c:805 src/passphrase.c:134
-# src/prefs.c:469 src/prefs_actions.c:282 src/prefs_common.c:2368
-# src/prefs_common.c:2931 src/prefs_customheader.c:158
-# src/prefs_display_header.c:192 src/prefs_summary_column.c:310
-# src/prefs_template.c:259 src/progressdialog.c:77 src/select-keys.c:323
-# src/summaryview.c:588 src/summaryview.c:2671
 #: src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "M?gsem"
+msgstr "Franciaorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
-msgstr ""
+msgstr "Franciaorsz?g, Metropolitan"
 
 #: src/plugins/geolocation/geolocation_plugin.c:600
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:601
 #: src/plugins/geolocation/geolocation_plugin.c:747
 msgid "United Kingdom"
-msgstr ""
+msgstr "Nagy-Britannia (Egyes?lt Kir?lys?g)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:602
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: src/plugins/geolocation/geolocation_plugin.c:603
 msgid "Georgia"
-msgstr ""
+msgstr "Gr?zia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:604
 msgid "French Guiana"
-msgstr ""
+msgstr "Francia Guyana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:605
 msgid "Ghana"
-msgstr ""
+msgstr "Gh?na"
 
 #: src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibralt?r"
 
-# src/colorlabel.c:50
 #: src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Z?ld"
+msgstr "Gr?nland"
 
 #: src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:609
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:610
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:611
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Egyenl?t?i-Guinea"
 
-# src/colorlabel.c:50
 #: src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Z?ld"
+msgstr "G?r?gorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
@@ -11890,23 +11838,23 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:614
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: src/plugins/geolocation/geolocation_plugin.c:615
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:616
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Bissau-Guinea"
 
 #: src/plugins/geolocation/geolocation_plugin.c:617
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: src/plugins/geolocation/geolocation_plugin.c:618
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hongkong"
 
 #: src/plugins/geolocation/geolocation_plugin.c:619
 msgid "Heard Island And Mcdonald Islands"
@@ -11914,44 +11862,43 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:620
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: src/plugins/geolocation/geolocation_plugin.c:621
 msgid "Croatia"
-msgstr ""
+msgstr "Horv?torsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:622
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: src/plugins/geolocation/geolocation_plugin.c:623
 msgid "Hungary"
-msgstr ""
+msgstr "Magyarorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:624
 msgid "Indonesia"
-msgstr ""
+msgstr "Indon?zia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:625
 msgid "Ireland"
-msgstr ""
+msgstr "?rorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:626
 msgid "Israel"
-msgstr ""
+msgstr "Izrael"
 
 #: src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Jelz?"
+msgstr "India"
 
 #: src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Brit indiai ?ce?ni ter?let"
 
 #: src/plugins/geolocation/geolocation_plugin.c:629
 msgid "Iraq"
-msgstr ""
+msgstr "Irak"
 
 #: src/plugins/geolocation/geolocation_plugin.c:630
 msgid "Iran, Islamic Republic Of"
@@ -11959,46 +11906,46 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:631
 msgid "Iceland"
-msgstr ""
+msgstr "Izland"
 
 #: src/plugins/geolocation/geolocation_plugin.c:632
 msgid "Italy"
-msgstr ""
+msgstr "Olaszorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:633
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: src/plugins/geolocation/geolocation_plugin.c:634
 msgid "Jordan"
-msgstr ""
+msgstr "Jord?nia"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/prefs_common.c:1110
 #: src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
 msgstr "Jap?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #: src/plugins/geolocation/geolocation_plugin.c:637
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgiziszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:638
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodzsa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:639
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "holnap"
+msgstr "Comore-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
@@ -12014,15 +11961,15 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:644
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuvait"
 
 #: src/plugins/geolocation/geolocation_plugin.c:645
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajm?n-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:646
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazahszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:647
 msgid "Lao People'S Democratic Republic"
@@ -12030,51 +11977,51 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:648
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:649
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:650
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: src/plugins/geolocation/geolocation_plugin.c:651
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sr? Lanka"
 
 #: src/plugins/geolocation/geolocation_plugin.c:652
 msgid "Liberia"
-msgstr ""
+msgstr "Lib?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:653
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: src/plugins/geolocation/geolocation_plugin.c:654
 msgid "Lithuania"
-msgstr ""
+msgstr "Litv?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:655
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: src/plugins/geolocation/geolocation_plugin.c:656
 msgid "Latvia"
-msgstr ""
+msgstr "Lettorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:657
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "L?biai Arab Jamahiriya"
 
 #: src/plugins/geolocation/geolocation_plugin.c:658
 msgid "Morocco"
-msgstr ""
+msgstr "Marokk?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:659
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #: src/plugins/geolocation/geolocation_plugin.c:660
 msgid "Moldova, Republic Of"
@@ -12082,13 +12029,14 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:661
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaszk?r"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/summaryview.c:364
 #: src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "?sszes megjel?l?se olvasottk?nt"
+msgstr "Marshall-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
@@ -12096,151 +12044,153 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:664
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
 #: src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "Kijel?l?s visszavon?sa"
+msgstr "Mianmar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
-msgstr ""
+msgstr "Mong?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:667
 msgid "Macao"
-msgstr ""
+msgstr "Maka?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:668
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "?szaki Mariana-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:669
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: src/plugins/geolocation/geolocation_plugin.c:670
 msgid "Mauritania"
-msgstr ""
+msgstr "Maurit?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:671
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: src/plugins/geolocation/geolocation_plugin.c:672
 msgid "Malta"
-msgstr ""
+msgstr "M?lta"
 
 #: src/plugins/geolocation/geolocation_plugin.c:673
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #: src/plugins/geolocation/geolocation_plugin.c:674
 msgid "Maldives"
-msgstr ""
+msgstr "Mald?v-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:675
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: src/plugins/geolocation/geolocation_plugin.c:676
 msgid "Mexico"
-msgstr ""
+msgstr "Mexik?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:677
 msgid "Malaysia"
-msgstr ""
+msgstr "Malajzia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:678
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambik"
 
 #: src/plugins/geolocation/geolocation_plugin.c:679
 msgid "Namibia"
-msgstr ""
+msgstr "Nam?bia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "?j kapcsolatok"
+msgstr "?j-Kaled?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: src/plugins/geolocation/geolocation_plugin.c:682
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk-sziget"
 
 #: src/plugins/geolocation/geolocation_plugin.c:683
 msgid "Nigeria"
-msgstr ""
+msgstr "Nig?ria"
 
 #: src/plugins/geolocation/geolocation_plugin.c:684
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: src/plugins/geolocation/geolocation_plugin.c:685
 msgid "Netherlands"
-msgstr ""
+msgstr "Hollandia"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/mainwindow.c:1857
 #: src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Tov?bb?t?s"
+msgstr "Norv?gia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
-msgstr ""
+msgstr "Nep?l"
 
 #: src/plugins/geolocation/geolocation_plugin.c:688
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: src/plugins/geolocation/geolocation_plugin.c:689
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: src/plugins/geolocation/geolocation_plugin.c:690
 msgid "New Zealand"
-msgstr ""
+msgstr "?j-Z?land"
 
 #: src/plugins/geolocation/geolocation_plugin.c:691
 msgid "Oman"
-msgstr ""
+msgstr "Om?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:692
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: src/plugins/geolocation/geolocation_plugin.c:693
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: src/plugins/geolocation/geolocation_plugin.c:694
 msgid "French Polynesia"
-msgstr ""
+msgstr "Francia Polin?zia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:695
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "P?pua ?j-Guinea"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/prefs_common.c:950
 #: src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "sor"
+msgstr "F?l?p-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakiszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:698
 msgid "Poland"
-msgstr ""
+msgstr "Lengyelorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:699
 msgid "Saint Pierre And Miquelon"
@@ -12248,70 +12198,70 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:700
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:701
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/editldap.c:316 src/editldap_basedn.c:171
 #: src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portug?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: src/plugins/geolocation/geolocation_plugin.c:704
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Katar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: src/plugins/geolocation/geolocation_plugin.c:707
 msgid "Romania"
-msgstr ""
+msgstr "Rom?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:708
 msgid "Russian Federation"
-msgstr ""
+msgstr "Orosz F?der?ci?"
 
 #: src/plugins/geolocation/geolocation_plugin.c:709
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:710
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Sza?d-Ar?bia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:711
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salamon-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:712
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:713
 msgid "Sudan"
-msgstr ""
+msgstr "Szud?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:714
 msgid "Sweden"
-msgstr ""
+msgstr "Sv?dorsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:715
 msgid "Singapore"
-msgstr ""
+msgstr "Szingap?r"
 
 #: src/plugins/geolocation/geolocation_plugin.c:716
 msgid "Saint Helena"
@@ -12319,7 +12269,7 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:717
 msgid "Slovenia"
-msgstr ""
+msgstr "Szlov?nia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:718
 msgid "Svalbard And Jan Mayen"
@@ -12327,44 +12277,43 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:719
 msgid "Slovakia"
-msgstr ""
+msgstr "Szlov?kia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:720
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: src/plugins/geolocation/geolocation_plugin.c:721
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: src/plugins/geolocation/geolocation_plugin.c:722
 msgid "Senegal"
-msgstr ""
+msgstr "Szeneg?l"
 
 #: src/plugins/geolocation/geolocation_plugin.c:723
 msgid "Somalia"
-msgstr ""
+msgstr "Szom?lia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "SMTP felhaszn?l?n?v:"
+msgstr "Suriname"
 
 #: src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tome ?s Principe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:726
 msgid "El Salvador"
-msgstr ""
+msgstr "Salvador"
 
 #: src/plugins/geolocation/geolocation_plugin.c:727
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Sz?riai Arab K?zt?rsas?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:728
 msgid "Swaziland"
-msgstr ""
+msgstr "Szv?zif?ld"
 
 #: src/plugins/geolocation/geolocation_plugin.c:729
 msgid "Turks And Caicos Islands"
@@ -12372,57 +12321,58 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:730
 msgid "Chad"
-msgstr ""
+msgstr "Cs?d"
 
 #: src/plugins/geolocation/geolocation_plugin.c:731
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Francia d?li ter?letek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:732
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/folderview.c:284 src/prefs_summary_column.c:68
 #: src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Thai"
+msgstr "Thaif?ld"
 
 #: src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
-msgstr ""
+msgstr "T?dzsikiszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:735
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:736
 msgid "Turkmenistan"
-msgstr ""
+msgstr "T?rkmeniszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:737
 msgid "Tunisia"
-msgstr ""
+msgstr "Tun?zia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:738
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: src/plugins/geolocation/geolocation_plugin.c:739
 msgid "East Timor"
-msgstr ""
+msgstr "Kelet-Timor"
 
 #: src/plugins/geolocation/geolocation_plugin.c:740
 msgid "Turkey"
-msgstr ""
+msgstr "T?r?korsz?g"
 
 #: src/plugins/geolocation/geolocation_plugin.c:741
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad ?s Tobago"
 
 #: src/plugins/geolocation/geolocation_plugin.c:742
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:743
 msgid "Taiwan, Province Of China"
@@ -12434,31 +12384,31 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:745
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukrajna"
 
 #: src/plugins/geolocation/geolocation_plugin.c:746
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: src/plugins/geolocation/geolocation_plugin.c:748
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Amerikai Csendes-?ce?ni-szigetek"
 
 #: src/plugins/geolocation/geolocation_plugin.c:749
 msgid "United States"
-msgstr ""
+msgstr "Egyes?lt ?llamok"
 
 #: src/plugins/geolocation/geolocation_plugin.c:750
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: src/plugins/geolocation/geolocation_plugin.c:751
 msgid "Uzbekistan"
-msgstr ""
+msgstr "?zbegiszt?n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:752
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Szentsz?k (Vatik?nv?rosi ?llam)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:753
 msgid "Saint Vincent And The Grenadines"
@@ -12466,53 +12416,54 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:754
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: src/plugins/geolocation/geolocation_plugin.c:755
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Virgin-szigetek (brit)"
 
 #: src/plugins/geolocation/geolocation_plugin.c:756
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Virgin-szigetek (USA)"
 
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
+# #-#-#-#-#  hu.po (Claws Mail 3.10.0)  #-#-#-#-#
 # src/importldif.c:516
 #: src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "F?jln?v"
+msgstr "Vietnam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: src/plugins/geolocation/geolocation_plugin.c:759
 msgid "Wallis And Futuna"
-msgstr ""
+msgstr "Wallis ?s Futuna"
 
 #: src/plugins/geolocation/geolocation_plugin.c:760
 msgid "Samoa"
-msgstr ""
+msgstr "Szamoa"
 
 #: src/plugins/geolocation/geolocation_plugin.c:761
 msgid "Yemen"
-msgstr ""
+msgstr "Jemen"
 
 #: src/plugins/geolocation/geolocation_plugin.c:762
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: src/plugins/geolocation/geolocation_plugin.c:763
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Szerbia ?s Montenegro"
 
 #: src/plugins/geolocation/geolocation_plugin.c:764
 msgid "South Africa"
-msgstr ""
+msgstr "D?l-Afrika"
 
 #: src/plugins/geolocation/geolocation_plugin.c:765
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: src/plugins/geolocation/geolocation_plugin.c:766
 msgid "Democratic Republic Of The Congo"
@@ -12520,31 +12471,28 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:767
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: src/plugins/geolocation/geolocation_plugin.c:777
 #: src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Hely:"
+msgstr "GeoLocation"
 
 #: src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy
 msgid "Could not initialize clutter"
-msgstr "%s helyes?r?s-ellen?rz? nem inicializ?lhat?,"
+msgstr "A clutter nem inicializ?lhat?,"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
 #: src/plugins/geolocation/geolocation_plugin.c:788
 #: src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Az ideiglenes f?jl nem hozhat? l?tre: %s"
+msgstr "A regul?ris kifejez?s nem hozhat? l?tre: %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"T?mav?lt?si szab?lyl?nc regisztr?l?sa nem siker?lt az ?rtes?t? pluginben"
+"?zenetn?zet szab?lyl?nc regisztr?l?sa nem siker?lt a Geolocation pluginben"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -12565,9 +12513,8 @@ msgstr ""
 
 # src/prefs_filter.c:329
 #: src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "GData integr?ci?"
+msgstr "GeoLocation integr?ci?"
 
 #: src/plugins/libravatar/libravatar.c:360
 #: src/plugins/libravatar/libravatar.c:431
@@ -12622,9 +12569,8 @@ msgstr ""
 "Visszajelz?st sz?vesen fogadok a <ricardo at mones.org> c?mre.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">E-mail c?m:</span>"
+msgstr "<span color=\"red\">Hiba a gyors?t?t?r statisztik?k olvas?sakor</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -12632,27 +12578,25 @@ msgid ""
 "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
 "errors</span>"
 msgstr ""
+"<span color=\"red\">%s haszn?lata %d f?jlban, %d k?nyvt?rban, %d egy?b ?s %d "
+"hiba</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "%s haszn?lata %d f?jlban, %d k?nyvt?rban, %d egy?b"
 
-# src/message_search.c:106
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Ikon gyors?t?t?r"
+msgstr "Ikon cache t?rl?se"
 
-# src/prefs_template.c:514
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Val?ban el akarod t?vol?tani ezt a t?m?t?"
+msgstr "Biztosan t?r?lni akarsz minden gyors?t?t?razott avatar ikont?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Nincs elegend? mem?ria a m?velethez"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -12661,10 +12605,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Az ikon cache ikeresen t?r?lve:\n"
+"? %u hi?nyz? bejegyz?s elt?vol?tva.\n"
+"? %u f?jl t?r?lve."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">Az ikon cache sikeresen t?r?lve!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -12675,10 +12622,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Hib?k az ikon cache t?rl?sekor:\n"
+"? %u hi?nyz? bejegyz?s elt?vol?tva.\n"
+"? %u f?jl t?r?lve.\n"
+"? %u f?jl olvas?sa sikertelen.\n"
+"? %u f?jl nem t?vol?that? el."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Hiba az ikon cache t?rl?sekor.</span>"
 
 # src/prefs_account.c:1138
 #: src/plugins/libravatar/libravatar_prefs.c:213
@@ -12760,6 +12712,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Add meg azt az ?tir?ny?t?si c?met, ami hi?nyz? felhaszn?l? ikon eset?n lesz "
+"haszn?lva. Ha ?resen hagyod, az alap?rtelmezett narancs libravatar ikon lesz "
+"haszn?lva."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -12780,9 +12735,8 @@ msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Avatar v?tel?nek megk?s?rl?se a felad? libravatar szerver?r?l"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "Session timeout\n"
+msgstr "K?r?s timeout"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -12795,6 +12749,8 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
+"?ll?tsd 0-ra a glob?lis socket I/O timeout haszn?lat?hoz. A maxim?lis "
+"?rt?knek kisebbnek kell lennie, mint a glob?lis socket I/O timeout."
 
 # src/message_search.c:106
 #: src/plugins/libravatar/libravatar_prefs.c:455
@@ -12849,6 +12805,275 @@ msgstr ""
 "\n"
 "T?nyleg ezt akarod?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr ""
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr ""
+
+# src/addressbook.c:334 src/compose.c:450 src/mainwindow.c:417
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Sz?r?"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Sz?r? t?rl?se"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Akt?v"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr ""
+
+# src/prefs_account.c:792
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Szerver inform?ci?"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Szerver neve"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Szerver port"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Titkos?t?s"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Nincs TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "TLS haszn?lata, ha lehets?ges"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Nincs azonos?t?s"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr ""
+
+# src/prefs_account.c:892 src/prefs_account.c:1190
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Felhaszn?l?-azonos?t?"
+
+# src/prefs_account.c:898 src/prefs_account.c:1199
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Jelsz?"
+
+# src/prefs_account.c:1161
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Azonos?t?si elj?r?s"
+
+# src/prefs_account.c:1171
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatikus"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr ""
+
 # src/mainwindow.c:1810
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
@@ -13139,20 +13364,15 @@ msgstr "Lev?lmapp?k"
 msgid "News folders"
 msgstr "H?rmapp?k"
 
-# src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS mapp?k"
+msgstr "RSSyl mapp?k"
 
-# src/folderview.c:1613
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Napt?r mapp?k"
+msgstr "vCalendar mapp?k"
 
 #: src/plugins/notification/notification_prefs.c:649
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "E be?ll?t?sok fel?lb?r?lj?k a mappaspecifikus kijel?l?seket."
 
@@ -13197,26 +13417,21 @@ msgstr "Csak ha nem ?res"
 msgid "Banner speed"
 msgstr "Banner sebess?ge"
 
-# src/prefs_common.c:971
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Integr?land? n?vjegyek maxim?lis sz?ma:"
+msgstr "?zenetek maxim?lis sz?ma"
 
-# src/prefs_common.c:971
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "?zenetek maxim?lis sz?ma (0: korl?tlan)"
+msgstr "A megjelen?tett ?zenetek sz?m?nak korl?toz?sa, 0 = korl?tlan"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Banner sebess?ge"
+msgstr "Banner sz?less?ge"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Banner sz?less?g?nek korl?toz?sa, 0 = teljes k?perny? sz?less?g"
 
 # src/prefs_common.c:1695 src/prefs_common.c:1735
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
@@ -13248,11 +13463,9 @@ msgstr "Csak a kijel?lt mapp?k figyelembev?tele"
 msgid "Select folders..."
 msgstr "K?nyvt?rak kiv?laszt?sa..."
 
-# src/addressbook.c:1660
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Mappa sz?n"
+msgstr "Banner sz?nek"
 
 # src/prefs_common.c:2506
 #: src/plugins/notification/notification_prefs.c:902
@@ -13291,16 +13504,14 @@ msgstr "Popup enged?lyez?se"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Popup k?sleltet?se:"
+msgstr "Popup timeout"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "m?sodperc m?lva"
+msgstr "m?sodperc"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -13329,22 +13540,18 @@ msgstr "P?lda felugr? ablak"
 msgid "Done"
 msgstr "K?sz"
 
-# src/prefs_common.c:883 src/prefs_common.c:1046
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Parancs futtat?sa"
+msgstr "Parancs kiv?laszt?sa"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Parancs enged?lyez?se"
 
-# src/prefs_common.c:883 src/prefs_common.c:1046
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "V?grehajtand? parancs:"
+msgstr "Futtatand? parancs"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -13356,9 +13563,8 @@ msgid "Enable LCD"
 msgstr "LCD enged?lyez?se"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Hostn?v: LCDd szerver port:"
+msgstr "Az LCDd szerver: hosztn?v: port"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -13417,9 +13623,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Ikonm?retre v?lt?s:"
+msgstr "Ikonm?retre v?lt?s"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -13559,7 +13764,7 @@ msgstr "/ %d"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1358
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "A PDF megjelen?t?se ismeretlen okb?l nem siker?lt."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1721
 #: src/plugins/pdf_viewer/poppler_viewer.c:1939
@@ -13659,7 +13864,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "perl sz?r? szab?lyok szerkeszt?se (ext)..."
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -14017,7 +14222,7 @@ msgstr "Nem tal?ltam al??r?st"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "Nem megb?zhat?"
 
 # src/textview.c:557
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
@@ -14034,65 +14239,54 @@ msgstr "Ez a digit?lis al??r?s m?g nincs ellen?rizve."
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: a kulcs nem ?rhet? el - nincs fut? gpg-agent."
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j? [ultimate]"
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j? [teljes]"
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j? [margin?lis]"
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j?."
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "%s digit?lis al??r?sa lej?rt."
+msgstr "\"%s\" al??r?sa lej?rt."
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j?, de a kulcs lej?rt."
 
-# src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "%s digit?lis al??r?sa j?."
+msgstr "\"%s\" al??r?sa j?, de a kulcs visszavonva."
 
-# src/rfc2015.c:177
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "%s digit?lis al??r?sa rossz."
+msgstr "\"%s\" al??r?sa rossz."
 
-# src/rfc2015.c:145 src/rfc2015.c:180 src/sigstatus.c:231
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "A(z) 0x%s kulcs nem el?rhet? az al??r?s ellen?rz?s?hez."
+msgstr "0x%s kulcs nem el?rhet? az al??r?s ellen?rz?s?hez"
 
-# src/textview.c:557
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Ez a digit?lis al??r?s m?g nincs ellen?rizve."
+msgstr "Az al??r?s nincs ellen?rizve"
 
 # src/sigstatus.c:129
 #: src/plugins/pgpcore/sgpgme.c:285
@@ -14118,9 +14312,9 @@ msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "\"%s\" digit?lis al??r?sa j? (?rv?nyess?g: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "%s kulcsa lej?rt."
+msgstr "%s kulcs uid lej?rt.\n"
 
 # src/rfc2015.c:174
 #: src/plugins/pgpcore/sgpgme.c:337
@@ -14131,7 +14325,7 @@ msgstr "\"%s\" al??r?sa lej?rt (?rv?nyess?g: %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "Visszavont kulcs uid \"%s\"\n"
 
 # src/rfc2015.c:177
 #: src/plugins/pgpcore/sgpgme.c:347
@@ -14147,7 +14341,7 @@ msgstr "                    uid \"%s\" (?rv?nyess?g: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "Visszavont"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
@@ -14479,7 +14673,7 @@ msgstr "Az ideiglenes f?jl nem hozhat? l?tre: %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "OpenPGP digit?lis al??r?s"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
@@ -14551,7 +14745,6 @@ msgstr ""
 "siker?lt"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -14597,46 +14790,6 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"A plugin Python integr?ci?s lehet?s?geket biztos?t.\n"
-"A python k?d interakt?van is bevihet? egy be?gyazott python konzolban, az "
-"Eszk?z?k -> Python konzol megjelen?t?se alatt, vagy t?rolhat? scriptekben.\n"
-"\n"
-"Ezek a scriptek ezut?n a men?b?l el?rhet?ek. M?s men?pontokhoz hasonl?an, "
-"ezekhez is hozz?rendelhet?ek gyorsbillenty?k. A Claws Mail eszk?zt?r "
-"szerkeszt?j?vel gombokat is lehet k?sz?teni hozz?juk.\n"
-"\n"
-"A f? ablakban dolgoz? scripteket a ~/.claws-mail/python-scripts/main mapp?ba "
-"kell tenni.\n"
-"\n"
-"Nyitott szerkeszt?ablakban dolgoz? scriptek is haszn?lhat?ak, ezeket a ~/."
-"claws-mail/python-scripts/compose mapp?ba kell tenni.\n"
-"\n"
-"A ~/.claws-mail/python-scripts/auto/ mappa olyan scripteket tartalmazhat, "
-"amelyek bizonyos esem?nyekn?l futnak le. Jelenleg a k?vetkez? f?jlok "
-"haszn?lhat?ak:\n"
-"\n"
-"compose_any\n"
-"Nyitott szerkeszt?ablak eset?n fut le, f?ggetlen?l att?l, hogy ?j ?zenet, "
-"v?lasz vagy tov?bb?t?s miatt lett megnyitva.\n"
-"\n"
-"startup\n"
-"A plugin bet?lt?sekor fut le.\n"
-"\n"
-"shutdown\n"
-"A plugin le?ll?sakor fut le.\n"
-"\n"
-"\n"
-"A leg?jabb API dokument?ci?t az interakt?v python konzolban kiadott\n"
-"\n"
-" help(clawsmail)\n"
-"\n"
-"parancs jelen?ti meg.\n"
-"\n"
-"A plugin forr?sa t?bb p?lda scriptet tartalmaz az \"examples\" mapp?ban. Ha "
-"k?sz?tesz egy scriptet, amit megosztan?l m?sokkal, k?ldd el nekem, hogy "
-"betehessem a p?ld?k k?z?.\n"
-"\n"
-"Visszajelz?st sz?vesen fogadok a <berndth at gmx.de> c?mre."
 
 # src/mainwindow.c:666
 #: src/plugins/python/python_plugin.c:789
@@ -14645,33 +14798,34 @@ msgstr "Python integr?ci?"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Az mbox f?jl nem hozhat? l?tre:\n"
-"%s\n"
+"A r?gi feeds.xml f?jl tartalma nem olvashat?:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: Hiba '%s' ?r?sakor a h?rforr?s export list?ba.\n"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "A napl?f?jl nem nyithat? meg: %s: %s\n"
+msgstr "RSSyl: a r?gi OPML f?jl nem t?r?lhet?: '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
+"RSSyl: '%s' f?jl nem nyithat? meg a h?rforr?s lista export?l?s?hoz: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl: Hiba a h?rforr?s export f?jl ?r?sakor.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -14681,6 +14835,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Hiba a h?rforr?s felv?telekor:\n"
+"%s\n"
+"\n"
+"'%s' mappan?v nem megengedett."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -14702,10 +14860,9 @@ msgid "RSS feed"
 msgstr "RSS feed"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(?ltal?ban ?res)"
+msgstr "(?res)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -14722,53 +14879,50 @@ msgstr "A lek?rdezend? h?rforr?s URL c?me:"
 
 # src/folderview.c:1548 src/folderview.c:1619 src/folderview.c:1795
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
-msgstr "A mappn?v nem tartalmazhatja '%c'-t."
+msgstr "A mappan?v nem tartalmazhatja '%c'-t."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
-msgstr[0] "A h?rforr?s friss?t?s?hez h?l?zati kapcsolat kell."
-msgstr[1] "A h?rforr?sok friss?t?s?hez h?l?zati kapcsolat kell."
+msgstr[0] "A h?rforr?s friss?t?s?hez h?l?zati kapcsolat sz?ks?ges."
+msgstr[1] "A h?rforr?sok friss?t?s?hez h?l?zati kapcsolat sz?ks?ges."
 
 # src/folderview.c:1704
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
-msgstr "Val?ban t?rl?d '%s' mappaf?t?\n"
+msgstr "Val?ban t?rl?d `%s' h?rforr?s f?t?\n"
 
 # src/folderview.c:224 src/folderview.c:240
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
-msgstr "Mappafa t?rl?se"
+msgstr "H?rforr?s fa t?rl?se"
 
 # src/compose.c:5055 src/compose.c:5069
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
 msgstr "V?lassz egy .opml f?jlt"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "Nem hozhat? l?tre ?tmeneti f?jl a h?rk?ld?shez."
+msgstr "Nem k?sz?thet? mappa az ?j h?rforr?shoz: '%s'."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: %s h?rforr?s friss?t?se\n"
+msgstr "RSSyl: Feliratkoz?s ?j h?rforr?sra: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: ?j h?rforr?s hozz?adva: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: %s h?rforr?s friss?t?se\n"
 
@@ -14778,37 +14932,30 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: %s h?rforr?s friss?t?se k?sz\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: %s h?rforr?s friss?t?se\n"
+msgstr "RSSyl: Hiba a h?rforr?s v?telekor: '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: %s h?rforr?s friss?t?se\n"
+msgstr "RSSyl: Nincs ?rv?nyes h?rforr?s: '%s'\n"
 
 # src/compose.c:4662
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "A szabad/elfoglalt inform?ci? nem export?lhat? ide: '%s'\n"
+msgstr "RSSyl: A h?rforr?s feldolgoz?sa nem siker?lt: '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
+"RSSyl: Az alkalmaz?s kil?p, a h?rforr?s friss?t?se nem fejezhet? be: '%s'\n"
 
-# src/prefs_account.c:1138
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Azonos?t?s haszn?lata"
-
-# src/prefs_account.c:1138
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Azonos?t?s haszn?lata"
+msgstr "HTTP Basic azonos?t?s"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -14816,54 +14963,49 @@ msgstr "Alap?rtelmezett friss?t?si id?k?z haszn?lata"
 
 # src/folderview.c:1695
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "Ment?s e mapp?ba"
+msgstr "R?gi elemek megtart?sa"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "_Trim"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
+msgstr "H?rforr?s friss?t?se, a forr?sb?l m?r nem el?rhet? h?rek t?rl?se"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Hozz?sz?l?sok v?tele, ha lehets?ges"
 
-# src/summaryview.c:363
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
-msgstr "Mindig jel?lje olvasatlank?nt"
+msgstr "Mindig megjel?lni ?jk?nt"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
-msgstr "Csak ha v?ltozott a sz?veg"
+msgstr "Csak ha v?ltozott a sz?veg?k"
 
-# src/summaryview.c:363
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
-msgstr "Soha ne jel?lje olvasatlank?nt"
+msgstr "Sosem megjel?lni ?jk?nt"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "C?m hozz?ad?sa az ?zenet tetej?re"
 
 # src/summaryview.c:364
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "T?ma figyelmen k?v?l hagy?sa"
+msgstr "C?m ?tnevez?s?nek figyelmen k?v?l hagy?sa"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Enged?lyezd a jelenlegi mappan?v megtart?s?hoz, hacsak a h?rforr?s szerz?je "
+"meg nem v?ltoztatja a h?rforr?s c?m?t."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
@@ -14875,18 +15017,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>Forr?s URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Felhaszn?l?n?v:"
-
-# src/prefs_account.c:898 src/prefs_account.c:1199
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Jelsz?"
+msgstr "Felhaszn?l?n?v"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -14905,7 +15037,6 @@ msgstr ""
 "<small>(?ll?tsd 0-ra az automatikus friss?t?s letilt?s?hoz)</small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 msgid "<b>If an item changes, do not mark it as new:</b>"
 msgstr "<b>Ha egy h?r megv?ltozik, ne jel?lje olvasatlannak:</b>"
 
@@ -14926,7 +15057,6 @@ msgstr "_H?rforr?s friss?t?se"
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
 msgstr "H?rforr?s _be?ll?t?sai..."
 
@@ -14937,9 +15067,8 @@ msgstr "?t_nevez?s..."
 
 # src/editldap.c:333 src/editldap_basedn.c:181
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "Rekurz?v keres?s"
+msgstr "R_ekurz?v friss?t?s"
 
 # src/folderview.c:250
 #: src/plugins/rssyl/rssyl_gtk.c:52
@@ -14948,7 +15077,6 @@ msgstr "?_j h?rforr?s felv?tele..."
 
 # src/folderview.c:218 src/folderview.c:234
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
 msgstr "?j _mappa l?trehoz?sa..."
 
@@ -14959,9 +15087,8 @@ msgstr "H?rforr?s lista import?l?sa..."
 
 # src/prefs_account.c:976
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "T?rl?s"
+msgstr "Fa t?rl?se"
 
 # src/folderview.c:224 src/folderview.c:240
 #: src/plugins/rssyl/rssyl_gtk.c:126
@@ -14987,25 +15114,21 @@ msgstr ""
 msgid "My Feeds"
 msgstr "H?rforr?saim"
 
-# src/editjpilot.c:225
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Pine f?jl kiv?laszt?sa"
+msgstr "Cookies f?jl kiv?laszt?sa"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Alap?rtelmezett friss?t?si id?k?z haszn?lata"
+msgstr "Alap?rtelmezett friss?t?si id?k?z"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Minden h?rforr?s friss?t?se indul?skor "
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "SSL tan?s?tv?ny ?rv?nyess?g?nek ellen?rz?se az ?j h?rforr?sokn?l"
+msgstr "SSL tan?s?tv?nyok ?rv?nyess?g?nek ellen?rz?se az ?j h?rforr?sokn?l"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -15018,40 +15141,37 @@ msgstr ""
 "tartalmazza"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
 msgstr "Friss?t?s"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Biztons?g ?s adatv?delem"
 
 # src/folderview.c:250
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "?_j h?rforr?s felv?tele..."
+msgstr "?j h?rforr?s felv?tele?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> d?tum:</b>"
+msgstr "<b>H?rforr?s mappa:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
-msgstr ""
+msgstr "A hivatalos c?m helyett m?s mappan?v is be?ll?that? a h?rforr?shoz."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_H?rforr?s be?ll?t?sainak m?dos?t?sa a feliratkoz?s ut?n"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "%s cache friss?t?se..."
+msgstr "'%s' hozz?sz?l?sainak friss?t?se..."
 
 # src/prefs_account.c:1138
 #: src/plugins/rssyl/rssyl_update_feed.c:105
@@ -15071,9 +15191,9 @@ msgstr "404 (Nem tal?lhat?)"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "%ld hiba"
+msgstr "%d hiba"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -15084,6 +15204,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Hiba a h?rforr?s v?telekor:\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
@@ -15091,10 +15215,12 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"Nincs ?rv?nyes h?rforr?s:\n"
+"<b>%s</b>"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
 msgstr "'%s' h?rforr?s friss?t?se..."
 
@@ -15108,7 +15234,6 @@ msgid ""
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "A h?rforr?s friss?t?s?hez h?l?zati kapcsolat kell."
 
@@ -15440,8 +15565,7 @@ msgstr "Megjelen?t?s"
 
 # src/prefs_account.c:985
 #: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1476 src/prefs_folder_item.c:560
-#: src/prefs_matcher.c:336
+#: src/prefs_account.c:1476 src/prefs_folder_item.c:560 src/prefs_matcher.c:336
 msgid "days"
 msgstr "nap"
 
@@ -15906,9 +16030,9 @@ msgstr ""
 # src/compose.c:4658
 #: src/plugins/vcalendar/vcal_folder.c:1851
 #: src/plugins/vcalendar/vcal_folder.c:1854
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "%s c?lk?nyvt?r nem hozhat? l?tre."
+msgstr "%s k?nyvt?r nem hozhat? l?tre"
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -16370,13 +16494,6 @@ msgstr "Export?lhatsz helyi f?jlt vagy URL-t"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Add meg a helyi f?jlt vagy az URL-t (http://server/path/file.ics)"
 
-# src/prefs_account.c:892 src/prefs_account.c:1190
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Felhaszn?l?-azonos?t?"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Webcal feliratkoz?sok is szerepeljenek az export?l?sban"
@@ -16544,11 +16661,6 @@ msgstr "Teljes n?v"
 msgid "Mail address"
 msgstr "E-mail c?m"
 
-# src/prefs_account.c:792
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Szerver inform?ci?"
-
 # src/mainwindow.c:666
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
@@ -16686,16 +16798,6 @@ msgstr "Let?ltend? cikkek maxim?lis sz?ma"
 msgid "unlimited if 0 is specified"
 msgstr "0 megad?sa eset?n korl?tlan"
 
-# src/prefs_account.c:1161
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Azonos?t?si elj?r?s"
-
-# src/prefs_account.c:1171
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatikus"
-
 # src/prefs_account.c:1685
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
@@ -16941,7 +17043,7 @@ msgstr "Tan?s?tv?ny k?ld?shez"
 
 #: src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr "Ismeretlen, ?rv?nyes SSL tan?s?tv?nyok automatikus elfogad?sa"
+msgstr "Ismeretlen, ?rv?nyes tan?s?tv?nyok automatikus elfogad?sa"
 
 #: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
@@ -17267,22 +17369,21 @@ msgid "Do you really want to delete all the actions?"
 msgstr "T?nyleg t?r?ljem az ?sszes m?veletet?"
 
 #: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125
-#: src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2125 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Bejegyz?s nincs elmentve"
 
 #: 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 "A bejegyz?s nincs elmentve. M?gis bez?rod?"
 
 # src/send.c:375
 #: 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:2127
-#: src/prefs_template.c:574 src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2127 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "+_Continue editing"
 msgstr "+Szerkeszt?s _folytat?sa"
 
@@ -18549,9 +18650,8 @@ msgstr "fejl?c r?szek"
 
 # src/prefs_display_header.c:222
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "fejl?c sor"
+msgstr "fejl?cek ?rt?kei"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -18796,9 +18896,8 @@ msgstr "Fejl?c r?sz"
 
 # src/prefs_display_header.c:222
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "Fejl?c n?v"
+msgstr "Fejl?cek ?rt?kei"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -19573,11 +19672,9 @@ msgstr "Cirill (ISO-8859-5)"
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-# src/prefs_common.c:1103
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cirill (KOI8-R)"
+msgstr "Cirill (X-MAC-CYRILLIC)"
 
 # src/prefs_common.c:1106
 #: src/prefs_send.c:246
@@ -20101,10 +20198,9 @@ msgstr ""
 "A sablon \"Titkos m?solatot kap\" mez?je ?rv?nytelen e-mail c?met tartalmaz."
 
 #: src/prefs_template.c:835
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "A sablon \"C?mzett\" mez?je ?rv?nytelen e-mail c?met tartalmaz."
+msgstr "A sablon \"Reply-To\" mez?je ?rv?nytelen e-mail c?met tartalmaz."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -21363,11 +21459,6 @@ msgstr ""
 "Vannak adott fi?khoz tartoz? sz?r?si szab?lyok.\n"
 "V?laszd ki, mi a teend? e szab?lyokkal:"
 
-# src/addressbook.c:334 src/compose.c:450 src/mainwindow.c:417
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Sz?r?"
-
 # src/summaryview.c:3150
 #: src/summaryview.c:5659
 msgid "Filtering..."
@@ -22284,201 +22375,3 @@ msgid ""
 msgstr ""
 "A Claws Mail haszn?latra k?sz.\n"
 "Kattints a Ment?sre a kezd?shez."
-
-#, fuzzy
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr "A Claws Mail be?ll?tva alap?rtelmezett kliensk?nt."
-
-#~ msgid "messages which contain header S"
-#~ msgstr "S fejl?cet tartalmaz? ?zenetek"
-
-# src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "'To' (c?mzett) c?mek ment?se"
-
-# src/addressbook.c:837
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "'Cc' (m?solat) c?mek ment?se"
-
-# src/addressbook.c:837
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "'Bcc' (titkos m?solat) c?mek ment?se"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData plugin: Azonos?tva\n"
-
-#~ msgid "slow"
-#~ msgstr "lass?"
-
-#~ msgid "fast"
-#~ msgstr "gyors"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Banner m?rete k?pontban (0 a k?perny? m?ret?t jelenti)"
-
-# src/prefs_common.c:2353
-#~ msgid "Enable Popup"
-#~ msgstr "Popup enged?lyez?se"
-
-# src/rfc2015.c:174
-#~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "%s digit?lis al??r?sa j? (nem hiteles?tett)"
-
-# src/compose.c:4662
-#~ msgid "Cannot open temporary file"
-#~ msgstr "Nem siker?lt megnyitni az ideiglenes f?jlt"
-
-#~ msgid "Cannot init libCURL"
-#~ msgstr "Nem siker?lt inicializ?lni a libCURL-t"
-
-# src/summaryview.c:2611
-#~ msgid "Fetching '%s'..."
-#~ msgstr "'%s' v?tele..."
-
-# src/summaryview.c:1010 src/summaryview.c:1035
-#~ msgid "Malformed feed"
-#~ msgstr "Hib?san form?zott h?rforr?s"
-
-#~ msgid ""
-#~ "RSSyl: Fetching comments is not supported for RDF feeds. Cannot fetch "
-#~ "comments of '%s'"
-#~ msgstr ""
-#~ "RSSyl: Hozz?sz?l?sok v?tele nem t?mogatott az RDF h?rforr?sokn?l. '%s' "
-#~ "hozz?sz?l?sai nem lesznek lek?rdezve."
-
-# src/main.c:161
-#~ msgid "This feed format is not supported yet."
-#~ msgstr "A h?rforr?s form?tuma nem t?mogatott."
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-# src/account.c:674 src/addressbook.c:839 src/addressbook.c:1666
-# src/compose.c:2243 src/compose.c:2498 src/compose.c:4590
-# src/folderview.c:655 src/folderview.c:1696 src/folderview.c:1754
-# src/folderview.c:1860 src/folderview.c:1995 src/folderview.c:2032
-# src/mainwindow.c:1231 src/message_search.c:198 src/prefs_actions.c:877
-# src/prefs_customheader.c:541 src/prefs_filter.c:798
-# src/prefs_template.c:515 src/summary_search.c:311 src/summaryview.c:588
-# src/summaryview.c:891 src/summaryview.c:915 src/summaryview.c:947
-# src/summaryview.c:971 src/summaryview.c:1003 src/summaryview.c:1028
-# src/summaryview.c:1053 src/summaryview.c:1078 src/summaryview.c:2353
-#~ msgid "%ld byte"
-#~ msgid_plural "%ld bytes"
-#~ msgstr[0] "%ld b?jt"
-#~ msgstr[1] "%ld b?jt"
-
-# src/grouplistdialog.c:351
-#~ msgid "size unknown"
-#~ msgstr "a m?ret nem ?llap?that? meg"
-
-# src/compose.c:2898
-#~ msgid ""
-#~ "RSSyl: Cannot update feed %s:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "RSSyl: %s h?rforr?s nem friss?thet?:\n"
-#~ "%s\n"
-
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "M?r feliratkozt?l e h?rforr?sra."
-
-# src/summaryview.c:2677
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "'%s' URL nem el?rhet?:\n"
-#~ "%s"
-
-# src/summaryview.c:2677
-#~ msgid ""
-#~ "Couldn't fetch URL '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "'%s' URL nem el?rhet?:\n"
-#~ "%s\n"
-
-# src/folderview.c:1567 src/folderview.c:1814
-#~ msgid "Can't subscribe feed '%s'."
-#~ msgstr "'%s' h?rforr?s nem vehet? fel."
-
-# src/inc.c:621
-#~ msgid "Time out connecting to URL %s\n"
-#~ msgstr "Id?t?ll?p?s az URL-hez kapcsol?d?skor: %s\n"
-
-#~ msgid "Couldn't fetch URL %s\n"
-#~ msgstr "'%s' URL nem el?rhet?\n"
-
-#~ msgid "Error parsing feed from URL %s\n"
-#~ msgstr "Hiba a(z) %s URL-en l?v? h?rforr?s feldolgoz?sakor\n"
-
-#~ msgid "Unsupported feed type at URL %s\n"
-#~ msgstr "Nem t?mogatott h?rforr?s t?pus a(z) %s URL-en\n"
-
-#~ msgid "RSSyl: Feed update aborted, application is exiting.\n"
-#~ msgstr "RSSyl: A h?rforr?s friss?t?se megszak?tva, kil?p?s.\n"
-
-# src/folderview.c:1704
-#~ msgid "Can't remove feed '%s'."
-#~ msgstr "'%s' h?rforr?s nem t?r?lhet?."
-
-#~ msgid "Refresh _all feeds"
-#~ msgstr "_Minden h?rforr?s friss?t?se"
-
-# src/folderview.c:250
-#~ msgid "_Unsubscribe feed..."
-#~ msgstr "H?rforr?s _t?rl?se..."
-
-# src/folderview.c:659
-#~ msgid "Remove folder _tree..."
-#~ msgstr "Mappa_fa t?rl?se..."
-
-#~ msgid "RSSyl..."
-#~ msgstr "RSSyl..."
-
-#~ msgid "Keep default number of expired entries"
-#~ msgstr "Megtartand? lej?rt bejegyz?sek alap?rtelmezett sz?ma"
-
-#~ msgid ""
-#~ "<b>Number of expired entries to keep:</b>\n"
-#~ "<small>(Set to -1 if you want to keep expired entries)</small>"
-#~ msgstr ""
-#~ "<b>Megtartand? lej?rt bejegyz?sek sz?ma:</b>\n"
-#~ "<small>(?ll?tsd '-1'-re, ha meg akarod tartani a lej?rt bejegyz?seket)</"
-#~ "small>"
-
-# src/folderview.c:250
-#~ msgid "Unsubscribe feed"
-#~ msgstr "Leiratkoz?s a h?rforr?sr?l"
-
-# src/prefs_customheader.c:540
-#~ msgid "Do you really want to remove feed"
-#~ msgstr "Biztosan el akarod t?vol?tani a h?rforr?st"
-
-# src/mainwindow.c:667
-#~ msgid "Remove cached entries"
-#~ msgstr "Gyors?t?t?rban l?v? bejegyz?sek t?rl?se"
-
-#~ msgid "RSSyl"
-#~ msgstr "RSSyl"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Alap?ertelmezett friss?t?si id?k?z percben"
-
-#~ msgid "Set to 0 to disable automatic refreshing"
-#~ msgstr "?ll?tsd 0-ra az automatikus friss?t?s letilt?s?hoz"
-
-#~ msgid "Default number of expired items to keep"
-#~ msgstr "Megtartand? lej?rt bejegyz?sek alap?rtelmezett sz?ma"
-
-#~ msgid "Set to -1 to keep expired items"
-#~ msgstr "?ll?tsd '-1'-re a lej?rt bejegyz?sek megtart?s?hoz"
-
-# src/editaddress.c:1042
-#~ msgid "Use this"
-#~ msgstr "Haszn?lja ezt"
-
-# src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Az e-mail nem titkos?that?: %s"
diff --git a/po/nb.po b/po/nb.po
index 37f8973..007a206 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,30 +5,30 @@
 #
 # Geir Helland <pjallabais at users.sourceforge.net> 2005
 # Joakim Andreasson <joakim.andreasson at gmx.net> 2001
+# Petter Adsen <petter at synth.no>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 2.4.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-24 01:33+0100\n"
-"Last-Translator: Eyolf ?strem <eyolf at oestrem.com>\n"
-"Language-Team: Norwegian Bokm?l <i18n-bn at lister.ping.uio.no>\n"
+"POT-Creation-Date: 2015-07-12 07:58+0100\n"
+"PO-Revision-Date: 2015-07-09 10:28+0200\n"
+"Last-Translator: Petter Adsen <petter at synth.no>\n"
+"Language-Team: Bokm?l, Norwegian; Norwegian Bokm?l <>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 "Du har ?pne redigeringsvinduer.\n"
-"Disse m? lukkes f?r du kan gj?re endringer i kontoinnstillingene\t."
+"Disse m? lukkes f?r du kan gj?re endringer i kontoinnstillingene."
 
 #: src/account.c:437
 msgid "Can't create folder."
@@ -84,13 +84,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hent epost' henter epost fra de avkryssede kontoer"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -431,7 +432,7 @@ msgstr "_Bok"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Endre"
 
@@ -474,10 +475,14 @@ msgid "_Delete book"
 msgstr "_Slett bok"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Lagre"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Lukk"
 
@@ -491,11 +496,12 @@ msgstr "_Klipp ut"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kopier"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Sett inn"
 
@@ -956,12 +962,12 @@ msgstr "Oppdatering av adresse(r)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Oppdatering mislyktes. Endringer ble ikke lagret i registeret."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "NB"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1532,15 +1538,15 @@ msgstr "E_rstatt signatur"
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Angre"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Gjenta"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Klipp ut"
 
@@ -1561,6 +1567,7 @@ msgid "_Unwrapped"
 msgstr "_Uten ombrytning"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "_Velg alt"
 
@@ -1625,6 +1632,7 @@ msgid "Delete to end of line"
 msgstr "Slett til linjeslutt"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Finn"
 
@@ -1924,7 +1932,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+Sett _inn"
 
@@ -2021,7 +2029,7 @@ msgstr "Sett i k?en likevel?"
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2031,7 +2039,7 @@ msgstr ""
 "\n"
 "Tegnsettkonvertering mislyktes."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2041,7 +2049,7 @@ msgstr ""
 "\n"
 "Fant ikke mottagerens krypteringsn?kkel."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2108,68 +2116,73 @@ msgstr ""
 "\n"
 "Send likevel?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Kunne ikke kryptere meldingen: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Krypteringsadvarsel"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+_Fortsett"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Ingen konto tilgjengelig ? sende epost fra!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Den valgte konto er ikke NNTP: det er ikke mulig ? poste."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Vedlegget %s finnes ikke lenger. Ignorer?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Avbryt sending"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorer vedlegg"
 
 # Context or note needed
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Opprinnelig %s del"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "F?y til i adresse_boken"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Slett innhold"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Bruk <tab> for autofullf?ring ut fra adresseboken"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "St?rrelse"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Lagre melding i"
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2180,24 +2193,23 @@ msgstr "Lagre melding i"
 msgid "_Browse"
 msgstr "_Bla"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "Brevho_de"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Vedlegg"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "_Andre"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Emne:"
+msgstr "_Emne:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2206,25 +2218,24 @@ msgstr ""
 "Stavekontroll kunne ikke startes.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Fra: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Fra:"
+msgstr "_Fra:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Konto som skal brukes for denne meldingen"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Tjeneradresse for sending"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2233,69 +2244,68 @@ msgstr ""
 "Personvernsystemet '%s' kan ikke innlastes. Du vil ikke kunne signere eller "
 "kryptere denne meldingen."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Ingen"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Hovedteksten i malen har en feil ved linje %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Formatfeil i malens 'Fra'-felt."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Formatfeil i malens 'Til'-felt."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Formatfeil i malens 'Kopi-Til'-felt."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Formatfeil i malens 'Blindkopi-Til'-felt."
 
-#: src/compose.c:8753
-#, fuzzy
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
-msgstr "Formatfeil i malens 'Til'-felt."
+msgstr "Formatfeil i malens 'Svar-Til'-felt."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Formatfeil i malens emnefelt."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME-type."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Filen eksisterer ikke, eller den er tom."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Tegnkoding"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2306,15 +2316,15 @@ msgstr ""
 "Skal prosessen tvangsavbrytes?\n"
 "Prosessens gruppe-id: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail m? ha nettadgang for ? kunne sende epost."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Kunne ikke sette meldingen i k?."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2325,15 +2335,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Kunne ikke lagre utkast."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Kunne ikke lagre utkast"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2341,24 +2351,24 @@ msgstr ""
 "Kunne ikke lagre utkast.\n"
 "Vil du avbryte lukningen eller kassere denne meldingen? "
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Avbryt lukning."
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Kass?r epost"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Velg fil"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunne ikke leses."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2367,62 +2377,62 @@ msgstr ""
 "Filen '%s' inneholder tegn som ikke er gyldige i\n"
 "den aktuelle tegnkodingen; de kan ha blitt feilaktig innsatt."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Kass?r melding"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Meldingen er endret. Skal den kasseres?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Kass?r"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Lagre til _Utkast"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "_Lagre endringer"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Meldingen er endret. Skal endringene lagres?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Ikke lagre"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Lagre i _Utkast"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vil du bruke malen '%s'?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Bruk mal"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Sett inn eller vedlegg?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2430,16 +2440,16 @@ msgstr ""
 "Vil du sette innholdet av filen(e) direkte inn i meldingsteksten, eller skal "
 "det sendes som separate vedlegg?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Vedlegg"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Feil format p? siteringstegnet i linje %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3652,9 +3662,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserer %s for bruk i frakoblet tilstand...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "En mappe kan ikke flyttes mellom forskjellige postkasser."
+msgstr "Ett mappe-navn kan ikke begynne eller slutte med ett punktum."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3694,9 +3703,8 @@ msgid "Mark all re_ad"
 msgstr "Marker alt som l_est"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Marker _alt som lest"
+msgstr "Marker alt som lest rekursi_vt"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3744,104 +3752,111 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Angir mappeinformasjon..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Marker alt som lest"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Vil du virkelig merke all epost i denne mappen og dens undermapper som lest?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Vil du virkelig merke all epost i denne mappen som lest?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Marker alt som lest"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Ser igjennom mappen %s%c%s"
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Ser igjennom mappen %s ..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Gjendan lokalt mappetre"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Hvis mappetreet gjendannes, vil lokale hurtiglager fjernes. ?nsker du ? "
 "fortsette?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Oppdaterer mappetre..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Gjennoms?ker mappetre..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunne ikke gjennomg? mappen %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Ser etter nye meldinger i alle mapper..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Lukker mappen %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "?pner mappen %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Mappen kunne ikke ?pnes."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "T?m papirkurven"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Slett alle meldingene i papirkurven?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_T?m Papirkurv"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "NB: Du er ikke online"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbeider i frakoblet tilstand. Overstyr?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Send meldinger i k?en"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Send alle meldinger i k?en?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Send"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Enkelte feil oppsto mens meldinger i k?en ble sendt"
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3850,64 +3865,64 @@ msgstr ""
 "Enkelte feil oppsto mens meldinger i k?en ble sendt:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vil du virkelig kopiere mappen '%s' til '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vil du virkelig gj?re '%s' til en undermappe i '%s'?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopierer %s til %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flytter %s til %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Kilde og m?l er identiske."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan ikke kopiere en mappe til en av sine egne undermapper."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mappe kan ikke flyttes mellom forskjellige postkasser."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kopiering mislyktes!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Flytting mislyktes!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Bearbeider oppsetningen for for mappe %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "M?lmappen kan bare brukes for ? lagre undermapper."
 
@@ -4001,7 +4016,6 @@ msgstr ""
 "Claws-prosjektet kan det gj?res p?:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4011,8 +4025,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
-"Claws Mail-gruppen\n"
+"Copyright (C) 1999-2015\n"
+"Claws Mail-teamet\n"
 " og Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:161
@@ -4229,17 +4243,16 @@ msgstr "Samlet antall utg?ende meldinger: %d\n"
 
 #: src/gtk/about.c:773
 msgid "About Claws Mail"
-msgstr "Om Claws"
+msgstr "Om Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
-"Claws Mail-gruppen\n"
+"Copyright (C) 1999-2015\n"
+"Claws Mail-teamet\n"
 "og Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:845
@@ -5035,6 +5048,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5091,11 +5105,12 @@ msgstr "Sideindeks"
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Konto"
 
@@ -5160,14 +5175,12 @@ msgid "messages which have attachments"
 msgstr "meldinger med vedlegg"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "meldinger som inneholder S i brevhodet 'X-Label'"
+msgstr "meldinger som inneholder S i etthvert brevhode"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "meldinger som inneholder S i brevhodet 'X-Label'"
+msgstr "meldinger som inneholder S i verdien til etthvert brevhode"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5313,9 +5326,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "Noe gikk galt under s?kningen. Unders?k dine logger."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Fra/Til/Emne/Tagg"
+msgstr "Fra/Til/Kopi/Emne/Tagg"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5778,7 +5790,6 @@ msgstr ""
 "for SASL og programtillegget DIGEST-MD5 er installert."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5787,8 +5798,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5-innlogging vil kun fungere hvis libetpan er kompilert med st?tte "
-"forSASL, og programtillegget CRAM-MD5 er installert."
+"SCRAM-SHA-1-innlogging vil kun fungere hvis libetpan er kompilert med st?tte "
+"for SASL, og programtillegget SCRAM SASL er installert."
 
 #: src/imap.c:959
 #, c-format
@@ -5935,13 +5946,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Kan ikke gjeninnlese muligheter.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "Forbindelsen til %s mislyktes: tjeneren krever TLS, men Claws Mail er blitt "
-"kompilert uten OpenSSL-funksjonalitet.\n"
+"kompilert uten TLS-funksjonalitet.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6374,7 +6385,7 @@ msgstr "Ferdig (ingen nye meldinger)"
 msgid "Connection failed"
 msgstr "Forbindelse mislyktes"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Autentisering mislyktes"
 
@@ -6418,7 +6429,8 @@ msgstr "F?r ikke forbindelse til POP3-tjener: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "F?r ikke forbindelse til POP3-tjener: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentisering..."
 
@@ -7487,7 +7499,7 @@ msgstr "Frakoblet tilstand"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "Men_yer"
 
 #: src/mainwindow.c:809
 msgid "_Message view"
@@ -8147,12 +8159,15 @@ msgid "Remove _mailbox..."
 msgstr "Fjern post_kasse..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Kan ikke slette mappen '%s'."
+msgstr ""
+"Kan ikke slette mappen '%s'\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8538,7 +8553,6 @@ msgid "Address Keeper"
 msgstr "Adressebeholder"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
 msgstr "Sti til adressebok"
 
@@ -8561,7 +8575,7 @@ msgstr "Velg..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Behold adresser fra felt"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8576,12 +8590,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Behold adresser som forekommer i 'Blindkopi-Til'-brevhoder"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Ta ikke med adresser som samsvarer med f?lgende regul?re uttrykk (ett per "
-"linje):"
+"linje)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9126,9 +9139,8 @@ msgid "attach"
 msgstr "vedlegg"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Det er samsvar med ett av de f?lgene regul?re uttrykk (ett per linje):"
+msgstr "Det er samsvar med ett av de f?lgene regul?re uttrykk (ett per linje)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9312,19 +9324,16 @@ msgid "KB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Slett tagg"
+msgstr "Slett spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Lagre spam i"
+msgstr "Lagre spam i..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Marker som spam"
+msgstr "Bare marker som spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9837,9 +9846,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Bruk GNOMEs proxy-innstillinger"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Bruk proxy:"
+msgstr "Bruk proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9864,9 +9872,8 @@ msgid "Enable loading of remote content"
 msgstr "Tillat innlesning av fjerninnhold"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Forvalgt handling n?r det klikkes p? en lenke:"
+msgstr "Forvalgt handling n?r det klikkes p? en lenke"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -9874,7 +9881,7 @@ msgstr "?pne i nettleser"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "CSS i denne filen vil brukes p? alle HTML-deler"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -9885,9 +9892,8 @@ msgid "Bro_wse"
 msgstr "_Bla"
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "Stilsett"
+msgstr "Velg stilsett"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -10024,9 +10030,8 @@ msgid "Add fetchinfo headers"
 msgstr "Hent fetchinfo-brevhoder"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Tjeneradresse for sending"
+msgstr "Legg til brevhoder"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10035,7 +10040,7 @@ msgstr "UIDL"
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
-msgstr ""
+msgstr "Legg til X-FETCH-UIDL brevhoder med unik ID for melding (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10043,7 +10048,7 @@ msgstr "Kontonavn"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Legg til X-FETCH-ACCOUNT brevhode med konto-navn"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10051,7 +10056,7 @@ msgstr "Mottakertjener"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "Legg til X-FETCH-SERVER brevhode med mottaks-server"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10059,7 +10064,7 @@ msgstr "Bruker-ID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Legg til X-FETCH-USERID brevhode med bruker-ID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10070,11 +10075,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Legg til X-FETCH-TIME-brevhode med dato og tid for n?r neldingen ble hentet, "
+"i RFC822-format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "GData-tillegg: Autentiseringsfeil: %s\n"
+msgstr "GData-tillegg: Autentisering kreves"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10086,25 +10092,29 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Du m? autentisere Claws Mail for ? aksessere din Google kontakt-liste for ? "
+"bruke GData-tillegget.\n"
+"\n"
+"Bes?k Google's autoriserings-side ved ? trykke p? knappen nedenfor. Etter du "
+"har bekreftet autorisasjonen vil du f? en autentiseringskode. Legg den koden "
+"inn i feltet nedenfor for ? gi Claws Mail tilgang til din Google kontakt-"
+"liste."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Trinn"
+msgstr "Trinn 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Klikk her for ? ?pne Google's autentiserings-side i en nettleser."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Trinn"
+msgstr "Trinn 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Grensesnitt"
+msgstr "Legg inn kode:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10143,49 +10153,46 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "GData-tillegg: starter asynkron gruppes?kning\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData-tillegg: Autentiseringsfeil: %s\n"
+msgstr "GData-tillegg: Autoriseringsfeil: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "GData-tillegg: Autentiseringsfeil: %s\n"
+msgstr "GData-tillegg: Vellykket autorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData-tillegg: starter asynkron autentisering\n"
+msgstr "GData-tillegg: starter interaktiv autorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData-tillegg: starter asynkron autentisering\n"
+msgstr "GData-tillegg: Mottatt autoriserings-kode, ber om autorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"GData-tillegg: Ingen autoriseringskode mottatt, autorisering avbrutt.\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData-tillegg: Autentiseringsfeil: %s\n"
+msgstr "GData-tillegg: Feil ved oppfriskning av autorisering: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData-tillegg: Autentiseringsfeil: %s\n"
+msgstr "GData-tillegg: Vellykket oppfriskning av autorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData-tillegg: starter asynkron autentisering\n"
+msgstr "GData-tillegg: Fors?ker ? oppfriske autorisasjon\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
-msgstr "Autentisering"
+msgstr "Autorisering"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:83
 #: src/plugins/spam_report/spam_report_prefs.c:152
@@ -11326,9 +11333,8 @@ msgstr ""
 "Feedback til <ricardo at mones.org> mottas med takk.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Epostadresse:</span>"
+msgstr "<span color=\"red\">Feil ved lesing av cache-statistikk</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11336,25 +11342,25 @@ 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Bruker %s i %d filer, %d kataloger og %d andre"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Ikoncache"
+msgstr "T?m ikon-cache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Vil du virkelig slette detta temaet?"
+msgstr "Vil du virkelig slette alle cachede avatar iconer?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Ikke nok minne for operasjon"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11363,10 +11369,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"T?mming av ikon-cache vellykket:\n"
+"? %u manglende enheter fjernet.\n"
+"? %u filer slettet."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">T?mming av ikon-cache vellykket!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11377,10 +11386,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Feil ved t?mming av ikon-cache:\n"
+"? %u manglende enheter fjernet.\n"
+"? %u filer slettet.\n"
+"? %u filer kunne ikke leses.\n"
+"? %u filer kunne ikke slettes."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Feil ved t?mming av ikon-cache.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11459,6 +11473,8 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Tast inn URL du vil skal erstattes n?r bruker-ikon ikke er tilgjengelig. "
+"Legg inn en tom URL for ? bruke standard libravatar oransje ikon."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11481,9 +11497,8 @@ msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Pr?v ? hente avataren fra en libravatar-tjener p? avsenderens domene"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "Tidsavbrudd p? sesjonen\n"
+msgstr "Tidsavbrudd p? sesjonen"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -11496,6 +11511,8 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
+"Sett til 0 for ? bruke global socket I/O tidsavbrudd. Maksimum verdi m? ogs? "
+"v?re mindre enn global socket I/O tidsavbrudd."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
@@ -11544,6 +11561,270 @@ msgstr ""
 "Alle mapper og meldinger under '%s' vil bli slette.\n"
 "Vil du virkelig slette?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Sieve autentiserings-metode ikke tilgjengelig\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "?nsket Sieve autentiserings-metode er ikke tilgjengelig\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Frakoblet"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Frakoblet: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "uh?ndtert melding i Sieve-sesjon: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS mislyktes"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "feil oppstod i SIEVE-sesjonen\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "feil oppstod i Sieve-sesjonen. data: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "uh?ndtert melding i Sieve-sesjonen: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: pr?ver auth p? nytt\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Auth metode ikke tilgjengelig"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filter"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Sjek_k Syntaks"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "Gj?r _om"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Kunne ikke hente innhold i script"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Gj?r om..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Gj?r om script"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Scriptet er endret. Skal endringene gj?res om?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "_Gj?r om"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Script lagret."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Lagrer..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Kontrollerer syntaks..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Scriptet er endret. Skal endringene lagres?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Lagre"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve Filter%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Legg til Sieve script"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Angi navnet p? det nye Sieve filter-scriptet."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Angi nytt navn for scriptet."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Vil du virkelig slette filteret '%s'?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Slett filter"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "En konto kan bare ha ett aktivt script om gangen."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Kunne ikke koble til"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Lister script..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Kobler til..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Administrer Sieve Filtre"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "For ? bruke Sieve, skru det p? i en kontos innstillinger."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Administrer Sieve Filtre..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr ""
+"Administrer Sieve filtre p? en tjener som bruker ManageSieve-protokollen."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Aktiver Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Tjenerinformasjon"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Navn p? tjener"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr "Koble til denne maskinen istedenfor maskinen som mottar mail"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Tjener-port"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Koble til denne porten istedenfor forvalg"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Ingen TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Bruk TLS n?r tilgjengelig"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Krev TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Ingen autentisering"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Bruke samme autentisering som for ? hente mail"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Spesifiser autentisering"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Bruker-ID"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Passord"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Autentiseringsmetode"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Sieve-tjener m? ikke inneholde mellomrom."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Sieve-tjener ikke angitt."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NyMelding"
@@ -11803,14 +12084,12 @@ msgid "News folders"
 msgstr "Nye mapper"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS-mapper"
+msgstr "RSSyl-mapper"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Kalendermapper"
+msgstr "vCalendar-mapper"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11856,23 +12135,20 @@ msgid "Banner speed"
 msgstr "Bannerhastighet"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Maksimalt antall resultater:"
+msgstr "Maksimalt antall meldinger"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "H?yeste antall meldinger (0 betyr ubegrenset)"
+msgstr "Begrens antall viste meldinger, bruk 0 for ubegrenset"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Bannerhastighet"
+msgstr "Vidde p? banner"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Begrens st?rrelse p? banner, bruk 0 for skjerm-vidde"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11902,9 +12178,8 @@ msgid "Select folders..."
 msgstr "Velg mapper..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Mappefarge: "
+msgstr "Farge p? banner"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -11940,16 +12215,14 @@ msgstr "Aktiver popup"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Tidsavbrudd for popup:"
+msgstr "Tidsavbrudd for popup"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "sekunder"
+msgstr "sekund(er)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -11977,18 +12250,16 @@ msgid "Done"
 msgstr "Ferdig"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Kj?r kommando"
+msgstr "Velg kommando"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Aktiver kommando"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Kommando som skal utf?res:"
+msgstr "Kommando som skal utf?res"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -11999,9 +12270,8 @@ msgid "Enable LCD"
 msgstr "Aktiver LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Maskinnavn:Port for LCDd-tjener:"
+msgstr "Maskinnavn:Port for LCDd-tjener"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12059,9 +12329,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Minimer (av/p?):"
+msgstr "Minimer av/p?"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12612,7 +12881,7 @@ msgstr "Ingen signatur funnet"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "Uklarert"
 
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
@@ -12628,54 +12897,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan ikke finne n?kkel - ingen gpg-agent kj?rer."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "God signatur fra %s."
+msgstr "Gyldig signatur fra \"%s\" [ultimat]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "God signatur fra %s."
+msgstr "Gyldig signatur fra \"%s\" [full]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "God signatur fra %s."
+msgstr "Gyldig signatur fra \"%s\" [marginal]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "God signatur fra %s."
+msgstr "Gyldig signatur fra \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Utl?pt signatur fra %s."
+msgstr "Utl?pt signatur fra \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Gyldig signatur fra %s, men n?kkelen er utl?pt."
+msgstr "Gyldig signatur fra \"%s\", men n?kkelen er utl?pt"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Gyldig signatur fra %s, men n?kkelen er blitt tilbakekalt."
+msgstr "Gyldig signatur fra \"%s\", men n?kkelen er blitt tilbakekalt"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Ugyldig signatur fra %s."
+msgstr "Ugyldig signatur fra \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "N?kkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen."
+msgstr "N?kkel 0x%s er ikke tilgjengelig for verifisering av denne signaturen"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Signaturen er ikke verifisert."
+msgstr "Signaturen er ikke verifisert"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12723,12 +12991,12 @@ msgstr "                    uid \"%s\" (Gyldighet: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "Opphevet"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
 msgid "Owner Trust: %s\n"
-msgstr ""
+msgstr "Eier-tillitt: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:367
 msgid "Primary key fingerprint:"
@@ -13035,7 +13303,7 @@ msgstr "Kunne ikke opprette tempor?r fil: %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "OpenPGP digital signatur"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
@@ -13107,7 +13375,6 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Kunne ikke registrere haken \"compose create\" i Python-tillegget"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13154,8 +13421,8 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 "Dette programtillegget tilbyr funksjoner for integrasjon med Python.\n"
-"Python-kode kan skrives inn interaktivt i en innebygd Python-konsoll, under /"
-"Verkt?y/Vis Python-konsoll, eller lagret i skript.\n"
+"Python-kode kan skrives inn interaktivt i en innebygd Python-konsoll, under "
+"Verkt?y -> Vis Python-konsoll, eller lagret i skript.\n"
 "\n"
 "Disse skriptene er tilgjengelige fra menyen, og kan gis hurtigtaster p? "
 "samme m?te som med andre menypunkter. Man kan dessuten bruke Claws Mails "
@@ -13194,39 +13461,39 @@ msgstr ""
 "vil dele, s? send meg det gjerne, s? vil jeg vurdere ? ha det med blant "
 "eksemplene.\n"
 "\n"
-"Feedback til <berndth at gmx.de> mottas med takk."
+"Feedback til <berndth at gmx.de> er velkommen."
 
 #: src/plugins/python/python_plugin.c:789
 msgid "Python integration"
 msgstr "Python-integrasjon"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Kunne ikke opprette mboxfil:\n"
-"%s\n"
+"Kunne ikke lese innhold av gammel feeds.xml fil:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: Feil ved skriving av '%s' til kilde eksport-liste.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "Kunne ikke ?pne loggfil %s: %s\n"
+msgstr "Kunne ikke slette gammel OPML fil '%s': %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
-msgstr ""
+msgstr "RSSyl: Kunne ikke ?pne fil '%s' for eksportering av kilde-liste: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl: Feil ved skriving av kilde-eksport-fil.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -13236,6 +13503,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Feil ved abonnering p? kilde\n"
+"%s\n"
+"\n"
+"Mappenavn '%s' er ikke tillatt."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -13256,10 +13527,9 @@ msgid "RSS feed"
 msgstr "RSS-kilde"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(vanligvis tom)"
+msgstr "(tom)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -13267,56 +13537,53 @@ msgstr "Oppdater alle kilder"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
-msgstr "_Abonner p? feed"
+msgstr "_Abonner p? kilde"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Angi URL-en for den nyhetskilde du vil abonnere p?:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "Et mappenavn kan ikke inneholde '%c'."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail m? ha nettadgang for ? kunne oppdatere feeden."
 msgstr[1] "Claws Mail m? ha nettadgang for ? kunne oppdatere feedene."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Vil du virkelig fjerne mappetreet '%s'?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
 msgstr "Fjern mappetre"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
-msgstr "Velg .opml-fil"
+msgstr "Velg OPML fil"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "Kunne ikke opprette midlertidig fil for sending til postliste."
+msgstr "Kunne ikke opprette mappe for ny feed '%s'."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: Oppdaterer kilde %s\n"
+msgstr "RSSyl: Abonnerer p? ny feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: Abonnert p? ny feed: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Oppdaterer kilde %s\n"
 
@@ -13326,85 +13593,78 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Kildeoppdatering fullf?rt: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: Oppdaterer kilde %s\n"
+msgstr "RSSyl: Feil ved henting av kilde p? '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: Oppdaterer kilde %s\n"
+msgstr "RSSyl: Ingen godkjent kilde funnet p? %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "Kunne ikke eksportere ledig/opptatt-info til '%s'\n"
+msgstr "RSSyl: Kunne ikke behandle kilde p? '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Bruk autentisering"
+"RSSyl: Applikasjonen avslutter, kunne ikke avslutte oppdatering av kilde p? "
+"'%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Bruk autentisering"
+msgstr "HTTP Basic autentisering"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Bruk det forvalgte oppdateringsintervall"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "Behold i mappe"
+msgstr "Behold gamle meldinger"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "_Trim"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
-msgstr ""
+msgstr "Oppdater kilde, slett meldinger som ikke lenger er i kilden"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Hent kommentarer hvis mulig"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
-msgstr "Marker alltid som ulest"
+msgstr "Marker alltid som ny"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
-msgstr "Hvis bare teksten er endret"
+msgstr "Bare hvis teksten er endret"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
-msgstr "Marker aldri som ulest"
+msgstr "Marker aldri som ny"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "Legg tittel til toppen av meldingen"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "Ignorer tr?d"
+msgstr "Ignorer endring av titler"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Bruk n?v?rende mappenavn, selv om forfatter av kilden endrer tittel p? "
+"kilden."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
@@ -13416,17 +13676,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>Kilde-URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Brukernavn:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Passord"
+msgstr "Brukernavn"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13446,9 +13697,8 @@ msgstr ""
 "kilden)</small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 msgid "<b>If an item changes, do not mark it as new:</b>"
-msgstr "Hvis en post endres, "
+msgstr "<b>Hvis en post endres, ikke marker den som ny:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:609
 msgid "_OK"
@@ -13463,36 +13713,32 @@ msgid "_Refresh feed"
 msgstr "_Oppdater kilde"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
-msgstr "_Egenskaper..."
+msgstr "_Egenskaper"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
 msgstr "_Omd?p..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "Gjennoms?k alle undermapper"
+msgstr "O_ppdater alle undermapper"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
 msgstr "/_Abboner p? _ny feed..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
-msgstr "/Opprett _ny mappe..."
+msgstr "Opprett _ny mappe..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
 msgstr "Importer feed-liste..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "Slett etter"
+msgstr "Slett tre"
 
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
@@ -13517,23 +13763,20 @@ msgid "My Feeds"
 msgstr "Mine Kilder"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Velg Pine-fil"
+msgstr "Velg cookies-fil"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Bruk det forvalgte oppdateringsintervall"
+msgstr "Forvalgt oppdateringsintervall"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Oppdater alle kildene ved programstart"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "Verifiser SSL-sertifikatets gyldighet for nye feeder"
+msgstr "Verifiser SSL-sertifikatets gyldighet for nye kilder"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -13545,38 +13788,37 @@ msgstr ""
 "Sti til filen cookies.txt i Netscape-stil, som inneholder dine cookies."
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Oppdater"
+msgstr "Oppdatering"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Sikkerhet og privatliv"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "/_Abboner p? _ny feed..."
+msgstr "Abonner p? ny feed?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> p?:</b>"
+msgstr "<b>Kilde-mappe:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
+"Istedenfor ? bruke offisiell tittel, kan du legge inn ett annet mappe-navn "
+"for kilden."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_Editer kilde-egenskaper etter abonnering"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "Oppdaterer mellomlager for %s..."
+msgstr "Oppdaterer kommentarer for '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
 #: src/plugins/vcalendar/vcal_folder.c:1598
@@ -13594,9 +13836,9 @@ msgid "404 (Not found)"
 msgstr "404 (Ikke funnet)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "Feil %ld"
+msgstr "Feil %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -13607,6 +13849,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Feil ved henting av kilde p?\n"
+"<b>%s</b>\n"
+"\n"
+"<%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
@@ -13614,11 +13860,13 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"Ingen godkjent kilde funnet p?\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
-msgstr "Oppdaterer feed '%s'..."
+msgstr "Oppdaterer kilde '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:246
 #, c-format
@@ -13628,17 +13876,22 @@ msgid ""
 "\n"
 "Please contact developers, this should not happen."
 msgstr ""
+"Kunne ikke behandle kilde p?\n"
+"<b>%s</b>\n"
+"\n"
+"Vennligst kontakt utviklerne, dette burde ikke skje."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
-msgstr "Claws Mail m? ha nettadgang for ? kunne oppdatere feeden."
+msgstr "Claws Mail m? ha nettadgang for ? kunne oppdatere kildene dine."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
+"Internt problem ved oppgradering av lagrings-format. Dette burde ikke skje. "
+"Vennligst rapporter dette, med debug-utskrift vedlagt.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
 #: src/plugins/smime/smime.c:911
@@ -14827,12 +15080,6 @@ msgstr "Du kan eksportere til en lokal fil eller en URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Angi en lokal fil eller en URL (http://tjener/sti/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Bruker-ID"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Ta med webcal-abonnementer i eksport"
@@ -14974,10 +15221,6 @@ msgstr "Fullt navn"
 msgid "Mail address"
 msgstr "Epostadresse"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Tjenerinformasjon"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Innstill automatisk"
@@ -15084,14 +15327,6 @@ msgstr "Maksimalt antall artikler som skal lastes ned"
 msgid "unlimited if 0 is specified"
 msgstr "ubegrenset dersom 0 angis"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Autentiseringsmetode"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatisk"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Mappe p? IMAP-tjeneren"
@@ -16696,9 +16931,8 @@ msgid "headers part"
 msgstr "del av brevhode"
 
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "linje i brevhodet"
+msgstr "verdier i brevhodet"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -16898,9 +17132,8 @@ msgid "Headers part"
 msgstr "Del av brevhode"
 
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "Navn p? brevhode"
+msgstr "Verdier i brevhoder"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -17560,9 +17793,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Kyrillisk (KOI8-R)"
+msgstr "Kyrillisk (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -18015,10 +18247,9 @@ msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "\"Blindkopi-Til\"-feltet i malen inneholder en ugyldig epost-adresse."
 
 #: src/prefs_template.c:835
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "\"Til\"-feltet i malen inneholder en ugyldig epost-adresse."
+msgstr "\"Svar-Til\"-feltet i malen inneholder en ugyldig epost-adresse."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -19142,10 +19373,6 @@ msgstr ""
 "Enkelte filterregler h?rer til en bestemt konto.\n"
 "Velg hva som skal skje med disse reglene:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filter"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrerer..."
@@ -20148,6 +20375,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Bruk dette"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Kunne ikke kryptere meldingen: %s"
diff --git a/po/nl.po b/po/nl.po
index e59bd8e..a631cd5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,26 +7,27 @@
 # Claws merge by Alfons Hoogervorst <alfons at proteus.demon.nl>
 # Claws maintenance 2002 by Wilbert Berendsen <wbsoft at xs4all.nl>
 # Claws maintenance 2006-2007 by Tim Dijkstra <tim at famdijkstra.org>
-# Claws maintenance 2008-2014 by Marcel Pol <marcel at timelord.nl>
+# Claws maintenance 2008-2015 by Marcel Pol <marcel at timelord.nl>
 #
-# todo:
-# snelkoppelingen nalopen
-# Configuratie is juist Instellingen
+# TODO:
+# Snelkoppelingen nalopen.
+# Hooks kunnen gewoon in Engels, geeft minder verwarring.
+# Dubbele Engelse woorden zijn een enkel woord.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.10.0\n"
+"Project-Id-Version: Claws Mail 3.11.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-19 20:20+0100\n"
+"POT-Creation-Date: 2015-07-12 09:10+0200\n"
+"PO-Revision-Date: 2015-07-13 14:02+0200\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
-"Language-Team:  <translators at lists.claws-mail.org>\n"
+"Language-Team: translators at lists.claws-mail.org\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.2\n"
 
 #: src/account.c:392 src/account.c:459
 msgid ""
@@ -51,7 +52,7 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"'Ophalen' zal berichten ophalen in de opgegeven volgorde, het aanvinkhokje "
+"'Ophalen' zal berichten ophalen in de opgegeven volgorde, het aanvinkvakje "
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
@@ -91,13 +92,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -132,7 +134,7 @@ msgid ""
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 "De geselecteerde actie kan niet worden gebruikt in het\n"
-"opstel-venster omdat het %%f, %%F, %%as of %%p bevat."
+"opstelvenster omdat het %%f, %%F, %%as of %%p bevat."
 
 #: src/action.c:721
 msgid "There is no filtering action set"
@@ -220,7 +222,7 @@ msgstr "Kan een map niet kopi?ren naar zichzelf of ??n van z'n submappen."
 
 #: src/addrclip.c:502
 msgid "Cannot copy an address book to itself."
-msgstr "Kan adresboek niet naar zichzelf kopi?ren."
+msgstr "Kan adresboek niet naar zichzelf kopi?ren."
 
 #: src/addrclip.c:593
 msgid "Cannot move a folder to itself or to its sub-structure."
@@ -265,27 +267,27 @@ msgstr "fax"
 
 #: src/addrcustomattr.c:73
 msgid "website"
-msgstr "webpagina"
+msgstr "website"
 
 #: src/addrcustomattr.c:141
 msgid "Attribute name"
-msgstr "Gegeven"
+msgstr "Eigenschapnaam"
 
 #: src/addrcustomattr.c:156
 msgid "Delete all attribute names"
-msgstr "Alle gegevens verwijderen"
+msgstr "Alle eigenschapnamen verwijderen"
 
 #: src/addrcustomattr.c:157
 msgid "Do you really want to delete all attribute names?"
-msgstr "Wil je deze gegevens werkelijk verwijderen?"
+msgstr "Wil je deze eigenschapnamen werkelijk verwijderen?"
 
 #: src/addrcustomattr.c:181
 msgid "Delete attribute name"
-msgstr "Verwijder gegeven"
+msgstr "Verwijder eigenschapnaam"
 
 #: src/addrcustomattr.c:182
 msgid "Do you really want to delete this attribute name?"
-msgstr "Wil je werkelijk dit gegeven verwijderen?"
+msgstr "Wil je werkelijk deze eigenschapnaam verwijderen?"
 
 #: src/addrcustomattr.c:191
 msgid "Reset to default"
@@ -296,7 +298,7 @@ msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
-"Wil je werkelijk alle gegevens vervangen door\n"
+"Wil je werkelijk alle eigenschapnamen vervangen door\n"
 "de standaard set?"
 
 #: src/addrcustomattr.c:212 src/addressbook.c:435 src/addressbook.c:463
@@ -317,24 +319,24 @@ msgstr "_Terugzetten naar standaard"
 
 #: src/addrcustomattr.c:403
 msgid "Attribute name is not set."
-msgstr "Gegeven is niet ingesteld."
+msgstr "Eigenschapnaam is niet ingesteld."
 
 #: src/addrcustomattr.c:462
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "Bewerk gegeven"
+msgstr "Bewerk eigenschapnamen"
 
 #: src/addrcustomattr.c:476
 msgid "New attribute name:"
-msgstr "Nieuw gegeven:"
+msgstr "Nieuwe eigenschapnaam:"
 
 #: src/addrcustomattr.c:513
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
 msgstr ""
-"Toevoegen of verwijderen van gegevens heeft geen invloed op gegevens die al "
-"ingesteld zijn voor contacten."
+"Toevoegen of verwijderen van eigenschapnamen heeft geen invloed op "
+"eigenschappen die al ingesteld zijn voor contacten."
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
@@ -346,20 +348,20 @@ msgstr "Geef dubbelen weer in verschillende boeken"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Vind e-mail dubbelen in adresboek"
+msgstr "Vind dubbele e-mailadressen in adresboek"
 
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
-msgstr "Claws Mail zal nu dubbele e-mail adressen zoeken in het adresboek"
+msgstr "Claws Mail zal nu dubbele e-mailadressen zoeken in het adresboek"
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
-msgstr "Geen dubbele e-mail adressen gevonden in adresboek"
+msgstr "Geen dubbele e-mailadressen gevonden in adresboek"
 
 #: src/addrduplicates.c:346
 msgid "Duplicate email addresses"
-msgstr "Dubbele e-mail adressen"
+msgstr "Dubbele e-mailadressen"
 
 #: src/addrduplicates.c:442 src/addressadd.c:227
 #: src/plugins/pgpcore/select-keys.c:397 src/toolbar.c:434
@@ -433,7 +435,7 @@ msgstr "_Boek"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "B_ewerken"
 
@@ -465,7 +467,7 @@ msgstr "Nieuwe _JPilot"
 
 #: src/addressbook.c:417
 msgid "New LDAP _Server"
-msgstr "Nieuwe LDAP _Server"
+msgstr "Nieuwe LDAP-_Server"
 
 #: src/addressbook.c:421
 msgid "_Edit book"
@@ -476,10 +478,14 @@ msgid "_Delete book"
 msgstr "_Verwijder boek"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Opslaan"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Sluiten"
 
@@ -493,11 +499,12 @@ msgstr "K_nippen"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kopi?ren"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Plakken"
 
@@ -539,7 +546,7 @@ msgstr "Vind dubbele adressen..."
 
 #: src/addressbook.c:452
 msgid "Edit custom attributes..."
-msgstr "Bewerk extra gegevens..."
+msgstr "Bewerk aangepaste eigenschappen..."
 
 #: src/addressbook.c:455 src/compose.c:690 src/mainwindow.c:803
 #: src/messageview.c:339
@@ -604,7 +611,7 @@ msgstr "Geen pad opgegeven."
 
 #: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
-msgstr "Fout bij verbinding maken met POP3 server"
+msgstr "Fout bij verbinding maken met POP3-server"
 
 #: src/addressbook.c:532
 msgid "Error initializing LDAP"
@@ -624,7 +631,7 @@ msgstr "LDAP-operatie niet gelukt binnen de tijdslimiet"
 
 #: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
-msgstr "Fout in LDAP-zoekcriterie"
+msgstr "Fout in LDAP-zoekcriteria"
 
 #: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
@@ -681,7 +688,7 @@ msgstr ""
 
 #: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
-msgstr "Kan niet plakken.  Doel adresboek is alleen-lezen."
+msgstr "Kan niet plakken. Bedoeld adresboek is alleen-lezen."
 
 #: src/addressbook.c:2200
 msgid "Cannot paste into an address group."
@@ -754,7 +761,7 @@ msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren"
 
 #: src/addressbook.c:4026
 msgid "New user, could not save address book files."
-msgstr "Nieuwe gebruiker, kan adresboekbestanden niet bewaren."
+msgstr "Nieuwe gebruiker, kon adresboekbestanden niet bewaren."
 
 #: src/addressbook.c:4036
 msgid "Old address book converted successfully."
@@ -766,7 +773,7 @@ msgid ""
 "could not save new address index file."
 msgstr ""
 "Oud adresboek geconverteerd,\n"
-"nieuwe indexbestand kon niet worden opgeslagen."
+"nieuw indexbestand kon niet worden opgeslagen."
 
 #: src/addressbook.c:4054
 msgid ""
@@ -782,7 +789,7 @@ msgid ""
 "could not save new address index file."
 msgstr ""
 "Kon adresboek niet converteren,\n"
-"nieuw indexbestand kond niet worden aangemaakt."
+"nieuw indexbestand kon niet worden aangemaakt."
 
 #: src/addressbook.c:4065
 msgid ""
@@ -798,7 +805,7 @@ msgstr "Conversiefout adresboek"
 
 #: src/addressbook.c:4192
 msgid "Addressbook Error"
-msgstr "Adressenboekfout"
+msgstr "Adresboekfout"
 
 #: src/addressbook.c:4193
 msgid "Could not read address index"
@@ -893,7 +900,7 @@ msgstr "Adresboek:"
 
 #: src/addrgather.c:395
 msgid "Address book folder size:"
-msgstr "Grootte adresboek folder:"
+msgstr "Grootte map van adresboek:"
 
 #: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
@@ -957,12 +964,12 @@ msgstr "Adressen update"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1004,7 +1011,7 @@ msgstr "LDAP-naam"
 
 #: src/browseldap.c:272
 msgid "Attribute Value"
-msgstr "Gegeven waarde"
+msgstr "Eigenschapwaarde"
 
 #: src/common/plugin.c:65
 msgid "Nothing"
@@ -1016,7 +1023,7 @@ msgstr "een weergever"
 
 #: src/common/plugin.c:67
 msgid "a MIME parser"
-msgstr "een MIME verwerker"
+msgstr "een MIME-verwerker"
 
 #: src/common/plugin.c:68
 msgid "folders"
@@ -1074,15 +1081,15 @@ msgid ""
 "built with."
 msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
-"gemaakt is."
+"gecompileerd is."
 
 #: src/common/plugin.c:775
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
-"Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin gemaakt "
-"is."
+"Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin "
+"gecompileerd is."
 
 #: src/common/plugin.c:784
 #, c-format
@@ -1099,7 +1106,7 @@ msgstr "SSL-handdruk mislukt\n"
 
 #: src/common/smtp.c:179
 msgid "No SMTP AUTH method available\n"
-msgstr "SMTP AUTH mothode niet beschikbaar\n"
+msgstr "SMTP AUTH methode niet beschikbaar\n"
 
 #: src/common/smtp.c:182
 msgid "Selected SMTP AUTH method not available\n"
@@ -1128,7 +1135,7 @@ msgstr "kan de TLS-sessie niet tot stand brengen\n"
 
 #: src/common/socket.c:573
 msgid "Socket IO timeout.\n"
-msgstr "Socket IO tijdslimiet bereikt.\n"
+msgstr "Socket-IO tijdslimiet bereikt.\n"
 
 #: src/common/socket.c:602
 msgid "Connection timed out.\n"
@@ -1167,17 +1174,17 @@ msgstr "schrijf op fd%d: %s\n"
 #: src/common/ssl_certificate.c:328
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
-msgstr "Kan P12 certificaat bestand niet vinden (%s)\n"
+msgstr "Kan P12-certificaat-bestand niet vinden (%s)\n"
 
 #: src/common/ssl_certificate.c:336
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
-msgstr "Kan P12 certificaat bestand niet lezen (%s)\n"
+msgstr "Kan P12-certificaat-bestand niet lezen (%s)\n"
 
 #: src/common/ssl_certificate.c:345
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
-msgstr "Kan P12 certificaat bestand niet importeren (%s)\n"
+msgstr "Kan P12-certificaat-bestand niet importeren (%s)\n"
 
 #: src/common/ssl_certificate.c:630
 msgid "Internal error"
@@ -1189,7 +1196,7 @@ msgstr "Niet verifieerbaar"
 
 #: src/common/ssl_certificate.c:639
 msgid "Self-signed certificate"
-msgstr "Zelfgetekend certificaat"
+msgstr "Zelfondertekend certificaat"
 
 #: src/common/ssl_certificate.c:642
 msgid "Revoked certificate"
@@ -1206,37 +1213,37 @@ msgstr "Uitgever van certificaat is geen CA"
 #: src/common/ssl_certificate.c:871
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
-msgstr "Kan certificaat bestand %s niet openen: %s\n"
+msgstr "Kan certificaat-bestand %s niet openen: %s\n"
 
 #: src/common/ssl_certificate.c:875
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
-msgstr "Certificaat bestand %s mist (%s)\n"
+msgstr "Certificaat-bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:894
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
-msgstr "Kan sleutel bestand %s niet openen (%s)\n"
+msgstr "Kan sleutel-bestand %s niet openen (%s)\n"
 
 #: src/common/ssl_certificate.c:898
 #, c-format
 msgid "Key file %s missing (%s)\n"
-msgstr "Sleutel bestand %s mist (%s)\n"
+msgstr "Sleutel-bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:1046
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
-msgstr "Kan P12 certificaat bestand niet lezen %s\n"
+msgstr "Kan P12-certificaat bestand niet lezen %s\n"
 
 #: src/common/ssl_certificate.c:1049
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
-msgstr "Kan P12 certificaat bestand niet openen %s (%s)\n"
+msgstr "Kan P12-certificaat bestand niet openen %s (%s)\n"
 
 #: src/common/ssl_certificate.c:1053
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
-msgstr "P12 Certificaat bestand %s mist (%s)\n"
+msgstr "P12-Certificaat bestand %s mist (%s)\n"
 
 #: src/common/ssl_certificate.c:1078 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
@@ -1532,15 +1539,15 @@ msgstr "_Vervang ondertekening"
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "K_nippen"
 
@@ -1561,6 +1568,7 @@ msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
@@ -1625,6 +1633,7 @@ msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Vinden"
 
@@ -1674,7 +1683,7 @@ msgstr "Tekenset_codering"
 
 #: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:270
 msgid "Western European"
-msgstr "Westeuropees"
+msgstr "West-Europees"
 
 #: src/compose.c:672 src/mainwindow.c:611 src/messageview.c:271
 msgid "Baltic"
@@ -1794,7 +1803,7 @@ msgstr "Unicode (_UTF-8)"
 
 #: src/compose.c:729 src/mainwindow.c:874 src/messageview.c:358
 msgid "Central European (ISO-8859-_2)"
-msgstr "Centraaleuropees (ISO-8859-_2)"
+msgstr "Centraal-Europees (ISO-8859-_2)"
 
 #: src/compose.c:732 src/mainwindow.c:877 src/messageview.c:361
 msgid "Greek (ISO-8859-_7)"
@@ -1806,7 +1815,7 @@ msgstr "Turks (ISO-8859-_9)"
 
 #: src/compose.c:1066
 msgid "New message From format error."
-msgstr "Opmaakfout in Van header van nieuw bericht."
+msgstr "Opmaakfout in Van-header van nieuw bericht."
 
 #: src/compose.c:1158
 msgid "New message subject format error."
@@ -1827,25 +1836,26 @@ msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
-"Het \"Van\" veld van de \"Antwoord\" sjabloon bevat een ongeldig e-mailadres."
+"Het \"Van\" veld van het \"Antwoord\" sjabloon bevat een ongeldig e-"
+"mailadres."
 
 #: src/compose.c:1681 src/quote_fmt.c:589
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
-msgstr "Opmaakfout in berichttekst van de \"Antwoord\" sjabloon op regel %d."
+msgstr "Opmaakfout in berichttekst van het \"Antwoord\" sjabloon op regel %d."
 
 #: src/compose.c:1817 src/compose.c:2009 src/quote_fmt.c:606
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
-"Het \"Van\" veld van de \"Doorsturen\" sjabloon bevat een ongeldig e-mail "
-"adres."
+"Het \"Van\" veld van het \"Doorsturen\" sjabloon bevat een ongeldig e-"
+"mailadres."
 
 #: src/compose.c:1877 src/quote_fmt.c:609
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
-msgstr "De tekst van de \"Doorsturen\" sjabloon heeft een fout op regel %d."
+msgstr "De tekst van het \"Doorsturen\" sjabloon heeft een fout op regel %d."
 
 #: src/compose.c:2051
 msgid "Fw: multiple emails"
@@ -1855,7 +1865,7 @@ msgstr "Doorsturen: meerdere e-mails"
 #: src/compose.c:2531
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
-msgstr "De tekst van de \"Herverwijzen\" sjabloon heeft en fout op regel %d."
+msgstr "De tekst van het \"Herverwijzen\" sjabloon heeft en fout op regel %d."
 
 #: src/compose.c:2598 src/gtk/headers.h:14
 msgid "Cc:"
@@ -1904,7 +1914,7 @@ msgstr[1] "De bestanden '%s' zijn toegevoegd:"
 
 #: src/compose.c:3105
 msgid "The \"Quotation mark\" of the template is invalid."
-msgstr "De \"Citatie-markering\" van de sjabloon is ongeldig."
+msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
 #: src/compose.c:3596
 #, c-format
@@ -1917,14 +1927,14 @@ msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"Je staat op het moment om een bestand van %s in de berichttekst in te "
-"voegen. Wil je doorgaan?"
+"Je staat op het punt een bestand van %s in de berichttekst in te voegen. Wil "
+"je doorgaan?"
 
 #: src/compose.c:3610
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Invoegen"
 
@@ -2021,7 +2031,7 @@ msgstr "Toch in de wachtrij zetten?"
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2031,7 +2041,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2041,7 +2051,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2110,67 +2120,72 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Decoderen van e-mail mislukt: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
-msgstr "Coderen waarschuwing"
+msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+Ga _door met bewerken"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
-msgstr "geselecteerd account is geen NNTP: Posten is niet mogelijk."
+msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijvoegsel %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Negeer bijvoegsel"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Bericht bewaren in"
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2181,24 +2196,23 @@ msgstr "Bericht bewaren in"
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Bijvoegsels"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Onderwerp:"
+msgstr "_Onderwerp:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2207,25 +2221,24 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Van: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Afzender:"
+msgstr "_Van:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht."
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2234,68 +2247,68 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichttekst-sjabloon op regel %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Opmaakfout in Van-sjabloon."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Opmaakfout in Aan-sjabloon."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Opmaakfout in Cc-sjabloon."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Opmaakfout in Bcc-sjabloon."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Opmaakfout in Antwoord-Aan sjabloon."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Opmaakfout in Onderwerp-sjabloon."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
-msgstr "Ongeldig MIME type."
+msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
-msgstr "MIME type"
+msgstr "MIME-type"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2306,16 +2319,16 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2326,15 +2339,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2342,24 +2355,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Gooi e-mail weg"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2368,62 +2381,62 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Gooi weg"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Opslaan als _Klad"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Vervang"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "In- of Bijvoegen"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2431,23 +2444,23 @@ msgstr ""
 "Wil je de inhoud van de bestand(en) invoegen in de tekst van het bericht of "
 "bij het bericht voegen als het verstuurd wordt?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
-"Je staat op het moment om op %d berichten te reageren. Het openen van de "
-"vensters kan enige tijd duren. Wil je doorgaan?"
+"Je staat op het punt op %d berichten te reageren. Het openen van de vensters "
+"kan enige tijd duren. Wil je doorgaan?"
 
 #: src/crash.c:141
 #, c-format
@@ -2470,7 +2483,7 @@ msgstr ""
 
 #: src/crash.c:208
 msgid "Debug log"
-msgstr "Debug log"
+msgstr "Debuglog"
 
 #: src/crash.c:252 src/toolbar.c:422
 msgid "Close"
@@ -2507,17 +2520,17 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 "Voor het toevoegen van een nieuw persoon moet\n"
-"tenminste een van de volgende gegevens ingevoerd\n"
+"tenminste ??n van de volgende gegevens ingevoerd\n"
 "zijn:\n"
 " - Weergegeven naam\n"
 " - Voornaam\n"
 " - Achternaam\n"
 " - Bijnaam\n"
-" - een e-mail adres\n"
-" - een overig gegeven\n"
+" - een e-mailadres\n"
+" - een andere eigenschap\n"
 "\n"
-"Druk op OK om dit contact te blijven bewerken.\n"
-"Druk op Annuleren om af te sluiten zonder op te slaan."
+"Klik op OK om dit contact te blijven bewerken.\n"
+"Klik op Annuleren om af te sluiten zonder op te slaan."
 
 #: src/editaddress.c:169
 msgid ""
@@ -2531,15 +2544,15 @@ msgid ""
 "Click OK to keep editing this contact.\n"
 "Click Cancel to close without saving."
 msgstr ""
-"Voor het toevoegen van een nieuw persoon moet tenminste een\n"
+"Voor het toevoegen van een nieuw persoon moet tenminste ??n\n"
 "van de volgende gegevens ingevoerd zijn:\n"
 " - Voornaam\n"
 " - Achternaam\n"
-" - een e-mail adres\n"
-" - een overig gegeven\n"
+" - een e-mailadres\n"
+" - een andere eigenschap\n"
 "\n"
-"Druk op OK om dit contact te blijven bewerken.\n"
-"Druk op Annuleren om af te sluiten zonder op te slaan."
+"Klik op OK om dit contact te blijven bewerken.\n"
+"Klik op Annuleren om af te sluiten zonder op te slaan."
 
 #: src/editaddress.c:233
 msgid "Edit Person Details"
@@ -2627,7 +2640,7 @@ msgstr "_E-mailadres"
 
 #: src/editaddress.c:1428 src/editaddress.c:1431
 msgid "O_ther Attributes"
-msgstr "O_verige Gegevens"
+msgstr "O_verige Eigenschappen"
 
 #: src/editbook.c:109
 msgid "File appears to be OK."
@@ -2768,7 +2781,7 @@ msgstr "Een hostnaam voor de server is verplicht."
 
 #: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
-msgstr "Je dient op z'n minst een LDAP-gegeven op te geven."
+msgstr "Je dient op z'n minst ??n LDAP-eigenschap op te geven."
 
 #: src/editldap.c:278
 msgid "Connected successfully to server"
@@ -2776,7 +2789,7 @@ msgstr "Verbonden met server"
 
 #: src/editldap.c:336 src/editldap.c:974
 msgid "Edit LDAP Server"
-msgstr "Wijzig LDAP server"
+msgstr "Wijzig LDAP-server"
 
 #: src/editldap.c:437
 msgid "A name that you wish to call the server."
@@ -2834,7 +2847,7 @@ msgstr " Controleer server "
 
 #: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
-msgstr "Druk op deze knop om de verbinding met de server te testen."
+msgstr "Klik op deze knop om de verbinding met de server te testen."
 
 #: src/editldap.c:511
 msgid ""
@@ -2854,7 +2867,7 @@ msgstr ""
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
-msgstr "Druk op deze knop om de op de server beschikbare mapnamen op te halen."
+msgstr "Klik op deze knop om de op de server beschikbare mapnamen op te halen."
 
 #: src/editldap.c:578
 msgid "Search Attributes"
@@ -2865,8 +2878,8 @@ msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr ""
-"Een lijst van LDAP-gegevens waarin moet worden gekeken als een naam of adres "
-"gezocht wordt."
+"Een lijst van LDAP-eigenschappen waarin moet worden gekeken als een naam of "
+"adres gezocht wordt."
 
 #: src/editldap.c:590
 msgid " Defaults "
@@ -2877,13 +2890,13 @@ msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
-"Dit zet de gegevens terug op een standaardwaarde die, gebruikt in een "
-"zoekopdracht naar namen en adressen, waarschijnlijk de meeste records wel "
-"zal vinden"
+"Dit zet de eigenschapnamen terug naar een standaardwaarde die, gebruikt in "
+"een zoekopdracht naar namen en adressen, waarschijnlijk de meeste records "
+"wel zal vinden"
 
 #: src/editldap.c:600
 msgid "Max Query Age (secs)"
-msgstr "Maximale verzoek-leeftijd (secs)"
+msgstr "Maximale duur van verzoek (secs)"
 
 #: src/editldap.c:615
 msgid ""
@@ -2935,7 +2948,7 @@ msgid ""
 msgstr ""
 "Namen en adressen zoeken kan uitgevoerd worden door ?f te kijken of de "
 "zoekterm overeenkomt met het 'begin' van een naam ?f dat de naam de zoekterm "
-"ergens 'bevat'. Vink deze optie aan om een 'bevat'-zoekterm te gebruiken; "
+"ergens 'bevat'. Vink deze optie aan om een 'bevat'-zoekterm te gebruiken, "
 "het zoeken duurt dan in het algemeen wel langer. Voor snelheidsredenen "
 "gebruikt automatisch adres-aanvullen altijd een 'begint-met'-zoekterm voor "
 "zoeken in andere adresdatabases."
@@ -2999,7 +3012,7 @@ msgstr "Uitgebreid"
 
 #: src/editldap.c:979
 msgid "Add New LDAP Server"
-msgstr "Nieuwe LDAP server"
+msgstr "Nieuwe LDAP-server"
 
 #: src/edittags.c:187 src/prefs_filtering_action.c:1446
 msgid "Tag"
@@ -3060,15 +3073,15 @@ msgstr "Toevoegen nieuwe VCard"
 
 #: src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr "Niet mogelijk om client certificaat in te stellen.\n"
+msgstr "Niet mogelijk om client-certificaat in te stellen.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
-msgstr "Geef uitvoerdirectory en bestandsnaam aan."
+msgstr "Geef uitvoermap en bestandsnaam op."
 
 #: src/exphtmldlg.c:109
 msgid "Select stylesheet and formatting."
-msgstr "Kies stylesheet en formattering"
+msgstr "Kies stijlblad en formattering"
 
 #: src/exphtmldlg.c:112 src/expldifdlg.c:114
 msgid "File exported successfully."
@@ -3080,7 +3093,7 @@ msgid ""
 "The HTML output directory '%s'\n"
 "does not exist. Do you want to create it?"
 msgstr ""
-"De HTML uitvoermap '%s'\n"
+"De HTML-uitvoermap '%s'\n"
 "bestaat niet. Wil je deze map aanmaken?"
 
 #: src/exphtmldlg.c:181
@@ -3119,7 +3132,7 @@ msgstr "_Bekijk"
 
 #: src/exphtmldlg.c:446 src/plugins/fancy/fancy_prefs.c:300
 msgid "Stylesheet"
-msgstr "Stylesheet"
+msgstr "Stijlblad"
 
 #: src/exphtmldlg.c:454 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
 #: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1178
@@ -3177,7 +3190,7 @@ msgstr "Format van E-mail-koppeling"
 
 #: src/exphtmldlg.c:495
 msgid "Format User Attributes"
-msgstr "Gebruikersgegevens toevoegen"
+msgstr "Gebruikerseigenschappen toevoegen"
 
 #: src/exphtmldlg.c:540 src/expldifdlg.c:613 src/importldif.c:892
 msgid "Address Book :"
@@ -3193,7 +3206,7 @@ msgstr "Openen met Webbrowser"
 
 #: src/exphtmldlg.c:592
 msgid "Export Address Book to HTML File"
-msgstr "Exporteren Adresboek naar HTML bestand"
+msgstr "Exporteren Adresboek naar HTML-bestand"
 
 #: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:1021
 msgid "File Info"
@@ -3205,7 +3218,7 @@ msgstr "Formaat"
 
 #: src/expldifdlg.c:108
 msgid "Please specify output directory and LDIF filename to create."
-msgstr "Geef uitvoermap en bestandsnaam van LDIF-uitvoerbestand."
+msgstr "Geef uitvoermap en bestandsnaam van LDIF-uitvoerbestand op."
 
 #: src/expldifdlg.c:111
 msgid "Specify parameters to format distinguished name."
@@ -3322,15 +3335,14 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 "Een LDIF-bestand bevat verschillende gegevens-records die normaliter in een "
-"LDAP-server geladen gaan worden. Elk record wordt uniek ge?dentificeerd door "
-"een \"Distinguished Name\" (of DN). Het achtervoegsel wordt toegevoegd aan "
-"de zogenaamde \"Relative Distinguished Name\" (of RDN) om zo de DN te "
-"verkrijgen. Kies hier uit de verschillende opties wat gebruikt moeten worden "
-"als RDN."
+"LDAP-server geladen worden. Elk record wordt uniek ge?dentificeerd door een "
+"\"Distinguished Name\" (of DN). Het achtervoegsel wordt toegevoegd aan de "
+"zogenaamde \"Relative Distinguished Name\" (of RDN) om zo de DN te "
+"verkrijgen. Kies ??n van de beschikbare RDN-opties om de DN aan te maken."
 
 #: src/expldifdlg.c:544
 msgid "Use DN attribute if present in data"
-msgstr "Gebruik het DN-gegeven indien aawezig in de data"
+msgstr "Gebruik de DN-eigenschap indien aanwezig in de gegevens"
 
 #: src/expldifdlg.c:549
 msgid ""
@@ -3339,11 +3351,11 @@ msgid ""
 "address book data, may be used in the exported LDIF file. The RDN selected "
 "above will be used if the DN user attribute is not found."
 msgstr ""
-"Het adresboek kan ingangen bevatten die eerder uit een LDIF bestand "
+"Het adresboek kan ingangen bevatten die eerder uit een LDIF-bestand "
 "ge?mporteerd zijn, zodoende kunnen de ingangen een \"Distinguished Name\"-"
-"gegeven hebben. Dit DN-gegeven kan gebruikt worden in de te exporteren LDIF-"
-"bestand. Als de ingang geen DN-gegeven bevat zal de hierboven geselecteerde "
-"RDN gebruikt worden."
+"eigenschap hebben. Deze DN-eigenschap kan gebruikt worden in het te "
+"exporteren LDIF-bestand. Als de ingang geen DN-eigenschap bevat zal de "
+"hierboven geselecteerde RDN gebruikt worden."
 
 #: src/expldifdlg.c:559
 msgid "Exclude record if no Email Address"
@@ -3371,7 +3383,7 @@ msgstr "Exporteer naar mbox-bestand"
 
 #: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
-msgstr "Vind de te exporteren map en geef het mbox-bestand."
+msgstr "Vind de map om te exporteren en geef het mbox-bestand op."
 
 #: src/export.c:142
 msgid "Source folder:"
@@ -3404,7 +3416,7 @@ msgstr "Volledige naam"
 #: src/exporthtml.c:771 src/importldif.c:1022
 #: src/plugins/archive/archiver_gtk.c:731
 msgid "Attributes"
-msgstr "Gegevens"
+msgstr "Eigenschappen"
 
 #: src/exporthtml.c:974
 msgid "Claws Mail Address Book"
@@ -3572,7 +3584,7 @@ msgstr "Niet gedefini?erd"
 
 #: src/filtering.c:878
 msgid "incorporation"
-msgstr ""
+msgstr "bij ontvangen"
 
 #: src/filtering.c:882
 msgid "manually"
@@ -3671,9 +3683,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniseren %s voor offline gebruik... \n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Kan een map niet naar een ander postvak verplaatsen."
+msgstr "Een mapnaam kan niet beginnen of eindigen met een punt."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3713,9 +3724,8 @@ msgid "Mark all re_ad"
 msgstr "_Alles gelezen"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Alles gelezen"
+msgstr "Markeer alles gelezen, _recursief"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3763,103 +3773,111 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Markeer alles als gelezen"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Wil je werkelijk alle berichten in deze map en zijn submappen als gelezen "
+"markeren?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Markeer alles als gelezen"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wil je doorgaan?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen ..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+Prullenbak leegmaken"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
-msgstr "Off-line waarschuwing"
+msgstr "Offline waarschuwing"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Er is een fout opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3868,64 +3886,64 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Wil je werkelijk map '%s' kopi?ren naar '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopi?ren naar %s ..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s ..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
-msgstr "Kan een map niet kopi?ren naar een van z'n submappen."
+msgstr "Kan een map niet kopi?ren naar ??n van z'n submappen."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
-msgstr "Kan een map niet verplaatsen naar een van z'n submappen."
+msgstr "Kan een map niet verplaatsen naar ??n van z'n submappen."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kopi?ren mislukt!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doel-map kan alleen gebruikt worden om submappen op te slaan."
 
@@ -4003,7 +4021,7 @@ msgstr ""
 "\n"
 "\n"
 "Voor ondersteuning en discussie kun je je inschrijven voor de Claws Mail "
-"gebruikers mailinglijst:\n"
+"gebruikers-mailinglijst:\n"
 
 #: src/gtk/about.c:142
 msgid ""
@@ -4018,7 +4036,6 @@ msgstr ""
 "donatie wenst te maken aan het Claws Mail project, kan dat hier:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4028,9 +4045,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Auteursrecht (C) 1999-2014\n"
+"Auteursrecht (C) 1999-2015\n"
 "Het Claws Mail Team\n"
-"en Hiroyuki Yamamoto"
+" en Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:161
 msgid ""
@@ -4040,7 +4057,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Systeem Informatie\n"
+"Systeem-informatie\n"
 
 #: src/gtk/about.c:167
 #, c-format
@@ -4081,7 +4098,7 @@ msgstr "Het Claws Mail Team"
 
 #: src/gtk/about.c:261
 msgid "Previous team members"
-msgstr "Voormalige team-leden"
+msgstr "Voormalige teamleden"
 
 #: src/gtk/about.c:280
 msgid "The translation team"
@@ -4110,7 +4127,7 @@ msgstr "Ingebouwde eigenschappen\n"
 #: src/gtk/about.c:420
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
-msgstr "ondersteuning voor de X-Face header\n"
+msgstr "ondersteuning voor de X-Face-header\n"
 
 #: src/gtk/about.c:430
 msgctxt "Enchant"
@@ -4125,7 +4142,7 @@ msgstr "ondersteuning voor beveiligde verbindingen met servers\n"
 #: src/gtk/about.c:450
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "ondersteuning voor IPv6, het nieuwe internet adressering-protocol\n"
+msgstr "ondersteuning voor IPv6, het nieuwe internet-adressering-protocol\n"
 
 #: src/gtk/about.c:461
 msgctxt "iconv"
@@ -4136,7 +4153,7 @@ msgstr ""
 #: src/gtk/about.c:471
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
-msgstr "ondersteuning voor PalmOS adresboeken\n"
+msgstr "ondersteuning voor PalmOS-adresboeken\n"
 
 #: src/gtk/about.c:481
 msgctxt "LDAP"
@@ -4151,7 +4168,7 @@ msgstr "ondersteuning voor IMAP en NNTP-servers\n"
 #: src/gtk/about.c:501
 msgctxt "libSM"
 msgid "adds support for session handling\n"
-msgstr "ondersteuning voor sessies-beheer\n"
+msgstr "ondersteuning voor sessiebeheer\n"
 
 #: src/gtk/about.c:511
 msgctxt "NetworkManager"
@@ -4204,7 +4221,7 @@ msgstr ""
 
 #: src/gtk/about.c:698 src/main.c:2538
 msgid "Session statistics\n"
-msgstr "Sessie statistieken\n"
+msgstr "Sessie-statistieken\n"
 
 #: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2548 src/main.c:2551
 #, c-format
@@ -4249,13 +4266,12 @@ msgid "About Claws Mail"
 msgstr "Over Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Auteursrecht (C) 1999-2014\n"
+"Auteursrecht (C) 1999-2015\n"
 "Het Claws Mail Team\n"
 "en Hiroyuki Yamamoto"
 
@@ -4345,13 +4361,13 @@ msgstr "Magenta"
 
 #: src/gtk/foldersort.c:156
 msgid "Set mailbox order"
-msgstr "Bepaal postvak volgorde"
+msgstr "Bepaal postvakvolgorde"
 
 #: src/gtk/foldersort.c:190
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Beweeg postvakken op of neer om de sorteervolgorde in de mappenboom te "
-"veranderen."
+"Versleep postvakken naar boven of beneden om de sorteervolgorde in de "
+"mappenboom te veranderen."
 
 #: src/gtk/foldersort.c:216
 msgid "Mailboxes"
@@ -4872,19 +4888,19 @@ msgstr "Van, Aan of Onderwerp:"
 
 #: src/gtk/icon_legend.c:64
 msgid "New message"
-msgstr "Nieuw"
+msgstr "Nieuw bericht"
 
 #: src/gtk/icon_legend.c:65
 msgid "Unread message"
-msgstr "Ongelezen"
+msgstr "Ongelezen bericht"
 
 #: src/gtk/icon_legend.c:66
 msgid "Message has been replied to"
-msgstr "Is beantwoord"
+msgstr "Bericht is beantwoord"
 
 #: src/gtk/icon_legend.c:67
 msgid "Message has been forwarded"
-msgstr "Is doorgestuurd"
+msgstr "Bericht is doorgestuurd"
 
 #: src/gtk/icon_legend.c:68
 msgid "Message has been forwarded and replied to"
@@ -4892,39 +4908,39 @@ msgstr "Bericht is doorgestuurd en beantwoord"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message is in an ignored thread"
-msgstr "In een 'genegeerd' draadje"
+msgstr "Bericht is in een 'genegeerd' draadje"
 
 #: src/gtk/icon_legend.c:70
 msgid "Message is in a watched thread"
-msgstr "In een gevolgd draadje"
+msgstr "Bericht is in een gevolgd draadje"
 
 #: src/gtk/icon_legend.c:71
 msgid "Message is spam"
-msgstr "Is spam"
+msgstr "Bericht is spam"
 
 #: src/gtk/icon_legend.c:73
 msgid "Message has attachment(s)"
-msgstr "Heeft bijvoegsel(s)"
+msgstr "Bericht heeft bijvoegsel(s)"
 
 #: src/gtk/icon_legend.c:74
 msgid "Digitally signed message"
-msgstr "Digitaal ondertekend"
+msgstr "Bericht is digitaal ondertekend"
 
 #: src/gtk/icon_legend.c:75
 msgid "Encrypted message"
-msgstr "Versleuteld"
+msgstr "Bericht is versleuteld"
 
 #: src/gtk/icon_legend.c:76
 msgid "Message is signed and has attachment(s)"
-msgstr "Ondertekend en heeft bijvoegsel(s)"
+msgstr "Bericht is ondertekend en heeft bijvoegsel(s)"
 
 #: src/gtk/icon_legend.c:77
 msgid "Message is encrypted and has attachment(s)"
-msgstr "Versleuteld en heeft bijvoegsel(s)"
+msgstr "Bericht is versleuteld en heeft bijvoegsel(s)"
 
 #: src/gtk/icon_legend.c:79
 msgid "Marked message"
-msgstr "Gemarkeerd"
+msgstr "Bericht is gemarkeerd"
 
 #: src/gtk/icon_legend.c:80
 msgid "Message is marked for deletion"
@@ -4940,7 +4956,7 @@ msgstr "Bericht is gemarkeerd voor kopi?ren"
 
 #: src/gtk/icon_legend.c:84
 msgid "Locked message"
-msgstr "Opslot"
+msgstr "Bericht is op slot"
 
 #: src/gtk/icon_legend.c:86
 msgid "Folder (normal, opened)"
@@ -4948,7 +4964,7 @@ msgstr "Map (normaal, geopend)"
 
 #: src/gtk/icon_legend.c:87
 msgid "Folder with read messages hidden"
-msgstr "Map met gelezen berichten verborgen"
+msgstr "Map met gelezen berichten, verborgen"
 
 #: src/gtk/icon_legend.c:88
 msgid "Folder contains marked messages"
@@ -5052,6 +5068,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5069,7 +5086,7 @@ msgstr "Plugins"
 
 #: src/gtk/pluginwindow.c:337
 msgid "Load..."
-msgstr "Laad..."
+msgstr "Laden..."
 
 #: src/gtk/pluginwindow.c:338
 msgid "Unload"
@@ -5090,7 +5107,7 @@ msgstr ""
 
 #: src/gtk/pluginwindow.c:414
 msgid "Click here to load one or more plugins"
-msgstr "Klik hier om een of meerdere plugins te laden"
+msgstr "Klik hier om ??n of meerdere plugins te laden"
 
 #: src/gtk/pluginwindow.c:417
 msgid "Unload the selected plugin"
@@ -5108,11 +5125,12 @@ msgstr "Pagina Inhoudsopgave"
 msgid "_Hide"
 msgstr "_Verberg"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Account"
 
@@ -5177,14 +5195,12 @@ msgid "messages which have attachments"
 msgstr "berichten die bijvoegsels hebben"
 
 #: src/gtk/quicksearch.c:466
-#, fuzzy
 msgid "messages which contain S in any header name or value"
-msgstr "berichten waarin S in de header 'X-label' voorkomt"
+msgstr "berichten waarin S in een header-naam of waarde voorkomt"
 
 #: src/gtk/quicksearch.c:467
-#, fuzzy
 msgid "messages which contain S in the value of any header"
-msgstr "berichten waarin S in de header 'X-label' voorkomt"
+msgstr "berichten waarin S in een header-waarde voorkomt"
 
 #: src/gtk/quicksearch.c:468
 msgid "messages which contain S in Message-ID header"
@@ -5333,9 +5349,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Van/Aan/Onderwerp/Vlag"
+msgstr "Van/Aan/Cc/Onderwerp/Vlag"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5406,7 +5421,7 @@ msgstr "Locatie: "
 
 #: src/gtk/sslcertwindow.c:218
 msgid "Fingerprint: \n"
-msgstr "Sleutel vingerafdruk: \n"
+msgstr "Sleutel-vingerafdruk: \n"
 
 #: src/gtk/sslcertwindow.c:228
 msgid "Signature status: "
@@ -5453,11 +5468,11 @@ msgstr "_Bekijk certificaat"
 
 #: src/gtk/sslcertwindow.c:364
 msgid "SSL certificate is invalid"
-msgstr "Certificaten is ongeldig"
+msgstr "SSL-Certificaat is ongeldig"
 
 #: src/gtk/sslcertwindow.c:366
 msgid "SSL certificate is unknown"
-msgstr "SSL certificaat is onbekend"
+msgstr "SSL-certificaat is onbekend"
 
 #: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
 #: src/gtk/sslcertwindow.c:481
@@ -5479,11 +5494,11 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:414
 msgid "SSL certificate is invalid and expired"
-msgstr "SSL certificaat is ongeldig en verlopen"
+msgstr "SSL-certificaat is ongeldig en verlopen"
 
 #: src/gtk/sslcertwindow.c:416
 msgid "SSL certificate is expired"
-msgstr "SSL certificaat is verlopen"
+msgstr "SSL-certificaat is verlopen"
 
 #: src/gtk/sslcertwindow.c:419
 msgid "_Accept"
@@ -5512,11 +5527,11 @@ msgstr "_Bekijk certificaten"
 
 #: src/gtk/sslcertwindow.c:477
 msgid "SSL certificate changed and is invalid"
-msgstr "SSL certificaat is veranderd en ongeldig"
+msgstr "SSL-certificaat is veranderd en ongeldig"
 
 #: src/gtk/sslcertwindow.c:479
 msgid "SSL certificate changed"
-msgstr "SSL certificaat is veranderd"
+msgstr "SSL-certificaat is veranderd"
 
 #: src/headerview.c:95
 msgid "Tags:"
@@ -5560,22 +5575,22 @@ msgstr "IMAP4-verbinding verbroken\n"
 #: src/imap.c:621
 #, c-format
 msgid "IMAP error on %s: authenticated\n"
-msgstr "IMAP fout op %s: ge-authenticeerd\n"
+msgstr "IMAP-fout op %s: ge-authenticeerd\n"
 
 #: src/imap.c:624
 #, c-format
 msgid "IMAP error on %s: not authenticated\n"
-msgstr "IMAP fout op %s: niet ge-authenticeerd\n"
+msgstr "IMAP-fout op %s: niet ge-authenticeerd\n"
 
 #: src/imap.c:627
 #, c-format
 msgid "IMAP error on %s: bad state\n"
-msgstr "IMAP fout op %s: slechte staat\n"
+msgstr "IMAP-fout op %s: slechte staat\n"
 
 #: src/imap.c:630
 #, c-format
 msgid "IMAP error on %s: stream error\n"
-msgstr "IMAP fout op %s: stroom fout\n"
+msgstr "IMAP-fout op %s: stroomfout\n"
 
 #: src/imap.c:633
 #, c-format
@@ -5583,23 +5598,23 @@ msgid ""
 "IMAP error on %s: parse error (very probably non-RFC compliance from the "
 "server)\n"
 msgstr ""
-"IMAP fout op %s: verwerkingsfout (waarschijnlijk niet-RFC overeenkomend van "
+"IMAP-fout op %s: verwerkingsfout (waarschijnlijk niet-RFC overeenkomend van "
 "de server)\n"
 
 #: src/imap.c:637
 #, c-format
 msgid "IMAP error on %s: connection refused\n"
-msgstr "IMAP fout op %s: verbinding geweigerd\n"
+msgstr "IMAP-fout op %s: verbinding geweigerd\n"
 
 #: src/imap.c:640
 #, c-format
 msgid "IMAP error on %s: memory error\n"
-msgstr "IMAP fout op %s: geheugen fout\n"
+msgstr "IMAP-fout op %s: geheugen-fout\n"
 
 #: src/imap.c:643
 #, c-format
 msgid "IMAP error on %s: fatal error\n"
-msgstr "IMAP fout op %s: fatale fout\n"
+msgstr "IMAP-fout op %s: fatale fout\n"
 
 #: src/imap.c:646
 #, c-format
@@ -5607,173 +5622,173 @@ msgid ""
 "IMAP error on %s: protocol error(very probably non-RFC compliance from the "
 "server)\n"
 msgstr ""
-"IMAP fout op %s: protocol fout (waarschijnlijk niet-RFC overeenkomend van de "
+"IMAP-fout op %s: protocolfout (waarschijnlijk niet-RFC overeenkomend van de "
 "server)\n"
 
 #: src/imap.c:650
 #, c-format
 msgid "IMAP error on %s: connection not accepted\n"
-msgstr "IMAP fout op %s: verbinding geweigerd\n"
+msgstr "IMAP-fout op %s: verbinding geweigerd\n"
 
 #: src/imap.c:653
 #, c-format
 msgid "IMAP error on %s: APPEND error\n"
-msgstr "IMAP fout op %s: APPEND fout\n"
+msgstr "IMAP-fout op %s: APPEND-fout\n"
 
 #: src/imap.c:656
 #, c-format
 msgid "IMAP error on %s: NOOP error\n"
-msgstr "IMAP fout op %s: NOOP fout\n"
+msgstr "IMAP-fout op %s: NOOP-fout\n"
 
 #: src/imap.c:659
 #, c-format
 msgid "IMAP error on %s: LOGOUT error\n"
-msgstr "IMAP fout op %s: LOGOUT fout\n"
+msgstr "IMAP-fout op %s: LOGOUT-fout\n"
 
 #: src/imap.c:662
 #, c-format
 msgid "IMAP error on %s: CAPABILITY error\n"
-msgstr "IMAP fout op %s: CAPABILITY fout\n"
+msgstr "IMAP-fout op %s: CAPABILITY-fout\n"
 
 #: src/imap.c:665
 #, c-format
 msgid "IMAP error on %s: CHECK error\n"
-msgstr "IMAP fout op %s: CHECK fout\n"
+msgstr "IMAP-fout op %s: CHECK-fout\n"
 
 #: src/imap.c:668
 #, c-format
 msgid "IMAP error on %s: CLOSE error\n"
-msgstr "IMAP fout op %s: CLOSE fout\n"
+msgstr "IMAP-fout op %s: CLOSE-fout\n"
 
 #: src/imap.c:671
 #, c-format
 msgid "IMAP error on %s: EXPUNGE error\n"
-msgstr "IMAP fout op %s: EXPUNGE fout\n"
+msgstr "IMAP-fout op %s: EXPUNGE-fout\n"
 
 #: src/imap.c:674
 #, c-format
 msgid "IMAP error on %s: COPY error\n"
-msgstr "IMAP fout op %s: COPY fout\n"
+msgstr "IMAP-fout op %s: COPY-fout\n"
 
 #: src/imap.c:677
 #, c-format
 msgid "IMAP error on %s: UID COPY error\n"
-msgstr "IMAP fout op %s: UID COPY fout\n"
+msgstr "IMAP-fout op %s: UID COPY-fout\n"
 
 #: src/imap.c:680
 #, c-format
 msgid "IMAP error on %s: CREATE error\n"
-msgstr "IMAP fout op %s: CREATE fout\n"
+msgstr "IMAP-fout op %s: CREATE-fout\n"
 
 #: src/imap.c:683
 #, c-format
 msgid "IMAP error on %s: DELETE error\n"
-msgstr "IMAP fout op %s: DELETE fout\n"
+msgstr "IMAP-fout op %s: DELETE-fout\n"
 
 #: src/imap.c:686
 #, c-format
 msgid "IMAP error on %s: EXAMINE error\n"
-msgstr "IMAP fout op %s: EXAMINE fout\n"
+msgstr "IMAP-fout op %s: EXAMINE-fout\n"
 
 #: src/imap.c:689
 #, c-format
 msgid "IMAP error on %s: FETCH error\n"
-msgstr "IMAP fout op %s: FETCH fout\n"
+msgstr "IMAP-fout op %s: FETCH-fout\n"
 
 #: src/imap.c:692
 #, c-format
 msgid "IMAP error on %s: UID FETCH error\n"
-msgstr "IMAP fout op %s: UID FETCH fout\n"
+msgstr "IMAP-fout op %s: UID FETCH-fout\n"
 
 #: src/imap.c:695
 #, c-format
 msgid "IMAP error on %s: LIST error\n"
-msgstr "IMAP fout op %s: LIST fout\n"
+msgstr "IMAP-fout op %s: LIST-fout\n"
 
 #: src/imap.c:698
 #, c-format
 msgid "IMAP error on %s: LOGIN error\n"
-msgstr "IMAP fout op %s: LOGIN fout\n"
+msgstr "IMAP-fout op %s: LOGIN-fout\n"
 
 #: src/imap.c:701
 #, c-format
 msgid "IMAP error on %s: LSUB error\n"
-msgstr "IMAP fout op %s: LSUB fout\n"
+msgstr "IMAP-fout op %s: LSUB-fout\n"
 
 #: src/imap.c:704
 #, c-format
 msgid "IMAP error on %s: RENAME error\n"
-msgstr "IMAP fout op %s: RENAME fout\n"
+msgstr "IMAP-fout op %s: RENAME-fout\n"
 
 #: src/imap.c:707
 #, c-format
 msgid "IMAP error on %s: SEARCH error\n"
-msgstr "IMAP fout op %s: SEARCH fout\n"
+msgstr "IMAP-fout op %s: SEARCH-fout\n"
 
 #: src/imap.c:710
 #, c-format
 msgid "IMAP error on %s: UID SEARCH error\n"
-msgstr "IMAP fout op %s: UID SEARCH fout\n"
+msgstr "IMAP-fout op %s: UID SEARCH-fout\n"
 
 #: src/imap.c:713
 #, c-format
 msgid "IMAP error on %s: SELECT error\n"
-msgstr "IMAP fout op %s: SELECT fout\n"
+msgstr "IMAP-fout op %s: SELECT-fout\n"
 
 #: src/imap.c:716
 #, c-format
 msgid "IMAP error on %s: STATUS error\n"
-msgstr "IMAP fout op %s: STATUS fout\n"
+msgstr "IMAP-fout op %s: STATUS-fout\n"
 
 #: src/imap.c:719
 #, c-format
 msgid "IMAP error on %s: STORE error\n"
-msgstr "IMAP fout op %s: STORE fout\n"
+msgstr "IMAP-fout op %s: STORE-fout\n"
 
 #: src/imap.c:722
 #, c-format
 msgid "IMAP error on %s: UID STORE error\n"
-msgstr "IMAP fout op %s: UID STORE fout\n"
+msgstr "IMAP-fout op %s: UID STORE-fout\n"
 
 #: src/imap.c:725
 #, c-format
 msgid "IMAP error on %s: SUBSCRIBE error\n"
-msgstr "IMAP fout op %s: SUBSCRIBE fout\n"
+msgstr "IMAP-fout op %s: SUBSCRIBE-fout\n"
 
 #: src/imap.c:728
 #, c-format
 msgid "IMAP error on %s: UNSUBSCRIBE error\n"
-msgstr "IMAP fout op %s: UNSUBSCRIBE fout\n"
+msgstr "IMAP-fout op %s: UNSUBSCRIBE-fout\n"
 
 #: src/imap.c:731
 #, c-format
 msgid "IMAP error on %s: STARTTLS error\n"
-msgstr "IMAP fout op %s: STARTTLS fout\n"
+msgstr "IMAP-fout op %s: STARTTLS-fout\n"
 
 #: src/imap.c:734
 #, c-format
 msgid "IMAP error on %s: INVAL error\n"
-msgstr "IMAP fout op %s: INVAL fout\n"
+msgstr "IMAP-fout op %s: INVAL-fout\n"
 
 #: src/imap.c:737
 #, c-format
 msgid "IMAP error on %s: EXTENSION error\n"
-msgstr "IMAP fout op %s: EXTENSION fout\n"
+msgstr "IMAP-fout op %s: EXTENSION-fout\n"
 
 #: src/imap.c:740
 #, c-format
 msgid "IMAP error on %s: SASL error\n"
-msgstr "IMAP fout op %s: SASL fout\n"
+msgstr "IMAP-fout op %s: SASL-fout\n"
 
 #: src/imap.c:744
 #, c-format
 msgid "IMAP error on %s: SSL error\n"
-msgstr "IMAP fout op %s: SSL fout\n"
+msgstr "IMAP-fout op %s: SSL-fout\n"
 
 #: src/imap.c:748
 #, c-format
 msgid "IMAP error on %s: Unknown error [%d]\n"
-msgstr "IMAP fout op %s: Onbekende fout [%d]\n"
+msgstr "IMAP-fout op %s: Onbekende fout [%d]\n"
 
 #: src/imap.c:940
 msgid ""
@@ -5800,7 +5815,6 @@ msgstr ""
 "ondersteuning en de DIGEST-MD5 SASL plugin ge?nstalleerd is."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5809,8 +5823,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
-"ondersteuning en de CRFAM-MD5 SASL plugin ge?nstalleerd is."
+"CRAM-SHA-1 logins werken alleen als libetpan gecompileerd is met SASL-"
+"ondersteuning en de CRFAM SASL plugin ge?nstalleerd is."
 
 #: src/imap.c:959
 #, c-format
@@ -5831,7 +5845,7 @@ msgstr "Verbinding maken met %s mislukt"
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
-"IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
+"IMAP4-verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
 #: src/imap.c:1021 src/imap.c:3631 src/imap.c:4290 src/imap.c:4387
 #: src/imap.c:4567 src/imap.c:5376
@@ -5877,7 +5891,7 @@ msgstr "Kan geen verbinding maken met de IMAP4-server: %s:%d\n"
 
 #: src/imap.c:1231 src/imap.c:4052
 msgid "Can't start TLS session.\n"
-msgstr "Kan TLS sessie niet tot stand brengen.\n"
+msgstr "Kan TLS-sessie niet tot stand brengen.\n"
 
 #: src/imap.c:1294
 #, c-format
@@ -5917,7 +5931,7 @@ msgstr "Zoeken naar submappen van %s..."
 
 #: src/imap.c:3171
 msgid "can't create mailbox: LIST failed\n"
-msgstr "LIST mislukt; kan postvak niet aanmaken\n"
+msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
 #: src/imap.c:3186
 msgid "can't create mailbox\n"
@@ -5958,13 +5972,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
-"Verbinden me %s mislukt: de server vereist TLS, maar Claws Mail is niet "
-"vertaald met OpenSSL-ondersteuning.\n"
+"Verbinden met %s mislukt: de server vereist TLS, maar Claws Mail is "
+"gecompileerd zonder TLS-ondersteuning.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -5987,8 +6001,8 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Je hebt een of meer IMAP-accounts ingesteld. Deze versie van Claws Mail is "
-"echter gebouwd zonder IMAP-ondersteuning; je IMAP-account(s) werken dus "
+"Je hebt ??n of meer IMAP-accounts ingesteld. Deze versie van Claws Mail is "
+"echter gecompileerd zonder IMAP-ondersteuning, je IMAP-account(s) werken dus "
 "niet.\n"
 "\n"
 "Je dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
@@ -6149,7 +6163,7 @@ msgstr ""
 "Deze map ben je al op geabonneerd en heeft geen niet-geabonneerde mappen.\n"
 "\n"
 "Als er nieuwe mappen zijn, gemaakt met een ander programma, gebruik "
-"\"Controleer op nieuwe mappen\" op de postvaks hoofdmap."
+"\"Controleer op nieuwe mappen\" op de postvak-hoofdmap."
 
 #: src/imap_gtk.c:566
 #, c-format
@@ -6183,7 +6197,7 @@ msgstr "Importeer mbox-bestand"
 
 #: src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
-msgstr "Geef het mbox-bestand en de doelmap."
+msgstr "Geef het mbox-bestand en de doelmap op."
 
 #: src/import.c:148
 msgid "Destination folder:"
@@ -6199,7 +6213,7 @@ msgid ""
 "Import mbox file to the Inbox folder?"
 msgstr ""
 "Doel-map is niet opgegeven.\n"
-"Mboxbestand naar de inbox-map importeren?"
+"Mbox-bestand naar de inbox-map importeren?"
 
 #: src/import.c:229
 msgid "Can't find the destination folder."
@@ -6211,7 +6225,7 @@ msgstr "Selecteer het te importeren bestand"
 
 #: src/importldif.c:186
 msgid "Please specify address book name and file to import."
-msgstr "Geef adresboeknaam en te importeren bestand."
+msgstr "Geef adresboeknaam en te importeren bestand op."
 
 #: src/importldif.c:189
 msgid "Select and rename LDIF field names to import."
@@ -6227,7 +6241,7 @@ msgstr "Selecteer een bestand."
 
 #: src/importldif.c:457 src/importmutt.c:128 src/importpine.c:127
 msgid "Address book name must be supplied."
-msgstr "Naam voor adressenboek is verplicht."
+msgstr "Naam voor adresboek is verplicht."
 
 #: src/importldif.c:497
 msgid "LDIF file imported successfully."
@@ -6271,7 +6285,7 @@ msgstr "Naam van LDIF-veld"
 
 #: src/importldif.c:729
 msgid "Attribute Name"
-msgstr "Gegeven"
+msgstr "Eigenschapnaam"
 
 #: src/importldif.c:784
 msgid "LDIF Field"
@@ -6279,7 +6293,7 @@ msgstr "LDIF-veld"
 
 #: src/importldif.c:796
 msgid "Attribute"
-msgstr "Gegeven"
+msgstr "Eigenschap"
 
 #: src/importldif.c:808
 msgid ""
@@ -6297,12 +6311,12 @@ msgstr ""
 "hernoemd. Een enkele klik in de selecteer-kolom (\"S\") of een dubbele klik "
 "ergens anders in de rij, zal die rij selecteren voor importeren. Een enkele "
 "klik ergens in de rij selecteert de rij voor hernoemen en brengt je in het "
-"hernoem gedeelte onderin het scherm."
+"hernoem-gedeelte onderin het venster."
 
 #: src/importldif.c:823
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
-"Het LDIF-veld kan als gegeven, ge?mporteerd in het adresboek, een andere "
+"Het LDIF-veld kan als eigenschap, ge?mporteerd in het adresboek, een andere "
 "naam krijgen."
 
 #: src/importldif.c:828
@@ -6327,7 +6341,7 @@ msgstr "Records importeren :"
 
 #: src/importldif.c:944
 msgid "Import LDIF file into Address Book"
-msgstr "Importeren LDIF-bestand in adressenboek"
+msgstr "Importeren LDIF-bestand in adresboek"
 
 #: src/importldif.c:981
 msgid "Proceed"
@@ -6343,7 +6357,7 @@ msgstr "Selecteer MUTT-bestand"
 
 #: src/importmutt.c:204
 msgid "Import MUTT file into Address Book"
-msgstr "Importeren MUTT-bestand in adressenboek"
+msgstr "Importeren MUTT-bestand in adresboek"
 
 #: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
@@ -6359,7 +6373,7 @@ msgstr "Selecteer Pine-bestand"
 
 #: src/importpine.c:203
 msgid "Import Pine file into Address Book"
-msgstr "Importeren Pine-bestand in adressenboek"
+msgstr "Importeren Pine-bestand in adresboek"
 
 #: src/inc.c:186 src/inc.c:295 src/inc.c:322
 msgid "Claws Mail needs network access in order to get mails."
@@ -6401,7 +6415,7 @@ msgstr "Klaar (geen nieuwe berichten)"
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
@@ -6412,7 +6426,7 @@ msgstr "Beveiligd"
 
 #: src/inc.c:672 src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Timeout"
-msgstr "Wachttijd"
+msgstr "Tijdslimiet"
 
 #: src/inc.c:759
 #, c-format
@@ -6438,14 +6452,15 @@ msgstr "Account '%s': Verbinden met POP3-server: %s:%d..."
 #: src/inc.c:850
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "Kan geen verbinding maken met POP3 server: %s:%d"
+msgstr "Kan geen verbinding maken met POP3-server: %s:%d"
 
 #: src/inc.c:854
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "Kan geen verbinding maken met POP3 server: %s:%d\n"
+msgstr "Kan geen verbinding maken met POP3-server: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
@@ -6576,7 +6591,7 @@ msgstr "Het inbedden is afgelast\n"
 #: src/inc.c:1530
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%sJe bent nu offline; toch doorgaan gedurende %d minuten?"
+msgstr "%s%sJe bent nu offline. Toch doorgaan gedurende %d minuten?"
 
 #: src/inc.c:1536
 #, c-format
@@ -6637,8 +6652,8 @@ msgid ""
 "on your disk."
 msgstr ""
 "Een backup bewaren maakt het mogelijk terug te gaan naar een oudere versie, "
-"maar kan even duren als je veel IMAP of Nieuws data gecached hebt, en zal "
-"wat extra schijfruimte gebruiken."
+"maar kan even duren als je veel IMAP- of Nieuwsgegevens gecached hebt, en "
+"zal wat extra schijfruimte gebruiken."
 
 #: src/main.c:388
 msgid "Migration of configuration"
@@ -6707,7 +6722,8 @@ msgid ""
 msgstr ""
 "Claws Mail heeft een geconfigureerd postvak gevonden, maar die is "
 "incompleet. Dit komt waarschijnlijk door een IMAP-account dat niet werkt. "
-"Gebruik \"Ververs mappenboom\"op deze map om dit proberen te repareren."
+"Gebruik \"Ververs mappenboom\" in het contextmenu van deze map om dit "
+"proberen te repareren."
 
 #: src/main.c:1476
 msgid ""
@@ -6733,7 +6749,7 @@ msgstr "Vervormde header\n"
 
 #: src/main.c:1751
 msgid "Duplicated 'To:' header\n"
-msgstr "Gedupliceerde 'Aan' header\n"
+msgstr "Gedupliceerde 'Aan:' header\n"
 
 #: src/main.c:1762
 msgid "Missing required 'To:' header\n"
@@ -6839,7 +6855,7 @@ msgstr "  --statistics           toon statistieken van de sessie"
 
 #: src/main.c:1933
 msgid "  --reset-statistics     reset session statistics"
-msgstr "  --reset-statistics     sessie statistieken terugzetten"
+msgstr "  --reset-statistics     sessie-statistieken terugzetten"
 
 #: src/main.c:1934
 msgid ""
@@ -6875,14 +6891,14 @@ msgstr "  --help -h              geef deze hulp weer"
 
 #: src/main.c:1942
 msgid "  --version -v           output version information and exit"
-msgstr "  --version -v           geef versie informatie en sluit af"
+msgstr "  --version -v           geef versie-informatie en sluit af"
 
 #: src/main.c:1943
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr ""
-"  --version-full -V      geef versie informatie en ingebouwde mogelijkheden "
+"  --version-full -V      geef versie-informatie en ingebouwde mogelijkheden "
 "en sluit af"
 
 #: src/main.c:1944
@@ -6948,7 +6964,7 @@ msgstr "MH..."
 
 #: src/mainwindow.c:518
 msgid "Change mailbox order..."
-msgstr "Verander postvak volgorde..."
+msgstr "Verander postvakvolgorde..."
 
 #: src/mainwindow.c:521
 msgid "_Import mbox file..."
@@ -6976,7 +6992,7 @@ msgstr "Opslaan _deel als..."
 
 #: src/mainwindow.c:532 src/messageview.c:220
 msgid "Page setup..."
-msgstr "Pagina instellingen..."
+msgstr "Pagina-instellingen..."
 
 #: src/mainwindow.c:533 src/messageview.c:221
 msgid "_Print..."
@@ -7052,7 +7068,7 @@ msgstr "_Ga naar"
 
 #: src/mainwindow.c:571 src/messageview.c:233
 msgid "_Previous message"
-msgstr "_Vorige pagina"
+msgstr "_Vorige bericht"
 
 #: src/mainwindow.c:572 src/messageview.c:234
 msgid "_Next message"
@@ -7152,7 +7168,7 @@ msgstr "Br_on weergeven"
 
 #: src/mainwindow.c:630 src/messageview.c:288
 msgid "Message part"
-msgstr "Bericht deel"
+msgstr "Berichtendeel"
 
 #: src/mainwindow.c:631 src/messageview.c:289
 msgid "View as text"
@@ -7168,7 +7184,7 @@ msgstr "Openen met..."
 
 #: src/mainwindow.c:638 src/messageview.c:295
 msgid "Quotes"
-msgstr "Citaties"
+msgstr "Citaten"
 
 #: src/mainwindow.c:640
 msgid "_Update summary"
@@ -7196,7 +7212,7 @@ msgstr "Verzend berichten uit de _wachtrij"
 
 #: src/mainwindow.c:654
 msgid "Compose a_n email message"
-msgstr "Nieuw _e-mail bericht opstellen"
+msgstr "Nieuw _e-mailbericht opstellen"
 
 #: src/mainwindow.c:655
 msgid "Compose a news message"
@@ -7237,7 +7253,7 @@ msgstr "Mailing-_Lijst"
 
 #: src/mainwindow.c:670
 msgid "Post"
-msgstr "Posten"
+msgstr "Plaatsen"
 
 #: src/mainwindow.c:672
 msgid "Help"
@@ -7435,11 +7451,11 @@ msgstr "SSL-cer_tificaten"
 
 #: src/mainwindow.c:771
 msgid "Filtering Lo_g"
-msgstr "Filter Lo_g"
+msgstr "Filterlo_g"
 
 #: src/mainwindow.c:773
 msgid "Network _Log"
-msgstr "Netwerk _Log"
+msgstr "Netwerk_log"
 
 #: src/mainwindow.c:775
 msgid "_Forget all session passwords"
@@ -7475,7 +7491,7 @@ msgstr "_Naverwerken..."
 
 #: src/mainwindow.c:788
 msgid "_Filtering..."
-msgstr "Bezig met _filteren..."
+msgstr "_Filteren..."
 
 #: src/mainwindow.c:789
 msgid "_Templates..."
@@ -7499,7 +7515,7 @@ msgstr "_Handboek"
 
 #: src/mainwindow.c:797
 msgid "_Online User-contributed FAQ"
-msgstr "_On-line FAQ met bijdragen van gebruikers"
+msgstr "_Online FAQ met bijdragen van gebruikers"
 
 #: src/mainwindow.c:798
 msgid "Icon _Legend"
@@ -7507,7 +7523,7 @@ msgstr "Pictogram_legenda"
 
 #: src/mainwindow.c:800
 msgid "Set as default client"
-msgstr "Instellen als standaard programma"
+msgstr "Instellen als standaard mailprogramma"
 
 #: src/mainwindow.c:807
 msgid "Offline _mode"
@@ -7523,11 +7539,11 @@ msgstr "_Berichtweergave"
 
 #: src/mainwindow.c:811
 msgid "Status _bar"
-msgstr "_Status balk"
+msgstr "_Statusbalk"
 
 #: src/mainwindow.c:813
 msgid "Column headers"
-msgstr "Kolom koppen"
+msgstr "Kolomkoppen"
 
 #: src/mainwindow.c:814
 msgid "Th_read view"
@@ -7547,7 +7563,7 @@ msgstr "Verberg verwijderde berichten"
 
 #: src/mainwindow.c:818
 msgid "_Fullscreen"
-msgstr "_Volledig scherm"
+msgstr "_Volledig venster"
 
 #: src/mainwindow.c:819 src/messageview.c:344
 msgid "Show all _headers"
@@ -7599,7 +7615,7 @@ msgstr "_Brede berichtenlijst"
 
 #: src/mainwindow.c:840
 msgid "S_mall screen"
-msgstr "K_lein scherm"
+msgstr "K_lein venster"
 
 #: src/mainwindow.c:844
 msgid "By _number"
@@ -7675,11 +7691,11 @@ msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
 #: src/mainwindow.c:1960
 msgid "You are online. Click the icon to go offline"
-msgstr "Je bent on-line. Klik op het pictogram om offline te gaan"
+msgstr "Je bent online. Klik op het pictogram om offline te gaan"
 
 #: src/mainwindow.c:1963
 msgid "You are offline. Click the icon to go online"
-msgstr "Je bent offline. Klik op het pictogram om on-line te gaan"
+msgstr "Je bent offline. Klik op het pictogram om online te gaan"
 
 #: src/mainwindow.c:1977
 msgid "Select account"
@@ -7687,19 +7703,19 @@ msgstr "Selecteer account"
 
 #: src/mainwindow.c:2004 src/prefs_logging.c:140
 msgid "Network log"
-msgstr "Netwerk log"
+msgstr "Netwerklog"
 
 #: src/mainwindow.c:2008
 msgid "Filtering/Processing debug log"
-msgstr "Filteren/Verwerkingen debug log"
+msgstr "Filteren/Verwerken debuglog"
 
 #: src/mainwindow.c:2027 src/prefs_logging.c:392
 msgid "filtering log enabled\n"
-msgstr "filter log staat aan\n"
+msgstr "filterlog staat aan\n"
 
 #: src/mainwindow.c:2029 src/prefs_logging.c:394
 msgid "filtering log disabled\n"
-msgstr "filter log staat uit.\n"
+msgstr "filterlog staat uit.\n"
 
 #: src/mainwindow.c:2472 src/mainwindow.c:2479 src/mainwindow.c:2522
 #: src/mainwindow.c:2555 src/mainwindow.c:2587 src/mainwindow.c:2632
@@ -7846,7 +7862,7 @@ msgstr "header"
 
 #: src/matcher.c:219
 msgid "header line"
-msgstr "header regel"
+msgstr "header-regel"
 
 #: src/matcher.c:220
 msgid "body line"
@@ -7943,11 +7959,11 @@ msgstr "Opgegeven tekst niet gevonden"
 
 #: src/message_search.c:338
 msgid "Beginning of message reached; continue from end?"
-msgstr "Begin van bericht bereikt; verdergaan vanaf het einde?"
+msgstr "Begin van bericht bereikt, verdergaan vanaf het einde?"
 
 #: src/message_search.c:341
 msgid "End of message reached; continue from beginning?"
-msgstr "Einde van bericht bereikt; verdergaan vanaf het begin?"
+msgstr "Einde van bericht bereikt, verdergaan vanaf het begin?"
 
 #: src/message_search.c:344 src/summary_search.c:791
 msgid "Search finished"
@@ -8009,7 +8025,7 @@ msgstr "Decoderen mislukt: %s"
 #: src/messageview.c:1440 src/messageview.c:1448
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
-"Bericht is niet conform de MIME standaard. Het zou verkeerd weergegeven "
+"Bericht is niet conform de MIME-standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
 #: src/messageview.c:1840 src/messageview.c:1843 src/mimeview.c:1997
@@ -8062,7 +8078,7 @@ msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
-"Dit bericht was gedeeltelijk opgehaald;\n"
+"Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
 #: src/messageview.c:2002
@@ -8071,7 +8087,7 @@ msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
-"Dit bericht was gedeeltelijk opgehaald;\n"
+"Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
 #: src/messageview.c:2006 src/messageview.c:2028
@@ -8088,7 +8104,7 @@ msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
-"Dit bericht was gedeeltelijk opgehaald;\n"
+"Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
 #: src/messageview.c:2017 src/messageview.c:2030
@@ -8102,7 +8118,7 @@ msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
-"Dit bericht was gedeeltelijk opgehaald;\n"
+"Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
 #: src/messageview.c:2096
@@ -8116,7 +8132,8 @@ msgid ""
 "Please choose which account you want to use for sending the receipt "
 "notification:"
 msgstr ""
-"Dit bericht werd verzonden naar meerdere accounts van je\n"
+"Dit bericht werd verzonden naar meerdere accounts van je die dit e-mailadres "
+"gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
 #: src/messageview.c:2101 src/plugins/rssyl/rssyl_feed_props.c:588
@@ -8178,12 +8195,15 @@ msgid "Remove _mailbox..."
 msgstr "Verwijder _postvak..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Kan map '%s' niet verwijderen."
+msgstr ""
+"Kan map '%s' niet verwijderen.\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8224,7 +8244,7 @@ msgstr "_Alles op_slaan..."
 
 #: src/mimeview.c:273
 msgid "MIME Type"
-msgstr "MIME Type"
+msgstr "MIME-Type"
 
 #: src/mimeview.c:1032 src/mimeview.c:1037 src/mimeview.c:1042
 #: src/mimeview.c:1047
@@ -8243,7 +8263,7 @@ msgstr "%s Klik het pictogram om te controleren."
 #: src/mimeview.c:1067
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
-msgstr "%s Klik het pictogram of druk op '%s' om te controleren."
+msgstr "%s Klik het pictogram of klik op '%s' om te controleren."
 
 #: src/mimeview.c:1077
 msgid "Timeout checking the signature. Click the icon to try again."
@@ -8257,7 +8277,7 @@ msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
-"pictogram of druk op '%s' om het opnieuw te proberen."
+"pictogram of klik op '%s' om het opnieuw te proberen."
 
 #: src/mimeview.c:1319
 msgid "Checking signature..."
@@ -8344,7 +8364,7 @@ msgstr "De NNTP-verbinding naar %s:%d is verbroken.\n"
 #: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
-msgstr "Account '%s': Verbinden met NNTP server: %s:%d...\n"
+msgstr "Account '%s': Verbinden met NNTP-server: %s:%d...\n"
 
 #: src/news.c:356
 #, c-format
@@ -8355,7 +8375,7 @@ msgstr "Fout tijdens inloggen op %s:%d...\n"
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
-"Libetpan ondersteunt return code 480 niet dus voor nu kunnen we doorgaan\n"
+"Libetpan ondersteunt return-code 480 niet dus voor nu kunnen we doorgaan\n"
 
 #: src/news.c:446
 msgid "Mode reader failed, continuing nevertheless\n"
@@ -8416,9 +8436,9 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Je hebt een of meer Nieuws-accounts ingesteld. Deze versie van Claws Mail is "
-"echter gebouwd zonder Nieuws-ondersteuning; je Nieuws-account(s) werken dus "
-"niet.\n"
+"Je hebt ??n of meer Nieuws-accounts ingesteld. Deze versie van Claws Mail is "
+"echter gecompileerd zonder Nieuws-ondersteuning, je Nieuws-account(s) werken "
+"dus niet.\n"
 "\n"
 "Je dient waarschijnlijk libetpan te installeren en Claws Mail opnieuw te "
 "compileren."
@@ -8457,28 +8477,28 @@ msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
-"Controleer dat de kernel module 'acerhk' geladen is.\n"
-"Je kunt het krijgen op http://www.cakey.de/acerhk/"
+"Controleer dat de kernel-module 'acerhk' geladen is.\n"
+"Je kunt het verkrijgen op http://www.cakey.de/acerhk/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
-"Controleer dat de kernel module 'acer_acpi' geladen is.\n"
-"Je kunt het krijgen op http://code.google.com/p/aceracpi/"
+"Controleer dat de kernel-module 'acer_acpi' geladen is.\n"
+"Je kunt het verkrijgen op http://code.google.com/p/aceracpi/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
-msgstr "Controleer dat de kernel module 'asus_laptop'geladen is."
+msgstr "Controleer dat de kernel-module 'asus_laptop' geladen is."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
-msgstr "Controleer dat de kernel module 'asus_acpi' geladen is."
+msgstr "Controleer dat de kernel-module 'asus_acpi' geladen is."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
-msgstr "Controleer dat de kernel module 'ibm_acpi' geladen is."
+msgstr "Controleer dat de kernel-module 'ibm_acpi' geladen is."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid ""
@@ -8486,7 +8506,7 @@ msgid ""
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
 "Controleer dat apanelc geinstalleerd is.\n"
-"Je kunt het krijgen op http://apanel.sourceforge.net/"
+"Je kunt het verkrijgen op http://apanel.sourceforge.net/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:207
 #: src/plugins/acpi_notifier/acpi_notifier.c:213
@@ -8532,11 +8552,11 @@ msgstr "LED "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:386
 msgid "ACPI type: "
-msgstr "ACPI type: "
+msgstr "ACPI-type: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:395
 msgid "ACPI file: "
-msgstr "ACPI bestand: "
+msgstr "ACPI-bestand: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:406
 msgid "values - On: "
@@ -8552,11 +8572,11 @@ msgstr "Knipper wanneer interactie gevraagd wordt"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:867
 msgid "This plugin handles various ACPI mail LEDs."
-msgstr "Deze plugin regelt verschillende ACPI mail LEDs."
+msgstr "Deze plugin regelt verschillende ACPI-mail-LEDs."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:888
 msgid "Laptop LED"
-msgstr "Laptop LED"
+msgstr "Laptop-LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:250
@@ -8565,7 +8585,7 @@ msgstr "Niet gelukt om de controleer voor verzenden haak te registreren"
 
 #: src/plugins/address_keeper/address_keeper.c:292
 msgid "Keeps all recipient addresses in an addressbook folder."
-msgstr "Bewaart alle ontvangers in een adresboek map."
+msgstr "Bewaart alle ontvangers in een adresboek-map."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
@@ -8574,7 +8594,6 @@ msgid "Address Keeper"
 msgstr "Adres Bewaarder"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
 msgstr "Pad naar adresboek"
 
@@ -8597,7 +8616,7 @@ msgstr "Selecteren..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Velden om adressen van te bewaren"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8612,12 +8631,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Bewaar adressen die in 'Bcc' headers voorkomen"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
-"Negeer adressen bij het voorkomen van de volgende reguliere expressies (een "
-"per regel):"
+"Negeer adressen bij het voorkomen van de volgende reguliere expressies (??n "
+"per regel)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -8883,7 +8901,7 @@ msgstr "Kies compressie"
 
 #: src/plugins/archive/archiver_gtk.c:1056
 msgid "Choose this option to use ZIP compression for the archive"
-msgstr "Kies deze optie om ZIP compressie te gebruiken voor het archief"
+msgstr "Kies deze optie om ZIP-compressie te gebruiken voor het archief"
 
 #: src/plugins/archive/archiver_gtk.c:1063
 msgid "Choose this option to use BZIP2 compression for the archive"
@@ -8994,7 +9012,7 @@ msgstr "Standaard compressie"
 
 #: src/plugins/archive/archiver_prefs.c:219
 msgid "Choose this option to use ZIP compression by default"
-msgstr "Kies deze optie om standaard ZIP compressie te gebruiken"
+msgstr "Kies deze optie om standaard ZIP-compressie te gebruiken"
 
 #: src/plugins/archive/archiver_prefs.c:226
 msgid "Choose this option to use BZIP2 compression by default"
@@ -9124,11 +9142,11 @@ msgstr ""
 "Deze plugin verwijdert bijvoegsels van e-mails.\n"
 "\n"
 "Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
-"bijvoegsels zijn voor eeuwig en eeuwig verloren."
+"bijvoegsels zijn voor eeuwig en altijd verloren."
 
 #: src/plugins/att_remover/att_remover.c:595
 msgid "Attachment handling"
-msgstr "Bijvoegsel afhandeling"
+msgstr "Bijvoegsel-afhandeling"
 
 #: src/plugins/attachwarner/attachwarner.c:214
 #, c-format
@@ -9147,7 +9165,7 @@ msgstr ""
 
 #: src/plugins/attachwarner/attachwarner.c:218
 msgid "Attachment warning"
-msgstr "Bijvoegsel waarschuwing"
+msgstr "Bijvoegsel-waarschuwing"
 
 #: src/plugins/attachwarner/attachwarner.c:243
 #: src/plugins/attachwarner/attachwarner.c:280
@@ -9168,9 +9186,8 @@ msgid "attach"
 msgstr "voeg bij"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Een van de volgende reguliere expressies kwam overeen (een per regel):"
+msgstr "E?n van de volgende reguliere expressies overeenkomt (??n per regel)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9183,7 +9200,7 @@ msgstr ""
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:115
 msgid "Lines starting with quotation marks"
-msgstr "Regels beginnend met citaat markeringen"
+msgstr "Regels beginnend met citaatmarkeringen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:122
 msgid ""
@@ -9197,7 +9214,7 @@ msgstr ""
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:125
 msgid "Forwarded or redirected messages"
-msgstr "doorgestuurde of herverwezen berichten"
+msgstr "Doorgestuurde of herverwezen berichten"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:132
 msgid ""
@@ -9273,7 +9290,7 @@ msgstr "Bogofilter: leren van bericht..."
 #: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:511
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
-msgstr "Leren mislukt; `%s` gaf status %d terug."
+msgstr "Leren mislukt: `%s` gaf status %d terug."
 
 #: src/plugins/bogofilter/bogofilter.c:794
 msgid "Bogofilter: learning from messages..."
@@ -9285,7 +9302,7 @@ msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""
-"Leren mislukt; `%s %s %s` gaf een foutmelding:\n"
+"Leren mislukt, `%s %s %s` gaf een foutmelding:\n"
 "%s"
 
 #: src/plugins/bogofilter/bogofilter.c:1010
@@ -9304,11 +9321,11 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 "Deze plugin controleert alle berichten die binnen komen via een IMAP, LOKAAL "
-"of POP account op spam met gebruik van Bogofilter. Voor deze plugin heb je "
+"of POP-account op spam met gebruik van Bogofilter. Voor deze plugin heb je "
 "een lokale installatie van Bogofilter nodig.\n"
 "\n"
 "Voordat Bogofilter spamberichten kan herkennen moet het getraind worden door "
-"het markeren van enkele honderden spam- en hamberichten mbv \"/Markeer/"
+"het markeren van enkele honderden spam- en hamberichten mbv. \"/Markeer/"
 "Markeer als spam\" en \"/Markeer/Markeer als ham\".\n"
 "\n"
 "Als een bericht ge?dentificeerd is als spam kan het worden verwijderd of "
@@ -9353,19 +9370,16 @@ msgid "KB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Verwijder tag"
+msgstr "Verwijder spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Spam opslaan in"
+msgstr "Spam opslaan in..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Markeer als spam"
+msgstr "Markeer alleen als spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9402,11 +9416,11 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 msgid "Insert X-Bogosity header"
-msgstr "Voeg X-Bogosity header in"
+msgstr "Voeg X-Bogosity-header in"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
 msgid "Only done for messages in MH folders"
-msgstr "Alleen voor berichten in MH mappen"
+msgstr "Alleen voor berichten in MH-mappen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
@@ -9449,7 +9463,7 @@ msgstr "Bogofilter aanroep"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:303
 msgid "Path to bogofilter executable"
-msgstr "Pad naar bogofilter programma"
+msgstr "Pad naar bogofilter-programma"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:309
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
@@ -9476,7 +9490,7 @@ msgid ""
 "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as ham\" to train Bsfilter with "
 "a few hundred spam and ham messages."
 msgstr ""
-"De Bsfilter plugin kon een bericht niet filteren. De waarschijnlijke oorzaak "
+"De Bsfilter-plugin kon een bericht niet filteren. De waarschijnlijke oorzaak "
 "is dat het niet leerde van mail.\n"
 "Gebruik \"/Markeren/Markeer als spam\" en \"/Markeren/Markeer als ham\" om "
 "Bsfilter te trainen met een paar honderd spam en ham berichten."
@@ -9487,7 +9501,7 @@ msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"De Bsfilter plugin kon een bericht niet filteren. Het commando `%s` kon niet "
+"De Bsfilter-plugin kon een bericht niet filteren. Het commando `%s` kon niet "
 "gestart worden."
 
 #: src/plugins/bsfilter/bsfilter.c:501
@@ -9509,9 +9523,9 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Deze plugin kan alle berichten die van een IMAP, lokaal of POP account wordt "
-"ontvangen controleren op spam met gebruik van Bsfilter. Je hebt een "
-"installatie van Bsfilter lokaal nodig.\n"
+"Deze plugin kan alle berichten die van een IMAP, lokaal of POP-account wordt "
+"ontvangen controleren op spam met gebruik van Bsfilter. Je hebt een lokale "
+"installatie van Bsfilter nodig.\n"
 "\n"
 "Voordat Bsfilter spam berichten kan herkennen, moet je het trainen door het "
 "markeren van enkele honderden spam en ham berichten door het gebruik van \"/"
@@ -9541,7 +9555,7 @@ msgstr "Bsfilter aanroep"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:226
 msgid "Path to bsfilter executable"
-msgstr "Pad naar het bsfilter programma"
+msgstr "Pad naar het bsfilter-programma"
 
 #: src/plugins/clamd/clamav_plugin.c:47
 #: src/plugins/clamd/clamav_plugin_gtk.c:553
@@ -9555,7 +9569,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Scannen\n"
-"Geen socket informatie.\n"
+"Geen socket-informatie.\n"
 "Antivirus uitgeschakeld."
 
 #: src/plugins/clamd/clamav_plugin.c:114
@@ -9602,7 +9616,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Initialisatie\n"
-"Geen socket informatie.\n"
+"Geen socket-informatie.\n"
 "Antivirus uitgeschakeld."
 
 #: src/plugins/clamd/clamav_plugin.c:297
@@ -9638,22 +9652,22 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 "Deze plugin gebruikt Clam AntiVirus om alle berichten te scannen die "
-"ontvangen zijn via een IMAP, LOKAAL of POP account.\n"
+"ontvangen zijn via een IMAP, LOKAAL of POP-account.\n"
 "\n"
 "Wanneer in een bijvoegsel een virus is gevonden kan het verwijderd worden of "
 "opgeslagen in een speciaal daarvoor bestemde map.\n"
 "\n"
 "Omdat deze plugin communiceert met clamd via een \n"
 "socket zijn er wat minimale eisen voor de permissies van\n"
-"je home map en de .claws-mail map wanneer de\n"
+"je home-map en de .claws-mail-map wanneer de\n"
 "clamav-daemon geconfigureerd is om te communiceren\n"
-"via een unix socket.\n"
-"Alle gebruikers moeten minstens uitvoer permissies geven op\n"
+"via een unix-socket.\n"
+"Alle gebruikers moeten minstens uitvoer-permissies geven op\n"
 "deze mappen.\n"
 "\n"
 "Om het wijzigen van de permissies te vermijden kun je ook\n"
 "de clamav-daemon configureren om te communiceren via een\n"
-"TCP socket en handmatige configuratie kiezen voor clamd.\n"
+"TCP-socket en handmatige configuratie kiezen voor clamd.\n"
 "\n"
 "Opties kunnen gevonden worden in\n"
 "/Instellingen/Voorkeuren/Plugins/Clam AntiVirus"
@@ -9747,7 +9761,7 @@ msgstr "Hostnaam of IP voor de server die de clamav daemon draait"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:399
 msgid "Port number where clamav daemon is listening"
-msgstr "Poort nummer waarop de clamav daemon luistert"
+msgstr "Poortnummer waarop de clamav daemon luistert"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:528
 msgid ""
@@ -9756,7 +9770,7 @@ msgid ""
 "Antivirus disabled."
 msgstr ""
 "Nieuwe configuratie\n"
-"Geen socket informatie.\n"
+"Geen socket-informatie.\n"
 "Antivirus uitgezet."
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:532
@@ -9853,11 +9867,11 @@ msgstr "Ingesloten Javascript uitvoeren"
 
 #: src/plugins/fancy/fancy_prefs.c:156
 msgid "Execute Java applets"
-msgstr "Java applets uitvoeren"
+msgstr "Java-applets uitvoeren"
 
 #: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute embedded Java applets"
-msgstr "Ingesloten Java applets uitvoeren"
+msgstr "Ingesloten Java-applets uitvoeren"
 
 #: src/plugins/fancy/fancy_prefs.c:161
 msgid "Render objects using plugins"
@@ -9884,9 +9898,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Gebruik GNOME's proxy instellingen"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Gebruik proxy:"
+msgstr "Gebruik proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9900,10 +9913,10 @@ msgid ""
 "Java applets can still be enabled for content that is attached\n"
 "in the email."
 msgstr ""
-"Inhoud van de server laden kan leiden tot privacy problemen.\n"
+"Inhoud van de server laden kan leiden tot privacy-problemen.\n"
 "Wanneer inhoud van de server uitstaat, wordt er niets\n"
 "opgevraagd van het netwerk. Weergeven van afbeeldingen,\n"
-"scripts, plugin objecten of Java applets kan nog steeds\n"
+"scripts, plugin-objecten of Java-applets kan nog steeds\n"
 "worden aangezet voor inhoud die is bijgevoegd in de e-mail."
 
 #: src/plugins/fancy/fancy_prefs.c:244
@@ -9911,9 +9924,8 @@ msgid "Enable loading of remote content"
 msgstr "Inhoud van de server laden"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Bij klikken op een link, standaard:"
+msgstr "Bij klikken op een link, standaard"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -9921,7 +9933,7 @@ msgstr "Open met externe browser"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr "De CSS in dit bestand wordt toegepast op alle HTML delen"
+msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -9933,7 +9945,7 @@ msgstr "Bekijk"
 
 #: src/plugins/fancy/fancy_prefs.c:350
 msgid "Select stylesheet"
-msgstr "Stylesheet selecteren"
+msgstr "Stijlblad selecteren"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -9979,7 +9991,7 @@ msgstr "Zoeken op het Web"
 
 #: src/plugins/fancy/fancy_viewer.c:730
 msgid "Open in Viewer"
-msgstr "Open in Bladerprogramma"
+msgstr "Open in Browser"
 
 #: src/plugins/fancy/fancy_viewer.c:732
 msgid "Open in Viewer (enable remote content)"
@@ -9987,7 +9999,7 @@ msgstr "Open in Browser (laad inhoud van de server)"
 
 #: src/plugins/fancy/fancy_viewer.c:741
 msgid "Open in Browser"
-msgstr "Open in Bladerprogramma"
+msgstr "Open in Browser"
 
 #: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open Image"
@@ -10056,8 +10068,8 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
 "Deze plugin bewerkt gedownloade berichten. Het voegt headers toe met "
-"download informatie: UIDL, Claws Mail account naam, POP server, gebruikers "
-"ID en ophaal tijd.\n"
+"download-informatie: UIDL, Claws Mail accountnaam, POP-server, gebruikers-ID "
+"en ophaaltijd.\n"
 "\n"
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Fetchinfo"
 
@@ -10067,12 +10079,11 @@ msgstr "E-mail marketing"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
-msgstr "Toevoegen fetchinfo headers"
+msgstr "Toevoegen fetchinfo-headers"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Een afzender-adres is verplicht."
+msgstr "Headers om toe te voegen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10082,14 +10093,16 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"Voegt de X-FETCH-UIDL-header toe met de unieke ID-nummering van het bericht "
+"(POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
-msgstr "Account naam"
+msgstr "Accountnaam"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Voegt de X-FETCH-ACCOUNT-header toe met de accountnaam"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10097,7 +10110,7 @@ msgstr "Server om van te ontvangen"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "Voegt de X-FETCH-SERVER-header toe met de ontvangende server"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10105,22 +10118,23 @@ msgstr "Gebruikersnaam"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Voegt de X-FETCH-USERID-header toe met de gebruikers-ID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
-msgstr "Fetch tijd"
+msgstr "Fetch-tijd"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Voegt de X-FETCH-TIME-header toe met de datum en tijd van het ophalen van "
+"het bericht in RFC822-opmaak"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "GData plugin: Authenticatie fout: %s\n"
+msgstr "GData-plugin: Authorisatie vereist"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10132,30 +10146,34 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Je moet Claws Mail toestemming geven om je Google contactlijst te gebruiken "
+"voor de GData-plugin.\n"
+"\n"
+"Bezoek Google's authorisatiepagina door op de knop hieronder te klikken. Na "
+"het bevestigen van de authorisatie zal je een authorisatiecode ontvangen. "
+"Voer die code in het veld hieronder in om Claws Mail toegang te geven om je "
+"Google contactlijst te gebruiken."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Stap"
+msgstr "Stap 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Klik hier om de authorisatiepagina van Google te openen in een browser"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Stap"
+msgstr "Stap 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Interface"
+msgstr "Invoeren code:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "GData plugin: Fout bij het ophalen van contacten: %s\n"
+msgstr "GData-plugin: Fout bij het ophalen van contacten: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:340
 #, c-format
@@ -10173,63 +10191,61 @@ msgstr[1] "%d contacten aan de cache"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:352
 msgid "GData plugin: Starting async contacts query\n"
-msgstr "GData plugin: Starten asynchronisch contacten ophalen\n"
+msgstr "GData-plugin: Starten asynchronisch contacten ophalen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:373
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "GData plugin: Fout bij ophalen van groepen: %s\n"
+msgstr "GData-plugin: Fout bij ophalen van groepen: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:410
 msgid "GData plugin: Groups received\n"
-msgstr "GData plugin: Groepen ontvangen\n"
+msgstr "GData-plugin: Groepen ontvangen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Starting async groups query\n"
-msgstr "GData plugin: Starten asynchronisch groepen ophalen\n"
+msgstr "GData-plugin: Starten asynchronisch groepen ophalen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData plugin: Authenticatie fout: %s\n"
+msgstr "GData-plugin: Authorisatiefout: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "GData plugin: Authenticatie fout: %s\n"
+msgstr "GData-plugin: Authorisatie gelukt\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData plugin: Starten asynchronische authenticatie\n"
+msgstr "GData-plugin: Starten interactieve authorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData plugin: Starten asynchronische authenticatie\n"
+msgstr "GData-plugin: Authorisatiecode ontvangen, authorisatie aanvragen\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"GData-plugin: Geen authorisatiecode ontvangen, authorisatie-aanvraag is "
+"geannuleerd\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData plugin: Authenticatie fout: %s\n"
+msgstr "GData-plugin: Authorisatie-vernieuwingsfout: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData plugin: Authenticatie fout: %s\n"
+msgstr "GData-plugin: Authorisatie-vernieuwing gelukt\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData plugin: Starten asynchronische authenticatie\n"
+msgstr "GData-plugin: Starten van vernieuwing authorisatie\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authenticatie"
 
@@ -10257,15 +10273,15 @@ msgid ""
 "GData Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"GData Plugin: Kon plugin instellingen niet naar bestand wegschrijven\n"
+"GData-Plugin: Kon plugin-instellingen niet naar bestand wegschrijven\n"
 
 #: src/plugins/gdata/gdata_plugin.c:107
 msgid "Failed to register address completion hook in the GData plugin"
-msgstr "Kon adres-completeren-haak niet registreren in de GData plugin"
+msgstr "Kon adres-completeren-haak niet registreren in de GData-plugin"
 
 #: src/plugins/gdata/gdata_plugin.c:114
 msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Registreren van offline-gaan-haak mislukt in de GData plugin"
+msgstr "Registreren van offline-gaan-haak mislukt in de GData-plugin"
 
 #: src/plugins/gdata/gdata_plugin.c:161
 msgid ""
@@ -10277,9 +10293,9 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Deze plugin biedt toegang tot het GData protocol voor Claws Mail.\n"
+"Deze plugin biedt toegang tot het GData-protocol voor Claws Mail.\n"
 "\n"
-"Het GData protocol is een interface voor Google diensten\n"
+"Het GData-protocol is een interface voor Google diensten\n"
 "Op dit moment is de enige ge?mplementeerde functionaliteit om Google "
 "Contacten te gebruiken bij het aanvullen van adressen met behulp van de Tab-"
 "toets.\n"
@@ -10304,7 +10320,7 @@ msgstr "Aangenomen land van herkomst:"
 #. TRANSLATORS: The IP address is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:373
 msgid "Could not resolve location of IP address "
-msgstr "Kon locatie van IP adres niet opvragen."
+msgstr "Kon locatie van IP-adres niet opvragen."
 
 #: src/plugins/geolocation/geolocation_plugin.c:512
 msgid "Try to locate sender"
@@ -11285,7 +11301,7 @@ msgstr "Kon reguiere expressie niet aanmaken: %s\n"
 #: src/plugins/geolocation/geolocation_plugin.c:803
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Registreren van berichtweergave-toon-haak in de GeoLocatie plugin is mislukt"
+"Registreren van berichtweergave-toon-haak in de GeoLocatie-plugin is mislukt"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -11303,15 +11319,14 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome (but only if it's not about marital "
 "quarrels)."
 msgstr ""
-"Deze plugin voorziet in GeoLocatie functionaliteit voor Claws Mail.\n"
+"Deze plugin voorziet in GeoLocatie-functionaliteit voor Claws Mail.\n"
 "\n"
 "Waarschuwing: Het is technisch onmogelijk om met enige zekerheid de "
 "geografische locatie van afzenders te herleiden uit hun e-mails. De "
 "resultaten weergegeven door deze plugin zijn alleen grove schattingen. "
-"Vooral mailing lijst managers verwijderen informatie van de afzender uit de "
-"e-mails, dus e-mails van mailing lijsten kunnen de locatie toegewezen "
-"krijgen van de mailing lijst server in plaats van de afzender van de e-"
-"mail.\n"
+"Vooral mailinglijstmanagers verwijderen informatie van de afzender uit de e-"
+"mails, dus e-mails van mailinglijsten kunnen de locatie toegewezen krijgen "
+"van de mailinglijstserver in plaats van de afzender van de e-mail.\n"
 "In geval van twijfel, vertrouw de resultaten van deze plugin niet. En ga "
 "niet van je partner scheiden op basis van deze informatie.\n"
 "\n"
@@ -11360,25 +11375,24 @@ msgid ""
 "\n"
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
-"Geef afbeeldingen van libravatar profielen weer voor e-mailberichten.\n"
+"Geef afbeeldingen van libravatar-profielen weer voor e-mailberichten.\n"
 "Meer informatie over libravatar is op http://www.libravatar.org/. Als je\n"
-"een gravatar.com profiel hebt maar nog geen libravatar profiel, kan die\n"
-"ook opgehaald worden (wanneer herverwijzen aanstaat in de plugin\n"
-"configuratie).\n"
-"De Plugin configuratiepagina is beschikbaar vanaf het hoofdscherm:\n"
+"een gravatar.com-profiel hebt maar nog geen libravatar-profiel, kan die\n"
+"ook opgehaald worden (wanneer herverwijzen aanstaat in de\n"
+"plugin-configuratie).\n"
+"De Plugin-configuratiepagina is beschikbaar vanaf het hoofdvenster:\n"
 "/Instellingen/Voorkeuren/Plugins/Libravatar.\n"
 "\n"
 "Deze plugin gebruikt libcurl om afbeeldingen op te halen, dus als je\n"
 "achter een proxy zit lees dan de curl(1) manpage voor de details over\n"
 "'http_proxy' configuratie. Meer details hierover en andere onderwerpen\n"
-"staan in het README bestand.\n"
+"staan in het README-bestand.\n"
 "\n"
 "Feedback naar <ricardo at mones.org> is welkom.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Je e-mailadres:</span>"
+msgstr "<span color=\"red\">Fout bij lezen cache-statistieken</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11386,25 +11400,25 @@ msgid ""
 "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
 "errors</span>"
 msgstr ""
+"<span color=\"red\">Gebruikt %s in %d bestanden, %d mappen, %d overige en %d "
+"fouten</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Gebruikt %s in %d bestanden, %d mappen en %d overige"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Pictogramcache"
+msgstr "Pictogramcache verwijderen"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Wil je dit thema werkelijk verwijderen?"
+msgstr "Wil je de cache van avatarpictogrammen werkelijk verwijderen?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Niet genoeg geheugen om uitt e voeren"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11413,10 +11427,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Pictogramcache succesvol gewist:\n"
+"? %u missende delen verwijderd.\n"
+"? %u bestanden verwijderd."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">Pictogramcache is verwijderd</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11427,10 +11444,16 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Fouten bij het verwijderen van de pictogramcache:\n"
+"? %u missende pictogrammen verwijderd.\n"
+"? %u bestanden verwijderd.\n"
+"? %u bestanden konden niet gelezen worden.\n"
+"? %u bestanden konden niet worden verwijderd."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
 msgstr ""
+"<span color=\"red\">Fout bij het verwijderen van de pictogramcache.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11509,6 +11532,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Voer de URL in waarheen je wilt worden verwezen wanneer er geen "
+"gebruikerspictogram beschikbaar is. Laat leeg voor het standaard oranje "
+"libravatar pictogram."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11529,12 +11555,12 @@ msgstr "_Gebruik aangesloten servers"
 #: src/plugins/libravatar/libravatar_prefs.c:393
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
-"Probeer de avatar te krijgen van de libravatar-server van het domein van de "
-"afzender"
+"Probeer de avatar te verkrijgen van de libravatar-server van het domein van "
+"de afzender"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "Request timeout"
-msgstr "Aanvraag verlopen"
+msgstr "Aanvraag verlooptijd"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -11547,8 +11573,8 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
-"Zet op 0 om globale socket I/O timeout te gebruiken. Maximum waarde moet ook "
-"minder zijn dan de globale socket I/O timeout zijn."
+"Zet op 0 om globale socket-I/O timeout te gebruiken. Maximum waarde moet ook "
+"minder zijn dan de globale socket-I/O timeout."
 
 #: src/plugins/libravatar/libravatar_prefs.c:455
 msgid "Icon cache"
@@ -11564,11 +11590,11 @@ msgstr "Netwerk"
 
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder (etPan!)"
-msgstr "mailmbox folder (etPan!)"
+msgstr "mailmbox map (etPan!)"
 
 #: src/plugins/mailmbox/plugin.c:63
 msgid "This is a plugin to handle mailboxes in mbox format."
-msgstr "Dit is een plugin die inboxen in mbox formaat afhandelt."
+msgstr "Dit is een plugin die inboxen in mbox-formaat afhandelt."
 
 #: src/plugins/mailmbox/plugin.c:84
 msgid "MBOX"
@@ -11576,7 +11602,7 @@ msgstr "MBOX"
 
 #: src/plugins/mailmbox/plugin_gtk.c:86
 msgid "mbox (etPan!)..."
-msgstr "mbox (etPan!)"
+msgstr "mbox (etPan!)..."
 
 #: src/plugins/mailmbox/plugin_gtk.c:190
 msgid ""
@@ -11597,6 +11623,270 @@ msgstr ""
 "Alle map(pen) en bericht(en) in '%s' zullen worden verwijderd.\n"
 "Wilt je werkelijk verwijderen?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Sieve-auth-methode niet beschikbaar\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "Geselecteerde Sieve-auth-methode niet beschikbaar\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Verbinding verbroken: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "onbehandeld bericht in Sieve-sessie: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS mislukt"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "er is een fout opgetreden tijdens de SIEVE-sessie\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "er is een fout opgetreden tijdens de Sieve-sessie. data: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "onbehandeld bericht in Sieve-sessie: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: auth opnieuw proberen\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Auth-methode niet beschikbaar"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filter"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Co_ntroleer Syntax"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "Teru_gdraaien"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Kon scriptinhoud niet verkrijgen"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Terugdraaien..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Draai script terug"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Dit script is gewijzigd. Niet-opgeslagen veranderingen terugdraaien?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "_Terugdraaien"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Script succesvol opgeslagen."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Opslaan..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Syntax wordt geverifieerd..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Dit script is gewijzigd. Veranderingen opslaan?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Opslaan"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve-filter%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Toevoegen Sieve-script"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Voer naam in van nieuw Sieve filterscript."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Voer een nieuwe naam in voor het script."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Wil je werkelijk het filter '%s' verwijderen?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Verwijder filter"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Actief"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Een account kan maar ??n actief script tegelijkertijd hebben."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Niet in staat te verbinden"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Lijst van  scripts weergeven..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Beheer Sieve-filters"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Om Sieve te gebruiken, activeer het in de voorkeuren van een account."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Beheer Sieve-Filters..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "Beheer sieve-filters op een server mbv. het ManageSieve-protocol."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Sieve aanzetten"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Serverinformatie"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Servernaam"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Verbind met deze host ipv. de host gebruikt voor het ontvangen van e-mail"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Serverpoort"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Verbind met deze poort ipv. de standaardpoort"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Geen TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Gebruik TLS wanneer beschikbaar"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "TLS vereist"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Geen authenticatie"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Gebruik dezelfde authenticatie als voor het ontvangen van e-mail"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Geef authenticatie op"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Gebruikersnaam"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Authenticatie-methode"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Sieve-server mag geen spatie bevatten."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Je hebt geen Sieve-server opgegeven."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "Nieuwe Mail"
@@ -11608,7 +11898,7 @@ msgstr "Registreren van nieuwe-mail-haak mislukt"
 #: src/plugins/newmail/newmail.c:132
 #, c-format
 msgid "Could not open log file %s: %s\n"
-msgstr "Kon log bestand %s niet openen: %s\n"
+msgstr "Kon logbestand %s niet openen: %s\n"
 
 #: src/plugins/newmail/newmail.c:145
 #, c-format
@@ -11620,7 +11910,7 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Deze plugin schrijft een header samenvatting van een log bestand voor elke "
+"Deze plugin schrijft een header-samenvatting naar een logbestand voor elke "
 "ontvangen e-mail na het sorteren.\n"
 "\n"
 "Standaard is ~/Mail/NewLog\n"
@@ -11629,7 +11919,7 @@ msgstr ""
 
 #: src/plugins/newmail/newmail.c:179
 msgid "Log file"
-msgstr "Log bestand"
+msgstr "Logbestand"
 
 #: src/plugins/notification/notification_banner.c:356
 msgid "Folder:"
@@ -11662,47 +11952,47 @@ msgstr "Notificatie"
 
 #: src/plugins/notification/notification_plugin.c:221
 msgid "The Notification plugin needs threading support."
-msgstr "De Notificatie plugin heeft threading ondersteuning nodig."
+msgstr "De Notificatie-plugin heeft threading-ondersteuning nodig."
 
 #: src/plugins/notification/notification_plugin.c:228
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
-"Registreren van de map item update haak in de Notificatie plgin is mislukt"
+"Registreren van de map item update haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:236
 msgid "Failed to register folder update hook in the Notification plugin"
-msgstr "Registreren van map update haak in de Notificatie plugin is mislukt"
+msgstr "Registreren van map update haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:246
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
-"Registreren van msginfo update haak in de Notificatie plugin is mislukt"
+"Registreren van msginfo update haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:256
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
-"Registreren van off-line schakelaar haak in de Notificatie plugin is mislukt"
+"Registreren van offline schakelaar haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:267
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
-"Registreren van hoofdwindow sluiten haak in de Notificatie plugin is mislukt"
+"Registreren van hoofdvenster sluiten haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:280
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
-"Registreren van werd-ge-iconiseerd haak in de Notificatie plugin is mislukt"
+"Registreren van werd-ge-iconiseerd haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:293
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
-"Registreren van accountlijst veranderd haak in de Notificatie plugin is "
+"Registreren van accountlijst veranderd haak in de Notificatie-plugin is "
 "mislukt"
 
 #: src/plugins/notification/notification_plugin.c:306
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
-"Registreren van thema-veranderd-haak in de Notificatie plugin is mislukt"
+"Registreren van thema-veranderd-haak in de Notificatie-plugin is mislukt"
 
 #: src/plugins/notification/notification_plugin.c:422
 msgid ""
@@ -11713,10 +12003,10 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Deze plugin geeft verschillende manieren om de gebruiker te notifieren van "
+"Deze plugin biedt verschillende manieren om de gebruiker te notifi?ren van "
 "nieuwe en ongelezen e-mail.\n"
-"De plugin is uitgebreid instelbaar in het plugin gedeelte van de "
-"instellingen dialoog.\n"
+"De plugin is uitgebreid instelbaar in het plugin-gedeelte van de "
+"instellingen-dialoog.\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
 #: src/plugins/notification/notification_plugin.c:447
@@ -11746,12 +12036,12 @@ msgstr "Een nieuw kalender bericht is aangekomen"
 
 #: src/plugins/notification/notification_popup.c:343
 msgid "New RSS feed article"
-msgstr "Nieuwe RSS feed artikel"
+msgstr "Nieuw RSS-feed-artikel"
 
 #: src/plugins/notification/notification_popup.c:344
 #: src/plugins/notification/notification_trayicon.c:875
 msgid "A new article in a RSS feed arrived"
-msgstr "Een nieuw artikel in een RSS feed is aangekomen"
+msgstr "Een nieuw artikel in een RSS-feed is aangekomen"
 
 #: src/plugins/notification/notification_popup.c:347
 msgid "New unknown message"
@@ -11768,7 +12058,7 @@ msgstr "Toon hoofdvenster"
 
 #: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
-msgstr "E-mail bericht"
+msgstr "E-mailbericht"
 
 #: src/plugins/notification/notification_popup.c:492
 #: src/plugins/notification/notification_popup.c:498
@@ -11780,11 +12070,11 @@ msgstr[1] "%d nieuwe berichten aangekomen"
 
 #: src/plugins/notification/notification_popup.c:497
 msgid "News message"
-msgstr "Nieuws bericht"
+msgstr "Nieuwsbericht"
 
 #: src/plugins/notification/notification_popup.c:503
 msgid "Calendar message"
-msgstr "Kalender bericht"
+msgstr "Kalenderbericht"
 
 #: src/plugins/notification/notification_popup.c:504
 #: src/plugins/notification/notification_trayicon.c:909
@@ -11796,13 +12086,13 @@ msgstr[1] "%d nieuwe kalender berichten aangekomen"
 
 #: src/plugins/notification/notification_popup.c:509
 msgid "RSS news feed"
-msgstr "RSS nieuws feed"
+msgstr "RSS-nieuwsfeed"
 
 #: src/plugins/notification/notification_popup.c:510
 #, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
-msgstr[0] "%d nieuw artikel in een RSS feed is aangekomen"
+msgstr[0] "%d nieuw artikel in een RSS-feed is aangekomen"
 msgstr[1] "%d nieuwe artikelen in een RSS feed zijn aangekomen"
 
 #: src/plugins/notification/notification_popup.c:572
@@ -11847,7 +12137,7 @@ msgid ""
 "Notification Plugin: Failed to write plugin configuration to file\n"
 msgstr ""
 "\n"
-"Notificatie Plugin: plugin configuratie wegschrijven is mislukt\n"
+"Notificatie Plugin: plugin-configuratie wegschrijven is mislukt\n"
 
 #: src/plugins/notification/notification_prefs.c:608
 msgid "Include folder types"
@@ -11855,21 +12145,19 @@ msgstr "Voeg maptypes toe"
 
 #: src/plugins/notification/notification_prefs.c:617
 msgid "Mail folders"
-msgstr "Mail mappen"
+msgstr "Mailmappen"
 
 #: src/plugins/notification/notification_prefs.c:625
 msgid "News folders"
-msgstr "Nieuws mappen"
+msgstr "Nieuwsmappen"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS mappen"
+msgstr "RSSyl-mappen"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Kalender mappen"
+msgstr "vCalender-mappen"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11877,15 +12165,15 @@ msgstr "Deze instellingen overschrijven map-specifieke selecties."
 
 #: src/plugins/notification/notification_prefs.c:660
 msgid "Global notification settings"
-msgstr "Globale notificatie instellingen"
+msgstr "Globale notificatie-instellingen"
 
 #: src/plugins/notification/notification_prefs.c:669
 msgid "Set window manager urgency hint when new messages exist"
-msgstr "Stel window manager hint in wanneer er nieuwe berichten zijn"
+msgstr "Stel windowmanager hint in wanneer er nieuwe berichten zijn"
 
 #: src/plugins/notification/notification_prefs.c:678
 msgid "Set window manager urgency hint when unread messages exist"
-msgstr "Stel window manager hint in wanneer er ongelezen berichten zijn"
+msgstr "Stel windowmanager hint in wanneer er ongelezen berichten zijn"
 
 #: src/plugins/notification/notification_prefs.c:688
 msgid "Use sound theme"
@@ -11912,26 +12200,23 @@ msgstr "Alleen wanneer niet leeg"
 
 #: src/plugins/notification/notification_prefs.c:790
 msgid "Banner speed"
-msgstr "Banner snelheid"
+msgstr "Bannersnelheid"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Maximum aantal resultaten:"
+msgstr "Maximum aantal berichten"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "Maximum aantal berichten (0 betekent onbeperkt)"
+msgstr "Beperk het aantal getoonde berichten, gebruik 0 voor onbeperkt"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Banner snelheid"
+msgstr "Bannerbreedte"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Beperk de afmetingen van de banner, gebruik 0 voor schermbreedte"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11961,9 +12246,8 @@ msgid "Select folders..."
 msgstr "Selecteer mappen..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Mapkleur"
+msgstr "Bannerkleuren"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -11999,16 +12283,14 @@ msgstr "Zet popup aan"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Popup timeout:"
+msgstr "Popup verlooptijd"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "seconden"
+msgstr "seconde(n)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12016,11 +12298,11 @@ msgstr "Maak popup klevend"
 
 #: src/plugins/notification/notification_prefs.c:1112
 msgid "Set popup window width and position"
-msgstr "Stel popup window breedte en positie in"
+msgstr "Stel van popupvenster de breedte en positie in"
 
 #: src/plugins/notification/notification_prefs.c:1117
 msgid "(the window manager is free to ignore this)"
-msgstr "(de window manager is vrij om dit te negeren)"
+msgstr "(de windowmanager is vrij om dit te negeren)"
 
 #: src/plugins/notification/notification_prefs.c:1165
 #: src/plugins/notification/notification_prefs.c:1677
@@ -12029,25 +12311,23 @@ msgstr "Geef mapnaam weer"
 
 #: src/plugins/notification/notification_prefs.c:1230
 msgid "Sample popup window"
-msgstr "Voorbeeld popup window"
+msgstr "Voorbeeld popupvenster"
 
 #: src/plugins/notification/notification_prefs.c:1236
 msgid "Done"
 msgstr "Klaar"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Voer opdracht uit"
+msgstr "Selecteer opdracht"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Zet programma aan"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Programma om uit te voeren:"
+msgstr "Programma om uit te voeren"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12058,9 +12338,8 @@ msgid "Enable LCD"
 msgstr "Zet LCD aan"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Hostnaam:Poort van LCDd server:"
+msgstr "Hostnaam:Poort van LCDd-server"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12076,7 +12355,7 @@ msgstr "Verplaats naar systeemvak"
 
 #: src/plugins/notification/notification_prefs.c:1601
 msgid "Hide when iconified"
-msgstr "Verberg wanneer geiconifeerd"
+msgstr "Verberg wanneer ge?conifeerd"
 
 #. TRANSLATORS: "Toaster" does not refer to the kitchen appliance.
 #. A toast is a small passive (non-focus-stealing)
@@ -12120,9 +12399,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Aan/uit minimaliseren"
+msgstr "Klik om te minimaliseren"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12159,7 +12437,7 @@ msgstr "Nieuw: %d, ongelezen:%d, totaal: %d"
 
 #: src/plugins/notification/notification_trayicon.c:822
 msgid "New mail message"
-msgstr "Nieuw e-mail bericht"
+msgstr "Nieuw e-mailbericht"
 
 #: src/plugins/notification/notification_trayicon.c:824
 msgid "New news post"
@@ -12171,7 +12449,7 @@ msgstr "Nieuw kalender bericht"
 
 #: src/plugins/notification/notification_trayicon.c:828
 msgid "New article in RSS feed"
-msgstr "Nieuw artikel in RSS feed"
+msgstr "Nieuw artikel in RSS-feed"
 
 #: src/plugins/notification/notification_trayicon.c:831
 msgid "New messages arrived"
@@ -12181,8 +12459,8 @@ msgstr "Nieuwe berichten aangekomen"
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
-msgstr[0] "%d nieuw e-mail bericht aangekomen"
-msgstr[1] "%d nieuwe e-mail berichten aangekomen"
+msgstr[0] "%d nieuw e-mailbericht aangekomen"
+msgstr[1] "%d nieuwe e-mailberichten aangekomen"
 
 #: src/plugins/notification/notification_trayicon.c:898
 #, c-format
@@ -12195,8 +12473,8 @@ msgstr[1] "%d nieuwe nieuws berichten aangekomen"
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
-msgstr[0] "%d nieuw artikel in RSS feeds aangekomen"
-msgstr[1] "%d nieuwe artikelen in RSS feeds aangekomen"
+msgstr[0] "%d nieuw artikel in RSS-feeds aangekomen"
+msgstr[1] "%d nieuwe artikelen in RSS-feeds aangekomen"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Title:"
@@ -12233,7 +12511,7 @@ msgstr "Geoptimaliseerd:"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1179
 msgid "PDF properties"
-msgstr "PDF eigenschappen"
+msgstr "PDF-eigenschappen"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1276
 msgid "Loading..."
@@ -12251,7 +12529,7 @@ msgstr "van %d"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1358
 msgid "PDF rendering failed for an unknown reason."
-msgstr "PDF weergave is om een onbekende reden mislukt."
+msgstr "PDF-weergave is om een onbekende reden mislukt."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1721
 #: src/plugins/pdf_viewer/poppler_viewer.c:1939
@@ -12318,8 +12596,8 @@ msgid ""
 "\n"
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
-"Deze plugin maakt het mogelijk om PDF en PostScript bijvoegsels te bekijken "
-"met behulp van de Poppler %s bibliotheek en het gs gereedschap.\n"
+"Deze plugin maakt het mogelijk om PDF- en PostScript-bijvoegsels te bekijken "
+"met behulp van de Poppler %s bibliotheek en het gs-gereedschap.\n"
 "\n"
 "Feedback is welkom: iwkse at claws-mail.org"
 
@@ -12327,7 +12605,7 @@ msgstr ""
 #: src/plugins/pdf_viewer/poppler_viewer.c:2062
 #: src/plugins/pdf_viewer/poppler_viewer.c:2082
 msgid "PDF Viewer"
-msgstr "PDF Weergever"
+msgstr "PDF Lezer"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:2058
 #, c-format
@@ -12338,9 +12616,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Waarschuwing: kon het ghostscript programma (gs) niet vinden. Deze is nodig "
-"om via de %s plugin PostScript bijvoegsels te bekijken. Nu kunnen alleen PDF "
-"bijvoegsels worden getoond. Om PostScript te ondersteunen kun je het gs "
+"Waarschuwing: kon het ghostscript-programma (gs) niet vinden. Deze is nodig "
+"om via de %s plugin PostScript bijvoegsels te bekijken. Nu kunnen alleen PDF-"
+"bijvoegsels worden getoond. Om PostScript te ondersteunen kun je het gs-"
 "programma installeren.\n"
 "\n"
 "%s"
@@ -12474,7 +12752,7 @@ msgstr "   Deze sleutel kon niet ge?mporteerd worden in je sleutelring.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:189
 msgid "   Key servers are sometimes slow.\n"
-msgstr "   Sleutel servers zijn soms langzaam.\n"
+msgstr "   Sleutel-servers zijn soms langzaam.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:190
 msgid ""
@@ -12510,8 +12788,8 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin verzorgt de basis PGP operaties en voorziet in automatisch "
-"aanvullen vanuit de GPG sleutelring.\n"
+"Deze plugin verzorgt de basis PGP-operaties en voorziet in automatisch "
+"aanvullen vanuit de GPG-sleutelring.\n"
 "Het wordt gebruikt door andere plugins zoals PGP/Mime.\n"
 "\n"
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/GPG en /"
@@ -12570,11 +12848,11 @@ msgstr "Signeersleutel"
 
 #: src/plugins/pgpcore/prefs_gpg.c:316
 msgid "Use default GnuPG key"
-msgstr "Gebruik standaard GnuPG sleutel"
+msgstr "Gebruik standaard GnuPG-sleutel"
 
 #: src/plugins/pgpcore/prefs_gpg.c:327
 msgid "Select key by your email address"
-msgstr "Selecteer sleutel volgens e-mail adres"
+msgstr "Selecteer sleutel volgens e-mailadres"
 
 #: src/plugins/pgpcore/prefs_gpg.c:338
 msgid "Specify key manually"
@@ -12599,7 +12877,7 @@ msgstr "GPG"
 #: src/plugins/pgpcore/select-keys.c:95
 #, c-format
 msgid "No exact match for '%s'; please select the key."
-msgstr "Geen exacte overeenkomst gevonden voor '%s'; selecteer de sleutel."
+msgstr "Geen exacte overeenkomst gevonden voor '%s', selecteer de sleutel."
 
 #: src/plugins/pgpcore/select-keys.c:98
 #, c-format
@@ -12626,7 +12904,7 @@ msgstr "Selecteer sleutels"
 
 #: src/plugins/pgpcore/select-keys.c:395
 msgid "Key ID"
-msgstr "Sleutel ID"
+msgstr "Sleutel-ID"
 
 #: src/plugins/pgpcore/select-keys.c:398
 msgid "Trust"
@@ -12696,54 +12974,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Geen sleutel - er draait geen gpg-agent."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van \"%s\" [ultimate]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van \"%s\" [volledig]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van \"%s\" [beperkt]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Goedgekeurde ondertekening van %s."
+msgstr "Goedgekeurde ondertekening van \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Verlopen ondertekening van %s."
+msgstr "Verlopen ondertekening van \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Goedgekeurde ondertekening van %s, maar de sleutel is verlopen."
+msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is verlopen"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Goedgekeurde ondertekening van %s, maar de sleutel is ingetrokken."
+msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is ingetrokken"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Foutieve ondertekening van %s."
+msgstr "Foutieve ondertekening van \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Sleutel 0x%s niet voorhanden om deze ondertekening te verifi?ren"
+msgstr "Sleutel 0x%s niet beschikbaar om deze ondertekening te verifi?ren"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Deze ondertekening is nog niet gecontroleerd."
+msgstr "Deze ondertekening is nog niet gecontroleerd"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -12757,7 +13034,7 @@ msgstr "Fout bij het controleren van de ondertekening: %s\n"
 #: src/plugins/pgpcore/sgpgme.c:321
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
-msgstr "Ondertekening gemaakt op %s met %s sleutel ID %s\n"
+msgstr "Ondertekening gemaakt op %s met %s sleutel-ID %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:327
 #, c-format
@@ -12767,7 +13044,7 @@ msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:332
 #, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Verlopen sleutel uid \"%s\"\n"
+msgstr "Verlopen sleutel-uid \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
@@ -12777,7 +13054,7 @@ msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr "Ingetrokken sleutel uid \"%s\"\n"
+msgstr "Ingetrokken sleutel-uid \"%s\"\n"
 
 #: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
@@ -12796,7 +13073,7 @@ msgstr "Ingetrokken"
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
 msgid "Owner Trust: %s\n"
-msgstr ""
+msgstr "Betrouwbaarheid eigenaar: %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:367
 msgid "Primary key fingerprint:"
@@ -12816,7 +13093,7 @@ msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 #: src/plugins/pgpcore/sgpgme.c:425
 #, c-format
 msgid "Couldn't get data from message, %s"
-msgstr "Kon gegevens van bericht verkrijgen, %s"
+msgstr "Kon geen gegevens van bericht verkrijgen, %s"
 
 #: src/plugins/pgpcore/sgpgme.c:441
 #, c-format
@@ -12863,14 +13140,14 @@ msgid ""
 "OpenPGP support disabled."
 msgstr ""
 "GnuPG is niet goed ge?nstalleerd of moet worden bijgewerkt.\n"
-"OpenPGP ondersteuning wordt uitgeschakeld."
+"OpenPGP-ondersteuning wordt uitgeschakeld."
 
 #: src/plugins/pgpcore/sgpgme.c:767
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
-"Je dient de informatie van het account op te slaan door op \"OK\" te drukken "
+"Je dient de informatie van het account op te slaan door op \"OK\" te klikken "
 "alvorens je een sleutelpaar kunt aanmaken.\n"
 
 #: src/plugins/pgpcore/sgpgme.c:772
@@ -12927,7 +13204,7 @@ msgstr "Sleutel ge?xporteerd."
 
 #: src/plugins/pgpcore/sgpgme.c:914
 msgid "Couldn't export key."
-msgstr "Kon seutel niet exporteren."
+msgstr "Kon sleutel niet exporteren."
 
 #: src/plugins/pgpcore/sgpgme.c:918
 msgid "Key export isn't implemented in Windows."
@@ -12956,7 +13233,7 @@ msgstr "Kon tekstgegevens naar geen enkel zinnige karakterset converteren."
 #: src/plugins/pgpmime/pgpmime.c:651 src/plugins/smime/smime.c:415
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
-msgstr "Kon de GPG-context niet initializeren, %s"
+msgstr "Kon de GPG-context niet initialiseren, %s"
 
 #: src/plugins/pgpinline/pgpinline.c:317
 msgid "Couldn't parse mime part."
@@ -13034,7 +13311,7 @@ msgid ""
 "are email headers, like Subject."
 msgstr ""
 "Let op dat bijvoegsels niet worden versleuteld door het PGP/Ingesloten "
-"systeem, noch e-mail headers, zoals Onderwerp."
+"systeem, noch e-mail-headers, zoals Onderwerp."
 
 #: src/plugins/pgpinline/pgpinline.c:669 src/plugins/pgpmime/pgpmime.c:661
 #, c-format
@@ -13049,7 +13326,7 @@ msgstr "Kon tijdelijk bestand niet aanmaken, %s."
 #: src/plugins/pgpinline/pgpinline.c:728 src/plugins/pgpmime/pgpmime.c:717
 #, c-format
 msgid "Encryption failed, %s"
-msgstr "Coderen mislukt, %s"
+msgstr "Versleutelen mislukt, %s"
 
 #: src/plugins/pgpinline/pgpinline.c:797
 msgid "PGP/Inline"
@@ -13057,7 +13334,7 @@ msgstr "PGP/Ingesloten"
 
 #: src/plugins/pgpinline/plugin.c:34
 msgid "PGP/inline"
-msgstr "PGP/ingesloten"
+msgstr "PGP/Ingesloten"
 
 #: src/plugins/pgpinline/plugin.c:60
 msgid ""
@@ -13077,7 +13354,7 @@ msgstr ""
 "en/of versleutelen van berichten. Je kunt berichten decoderen, "
 "ondertekeningen verifi?ren of zelf berichten versleutelen en ondertekenen.\n"
 "\n"
-"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
 "[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
 "bent in /Opties/Privacy systeem\n"
 "\n"
@@ -13111,8 +13388,8 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
-"Let op dat e-mail headers, zoals Onderwerp, niet versleuteld worden door het "
-"PGP/Mime systeem."
+"Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
+"PGP/Mime-systeem."
 
 #: src/plugins/pgpmime/pgpmime.c:789
 msgid "PGP/Mime"
@@ -13135,11 +13412,11 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin verwerkt PGP/MIME ondertekende en/of versleutelde berichten. Je "
+"Deze plugin verwerkt PGP/MIME-ondertekende en/of versleutelde berichten. Je "
 "kunt berichten decoderen, ondertekeningen verifi?ren en zelf berichten "
 "ondertekenen en versleutelen.\n"
 "\n"
-"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
 "[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
 "bent in /Opties/Privacy systeem\n"
 "\n"
@@ -13154,7 +13431,7 @@ msgstr "Python scripts"
 
 #: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
-msgstr "Geef Python console weer..."
+msgstr "Geef Python-console weer..."
 
 #: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
@@ -13176,7 +13453,6 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registreren van \"aanmaken-maak-haak\" mislukt in de Python plugin"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13222,20 +13498,20 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Deze plugin biedt Python integratie mogelijkheden.\n"
-"Python code kan interactief ingevoerd worden in een ingesloten Python "
-"console, onder Gereedschap -> Toon Python console, of opgeslagen in "
+"Deze plugin biedt Python integratie-mogelijkheden.\n"
+"Python-code kan interactief ingevoerd worden in een ingesloten Python-"
+"console, onder Gereedschap -> Toon Python-console, of opgeslagen in "
 "scripts.\n"
 "\n"
 "Deze scripts zijn dan beschikbaar in het menu. Je kunt er snelkoppelingen "
-"aan toewijzen zoals met andere menu items. Je kunt ook knoppen toevoegen aan "
+"aan toewijzen zoals met andere menu-items. Je kunt ook knoppen toevoegen aan "
 "de werkbalk om scripts te starten met behulp van Claws Mail's ingebouwde "
 "werkbalk bewerker.\n"
 "\n"
 "Je kunt scripts toevoegen aan het hoofdvenster door bestanden te plaatsen in "
 "~/.claws-mail/python-scripts/main.\n"
 "\n"
-"Je kunt ook scripts toevoegen aan een open schrijfvenster door bestanden te "
+"Je kunt ook scripts toevoegen aan een open opstelvenster door bestanden te "
 "plaatsen in ~/.claws-mail/python-scripts/compose.\n"
 "\n"
 "De map ~/.claws-mail/python-scripts/auto/ kan scripts bevatten die "
@@ -13243,7 +13519,7 @@ msgstr ""
 "worden de volgende bestanden herkend:\n"
 "\n"
 "compose_any\n"
-"Wordt uitgevoerd wanneer een schrijfvenster wordt geopend, onafhankelijk of "
+"Wordt uitgevoerd wanneer een opstelvenster wordt geopend, onafhankelijk of "
 "dat gebeurt als gevolg van het schijven van een nieuw bericht, of antwoorden "
 "of doorsturen.\n"
 "\n"
@@ -13254,16 +13530,16 @@ msgstr ""
 "Uitgevoerd bij het ontladen van de plugin\n"
 "\n"
 "\n"
-"Voor de meest bijgewerkte API documentatie, type\n"
+"Voor de meest bijgewerkte API-documentatie, type\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
-"in de interactieve Python console\n"
+"in de interactieve Python-console\n"
 "\n"
-"De broncode distributie van deze plugin komt met verschillende voorbeeld "
-"scripts in de \"examples\" submap. Als je een script hebt geschreven dat je "
-"wilt delen, stuur het naar mij zodat ik kan overwegen het aan de voorbeelden "
-"toe te voegen.\n"
+"De broncode-distributie van deze plugin komt met verschillende "
+"voorbeeldscripts in de \"examples\" submap. Als je een script hebt "
+"geschreven dat je wilt delen, stuur het naar mij zodat ik kan overwegen het "
+"aan de voorbeelden toe te voegen.\n"
 "\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
@@ -13272,32 +13548,33 @@ msgid "Python integration"
 msgstr "Python integratie"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Kon mbox-bestand niet aanmaken:\n"
-"%s\n"
+"Kon inhoud van oude feeds.xml-bestand niet lezen:\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
-msgstr ""
+msgstr "RSSyl: Fout bij toevoegen van '%s' aan feed-exportlijst.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "Kon log bestand %s niet openen: %s\n"
+msgstr "RSSyl: Kon oud OPML-bestand '%s' niet verwijderen: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
+"RSSyl: Kon het bestand '%s' niet openen voor exporteren van feedlijst: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl: Fout tijdens schrijven van feed-exportbestand.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -13307,6 +13584,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Fout tijdens abonneren feed\n"
+"%s\n"
+"\n"
+"Mapnaam '%s' is niet toegestaan."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -13316,21 +13597,20 @@ msgid ""
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Deze plugin maakt het mogelijk om een mailbox boom aan te maken waar je "
-"nieuwsfeeds aan kunt toevoegen in RSS 1.0, RSS 2.0 of Atom formaat.\n"
+"Deze plugin maakt het mogelijk om een mailbox-boom aan te maken waar je "
+"nieuwsfeeds aan kunt toevoegen in RSS 1.0, RSS 2.0 of Atom-formaat.\n"
 "\n"
 "Elke nieuwsfeed zal een map aanmaken met ingangen gehaald van het web. Je "
 "kunt ze lezen, verwijderen of bewaren."
 
 #: src/plugins/rssyl/plugin.c:89
 msgid "RSS feed"
-msgstr "RSS feed"
+msgstr "RSS-feed"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(gewoonlijk leeg)"
+msgstr "(leegmaken)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -13350,11 +13630,10 @@ msgid "'%c' can't be used in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
-msgstr[0] "Claws-Mail heeft netwerk toegang nodig om de feed te verversen."
-msgstr[1] "Claws-Mail heeft netwerk toegang nodig om de feeds te verversen."
+msgstr[0] "Claws-Mail heeft netwerktoegang nodig om de feed te verversen."
+msgstr[1] "Claws-Mail heeft netwerktoegang nodig om de feeds te verversen."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
 #, c-format
@@ -13370,24 +13649,24 @@ msgid "Select an OPML file"
 msgstr "Selecteer een OPML bestand"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "Kon tijdelijk bestand voor het verzenden van nieuws niet aanmaken."
+msgstr "Kon de map voor de nieuwe feed '%s' niet aanmaken."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl: verversen feed %s\n"
+msgstr "RSSyl: abonneren nieuwe feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl: Nieuwe feed geabonneerd: '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
-msgstr "RSSyl: verversen feed %s\n"
+msgstr "RSSyl: Verversen feed: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
@@ -13395,34 +13674,28 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Feed verversen is klaar: %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl: verversen feed %s\n"
+msgstr "RSSyl: Fout bij verversen feed op '%s': %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl: verversen feed %s\n"
+msgstr "RSSyl: Geen geldige feed gevonden op '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
+msgstr "RSSyl: Kon feed niet verwerken van '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
-msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Gebruik authenticatie"
+msgstr "RSSyl: Applicatie wordt beeindigd, kon feed niet verversen op '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Gebruik authenticatie"
+msgstr "HTTP Basale authenticatie"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -13439,6 +13712,8 @@ msgstr "_Trim"
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
+"Verversen feed, verwijderen van items die niet langer in de feedbron "
+"aanwezig zijn"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
@@ -13469,36 +13744,29 @@ msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Aanzetten om de huidige mapnaam te behouden, zelfs wanneer de feed-auteur de "
+"titel van de feed wijzigt."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
 msgid "Verify SSL certificate validity"
-msgstr "Verifieer SSL certificaat geldigheid"
+msgstr "Verifieer geldigheid van SSL-certificaat"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "<b>Source URL:</b>"
 msgstr "<b>Bron URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Gebruikersnaam:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Wachtwoord"
+msgstr "Gebruikersnaam"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
 "<b>Fetch comments on posts aged less than:</b>\n"
 "<small>(In days; set to -1 to fetch all comments)</small>"
 msgstr ""
-"<b>Haal reacties op van posts jonger dan:</b><small>(In dagen; zet op -1 om "
-"alles op te halen)</small>"
+"<b>Haal reacties op van berichten jonger dan:</b><small>(In dagen, zet op -1 "
+"om alles op te halen)</small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:491
 msgid ""
@@ -13519,7 +13787,7 @@ msgstr "_OK"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:617
 msgid "Set feed properties"
-msgstr "Stel feed eigenschappen in"
+msgstr "Stel feed-eigenschappen in"
 
 #: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "_Refresh feed"
@@ -13527,7 +13795,7 @@ msgstr "_Ververs feed"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Feed pr_operties"
-msgstr "Feed _eigenschappen"
+msgstr "Feed-_eigenschappen"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
@@ -13547,7 +13815,7 @@ msgstr "Maak nieuwe _map aan..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
-msgstr "Importeer feed lijst..."
+msgstr "Importeer feedlijst..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
 msgid "Remove tree"
@@ -13555,11 +13823,11 @@ msgstr "Verwijder boom"
 
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
-msgstr "Voeg RSS mappenboom toe"
+msgstr "Voeg RSS-mappenboom toe"
 
 #: src/plugins/rssyl/rssyl_gtk.c:127
 msgid "Enter name for a new RSS folder tree."
-msgstr "Voer naam in van nieuwe RSS mappenboom."
+msgstr "Voer naam in van nieuwe RSS-mappenboom."
 
 #: src/plugins/rssyl/rssyl_gtk.c:143
 msgid ""
@@ -13576,40 +13844,36 @@ msgid "My Feeds"
 msgstr "Mijn Feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Selecteer Pine-bestand"
+msgstr "Selecteer Cookies-bestand"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Gebruik standaard verversings interval"
+msgstr "Standaard verversingsinterval"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Ververs alle feeds bij het starten van het programma"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "Verifieer SSL certificaat geldigheid voor nieuwe feeds"
+msgstr "Verifieer geldigheid van SSL-certificaat voor nieuwe feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
-msgstr "Pad naar het cookies bestand"
+msgstr "Pad naar het cookies-bestand"
 
 #: src/plugins/rssyl/rssyl_prefs.c:184
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Pad naar Netscape-stijl cookies.txt bestand dat je cookies bevat"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
 msgstr "Verversen"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Beveiliging en privacy"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -13617,17 +13881,19 @@ msgstr "Abonneer op nieuwe feed?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
 msgid "<b>Feed folder:</b>"
-msgstr "<b>Feed map:</b>"
+msgstr "<b>Feedmap:</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
+"In plaats van het gebruiken van de offici?le titel, kun je een andere "
+"mapnaam gebruiken voor de feed."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "_Bewerk feed-eigenschappen na het abonneren"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
 #, c-format
@@ -13663,6 +13929,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Fout bij ophalen feed op\n"
+"<b>%s</b>:\n"
+"\n"
+"%s"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
@@ -13670,6 +13940,8 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"Geen geldige feed gevonden op\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
 #, c-format
@@ -13684,6 +13956,10 @@ msgid ""
 "\n"
 "Please contact developers, this should not happen."
 msgstr ""
+"Kon feed niet verwerken van\n"
+"<b>%s</b>\n"
+"\n"
+"Neem contact op met de ontwikkelaars, dit zou niet mogen gebeuren."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
 msgid "Claws Mail needs network access in order to update your feeds."
@@ -13694,6 +13970,8 @@ msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
+"Intern probleem tijdens bijwerken van opslagformaat. Dit zou niet mogen "
+"gebeuren. Maak een bugreport aan, met de debug-uitvoer bijgevoegd.\n"
 
 #: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
 #: src/plugins/smime/smime.c:911
@@ -13719,11 +13997,11 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Deze plugin verwerkt S/MIME ondertekende en/of versleutelde berichten. Je "
+"Deze plugin verwerkt S/MIME-ondertekende en/of versleutelde berichten. Je "
 "kunt berichten decoderen, ondertekeningen verifi?ren en zelf berichten "
 "ondertekenen en versleutelen.\n"
 "\n"
-"Je kunt het selecteren als het standaard privacy systeem in /Instellingen/"
+"Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
 "[Voorkeuren huidig account]/Privacy en wanneer je een bericht aan het "
 "opstellen bent in /Opties/Privacy-systeem\n"
 "\n"
@@ -13731,7 +14009,7 @@ msgstr ""
 "De plugin heeft ook gpgsm, gnupg-agent en dirmngr nodig, ge?nstalleerd en "
 "geconfigureerd.\n"
 "\n"
-"Informatie over hoe S/MIME certificaten werken met GPGSM kan gevonden worden "
+"Informatie over hoe S/MIME-certificaten werken met GPGSM kan gevonden worden "
 "op:\n"
 "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
 "\n"
@@ -13740,7 +14018,7 @@ msgstr ""
 #: src/plugins/smime/smime.c:423
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
-msgstr "Kon het GPG protocol niet instellen, %s"
+msgstr "Kon het GPG-protocol niet instellen, %s"
 
 #: src/plugins/smime/smime.c:451
 msgid "Couldn't open temporary file"
@@ -13759,8 +14037,8 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
-"Let op dat e-mail headers, zoals Onderwerp, niet versleuteld worden door het "
-"S/MIME systeem."
+"Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
+"S/MIME-systeem."
 
 #: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
@@ -13869,7 +14147,7 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 "Deze plugin controleert alle berichten die binnen komen via een IMAP, LOKAAL "
-"of POP account op spam met behulp van een SpamAssassin-server. Voor deze "
+"of POP-account op spam met behulp van een SpamAssassin-server. Voor deze "
 "plugin heb je toegang tot een SpamAssassin-server (spamd) nodig.\n"
 "\n"
 "De plugin kan ook gebruikt worden om berichten te markeren als Ham of Spam.\n"
@@ -13956,7 +14234,7 @@ msgstr "Het schrijven van de deel data is mislukt."
 
 #: src/plugins/tnef_parse/tnef_parse.c:174
 msgid "Failed to parse VCalendar data."
-msgstr "Het verwerken van de VCalendar data is mislukt."
+msgstr "Het verwerken van de VCalendar-data is mislukt."
 
 #: src/plugins/tnef_parse/tnef_parse.c:213
 msgid "Failed to parse VTask data."
@@ -14123,17 +14401,17 @@ msgid ""
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
-"Deze plugin maakt het mogelijk vCalendar berichten af te handelen, zoals "
+"Deze plugin maakt het mogelijk vCalendar-berichten af te handelen, zoals "
 "deze gemaakt worden door Evolution of Outlook.\n"
 "\n"
-"Wanneer geladen, zal het een vCalendar mailbox aanmaken in de Mappen Lijst, "
+"Wanneer geladen, zal het een vCalendar-mailbox aanmaken in de Mappenlijst, "
 "welke volgemaakt wordt met afspraken die je hebt geaccepteerd of gemaakt.\n"
-"Afspraak verzoeken die je ontvangt zullen gepresenteerd worden en je kunt ze "
+"Afspraakverzoeken die je ontvangt zullen gepresenteerd worden en je kunt ze "
 "accepteren of weigeren.\n"
-"Om een nieuwe afspraak aan te maken rechts-klik op de vCalendar of Afspraken "
-"map en kies \"Nieuwe afspraak...\".\n"
+"Om een nieuwe afspraak aan te maken rechts-klik op de vCalendar of "
+"Afsprakenmap en kies \"Nieuwe afspraak...\".\n"
 "\n"
-"Het is ook mogelijk je in te schrijven op webCal feeds, je afspraken en "
+"Het is ook mogelijk je in te schrijven op webCal-feeds, je afspraken en "
 "agenda te exporteren, je vrij/bezet informatie te publiceren, en die "
 "informatie op te halen van anderen."
 
@@ -14226,7 +14504,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcalendar.c:832
 msgid "Error - could not get the calendar MIME part."
-msgstr "Fout - kon niet het agenda MIME deel krijgen."
+msgstr "Fout - kon niet het agenda-MIME-deel verkrijgen."
 
 #: src/plugins/vcalendar/vcalendar.c:839
 msgid "Error - no calendar part found."
@@ -14234,7 +14512,7 @@ msgstr "Fout - geen agenda deel gevonden."
 
 #: src/plugins/vcalendar/vcalendar.c:853
 msgid "Error - Unknown calendar component type."
-msgstr "Fout - Onbekend agenda component type."
+msgstr "Fout - Onbekend agenda component-type."
 
 #: src/plugins/vcalendar/vcalendar.c:982
 msgid "Send a notification to the attendees"
@@ -14343,7 +14621,7 @@ msgstr "_Hernoem..."
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
-msgstr "_Ververs inschrijvingen"
+msgstr "_Ververs abonnementen"
 
 #: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
@@ -14393,7 +14671,7 @@ msgstr ""
 #: src/plugins/vcalendar/vcal_folder.c:1589
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
-msgstr "Timeout (%d secondes) verbinden met %s\n"
+msgstr "Tijdslimiet (%d secondes) voor verbinden met %s\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1607
 #, c-format
@@ -14408,7 +14686,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Kon de Webcal URL niet ophalen:\n"
+"Kon de Webcal-URL niet ophalen:\n"
 "%s:\n"
 "\n"
 "%s"
@@ -14421,7 +14699,7 @@ msgid ""
 "\n"
 "%s\n"
 msgstr ""
-"Kon de Webcal URL niet ophalen:\n"
+"Kon de Webcal-URL niet ophalen:\n"
 "%s:\n"
 "\n"
 "%s\n"
@@ -14433,7 +14711,7 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Deze URL lijkt niet op een WebCal URL:\n"
+"Deze URL lijkt niet op een WebCal-URL:\n"
 "%s\n"
 "%s"
 
@@ -14444,7 +14722,7 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
-"Deze URL lijkt niet op een WebCal URL:\n"
+"Deze URL lijkt niet op een WebCal-URL:\n"
 "%s\n"
 "%s\n"
 
@@ -14456,7 +14734,7 @@ msgstr "Kon de doelmap %s niet aanmaken"
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
-msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal feed te verversen."
+msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal-feed te verversen."
 
 #: src/plugins/vcalendar/vcal_folder.c:1903
 #, c-format
@@ -14477,7 +14755,7 @@ msgstr "Abonneren op WebCal"
 
 #: src/plugins/vcalendar/vcal_folder.c:1927
 msgid "Enter the WebCal URL:"
-msgstr "Voer de WebCal URL in:"
+msgstr "Voer de WebCal-URL in:"
 
 #: src/plugins/vcalendar/vcal_folder.c:1939
 msgid "Could not parse the URL."
@@ -14761,7 +15039,7 @@ msgstr "<b>Begint om:</b>"
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
 msgid "<b> on:</b>"
-msgstr "<b> om:</b>"
+msgstr "<b> op:</b>"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "<b>Ends at:</b> "
@@ -14883,15 +15161,9 @@ msgstr "Je kunt naar een lokaal bestand of URL exporteren"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Geef een lokaal bestand of URL op (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Gebruikersnaam"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
-msgstr "Voeg webcal inschrijvingen bij het exporteren in"
+msgstr "Voeg webcal-inschrijvingen bij het exporteren in"
 
 #: src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Command to run after calendar export"
@@ -14933,19 +15205,19 @@ msgid ""
 "left part of the email address, %d for the domain"
 msgstr ""
 "Geef een lokaal bestand of URL (http://server/path/file.ifb) op. Gebruik %u "
-"voor het linker deel van het e-mail adres, %d voor het domein"
+"voor het linkerdeel van het e-mailadres, %d voor het domein"
 
 #: src/plugins/vcalendar/vcal_prefs.c:506
 msgid "SSL options"
-msgstr "SSL opties"
+msgstr "SSL-opties"
 
 #: src/pop.c:152
 msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Er is geen APOP timestamp gevonden in de begroeting\n"
+msgstr "Er is geen APOP-timestamp gevonden in de begroeting\n"
 
 #: src/pop.c:159
 msgid "Timestamp syntax error in greeting\n"
-msgstr "APOP timestamp in de begroeting is ongeldig\n"
+msgstr "APOP-timestamp in de begroeting is ongeldig\n"
 
 #: src/pop.c:166
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
@@ -14953,7 +15225,7 @@ msgstr "Timestamp syntax in de begroeting (geen ASCII) is ongeldig\n"
 
 #: src/pop.c:190 src/pop.c:217
 msgid "POP3 protocol error\n"
-msgstr "POP3 protocolfout\n"
+msgstr "POP3-protocolfout\n"
 
 #: src/pop.c:263
 #, c-format
@@ -15029,11 +15301,7 @@ msgstr "Volledige naam"
 
 #: src/prefs_account.c:1066
 msgid "Mail address"
-msgstr "E-mail adres"
-
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Serverinformatie"
+msgstr "E-mailadres"
 
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
@@ -15049,7 +15317,7 @@ msgid ""
 "has been built without IMAP and News support.</span>"
 msgstr ""
 "<span weight=\"bold\">Waarschuwing: deze versie van Claws Mail\n"
-"is gebouwd zonder ondersteuning voor IMAP en Nieuws.</span>"
+"is gecompileerd zonder ondersteuning voor IMAP en Nieuws.</span>"
 
 #: src/prefs_account.c:1176
 msgid "This server requires authentication"
@@ -15073,11 +15341,11 @@ msgstr "Lokaal postvak"
 
 #: src/prefs_account.c:1256
 msgid "SMTP server (send)"
-msgstr "SMTP server (zenden)"
+msgstr "SMTP-server (zenden)"
 
 #: src/prefs_account.c:1264
 msgid "Use mail command rather than SMTP server"
-msgstr "Gebruik mail opdracht ipv SMTP"
+msgstr "Gebruik mail opdracht ipv. SMTP"
 
 #: src/prefs_account.c:1273
 msgid "command to send mails"
@@ -15142,14 +15410,6 @@ msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Authenticatie-methode"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatisch"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
@@ -15195,11 +15455,11 @@ msgstr "Bericht-ID aanmaken"
 
 #: src/prefs_account.c:1723
 msgid "Send account mail address in Message-ID"
-msgstr "Stuur account e-mail adres in Bericht-Id"
+msgstr "Stuur account-e-mailadres in Bericht-ID"
 
 #: src/prefs_account.c:1726
 msgid "Add user agent header"
-msgstr "Voeg een door de gebruiker gespecificeerde header toe"
+msgstr "Voeg een header van de gebruikers-agent toe"
 
 #: src/prefs_account.c:1733
 msgid "Add user-defined header"
@@ -15295,7 +15555,7 @@ msgstr "Berichten altijd versleutelen"
 #: src/prefs_account.c:2274
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
-"Berichten altijd versleutelen bij het reageren op een versleuteld bericht"
+"Berichten altijd versleutelen bij het reageren op een ondertekend bericht"
 
 #: src/prefs_account.c:2277
 msgid "Always encrypt messages when replying to an encrypted message"
@@ -15322,7 +15582,7 @@ msgstr "Gebruik SSL voor POP3-verbinding"
 
 #: src/prefs_account.c:2444 src/prefs_account.c:2459 src/prefs_account.c:2490
 msgid "Use STARTTLS command to start SSL session"
-msgstr "Gebruik STARTTLS voor starten SSL sessie"
+msgstr "Gebruik STARTTLS voor starten SSL-sessie"
 
 #: src/prefs_account.c:2456
 msgid "Use SSL for IMAP4 connection"
@@ -15346,7 +15606,7 @@ msgstr "Gebruik SSL voor SMTP-verbinding"
 
 #: src/prefs_account.c:2495
 msgid "Client certificates"
-msgstr "Client certificaten"
+msgstr "Client-certificaten"
 
 #: src/prefs_account.c:2503
 msgid "Certificate for receiving"
@@ -15355,7 +15615,7 @@ msgstr "Certificaat om te ontvangen"
 #: src/prefs_account.c:2508 src/prefs_account.c:2510 src/prefs_account.c:2530
 #: src/prefs_account.c:2532
 msgid "Client certificate file as a PKCS12 or PEM file"
-msgstr "Client certificaat-bestand als een PKCS12 of PEM bestand"
+msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
 #: src/prefs_account.c:2525
 msgid "Certificate for sending"
@@ -15363,7 +15623,7 @@ msgstr "Certificaat om te verzenden"
 
 #: src/prefs_account.c:2558
 msgid "Automatically accept unknown valid SSL certificates"
-msgstr "Onbekende maar geldige SSL certificaten automatisch accepteren"
+msgstr "Onbekende maar geldige SSL-certificaten automatisch accepteren"
 
 #: src/prefs_account.c:2561
 msgid "Use non-blocking SSL"
@@ -15399,7 +15659,7 @@ msgid ""
 "connecting to SMTP servers."
 msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
-"wordt verbonden met SMTP servers."
+"wordt verbonden met SMTP-servers."
 
 #: src/prefs_account.c:2735
 msgid "Use command to communicate with server"
@@ -15419,7 +15679,7 @@ msgstr ""
 
 #: src/prefs_account.c:2749
 msgid "Mark cross-posted messages as read and color:"
-msgstr "Markeer dubbel geposte berichten als gelezen en kleur:"
+msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
 #: src/prefs_account.c:2805
 msgid "Put sent messages in"
@@ -15447,15 +15707,15 @@ msgstr "Je hebt geen e-mailadres opgegeven."
 
 #: src/prefs_account.c:2882
 msgid "SMTP server is not entered."
-msgstr "Je hebt geen SMTP server opgegeven."
+msgstr "Je hebt geen SMTP-server opgegeven."
 
 #: src/prefs_account.c:2887
 msgid "User ID is not entered."
-msgstr "Je hebt geen gebruikersnaam opgegeven."
+msgstr "Je hebt geen gebruikers-ID opgegeven."
 
 #: src/prefs_account.c:2892
 msgid "POP3 server is not entered."
-msgstr "Je hebt geen POP3 server opgegeven."
+msgstr "Je hebt geen POP3-server opgegeven."
 
 #: src/prefs_account.c:2912
 msgid "The default Inbox folder doesn't exist."
@@ -15463,11 +15723,11 @@ msgstr "De standaard Inbox-map bestaat niet."
 
 #: src/prefs_account.c:2918
 msgid "IMAP4 server is not entered."
-msgstr "Je hebt geen IMAP4 server opgegeven."
+msgstr "Je hebt geen IMAP4-server opgegeven."
 
 #: src/prefs_account.c:2923
 msgid "NNTP server is not entered."
-msgstr "Je hebt geen NNTP server opgegeven."
+msgstr "Je hebt geen NNTP-server opgegeven."
 
 #: src/prefs_account.c:2929
 msgid "local mailbox filename is not entered."
@@ -15475,7 +15735,7 @@ msgstr "Je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
 #: src/prefs_account.c:2935
 msgid "mail command is not entered."
-msgstr "Je hebt geen mail opdrachtregel opgegeven."
+msgstr "Je hebt geen mail-opdrachtregel opgegeven."
 
 #: src/prefs_account.c:3252
 msgid "Receive"
@@ -15512,7 +15772,7 @@ msgstr "Selecteer bestand met handtekening"
 
 #: src/prefs_account.c:3951 src/prefs_account.c:3968 src/wizard.c:1057
 msgid "Select certificate file"
-msgstr "Selecteer certificaat bestand"
+msgstr "Selecteer certificaat-bestand"
 
 #: src/prefs_account.c:4064
 msgid "Protocol:"
@@ -15621,7 +15881,7 @@ msgid ""
 msgstr ""
 "De opdracht\n"
 "%s\n"
-"bevat een syntaxis fout."
+"bevat een syntaxfout."
 
 #: src/prefs_actions.c:713
 msgid "Delete action"
@@ -15881,7 +16141,7 @@ msgstr "Bewaar de originele 'Van:' header bij herverwijzen"
 
 #: src/prefs_compose_writing.c:233
 msgid "When dropping files into the Compose window"
-msgstr "Bij het laten vallen van bestanden in het opstelscherm"
+msgstr "Bij het laten vallen van bestanden in het opstelvenster"
 
 #: src/prefs_compose_writing.c:242
 msgid "Ask"
@@ -15934,7 +16194,7 @@ msgstr "De gekozen afbeelding heeft niet de goede afmetingen (48x48)"
 
 #: src/prefs_customheader.c:591
 msgid "The image is too big; it must be maximum 725 bytes."
-msgstr "De afbeelding is t groot; it mag maximaal 725 bytes zijn."
+msgstr "De afbeelding is te groot, het mag maximaal 725 bytes zijn."
 
 #: src/prefs_customheader.c:596
 msgid "The image isn't in the correct format (PNG)."
@@ -16278,7 +16538,7 @@ msgstr "Pagina naar _boven"
 
 #: src/prefs_filtering.c:543
 msgid "Move the selected rule one page up"
-msgstr "Verplaats de geselecteerde regel een pagina naar boven"
+msgstr "Verplaats de geselecteerde regel ??n pagina naar boven"
 
 #: src/prefs_filtering.c:552
 msgid "Move the selected rule up"
@@ -16294,7 +16554,7 @@ msgstr "Pagina naar b_eneden"
 
 #: src/prefs_filtering.c:571
 msgid "Move the selected rule one page down"
-msgstr "Verplaats de geselecteerde regel een pagina naar beneden"
+msgstr "Verplaats de geselecteerde regel ??n pagina naar beneden"
 
 #: src/prefs_filtering.c:580
 msgid "Move the selected rule to the bottom"
@@ -16358,7 +16618,7 @@ msgid ""
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 "Selecteer weer te geven items in mappenlijst. Verander de\n"
-"volgorde met de Omhoog / Omlaag knoppen, of door de items te slepen."
+"volgorde met de Omhoog / Omlaag knoppen, of door de items te verslepen."
 
 #: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
 msgid "Hidden columns"
@@ -16453,7 +16713,7 @@ msgstr ""
 
 #: src/prefs_folder_item.c:502
 msgid "Select the HTML part of multipart messages"
-msgstr "Selecteer het HTML gedeelte van meerdelige berichten"
+msgstr "Selecteer het HTML-gedeelte van meerdelige berichten"
 
 #: src/prefs_folder_item.c:519
 msgid ""
@@ -16593,7 +16853,7 @@ msgstr "Afbeeldingweergever"
 
 #: src/prefs_logging.c:147 src/prefs_logging.c:254
 msgid "Restrict the log window to"
-msgstr "Beperk het log-venster tot"
+msgstr "Beperk het logvenster tot"
 
 #: src/prefs_logging.c:159 src/prefs_logging.c:266
 msgid "0 to stop logging in the log window"
@@ -16619,7 +16879,7 @@ msgid ""
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
 "Dit zet loggen van de filter- en verwerkingsregels aan.\n"
-"Toegang tot het log vind je via 'Gereedschap/Filter log'\n"
+"Toegang tot het log vind je via 'Gereedschap/Filterlog'\n"
 "Let op: deze optie aanzetten zal tot vertraging leiden bij het filter/"
 "verwerkingsproces, dit kan belangrijk zijn bij het toepassen van veel regels "
 "op duizenden berichten."
@@ -16634,7 +16894,7 @@ msgstr "filteren bij ontvangst"
 
 #: src/prefs_logging.c:193
 msgid "pre-processing folders"
-msgstr "voor-verwerken van mappen"
+msgstr "voor-verwerken mappen"
 
 #: src/prefs_logging.c:198
 msgid "manually filtering"
@@ -16650,7 +16910,7 @@ msgstr "verwerken mappen"
 
 #: src/prefs_logging.c:222
 msgid "Log level"
-msgstr "Log niveau"
+msgstr "Logniveau"
 
 #: src/prefs_logging.c:231
 msgid "Low"
@@ -16686,7 +16946,7 @@ msgstr ""
 
 #: src/prefs_logging.c:280
 msgid "Disk log"
-msgstr "Schijf log"
+msgstr "Schijflog"
 
 #: src/prefs_logging.c:282
 msgid "Write the following information to disk..."
@@ -16698,7 +16958,7 @@ msgstr "Waarschuwingsberichten"
 
 #: src/prefs_logging.c:291
 msgid "Network protocol messages"
-msgstr "Netwerk protocol berichten"
+msgstr "Netwerkprotocol berichten"
 
 #: src/prefs_logging.c:295
 msgid "Error messages"
@@ -16774,7 +17034,7 @@ msgstr "header-deel"
 
 #: src/prefs_matcher.c:384
 msgid "headers values"
-msgstr "headers waardes"
+msgstr "header-waardes"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -16786,7 +17046,7 @@ msgstr "hele bericht"
 
 #: src/prefs_matcher.c:392 src/summaryview.c:6308
 msgid "Marked"
-msgstr "Markeer"
+msgstr "Gemarkeerd"
 
 #: src/prefs_matcher.c:393 src/summaryview.c:6306
 msgid "Deleted"
@@ -16907,7 +17167,7 @@ msgstr "Gedeeltelijk opgehaald"
 
 #: src/prefs_matcher.c:634
 msgid "External program test"
-msgstr "Externe programma test"
+msgstr "Externe programma-test"
 
 #: src/prefs_matcher.c:710 src/prefs_matcher.c:1616 src/prefs_matcher.c:1631
 #: src/prefs_matcher.c:2521
@@ -16925,7 +17185,7 @@ msgstr "Bericht moet overeenkomen met"
 
 #: src/prefs_matcher.c:825
 msgid "at least one"
-msgstr "minstens een"
+msgstr "minstens ??n"
 
 #: src/prefs_matcher.c:826
 msgid "all"
@@ -16975,7 +17235,7 @@ msgstr "Header-deel"
 
 #: src/prefs_matcher.c:1846
 msgid "Headers values"
-msgstr "Headers waardes"
+msgstr "Header-waardes"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -17104,11 +17364,11 @@ msgstr "Geef HTML-berichten weer als tekst"
 
 #: src/prefs_message.c:162
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "Geef indien mogelijk HTML-berichten weer met de plugin."
+msgstr "Geef indien mogelijk HTML-berichten weer met de plugin"
 
 #: src/prefs_message.c:165
 msgid "Select the HTML part of multipart/alternative messages"
-msgstr "Selecteer het HTML gedeelte van meerdelige/alternatieve berichten"
+msgstr "Selecteer het HTML-gedeelte van meerdelige/alternatieve berichten"
 
 #: src/prefs_message.c:175
 msgid "Line space"
@@ -17144,7 +17404,7 @@ msgstr "Vouw citaat in bij dubbelklik"
 
 #: src/prefs_message.c:249
 msgid "Treat these characters as quotation marks: "
-msgstr "Behandel deze tekens als citaatmarkers: "
+msgstr "Behandel deze tekens als citaatmarkering: "
 
 #: src/prefs_message.c:355
 msgid "Text Options"
@@ -17160,7 +17420,7 @@ msgstr "Kleurmarkering in berichten aanzetten"
 
 #: src/prefs_msg_colors.c:162
 msgid "Quote"
-msgstr "Citatie"
+msgstr "Citaat"
 
 #: src/prefs_msg_colors.c:174
 msgid "Cycle quote colors"
@@ -17352,7 +17612,7 @@ msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
-"Je kunt ook altijd sneltoetsen van menu items veranderen door\n"
+"Je kunt ook altijd sneltoetsen van menu-items veranderen door\n"
 "met de muis op dat item te gaan staan, en dan de gewenste toets in te "
 "drukken."
 
@@ -17374,7 +17634,7 @@ msgstr "Prullenbak legen bij het afsluiten"
 
 #: src/prefs_other.c:495
 msgid "Warn if there are queued messages"
-msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
+msgstr "Waarschuwen wanneer er berichten in de wachtrij staan"
 
 #: src/prefs_other.c:497
 msgid "Keyboard shortcuts"
@@ -17408,8 +17668,8 @@ msgid ""
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 "Veiliger modus vraagt het OS om metadata gelijk naar de harde schijf te "
-"sturen;\n"
-" het vermijdt informatieverlies na vastlopen maar kan wat langer duren."
+"schrijven,\n"
+"het vermijdt informatieverlies na vastlopen maar kan wat langer duren."
 
 #: src/prefs_other.c:525
 msgid "Safer"
@@ -17421,7 +17681,7 @@ msgstr "Sneller"
 
 #: src/prefs_other.c:545
 msgid "Socket I/O timeout"
-msgstr "Socket I/O tijdslimiet"
+msgstr "Socket-I/O tijdslimiet"
 
 #: src/prefs_other.c:567
 msgid "Ask before emptying trash"
@@ -17429,7 +17689,7 @@ msgstr "Bevestigen bij het legen"
 
 #: src/prefs_other.c:569
 msgid "Ask about account specific filtering rules when filtering manually"
-msgstr "Bij handmatig filteren, vraag naar account specifieke filterregels"
+msgstr "Bij handmatig filteren, vraag naar accountspecifieke filterregels"
 
 #: src/prefs_other.c:574
 msgid "Use secure file deletion if possible"
@@ -17448,9 +17708,9 @@ msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
 msgstr ""
-"Gebruik het 'shred' programma om bestanden met willekeurige data voor ze te "
-"verwijderen. Dit vertraagt het verwijderen. Het advies is om de handleiding "
-"(man shred) na te lezen voor de zekerheid."
+"Gebruik het programma 'shred' om bestanden met willekeurige data te "
+"overschrijven voor het verwijderen. Dit vertraagt het verwijderen. Het "
+"advies is om de handleiding (man shred) na te lezen voor de zekerheid."
 
 #: src/prefs_other.c:587
 msgid "Synchronise offline folders as soon as possible"
@@ -17503,7 +17763,7 @@ msgstr "Na het ophalen onvangstvenster sluiten"
 
 #: src/prefs_receive.c:196
 msgid "Don't popup error dialog on receive error"
-msgstr "Geen pop-up waarschuwingscherm bij ontvangstfouten"
+msgstr "Geen popup-waarschuwingsvenster bij ontvangstfouten"
 
 #: src/prefs_receive.c:199
 msgid "After receiving new mail"
@@ -17552,7 +17812,7 @@ msgstr "Bewaar verzonden berichten in Verzonden"
 
 #: src/prefs_send.c:164
 msgid "Confirm before sending queued messages"
-msgstr "Bevestig voor verzenden van berichten uit de wachtrij."
+msgstr "Bevestig voor verzenden van berichten uit de wachtrij"
 
 #: src/prefs_send.c:167
 msgid "Never send Return Receipts"
@@ -17592,15 +17852,15 @@ msgstr "Unicode (UTF-8)"
 
 #: src/prefs_send.c:225
 msgid "Western European (ISO-8859-1)"
-msgstr "Westeuropees (ISO-8859-1)"
+msgstr "West-Europees (ISO-8859-1)"
 
 #: src/prefs_send.c:226
 msgid "Western European (ISO-8859-15)"
-msgstr "Westeuropees (ISO-8859-15)"
+msgstr "West-Europees (ISO-8859-15)"
 
 #: src/prefs_send.c:228
 msgid "Central European (ISO-8859-2)"
-msgstr "Centraaleuropees (ISO-8859-2)"
+msgstr "Centraal-Europees (ISO-8859-2)"
 
 #: src/prefs_send.c:230
 msgid "Baltic (ISO-8859-13)"
@@ -17643,9 +17903,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cyrillisch (KOI8-R)"
+msgstr "Cyrillisch (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -17742,7 +18001,7 @@ msgstr "Automatisch controleren"
 
 #: src/prefs_spelling.c:149
 msgid "Re-check message when changing dictionary"
-msgstr "Controleer berichten opnieuw na veranderen van woordenboek."
+msgstr "Controleer berichten opnieuw na veranderen van woordenboek"
 
 #: src/prefs_spelling.c:153
 msgid "Dictionary"
@@ -17775,47 +18034,47 @@ msgstr "afkorting naam van de dag"
 
 #: src/prefs_summaries.c:153
 msgid "the full weekday name"
-msgstr "Volledige naam van dag"
+msgstr "volledige naam van dag"
 
 #: src/prefs_summaries.c:154
 msgid "the abbreviated month name"
-msgstr "Afkorting naam van de dag"
+msgstr "afkorting naam van de dag"
 
 #: src/prefs_summaries.c:155
 msgid "the full month name"
-msgstr "Volledige naam van maand"
+msgstr "volledige naam van maand"
 
 #: src/prefs_summaries.c:156
 msgid "the preferred date and time for the current locale"
-msgstr "Voorkeursdatum en -tijd voor huidige locale"
+msgstr "voorkeursdatum en -tijd voor huidige locale"
 
 #: src/prefs_summaries.c:157
 msgid "the century number (year/100)"
-msgstr "Eeuw (jaar/100)"
+msgstr "eeuw (jaar/100)"
 
 #: src/prefs_summaries.c:158
 msgid "the day of the month as a decimal number"
-msgstr "Dag van de maand"
+msgstr "dag van de maand"
 
 #: src/prefs_summaries.c:159
 msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "Uur (24-uurs klok)"
+msgstr "uur (24-uurs klok)"
 
 #: src/prefs_summaries.c:160
 msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "Uur (12-uurs klok)"
+msgstr "uur (12-uurs klok)"
 
 #: src/prefs_summaries.c:161
 msgid "the day of the year as a decimal number"
-msgstr "Dagnummer van het jaar (1-366)"
+msgstr "dagnummer van het jaar (1-366)"
 
 #: src/prefs_summaries.c:162
 msgid "the month as a decimal number"
-msgstr "Maandnummer (1-12)"
+msgstr "maandnummer (1-12)"
 
 #: src/prefs_summaries.c:163
 msgid "the minute as a decimal number"
-msgstr "Minuut"
+msgstr "minuut"
 
 #: src/prefs_summaries.c:164
 msgid "either AM or PM"
@@ -17823,27 +18082,27 @@ msgstr "AM / PM"
 
 #: src/prefs_summaries.c:165
 msgid "the second as a decimal number"
-msgstr "Seconde"
+msgstr "seconde"
 
 #: src/prefs_summaries.c:166
 msgid "the day of the week as a decimal number"
-msgstr "Dagnummer van de week (0-6, 0=zondag)"
+msgstr "dagnummer van de week (0-6, 0=zondag)"
 
 #: src/prefs_summaries.c:167
 msgid "the preferred date for the current locale"
-msgstr "Voorkeursdatum voor huidige locale"
+msgstr "voorkeursdatum voor huidige locale"
 
 #: src/prefs_summaries.c:168
 msgid "the last two digits of a year"
-msgstr "Laatste twee decimalen van een jaar"
+msgstr "laatste twee decimalen van een jaar"
 
 #: src/prefs_summaries.c:169
 msgid "the year as a decimal number"
-msgstr "Laatste decimaal van een jaar"
+msgstr "laatste decimaal van een jaar"
 
 #: src/prefs_summaries.c:170
 msgid "the time zone or name or abbreviation"
-msgstr "Tijdzone of naam of afkorting"
+msgstr "tijdzone of naam of afkorting"
 
 #: src/prefs_summaries.c:191 src/prefs_summaries.c:239
 #: src/prefs_summaries.c:519
@@ -17913,7 +18172,7 @@ msgstr "Wanneer berichtvenster zichtbaar is"
 #: src/prefs_summaries.c:470
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
-"Maak discussie-draden aan de hand van het onderwerp boven op het gebruik van "
+"Maak discussie-draden aan de hand van het onderwerp bovenop het gebruik van "
 "de standaard headers"
 
 #: src/prefs_summaries.c:474
@@ -17946,7 +18205,7 @@ msgstr "Toon afzender mbv. adresboek"
 
 #: src/prefs_summaries.c:513
 msgid "Show tooltips"
-msgstr "Geef werktips weer"
+msgstr "Geef tooltips weer"
 
 #: src/prefs_summaries.c:539
 msgid "Date format help"
@@ -17955,7 +18214,7 @@ msgstr "Help bij datumformaat"
 #: src/prefs_summaries.c:557
 msgid "Confirm before marking all messages in a folder as read"
 msgstr ""
-"Vraag om bevestiging voor alle berichten in een map als gelezen te markeren"
+"Vraag om bevestiging om alle berichten in een map als gelezen te markeren"
 
 #: src/prefs_summaries.c:560
 msgid "Translate header names"
@@ -17987,7 +18246,7 @@ msgid ""
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 "Selecteer weer te geven kolommen in berichtenlijst. Verander de\n"
-"volgorde met de Omhoog / Omlaag knoppen, of door kolommen te slepen."
+"volgorde met de Omhoog / Omlaag knoppen, of door kolommen te verslepen."
 
 #: src/prefs_summary_open.c:109
 msgid "first marked email"
@@ -18034,21 +18293,21 @@ msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
-"Overschrijf de Van header bij het opstellen. Dit veranderd niets aan het "
+"Overschrijf de Van-header bij het opstellen. Dit verandert niets aan het "
 "account bij het opstellen."
 
 #: src/prefs_template.c:309
 msgid "Append the new template above to the list"
-msgstr "Voeg de nieuwe sjabloon boven aan de lijst toe"
+msgstr "Voeg het nieuwe sjabloon boven aan de lijst toe"
 
 #: src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr ""
-"Vervang de geselecteerde sjabloon in de lijst met bovenstaande sjabloon"
+"Vervang het geselecteerde sjabloon in de lijst met bovenstaande sjabloon"
 
 #: src/prefs_template.c:328
 msgid "Delete the selected template from the list"
-msgstr "Verwijder de geselecteerde sjabloon van de lijst"
+msgstr "Verwijder het geselecteerde sjabloon van de lijst"
 
 #: src/prefs_template.c:346
 msgid "Show information on configuring templates"
@@ -18056,19 +18315,19 @@ msgstr "Geef informatie weer over het configureren van sjablonen"
 
 #: src/prefs_template.c:370
 msgid "Move the selected template to the top"
-msgstr "Verplaats de geselecteerde sjabloon naar bovenaan"
+msgstr "Verplaats het geselecteerde sjabloon naar bovenaan"
 
 #: src/prefs_template.c:380
 msgid "Move the selected template up"
-msgstr "Verplaats de geselecteerde sjabloon naar boven"
+msgstr "Verplaats het geselecteerde sjabloon naar boven"
 
 #: src/prefs_template.c:388
 msgid "Move the selected template down"
-msgstr "Verplaats de geselecteerde sjabloon naar onderen"
+msgstr "Verplaats het geselecteerde sjabloon naar onderen"
 
 #: src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
-msgstr "Verplaats de geselecteerde sjabloon naar onderaan"
+msgstr "Verplaats het geselecteerde sjabloon naar onderaan"
 
 #: src/prefs_template.c:414
 msgid "Template configuration"
@@ -18088,29 +18347,29 @@ msgstr "De sjabloonnaam is niet ingevoerd."
 
 #: src/prefs_template.c:811
 msgid "The \"From\" field of the template contains an invalid email address."
-msgstr "Het \"Van\" veld van de sjabloon bevat een ongeldig e-mail adres."
+msgstr "Het \"Van\" veld van het sjabloon bevat een ongeldig e-mailadres."
 
 #: src/prefs_template.c:817
 msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "Het \"Aan\" veld van de sjabloon bevat een ongeldig e-mail adres."
+msgstr "Het \"Aan\" veld van het sjabloon bevat een ongeldig e-mailadres."
 
 #: src/prefs_template.c:823
 msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "Het \"Cc\" veld van de sjabloon bevat een ongeldig e-mail adres."
+msgstr "Het \"Cc\" veld van het sjabloon bevat een ongeldig e-mailadres."
 
 #: src/prefs_template.c:829
 msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "Het \"Bcc\" veld van de sjabloon bevat een ongeldig e-mail adres."
+msgstr "Het \"Bcc\" veld van het sjabloon bevat een ongeldig e-mailadres."
 
 #: src/prefs_template.c:835
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
-"Het \"Antwoord-Aan\" veld van de sjabloon bevat een ongeldig e-mail adres."
+"Het \"Antwoord-Aan\" veld van het sjabloon bevat een ongeldig e-mailadres."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
-msgstr "Het \"Onderwerp\" veld van de sjabloon is ongeldig."
+msgstr "Het \"Onderwerp\" veld van het sjabloon is ongeldig."
 
 #: src/prefs_template.c:912
 msgid "Delete template"
@@ -18118,7 +18377,7 @@ msgstr "Verwijder sjabloon"
 
 #: src/prefs_template.c:913
 msgid "Do you really want to delete this template?"
-msgstr "Wil je deze sjabloon werkelijk verwijderen?"
+msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
 #: src/prefs_template.c:925
 msgid "Delete all templates"
@@ -18504,7 +18763,7 @@ msgstr "stel datumweergave in (zie 'man strftime')"
 
 #: src/quote_fmt.c:51
 msgid "email address of sender"
-msgstr "e-mail adres van afzender"
+msgstr "e-mailadres van afzender"
 
 #: src/quote_fmt.c:52
 msgid "full name of sender"
@@ -18540,7 +18799,7 @@ msgstr "inhoud van bericht als citaat, zonder handtekening"
 
 #: src/quote_fmt.c:66
 msgid "message tags"
-msgstr "bericht tags"
+msgstr "bericht-tags"
 
 #: src/quote_fmt.c:67
 msgid "current dictionary"
@@ -18556,7 +18815,7 @@ msgstr "account-eigenschap: je naam"
 
 #: src/quote_fmt.c:70
 msgid "account property: your email address"
-msgstr "account-eigenschap: je e-mail adres"
+msgstr "account-eigenschap: je e-mailadres"
 
 #: src/quote_fmt.c:71
 msgid "account property: account name"
@@ -18629,7 +18888,7 @@ msgid ""
 "symbols (or their long equivalent)"
 msgstr ""
 "invoegen van <span style=\"oblique\">expr</span> als x is aangezet, waar\n"
-"x is een van de [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"x is ??n van de [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "speciale tekens (of hun lange equivalent)"
 
 #: src/quote_fmt.c:91
@@ -18641,7 +18900,7 @@ msgid ""
 msgstr ""
 "invoegen van <span style=\"oblique\">expr</span> als x is niet aangezet, "
 "waar\n"
-"x is een van of de [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
+"x is ??n van of de [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "speciale tekens (of hun lange equivalent)"
 
 #: src/quote_fmt.c:92
@@ -18661,9 +18920,10 @@ msgid ""
 "get\n"
 "the output from"
 msgstr ""
-"voeg programma output in:\n"
-"<span style=\"oblique\">sub_expr</span> wordt geevalueerd tot een "
-"opdrachtregel waarvan de output wordt gebruikt"
+"voeg programma-uitvoer in:\n"
+"<span style=\"oblique\">sub_expr</span> wordt ge?valueerd tot een "
+"opdrachtregel waarvan\n"
+"de uitvoer wordt gebruikt"
 
 #: src/quote_fmt.c:94
 msgid ""
@@ -18714,7 +18974,7 @@ msgid ""
 "one contact in the address book"
 msgstr ""
 "aanvullen vanuit het adresboek werkt alleen met het eerste\n"
-"adres van de header, het geeft de volledige naame weer van\n"
+"adres van de header, het geeft de volledige naam weer van\n"
 "het contact wanneer dat adres precies overeenkomt met\n"
 "een enkel contact in het adresboek"
 
@@ -18735,7 +18995,7 @@ msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
 msgstr ""
-"Overschrijf de Van header. Dit verandert niets aan het account dat gebruikt "
+"Overschrijf de Van-header. Dit verandert niets aan het account dat gebruikt "
 "wordt om het nieuwe bericht te schrijven."
 
 #: src/quote_fmt.c:299
@@ -18744,7 +19004,7 @@ msgstr "Gebruik sjabloon bij het beantwoorden van berichten"
 
 #: src/quote_fmt.c:323
 msgid "Override From header. This doesn't change the account used to reply."
-msgstr "Overschrijf Van header. Dit verandert het gebruikte account niet."
+msgstr "Overschrijf Van-header. Dit verandert het gebruikte account niet."
 
 #: src/quote_fmt.c:334 src/quote_fmt.c:464
 msgid "Quotation mark"
@@ -18756,7 +19016,7 @@ msgstr "Gebruik sjabloon bij het doorsturen van berichten"
 
 #: src/quote_fmt.c:453
 msgid "Override From header. This doesn't change the account used to forward."
-msgstr "Overschrijf Van header. Dit verandert het gebruikte account niet."
+msgstr "Overschrijf Van-header. Dit verandert het gebruikte account niet."
 
 #: src/quote_fmt.c:545
 msgid "Defaults"
@@ -18767,22 +19027,22 @@ msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
-"Het \"Van\" veld van de \"Nieuw bericht\" sjabloon bevat een ongeldig e-mail "
-"adres"
+"Het \"Van\" veld van het \"Nieuw bericht\" sjabloon bevat een ongeldig e-"
+"mailadres."
 
 #: src/quote_fmt.c:566
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
-msgstr "Het \"Onderwerp\" veld van de \"Nieuw bericht\" sjabloon is ongeldig."
+msgstr "Het \"Onderwerp\" veld van het \"Nieuw bericht\" sjabloon is ongeldig."
 
 #: src/quote_fmt.c:583
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr ""
-"Het \"Citeer markering\" veld van de \"Beantwoorden\" sjabloon is ongeldig."
+"Het \"Citeer markering\" veld van het \"Beantwoorden\" sjabloon is ongeldig."
 
 #: src/quote_fmt.c:603
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr ""
-"Het \"Citeer markering\" veld van de \"Doorsturen\" sjabloon is ongeldig."
+"Het \"Citeer markering\" veld van het \"Doorsturen\" sjabloon is ongeldig."
 
 #: src/quote_fmt_parse.y:509
 #, c-format
@@ -18823,7 +19083,7 @@ msgstr "POP voor SMTP"
 #: src/send_message.c:361
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
-msgstr "Account '%s': Verbinden met SMTP server: %s:%d..."
+msgstr "Account '%s': Verbinden met SMTP-server: %s:%d..."
 
 #: src/send_message.c:418
 msgid "Mail sent successfully."
@@ -18894,8 +19154,8 @@ msgid ""
 "if you have the one.\n"
 "If you're not sure, just select OK."
 msgstr ""
-"Je zal eerst de locatie van het postvak moeten geven.\n"
-"Je kunt een bestaand postvak in MH formaat gebruiken.\n"
+"Je zult eerst de locatie van het postvak moeten geven.\n"
+"Je kunt een bestaand postvak in MH-formaat gebruiken.\n"
 "Als je twijfelt kun je het beste gewoon op OK klikken."
 
 #: src/sourcewindow.c:64
@@ -18950,11 +19210,11 @@ msgstr "Bezig met zoeken in %s...\n"
 
 #: src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
-msgstr "Begin van de lijst bereikt; verdergaan vanaf het einde?"
+msgstr "Begin van de lijst bereikt, verdergaan vanaf het einde?"
 
 #: src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
-msgstr "Einde van de lijst bereikt; verdergaan vanaf het begin?"
+msgstr "Einde van de lijst bereikt, verdergaan vanaf het begin?"
 
 #: src/summaryview.c:430
 msgid "Create _filter rule"
@@ -18970,7 +19230,7 @@ msgstr "Tik meervoudige selectie aan"
 
 #: src/summaryview.c:1297
 msgid "Process mark"
-msgstr "Verwerk markering"
+msgstr "Verwerkmarkering"
 
 #: src/summaryview.c:1298
 msgid "Some marks are left. Process them?"
@@ -19197,7 +19457,7 @@ msgstr "_Overschrijven"
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "Je staat op het moment om %d berichten af te drukken. Wil je doorgaan?"
+msgstr "Je staat op het punt om %d berichten af te drukken. Wil je doorgaan?"
 
 #: src/summaryview.c:5345
 msgid "Building threads..."
@@ -19227,10 +19487,6 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filter"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
@@ -19350,7 +19606,7 @@ msgstr ""
 
 #: src/textview.c:909
 msgid "'Network Log'"
-msgstr "'Netwerk Log'"
+msgstr "'Netwerklog'"
 
 #: src/textview.c:910
 msgid " in the Tools menu for more information."
@@ -19387,7 +19643,7 @@ msgstr "'Als tekst weergeven'"
 
 #: src/textview.c:1002
 msgid "     - To open with an external program, select "
-msgstr "     - Om te openen met een extern programma selecteer "
+msgstr "     - Om te openen met een extern programma, selecteer "
 
 #: src/textview.c:1003
 msgid "'Open'"
@@ -19648,7 +19904,7 @@ msgstr "Bewerken"
 
 #: src/toolbar.c:432
 msgid "Wrap para."
-msgstr "Breek para af"
+msgstr "Breek para. af"
 
 #: src/toolbar.c:433
 msgid "Wrap all"
@@ -19813,7 +20069,7 @@ msgstr ""
 "---------------------\n"
 "\n"
 "Nu je je account hebt ingesteld, kun je je e-mail ophalen door op de\n"
-"'Ophalen' knop helemaal links in de werkbalk te drukken.\n"
+"'Ophalen' knop helemaal links in de werkbalk te klikken.\n"
 "\n"
 "Claws Mail heeft vele extra opties die toegankelijk zijn via plugins,\n"
 " o.a. anti-spam filters en training (via de Bogofilter of SpamAssassin "
@@ -19826,7 +20082,7 @@ msgstr ""
 " instellingen verander je via '/Instellingen/Voorkeuren'.\n"
 "\n"
 "Meer informatie vind je in de handleiding van Claws Mail, die \n"
-"kun je vinden via de menu-ingang '/Help/Handleiding' of on-line via \n"
+"kun je vinden via de menu-ingang '/Help/Handleiding' of online via \n"
 "de URL hier beneden aangegeven.\n"
 "\n"
 "Handige URLs\n"
@@ -19923,11 +20179,11 @@ msgstr ""
 
 #: src/wizard.c:1132
 msgid "SMTP username:"
-msgstr "SMTP gebruikersnaam"
+msgstr "SMTP-gebruikersnaam"
 
 #: src/wizard.c:1143
 msgid "SMTP password:"
-msgstr "SMTP wachtwoord:"
+msgstr "SMTP-wachtwoord:"
 
 #: src/wizard.c:1156
 msgid "Use SSL to connect to SMTP server"
@@ -19987,7 +20243,7 @@ msgid ""
 "has been built without IMAP support.</span>"
 msgstr ""
 "<span weight=\"bold\">Waarschuwing: deze versie van Claws Mail\n"
-"is vertaald zonder ondersteuning voor IMAP.</span>"
+"is gecompileerd zonder ondersteuning voor IMAP.</span>"
 
 #: src/wizard.c:1773
 msgid "Claws Mail Setup Wizard"
@@ -20042,217 +20298,3 @@ msgid ""
 msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
-
-#~ msgid "E-mail client"
-#~ msgstr "E-mail client"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "Lichtgewicht en snelle GTK+ gebaseerde Mail Client"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "lichtgewicht;snel;gui;uitbreidbaar;plugin;pop;pop3;imap;imap4;nntp;news;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr ""
-#~ "Claws Mail is een snel en zeer uitbreidbaar mailprogramma met veel "
-#~ "mogelijkheden."
-
-#~ 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 ""
-#~ "Het heeft veel configuratie-opties en kan duizenden e-mails makkelijk "
-#~ "aan. Berichten worden opgeslagen in een open formaat, en ze zijn "
-#~ "makkelijk te benaderen.\t"
-
-#~ 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 ""
-#~ "Veel extra functionaliteit wordt in voorzien door plugins, zoals PGP "
-#~ "handtekeningen en versleuteling, een RSS-lezer, een agenda, goede "
-#~ "spamfilters, Perl en Python interacties, HTML en PDF weergave, en meer."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr "Geeft e-mail notificatie via LEDs op sommige laptops"
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om uitgaande adressen op te slaan in een opgegeven "
-#~ "map in het adresboek"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om tarbestanden of zipbestanden van oude mappen aan "
-#~ "te maken"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "Biedt de mogelijkheid om bijlages van e-mails te verwijderen"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr ""
-#~ "Waarschuwt wanneer een bericht een bijlage noemt in de berichtinhoud "
-#~ "zonder dat er bijlages zijn bijgevoegd"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om inkomende e-mail van een POP, IMAP of een lokaal "
-#~ "account te scannen met behulp van Bogofilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "Controleer alle erichten die ontvangen zijn van een IMAP, lokaal of POP "
-#~ "account op spam met behulp van Bsfilter"
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "Scan alle berichten die ontvangen zijn van een IMAP, lokaal of POP "
-#~ "account met behulp van clamd (Clam AV)"
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr "Geeft HTML e-mail weer met behulp van de WebKit bibliotheek"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "Voegt headers toe met UIDL, Claws' account naam, POP server, user ID en "
-#~ "tijd van ophalen"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Biedt een interface voor Google diensten"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Biedt GeoLocatie functionaliteit"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr ""
-#~ "Geeft libravatar/gravatar profielafbeeldingen weer of een dynamisch "
-#~ "aangemaakte of vooraf opgegeven alternatief"
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Directe indersteuning voor mailboxen in mbox formaat"
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr ""
-#~ "Geeft een berichtheader verslag van een logbestand op het aankomen van "
-#~ "nieuwe e-mail na het sorteren"
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Biedt verschillende manieren om de gebruiker notificatie te geven van "
-#~ "nieuwe en ongelezen e-mail"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "Deze plugin maakt het mogelijk om PDF en PostScript bijvoegsels te "
-#~ "bekijken met behulp van de Poppler bibliotheek en GhostScript"
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om Perl volledig te gebruiken in e-mail filters"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "Biedt de basis PGP functies en is een afhankelijkheid van zowel de PGP/"
-#~ "Inline en PGP/MIME plugins"
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Werkt met PGP/Inline ondertekende en/of versleutelde e-mails"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Werkt met PGP/MIME ondertekende en/of versleutelde e-mails"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om Python scripts te gebruiken. Code kan ingevoerd "
-#~ "worden in een interne Python console of worden opgeslagen"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "Lees je favoriete RSS nieuwsfeeds"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Werkt met S/MIME ondertekende en/of versleutelde e-mails"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Rapporteert spam op verschillende plekken"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid om e-mail ontvangen van een POP, IMAP of lokaal "
-#~ "account te scannen met behulp van SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "Biedt de mogelijkheid om application/ms-tnef bijlages te lezen"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "Biedt de mogelijkheid van vCalendar berichtafhandeling en werkt met "
-#~ "webCal inschrijvingen. Biedt de mogelijkheid een agenda te importeren"
-
-#~ msgid "_Subject:"
-#~ msgstr "_Onderwerp:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Bewaar 'Aan' adressen"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Bewaar 'Cc'  adressen"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Bewaar 'Bcc' adressen"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "Stylesheet:"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "GData plugin: Ge-authenticeerd\n"
-
-#~ msgid "slow"
-#~ msgstr "langzaam"
-
-#~ msgid "fast"
-#~ msgstr "snel"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Banner breedte in pixels (0 betekent scherm grootte)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Zet Popup Aan"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Standaard verversings interval in minuten"
-
-#~ msgid "Use this"
-#~ msgstr "Gebruik deze"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Kon bericht '%s' niet versleutelen."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9ff1849..6e40599 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,18 +1,17 @@
 # Brazilian Portuguese translation of Claws Mail.
-# Copyright ? 2006-2014 The Claws Mail team.
+# Copyright ? 2006-2015 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
 #
-# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2014.
+# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
 "POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-20 00:50-0200\n"
-"Last-Translator: Frederico Goncalves Guimaraes\n"
-"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR at kde.org>\n"
+"PO-Revision-Date: 2015-07-13 22:26-0300\n"
+"Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -209,16 +208,16 @@ msgstr "Argumento do usu?rio para a??o"
 #: src/addrclip.c:479
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
-"N?o ? poss?vel copiar a pasta para dentro dela mesma ou de sua sub-estrutura"
+"N?o ? poss?vel copiar a pasta para dentro dela mesma ou de sua sub-estrutura."
 
 #: src/addrclip.c:502
 msgid "Cannot copy an address book to itself."
-msgstr "N?o ? poss?vel copiar um Livro de Endere?os para ele mesmo"
+msgstr "N?o ? poss?vel copiar um Livro de Endere?os para ele mesmo."
 
 #: src/addrclip.c:593
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
-"N?o ? poss?vel mover uma pasta para dentro dela mesma ou de sua sub-estrutura"
+"N?o ? poss?vel mover uma pasta para dentro dela mesma ou de sua sub-estrutura."
 
 #: src/addr_compl.c:685 src/addressbook.c:4873
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
@@ -635,7 +634,7 @@ msgstr "A pesquisa no LDAP foi terminada sob solicita??o"
 
 #: src/addressbook.c:539
 msgid "Error starting TLS connection"
-msgstr "Erro ao iniciar a conex?o TSL"
+msgstr "Erro ao iniciar a conex?o TLS"
 
 #: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
@@ -2204,9 +2203,8 @@ msgid "Othe_rs"
 msgstr "_Outros"
 
 #: src/compose.c:7816
-#, fuzzy
 msgid "S_ubject:"
-msgstr "Assunto:"
+msgstr "_Assunto:"
 
 #: src/compose.c:8039
 #, c-format
@@ -2218,14 +2216,13 @@ msgstr ""
 "%s"
 
 #: src/compose.c:8148
-#, fuzzy, c-format
+#, c-format
 msgid "<i>%s</i>"
-msgstr "De: <i>%s</i>"
+msgstr "<i>%s</i>"
 
 #: src/compose.c:8178
-#, fuzzy
 msgid "_From:"
-msgstr "De:"
+msgstr "_De:"
 
 #: src/compose.c:8195
 msgid "Account to use for this email"
@@ -3571,7 +3568,7 @@ msgstr "regra de processamento '%s' [ %s ]\n"
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr "regra de processamento <sem nome> [ %s ]\n"
+msgstr "regra de processamento <unnamed> [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
@@ -3581,7 +3578,7 @@ msgstr "regra desabilitada '%s' [ %s ]\n"
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr "regra desabilitada <sem nome> [ %s ]\n"
+msgstr "regra desabilitada <unnamed> [ %s ]\n"
 
 #: src/filtering.c:874
 msgid "undetermined"
@@ -3688,9 +3685,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "N?o ? possivel mover pastas entre caixas postais diferentes."
+msgstr "O nome da pasta n?o pode come?ar ou terminar com um ponto."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3730,9 +3726,8 @@ msgid "Mark all re_ad"
 msgstr "Marcar _todas como lidas"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Marcar _todas como lidas"
+msgstr "Marcar _recursivamente todas como lidas"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -4036,7 +4031,6 @@ msgstr ""
 "fazer doa??es para o projeto do Claws Mail, voc? pode faz?-lo em:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4046,7 +4040,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "A Equipe do Claws Mail\n"
 " e Hiroyuki Yamamoto"
 
@@ -4268,13 +4262,12 @@ msgid "About Claws Mail"
 msgstr "Sobre o Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "A Equipe do Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
@@ -5353,9 +5346,8 @@ msgstr ""
 "relat?rios."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "De/Para/Assunto/Etiqueta"
+msgstr "De/Para/Cc/Assunto/Etiqueta"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5820,7 +5812,6 @@ msgstr ""
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5829,8 +5820,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autentica??es CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
-"suporte a SASL e o plugin CRAM-MD5 SASL instalado."
+"Autentica??es SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"com suporte a SASL e o plugin SCRAM SASL instalado."
 
 #: src/imap.c:959
 #, c-format
@@ -5977,13 +5968,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "N?o foi poss?vel atualizar as capacidades.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "Ocorreu uma falha na conex?o com %s: o servidor requer TLS, mas o Claws Mail "
-"foi compilado sem o suporte ao OpenSSL.\n"
+"foi compilado sem o suporte a TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -8205,12 +8196,15 @@ msgid "Remove _mailbox..."
 msgstr "Remover _caixa postal..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "N?o foi poss?vel remover a pasta '%s'."
+msgstr ""
+"N?o foi poss?vel remover a pasta '%s'.\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8603,9 +8597,8 @@ msgid "Address Keeper"
 msgstr "Address Keeper"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "Caminho do livro de endere?os"
+msgstr "Localiza??o do livro de endere?os"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
@@ -8626,7 +8619,7 @@ msgstr "Selecione..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Campos de onde preservar os endere?os"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8641,12 +8634,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Armazenar os endere?os que aparecem nos cabe?alhos 'Cco'"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Excluir os endere?os correspondentes ?s seguintes express?es regulares (uma "
-"por linha):"
+"por linha)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9193,11 +9185,10 @@ msgid "attach"
 msgstr "anexo"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
 "For encontrada correspond?ncia para uma das seguintes express?es regulares "
-"(uma por linha):"
+"(uma por linha)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9380,19 +9371,16 @@ msgid "KB"
 msgstr "Kb"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Excluir etiqueta"
+msgstr "Excluir spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Salvar spam em"
+msgstr "Salvar spam em..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Marcar como _spam"
+msgstr "Apenas marcar como spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9910,9 +9898,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Usar as configura??es de proxy do GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Usar proxy:"
+msgstr "Usar proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9936,9 +9923,8 @@ msgid "Enable loading of remote content"
 msgstr "Habilitar a carga de conte?do remoto"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Ao clicar em um link, por padr?o:"
+msgstr "Ao clicar em um link, por padr?o"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -10096,9 +10082,8 @@ msgid "Add fetchinfo headers"
 msgstr "Adicionar cabe?alhos fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Endere?o do remetente a ser usado"
+msgstr "Cabe?alhos a serem a adicionados"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10108,6 +10093,8 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"Adiciona o cabe?alho X-FETCH-UIDL com com o ID ?nico de listagem da mensagem "
+"(POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10115,7 +10102,7 @@ msgstr "Nome da conta"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Adiciona o cabe?alho X-FETCH-ACCOUNT com o nome da conta"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10124,6 +10111,7 @@ msgstr "Servidor de recebimento"
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr ""
+"Adiciona o cabe?alho X-FETCH-SERVER com o nome do servidor de recebimento"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10131,7 +10119,7 @@ msgstr "ID do usu?rio"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Adiciona o cabe?alho X-FETCH-USERID com o ID do usu?rio"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10142,11 +10130,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Adiciona o cabe?alho X-FETCH-TIME com a data e hora do recebimento da mensagem"
+"no formato RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "Plugin GData: Erro na autentica??o: %s\n"
+msgstr "Plugin GData: ? necess?ria autoriza??o"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10158,25 +10147,30 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Voc? deve autorizar o Claws Mail a acessar sua lista de contatos da Google "
+"para usar o plugin GData.\n"
+"\n"
+"Visite a p?gina de autoriza??o da Google pressionando o bot?o abaixo. Ap?s "
+"a confirma??o da autoriza??o, voc? receber? um c?digo de autoriza??o. Digite "
+"esse c?digo no campo abaixo para garantir ao Claws Mail o acesso ? sua lista "
+"de contatos da Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Passo"
+msgstr "Passo 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
+"Clique aqui para abrir a p?gina de autoriza??o da Google no seu navegador"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Passo"
+msgstr "Passo 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Interface"
+msgstr "Digite o c?digo:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10215,45 +10209,43 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "Plugin GData: Iniciando solicita??o ass?ncrona de grupos\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "Plugin GData: Erro na autentica??o: %s\n"
+msgstr "Plugin GData: Erro na autoriza??o: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "Plugin GData: Erro na autentica??o: %s\n"
+msgstr "Plugin GData: A autoriza??o foi bem sucedida\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Plugin GData: Iniciando autentica??o ass?ncrona\n"
+msgstr "Plugin GData: Iniciando autoriza??o interativa\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "Plugin GData: Iniciando autentica??o ass?ncrona\n"
+msgstr ""
+"Plugin GData: C?digo de autoriza??o recebido, requisitando a autoriza??o\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"Plugin GData: N?o foi recebido nenhum c?digo de autoriza??o, a solicita??o "
+"de autoriza??o foi cancelada\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Plugin GData: Erro na autentica??o: %s\n"
+msgstr "Plugin GData: Erro na atualiza??o da autoriza??o: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Plugin GData: Erro na autentica??o: %s\n"
+msgstr "Plugin GData: A atualiza??o da autoriza??o foi bem sucedida\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Plugin GData: Iniciando autentica??o ass?ncrona\n"
+msgstr "Plugin GData: Tentando atualizar a autoriza??o\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
 msgid "Authentication"
@@ -11407,9 +11399,8 @@ msgstr ""
 "Qualquer retorno para <ricardo at mones.org> ? bem-vindo.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Seu endere?o de e-mail:</span>"
+msgstr "<span color=\"red\">Erro na leitura das estat?sticas do cache</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11417,25 +11408,27 @@ msgid ""
 "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
 "errors</span>"
 msgstr ""
+"<span color=\"red\">Usando %s em %d arquivos, %d diret?rios, %d outros e %d "
+"erros</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Usando %s em %d arquivos, %d diret?rios e %d outros"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Cache de ?cone"
+msgstr "Limpar o cache de ?cones"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Deseja realmente remover esse tema?"
+msgstr ""
+"Deseja realmente remover todos os ?cones de avatares armazenados "
+"em cache?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "N?o existe mem?ria suficiente para essa opera??o"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11444,10 +11437,14 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"O cache de ?cones foi limpo com sucesso:\n"
+"? %u entradas perdidas removidas.\n"
+"? %u arquivos removidos."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
 msgstr ""
+"<span color=\"#006400\">O cache de ?cones foi limpo com sucesso!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11458,10 +11455,16 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Ocorreram erros na limpeza do cache de ?cones:\n"
+"? %u entradas perdidas removidas.\n"
+"? %u arquivos removidos.\n"
+"? %u arquivos que n?o puderam ser lidos.\n"
+"? %u arquivos que n?o puderam ser removidos."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
 msgstr ""
+"<span color=\"red\">Ocorreram erros na limpeza do cache de ?cones.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11540,6 +11543,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Digite a URL para a qual voc? deve ser direcionado caso n?o exista um "
+"?cone de usu?rio dispon?vel. Deixe em branco para usar o ?cone laranja "
+"padr?o da libravatar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11900,14 +11906,12 @@ msgid "News folders"
 msgstr "Pastas de Newsgroups"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "Pastas RSS"
+msgstr "Pastas RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Pastas de Agenda"
+msgstr "Pastas do vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11958,23 +11962,20 @@ msgid "Banner speed"
 msgstr "Velocidade do letreiro"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "N?mero m?ximo de resultados:"
+msgstr "N?mero m?ximo de mensagens"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "N?mero m?ximo de mensagens (0 significa ilimitado)"
+msgstr "Limite o n?mero de mensagens exibidas, use 0 para ilimitadas"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Velocidade do letreiro"
+msgstr "Largura do letreiro"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Limite o tamanho do letreiro, use 0 para a largura da tela"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -12004,9 +12005,8 @@ msgid "Select folders..."
 msgstr "Selecione as pastas..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Cor da Pasta"
+msgstr "Cores do letreiro"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12042,16 +12042,14 @@ msgstr "Habilitar janela de notifica??o"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Limite de tempo da janela de notifica??o:"
+msgstr "Limite de tempo da janela de notifica??o"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "segundos"
+msgstr "segundo(s)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12079,18 +12077,16 @@ msgid "Done"
 msgstr "Feito"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Comando do shell"
+msgstr "Selecionar o comando"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Habilitar comando"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Comando a ser executado:"
+msgstr "Comando a ser executado"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12101,9 +12097,8 @@ msgid "Enable LCD"
 msgstr "Habilitar LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Nome do host:Porta do servidor em LCD:"
+msgstr "Nome do host:porta do servidor LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12161,9 +12156,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Alternar minimizar:"
+msgstr "Alternar minimizar"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12738,58 +12732,57 @@ msgstr ""
 "N?cleo PGP: N?o foi poss?vel obter a chave - nenhum gpg-agent em execu??o."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "A assinatura de %s ? v?lida."
+msgstr "A assinatura de \"%s\" ? v?lida [definitivamente]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "A assinatura de %s ? v?lida."
+msgstr "A assinatura de \"%s\" ? v?lida [completamente]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "A assinatura de %s ? v?lida."
+msgstr "A assinatura de \"%s\" ? v?lida [relativamente]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "A assinatura de %s ? v?lida."
+msgstr "A assinatura de \"%s\" ? v?lida"
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "A assinatura de %s expirou."
+msgstr "A assinatura de \"%s\" expirou"
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "A assinatura de %s ? v?lida, mas a chave expirou."
+msgstr "A assinatura de \"%s\" ? v?lida, mas a chave expirou"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "A assinatura de %s ? v?lida, mas a chave foi revogada."
+msgstr "A assinatura de \"%s\" ? v?lida, mas a chave foi revogada"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "A assinatura de %s ? inv?lida."
+msgstr "A assinatura de \"%s\" ? inv?lida"
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "A chave 0x%s para verificar essa assinatura n?o est? dispon?vel."
+msgstr "A chave 0x%s para verificar essa assinatura n?o est? dispon?vel"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "A assinatura n?o foi checada."
+msgstr "A assinatura n?o foi verificada"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
-msgstr "Erro durante a verifica??o da assinatura: sem status\n"
+msgstr "Ocorreu um erro na verifica??o da assinatura: sem status\n"
 
 #: src/plugins/pgpcore/sgpgme.c:303
 #, c-format
@@ -13220,7 +13213,6 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "N?o foi poss?vel registrar \"compose create hook\" no plugin Python"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13293,10 +13285,10 @@ msgstr ""
 "encaminhamento de uma mensagem j? existente.\n"
 "\n"
 "startup\n"
-"Executado quando o plugin ? aberto\n"
+"Executado quando o plugin ? carregado\n"
 "\n"
 "shutdown\n"
-"Executado quando o plugin ? encerrado\n"
+"Executado quando o plugin ? descarregado\n"
 "\n"
 "\n"
 "Para informa??es mais atualizadas sobre a API, digite\n"
@@ -13403,7 +13395,6 @@ msgid "'%c' can't be used in folder name."
 msgstr "'%c' n?o pode ser usado no nome da pasta."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "O Claws Mail necessita de acesso ? rede para atualizar a fonte."
@@ -13470,18 +13461,16 @@ msgstr ""
 "feed em '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
 msgid "No authentication"
-msgstr "Efetuar autentica??o"
+msgstr "Sem autentica??o"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Efetuar autentica??o"
+msgstr "Autentica??o HTTP b?sica"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
-msgstr "Use o intervalo de atualiza??o padr?o"
+msgstr "Use o intervalo padr?o de atualiza??o"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
@@ -13538,9 +13527,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>URL de origem:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Nome de usu?rio:"
+msgstr "Nome de usu?rio"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/vcal_prefs.c:337
@@ -13633,14 +13621,12 @@ msgid "My Feeds"
 msgstr "Minhas fontes"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Selecione o arquivo do Pine"
+msgstr "Selecione o arquivo de cookie"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Use o intervalo de atualiza??o padr?o"
+msgstr "Intervalo padr?o de atualiza??o"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
@@ -13660,13 +13646,12 @@ msgstr ""
 "Caminho para o arquivo cookies.txt (estilo Netscape), contendo seus cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Atualizar"
+msgstr "Atualizando"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Seguran?a e privacidade"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -17706,9 +17691,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cir?lico (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cir?lico (KOI8-R)"
+msgstr "Cir?lico (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
diff --git a/po/sk.po b/po/sk.po
index c753549..c82673a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -20,14 +20,14 @@
 # source:
 # http://www.geodesy.gov.sk
 # http://www.fao.org/ (historic names)
-# Slavko <linux at slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014.
+# Slavko <linux at slavino.sk>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166 3.13\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-19 19:37+0200\n"
+"POT-Creation-Date: 2015-07-12 07:58+0100\n"
+"PO-Revision-Date: 2015-07-12 17:13+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: sloven?ina <linux at slavino.sk>\n"
 "Language: sk\n"
@@ -35,7 +35,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "#-#-#-#-#  sk.po (claws-mail 3.11.0)  #-#-#-#-#\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-POFile-SpellExtra: Distguished DIGEST-MD5 Foundation iconv compose Okt\n"
 "X-POFile-SpellExtra: EUC-JP send podzlo?iek X-Mailer faq List-Help XBM\n"
@@ -167,13 +167,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tla?idlo ?Prija? po?tu? prijme po?tu z ozna?en?ch ??tov"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -510,7 +511,7 @@ msgstr "_Adres?r"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Upravi?"
 
@@ -553,10 +554,14 @@ msgid "_Delete book"
 msgstr "Z_maza? adres?r"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Ulo?i?"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Zavrie?"
 
@@ -570,11 +575,12 @@ msgstr "_Vystrihn??"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kop?rova?"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "V_lo?i?"
 
@@ -1034,12 +1040,12 @@ msgstr "Aktualiz?cia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualiz?cia zlyhala. Zmeny neboli zap?san? do adres?ra."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1610,15 +1616,15 @@ msgstr "Nah_radi? podpis"
 msgid "_Print"
 msgstr "_Tla?i?"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Sp??"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "_Vystrihn??"
 
@@ -1639,6 +1645,7 @@ msgid "_Unwrapped"
 msgstr "_Nezalomen?"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Vy_bra? v?etko"
 
@@ -1703,6 +1710,7 @@ msgid "Delete to end of line"
 msgstr "Zmaza? do konca riadku"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_H?ada?"
 
@@ -2002,7 +2010,7 @@ msgstr "Do tela spr?vy vklad?te s?bor %s. Ste si ist?, ?e to chcete urobi?
 msgid "Are you sure?"
 msgstr "Ste si ist??"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Vlo?i?"
 
@@ -2099,7 +2107,7 @@ msgstr "Zaradi? do fronty i tak?"
 msgid "Send later"
 msgstr "Odosla? ho nesk?r"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2109,7 +2117,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia k?dovania."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2119,7 +2127,7 @@ msgstr ""
 "\n"
 "Nie je dostupn? ?ifrovac? k??? pr?jemcu."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2186,67 +2194,72 @@ msgstr ""
 "\n"
 "Odosla? aj tak?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Nemo?no za?ifrova? spr?vu: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Upozornenie ?ifrovania"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+_Pokra?ova?"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupn? ?iadny ??et na odosielanie spr?v!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolen? ??et nie je NNTP: Posielanie nie je mo?n?."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Pr?loha %s u? neexistuje. Ignorova??"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Zru?i? posielanie"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorova? pr?lohu"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "P?vodn? ?as? %s"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Prida? do _adres?ra"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Zmaza? obsah polo?iek"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatick? doplnenie z adres?ra pou?ite <TAB>"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Ve?kos?"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Ulo?i? spr?vu do "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2257,24 +2270,23 @@ msgstr "Ulo?i? spr?vu do "
 msgid "_Browse"
 msgstr "_Precha?dzat?"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "H_lavi?ka"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Pr?lohy"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "_Ostatn?"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Predmet:"
+msgstr "Pre_dmet:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2283,25 +2295,24 @@ msgstr ""
 "Nemo?no spusti? kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Od: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Od:"
+msgstr "O_d:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "??et, pou?it? pre tento email"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Adresa odosielate?a"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2310,68 +2321,68 @@ msgstr ""
 "Nemo?no na??ta? syst?m s?kromia ?%s?. Nebude mo?n? podp?sa? ani za?ifrova? "
 "t?to spr?vu."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "?iad_na"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Telo ?abl?ny m? chybu v riadku %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Chyba v tvare hlavi?ky odosielate?a v ?abl?ne."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Chyba v tvare hlavi?ky pr?jemcu v ?abl?ne."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Chyba v tvare hlavi?ky k?pie v ?abl?ne."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Chyba v tvare hlavi?ky slepej k?pie v ?abl?ne."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Chyba vo form?te ?abl?ny Odpoveda?."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Chyba vo form?te predmetu ?abl?ny."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Neplatn? typ MIME."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "S?bor neexistuje alebo je pr?zdny."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "K?dovanie"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "N?zov s?boru"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2382,15 +2393,15 @@ msgstr ""
 "Vyn?ti? ukon?enie procesu?\n"
 "ID skupiny procesu: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrebuje na odoslanie tejto spr?vy pripojenie k sieti."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Nemo?no zaradi? spr?vu do fronty na odoslanie."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2401,15 +2412,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Koncept nemo?no ulo?i?."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Koncept nemo?no ulo?i?"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2417,24 +2428,24 @@ msgstr ""
 "Koncept nemo?no ulo?i?.\n"
 "Chcete pokra?ova? v p?san?, alebo zahodi? rozp?san? spr?vu?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "+_Zru?i? skon?enie"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Zahodi? spr?vu"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Zvo?te s?bor"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "S?bor ?%s? nemo?no ??ta?."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2443,62 +2454,62 @@ msgstr ""
 "S?bor ?%s? obsahuje neplatn? znaky pre\n"
 "s??asn? k?dovanie, vlo?enie m??e by? nepresn?."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Zahodi? spr?vu"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "T?to spr?va bola zmenen?. Zahodi? zmeny?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Zahodi?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Ulo?i? medzi _koncepty"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Ulo?i? zmeny"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "T?to spr?va bola zmenen?. Ulo?i? posledn? zmeny?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Neuklada?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Ulo?i? medzi _koncepty"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete pou?i? ?abl?nu ?%s??"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Pou?i? ?abl?nu"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Nahradi?"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Vlo?i?"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Vlo?i?, alebo pripoji? ako pr?lohu?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2506,16 +2517,16 @@ msgstr ""
 "Chcete vlo?i? obsah s?boru do tela spr?vy, alebo ho chcete pripoji? k spr?ve "
 "ako pr?lohu?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Pripoji?"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare cit?cie na riadku %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3729,9 +3740,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizujem %s na pou?itie pri odpojen??\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Zlo?ky nemo?no pres?va? medzi r?znymi schr?nkami."
+msgstr "N?zov zlo?ky nem??e za??na? alebo kon?i? bodkou."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3771,9 +3781,8 @@ msgid "Mark all re_ad"
 msgstr "Ozna?i? _v?etky ako pre??tan?"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Ozna?i? _v?etky ako pre??tan?"
+msgstr "Ozna?i? _v?etky ako pre??tan? rekurz?vne"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3821,104 +3830,112 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Nastavujem inform?cie zlo?ky?"
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Ozna?i? v?etky ako pre??tan?"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Naozaj chcete ozna?i? v?etky spr?vy tejto zlo?ky a jej podzlo?iek ako "
+"pre??tan??"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Naozaj chcete ozna?i? v?etky spr?vy tejto zlo?ky ako pre??tan??"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Ozna?i? v?etky ako pre??tan?"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Preh?ad?vanie zlo?ky %s%c%s?"
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Preh?ad?vanie zlo?ky %s?"
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Obnovi? strom zlo?iek"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu zlo?iek sp?sob? vymazanie lok?lnych vyrovn?vac?ch pam?t?. "
 "Chcete pokra?ova??"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom zlo?iek?"
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Skenujem strom zlo?iek?"
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemo?no skenova? obsah zlo?ky %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nov? spr?vy vo v?etk?ch zlo?k?ch?"
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatv?ram zlo?ku %s?"
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otv?ram zlo?ku %s?"
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Zlo?ku nemo?no otvori?."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Vypr?zdni? k??"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Vymaza? v?etky spr?vy z ko?a?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Vypr?zdni? k??"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojen?. Pripoji??"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Odosla? spr?vy vo fronte"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Odosla? v?etky spr?vy vo fronte?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Odosla?"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielan? spr?v vo fronte nastali chyby."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3927,64 +3944,64 @@ msgstr ""
 "Pri odosielan? spr?v vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Naozaj chcete kop?rova? zlo?ku ?%s? do ?%s??"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Naozaj chcete presun?? zlo?ku ?%s? ako podzlo?ku ?%s??"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kop?rova? zlo?ku"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Presun?? zlo?ku"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kop?rujem %s do %s?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Pres?vam %s do %s?"
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Zdroj je identick? s cie?om."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie je mo?n? skop?rova? zlo?ku do jeho potomka."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je mo?n? presun?? zlo?ku do jeho potomka."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zlo?ky nemo?no pres?va? medzi r?znymi schr?nkami."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kop?rovanie zlyhalo!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zlo?ky %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolen? cie?ov? zlo?ka m??e obsahova? len podzlo?ky."
 
@@ -4077,7 +4094,6 @@ msgstr ""
 "prispie? na projekt Claws Mail, m??ete tak u?ini? na:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4087,7 +4103,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999 ? 2014\n"
+"Copyright (C) 1999 ? 2015\n"
 "T?m Claws Mail\n"
 " a Hiroyuki Yamamoto"
 
@@ -4305,15 +4321,14 @@ msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999 ? 2014\n"
+"Copyright (C) 1999 ? 2015\n"
 "Ti?m Claws Mail\n"
-" a Hiroyuki Yamamoto"
+"a Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:845
 msgid "_Info"
@@ -5106,6 +5121,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5162,11 +5178,12 @@ msgstr "Obsah Str?nky"
 msgid "_Hide"
 msgstr "_Skry?"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "??et"
 
@@ -5383,9 +5400,8 @@ msgstr ""
 "Po?as h?adania sa prihodilo nie?o zl?. Pros?m, skontrolujte svoje z?znamy."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Od/Komu/Predmet/Zna?ka"
+msgstr "Od/Komu/K?pia/Predmet/Zna?ka"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5850,7 +5866,6 @@ msgstr ""
 "podporou SASL, a je nain?talovan? z?suvn? modul DIGEST-MD5 SASL."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5859,8 +5874,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Prihl?senie CRAM-MD5 funguje len ak bola kni?nica libetpan zostaven? s "
-"podporou SASL, a je nain?talovan? z?suvn? modul CRAM-MD5 SASL."
+"Prihl?senie CRAM-SHA-1 funguje len ak bola kni?nica libetpan zostaven? s "
+"podporou SASL, a je nain?talovan? z?suvn? modul SCRAM SASL."
 
 #: src/imap.c:959
 #, c-format
@@ -6007,13 +6022,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnovi? mo?nosti servera.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "Pripojenie k %s zlyhalo: server vy?aduje TLS, ale Claws Mail bol zostaven? "
-"bez podpory OpensSSL.\n"
+"bez podpory TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6447,7 +6462,7 @@ msgstr "Hotovo (?iadne nov? spr?vy)"
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Autentifik?cia zlyhala"
 
@@ -6492,7 +6507,8 @@ msgstr "Nepodarilo sa pripoji? k serveru POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripoji? k serveru POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentifik?cia?"
 
@@ -8228,12 +8244,15 @@ msgid "Remove _mailbox..."
 msgstr "_Odstr?ni? schr?nku?"
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Nemo?no odstr?ni? zlo?ku ?%s?."
+msgstr ""
+"Nemo?no odstr?ni? zlo?ku ?%s?\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8619,9 +8638,8 @@ msgid "Address Keeper"
 msgstr "Uchov?vanie adries"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "Cesta k adres?ru"
+msgstr "Umiestnenie adres?ra"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
@@ -8638,11 +8656,11 @@ msgstr "Cesta k Adres?ru, kde maj? by? uchovan? adresy"
 #: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
 #: src/prefs_matcher.c:679
 msgid "Select..."
-msgstr "Vybrat?..."
+msgstr "Vybrat??"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Polia, z ktor?ch zachova? adresy"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8657,7 +8675,6 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Uchov?va? adresy, ktor? sa objavia v hlavi?k?ch ?Slep? k?pia?"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
@@ -8670,7 +8687,7 @@ msgstr "Archiv?cia po?ty"
 
 #: src/plugins/archive/archiver.c:54
 msgid "Create Archive..."
-msgstr "Vytvori? arch?v..."
+msgstr "Vytvori? arch?v?"
 
 #: src/plugins/archive/archiver.c:122
 #, c-format
@@ -9207,9 +9224,8 @@ msgid "attach"
 msgstr "pripoji?"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Jeden z nasleduj?cich regul?rnych v?razov zodpoved? (jeden v riadku):"
+msgstr "Jeden z nasleduj?cich regul?rnych v?razov zodpoved? (jeden v riadku)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9392,19 +9408,16 @@ msgid "KB"
 msgstr "kB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Odstr?ni? zna?ku"
+msgstr "Odstr?ni? spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Ulo?i? spam v"
+msgstr "Ulo?i? spam v?"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Ozna?i? ako spam"
+msgstr "Len ozna?i? ako spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9501,11 +9514,11 @@ msgstr "Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter.c:299
 msgid "Bsfilter: fetching body..."
-msgstr "Bsfilter: vyberanie tela..."
+msgstr "Bsfilter: vyberanie tela?"
 
 #: src/plugins/bsfilter/bsfilter.c:308
 msgid "Bsfilter: filtering message..."
-msgstr "Bsfilter: filtrovanie spr?vy..."
+msgstr "Bsfilter: filtrovanie spr?vy?"
 
 #: src/plugins/bsfilter/bsfilter.c:393
 msgid ""
@@ -9529,7 +9542,7 @@ msgstr ""
 
 #: src/plugins/bsfilter/bsfilter.c:501
 msgid "Bsfilter: learning from message..."
-msgstr "Bsfilter: u?enie zo spr?vy..."
+msgstr "Bsfilter: u?enie zo spr?vy?"
 
 #: src/plugins/bsfilter/bsfilter.c:641
 msgid ""
@@ -9626,7 +9639,7 @@ msgstr "S?bor: %s. Ve?kos? (%d) prekra?uje limit (%d)\n"
 
 #: src/plugins/clamd/clamav_plugin.c:174
 msgid "ClamAV: scanning message..."
-msgstr "ClamAV: spr?va skenovania..."
+msgstr "ClamAV: spr?va skenovania?"
 
 #: src/plugins/clamd/clamav_plugin.c:275
 msgid "Failed to register mail filtering hook"
@@ -9920,9 +9933,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Pou?i? nastavenia proxy v GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Pou?i? proxy:"
+msgstr "Pou?i? proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9947,9 +9959,8 @@ msgid "Enable loading of remote content"
 msgstr "Povoli? na??tanie vzdialen?ho obsahu"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Pri kliknut? na odkaz, predvolene:"
+msgstr "Pri kliknut? na odkaz, predvolene"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -10106,9 +10117,8 @@ msgid "Add fetchinfo headers"
 msgstr "Prida? hlavi?ky Fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Adresa odosielate?a"
+msgstr "Pridan? hlavi?ky"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10117,7 +10127,7 @@ msgstr "UIDL"
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
-msgstr ""
+msgstr "Prid? hlavi?ku X-FETCH-UIDL s jedine?n?m ID spr?vy (POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10125,7 +10135,7 @@ msgstr "N?zov ??tu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Prid? hlavi?ku X-FETCH-ACCOUNT s menom ??tu"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10133,7 +10143,7 @@ msgstr "Prij?mac? server"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "Prid? hlavi?ku X-FETCH-SERVER s prij?mac?m serverom"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10141,7 +10151,7 @@ msgstr "ID pou??vate?a"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Prid? hlavi?ku X-FETCH-USERID s ID pou??vate?a"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10152,11 +10162,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Prid? hlavi?ku X-FETCH-TIME s d?tumom a ?asom prijatia spr?vy vo form?te "
+"RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "Z?suvn? modul GData: Chyba autentifik?cie: %s\n"
+msgstr "Z?suvn? modul GData: Vy?adovan? autoriz?cia"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10168,25 +10179,29 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Mus?te povoli? pre Claws Mail pr?stup k k svojmu zoznamu kontaktov Google, "
+"aby ste mohli pou??va? z?suvn? modul GData.\n"
+"\n"
+"Nav?t?vte str?nku autoriz?cie Google kliknut?m na tla?idlo ni??ie. Po "
+"potvrden? autoriz?cie z?skate autoriza?n? k?d. Tento k?d zadajte do po?a "
+"ni??ie, aby tse povolili pr?stup Claws Mail k svojmu zoznamu kontaktov "
+"Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Posun"
+msgstr "Krok 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Kliknite tu na otvorenie autoriza?nej str?nky Google v prehliada?i"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Posun"
+msgstr "Step 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Ovl?danie"
+msgstr "Zadajte k?d:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10227,47 +10242,45 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "Z?suvn? modul GData: ?tart asynchr?nneho h?adania skup?n\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "Z?suvn? modul GData: Chyba autentifik?cie: %s\n"
+msgstr "Z?suvn? modul GData: Chyba autoriz?cie: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "Z?suvn? modul GData: Chyba autentifik?cie: %s\n"
+msgstr "Z?suvn? modul GData: Autoriz?cia ?spe?n?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Z?suvn? modul GData: ?tart asynchr?nnej autentifik?cie\n"
+msgstr "Z?suvn? modul GData: ?tart interakt?vnej autoriz?cie\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "Z?suvn? modul GData: ?tart asynchr?nnej autentifik?cie\n"
+msgstr "Z?suvn? modul GData: Z?skan? autoriza?n? k?d, po?adujem autoriz?ciu\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"Z?suvn? modul GData: Nebol z?skan? autoriza?n? k?d, po?iadavka autoriz?cie "
+"zru?en?\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Z?suvn? modul GData: Chyba autentifik?cie: %s\n"
+msgstr "Z?suvn? modul GData: Chyba obnovenia autoriz?cie: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Z?suvn? modul GData: Chyba autentifik?cie: %s\n"
+msgstr "Z?suvn? modul GData: Obnovenie autoriz?cie ?spe?n?: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Z?suvn? modul GData: ?tart asynchr?nnej autentifik?cie\n"
+msgstr "Z?suvn? modul GData: Pokus o obnovenie autoriz?cie\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentifik?cia"
 
@@ -11405,7 +11418,7 @@ msgstr ""
 "m?te profil gravatar.com, ale nie libravatar, bud? pou?it? i tieto\n"
 "(ak je povolen? presmerovanie v nastaven? z?suvn?ho modulu).\n"
 "Str?nka nastaven? z?suvn?ho modulu je dostupn? z hlavn?ho okna:\n"
-"na /Nastavenie/Nastavenia.../Z?suvn? moduly/Libravatar.\n"
+"na /Nastavenie/Nastavenia?/Z?suvn? moduly/Libravatar.\n"
 "\n"
 "Tento z?suvn? modul pou??va na z?skanie obr?zkov libcurl, tak?e ak ste\n"
 "za proxy, pros?m, h?adajte podrobnosti o nastaven? ?http_proxy? v\n"
@@ -11415,9 +11428,9 @@ msgstr ""
 "Sp?tn? v?zba na <ricardo at mones.org> je v?tan?.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Va?a emailov? adresa:</span>"
+msgstr ""
+"<span weight=\"bold\">Chyba ??tania ?tatist?k vyrovn?vacej pam?te:</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11425,25 +11438,25 @@ 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Pou?it? %s v %d s?boroch, %d zlo?k?ch a %d in?ch"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Vyrovn?vacia pam?? ikon"
+msgstr "Vymaza? Vyrovn?vaciu pam?? ikon"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Naozaj chcete zmaza? t?to t?mu?"
+msgstr "Naozaj chcete vymaza? v?etky ulo?en? ikony avatarov?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Nedostatok pam?te na oper?ciu"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11452,10 +11465,14 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Vyrovn?vacia pam?? ikon ?spe?ne vymazan?:\n"
+"? %u ch?baj?cich polo?iek odstr?nen?ch.\n"
+"? %u s?borov odstr?nen?ch."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
 msgstr ""
+"<span color=\"#006400\">Vyrovn?vacia pam?? ikon ?spe?ne vymazan?!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11466,10 +11483,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Chyba vymaz?vania vyrovn?vacej pam?te ikon:\n"
+"? %u ch?baj?cich polo?iek odstr?nen?ch.\n"
+"? %u s?borov odstr?nen?ch.\n"
+"? %u s?borov zlyhalo ??tanie.\n"
+"? %u s?borov nebolo mo?n? odstr?ni?."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Chyba mazania vyrovn?vacej pam?te ikon.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11546,6 +11568,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"zadajte URL, na ktor? chcete by? presmerovan?, ak nie je dostupn? ikona "
+"pou??vate?a. Nechajte pr?zdne na pou?itie prevolenej oran?ovej ikony "
+"libravatar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11632,6 +11657,270 @@ msgstr ""
 "V?etky zlo?ky a spr?vy v ?%s? bud? odstr?nen?.\n"
 "Naozaj chcete pokra?ova??"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Nie je dostupn? met?da Sieve auth\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "Zvolen? met?da Sieve auth nie je dostupn?\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Odpojen?"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Odpojen?: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "nespracovan? spr?va v rel?cii Sieve: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS zlyhalo"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "nastala chyba rel?cie SIEVE\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "nastala chyba rel?cie Sieve. D?ta: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "nespracovan? spr?va v rel?cii Sieve: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: opakovanie auth\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Met?da auth nie je dostupn?"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtrova?"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "S_kontrolova? syntax"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "_Vr?ti?"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Nemo?no z?ska? obsah skriptu"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Prij?manie?"
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Vr?ti? skript"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Tento skript bol zmenen?. Vr?ti? neulo?en? zmeny?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "V_r?ti?"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Skript ?spe?ne ulo?en?."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Ukladanie?"
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Kontrola syntaxe?"
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Tento skript bol zmenen?. Ulo?i? posledn? zmeny?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Ulo?i?"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s ? Filter Sieve%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Prida? skript Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Zadajte meno nov?ho skriptu Sieve."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "zadajte nov? meno skriptu."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Naozaj chcete odstr?ni? filter ?%s??"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Odstr?ni? filter"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Akt?vne"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "??et m??e ma? v jednom okamihu len jeden akt?vny skript."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Nemo?no sa pripoji?"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "V?pis skriptov?"
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Prip?janie?"
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Spravova? skripty Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Na pou?itie Sieve, zapnite ho v nastaven? ??tu."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Spravova? filtre Sieve?"
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "Spravovanie filtrov Sieve na serveri pomocou protokolu ManageSieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Povoli? Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Inform?cie o servere"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Meno servera"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Pripoji? sa k tomuto stroju, namiesto stroja pou?it?ho na prijatie spr?vy"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Port servera"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Pripoji? sa na tento port, namiesto predovlen?ho"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "?ifrovanie"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Bez TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Pou?i? TLS, ke? je dostupn?"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Vy?adova? TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Bez autentifik?cie"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Pou?i? rovnak? autentifik?ciu ako na prij?manie po?ty"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Zada? autentifik?ciu"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Prihlasovacie meno"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Heslo"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Met?da autentifik?cie"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatick?"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Server Sieve nesmie obsahova? medzery."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Nebol zadan? server Sieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NewMail"
@@ -11910,14 +12199,12 @@ msgid "News folders"
 msgstr "Diskusn? skupiny"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSS kan?ly"
+msgstr "Zlo?ky RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Zlo?ky kalend?ra"
+msgstr "Zlo?ky vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11967,23 +12254,20 @@ msgid "Banner speed"
 msgstr "R?chlos? titulkov?ho pruhu"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Maxim?lny po?et v?sledkov:"
+msgstr "Maxim?lny po?et spr?v"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "Maxim?lny po?et spr?v (0 znamen? neobmedzen?)"
+msgstr "Maxim?lny po?et zobrazen?ch spr?v (0 znamen? neobmedzen?)"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "R?chlos? titulkov?ho pruhu"
+msgstr "??rka pruhu"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "maxim?lna ??rka pruhu (0 pre ??rku obrazovky)"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -12010,12 +12294,11 @@ msgstr "Zahrn?? len vybrat? zlo?ky"
 #: src/plugins/notification/notification_prefs.c:1386
 #: src/plugins/notification/notification_prefs.c:1621
 msgid "Select folders..."
-msgstr "Vybra? zlo?ky..."
+msgstr "Vybra? zlo?ky?"
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Farba zlo?ky"
+msgstr "Farba pruhu"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12051,16 +12334,14 @@ msgstr "Zapn?? vyskakovacie okno"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "?asov? limit zobrazenia okna:"
+msgstr "?asov? limit zobrazenia okna"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "sek?nd"
+msgstr "sekunda(y)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12088,18 +12369,16 @@ msgid "Done"
 msgstr "Hotovo"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Pr?kaz shellu"
+msgstr "Vybra? pr?kaz"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Zapn?? vykonanie pr?kazu"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Pr?kaz:"
+msgstr "Pr?kaz na spustenie"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12110,9 +12389,8 @@ msgid "Enable LCD"
 msgstr "Zapn?? LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Meno_stroja:Port servera LCDd:"
+msgstr "Meno_stroja:Port servera LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12170,9 +12448,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Prepn?? minimalizovan?:"
+msgstr "Prepn?? minimalizovan?"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12290,7 +12567,7 @@ msgstr "Vlastnosti PDF"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1276
 msgid "Loading..."
-msgstr "Na??tanie..."
+msgstr "Na??tanie?"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1335
 #, c-format
@@ -12400,7 +12677,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr "Upravi? filtrovacie pravidl? perl (ext)..."
+msgstr "Upravi? filtrovacie pravidl? perl (ext)?"
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -12743,52 +13020,51 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Nemo?no z?ska? k??? ? nie je spusten? gpg-agent."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Platn? podpis od %s."
+msgstr "Platn? podpis od ?%s? [absol?tna]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Platn? podpis od %s."
+msgstr "Platn? podpis od ?%s? [pln?]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Platn? podpis od %s."
+msgstr "Platn? podpis od ?%s? [?iasto?n?]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Platn? podpis od %s."
+msgstr "Platn? podpis od ?%s?"
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Vypr?an? podpis od %s."
+msgstr "Vypr?an? podpis od ?%s?"
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Platn? podpis od %s, ale k???u skon?ila platnos?."
+msgstr "Platn? podpis od ?%s?, ale k???u vypr?ala platnos?"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Platn? podpis od %s, ale k??? bol odvolan?."
+msgstr "Platn? podpis od ?%s?, ale k??? bol odvolan?"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Chybn? podpis od %s."
+msgstr "Chybn? podpis od ?%s?."
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Nemo?no n?js? verejn? k??? 0x%s na overenie tohoto podpisu."
+msgstr "Nie je dostupn? k??? 0x%s na overenie tohoto podpisu"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
 msgstr "Podpis nebol overen?"
 
@@ -13198,7 +13474,7 @@ msgstr "Skripty Python"
 
 #: src/plugins/python/python_plugin.c:497
 msgid "Show Python console..."
-msgstr "Zobrazi? konzolu Python..."
+msgstr "Zobrazi? konzolu Python?"
 
 #: src/plugins/python/python_plugin.c:503
 msgid "Refresh"
@@ -13222,7 +13498,6 @@ msgstr ""
 "create hook?"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13399,7 +13674,6 @@ msgid "'%c' can't be used in folder name."
 msgstr "?%c? nemo?no pou?i? v n?zve zlo?ky."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail potrebuje na aktualiz?ciu kan?la sie?ov? pr?stup."
@@ -13464,15 +13738,9 @@ msgstr "RSSyl: Nemo?no spracova? kan?l na ?%s?\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Aplik?cia kon??, nemo?no dokon?i? aktualiz?ciu kan?la na ?%s?\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Pou?i? autentifik?ciu"
-
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Pou?i? autentifik?ciu"
+msgstr "Z?kladn? autentifik?cia HTTP"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -13531,17 +13799,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>Zdrojov? URL:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Pou??vate?sk? meno:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Heslo"
+msgstr "Meno pou??vate?a"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13582,7 +13841,7 @@ msgstr "V_lastnosti kan?la.."
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
-msgstr "Pre_menova?..."
+msgstr "Pre_menova??"
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "R_efresh recursively"
@@ -13590,15 +13849,15 @@ msgstr "Obnovi? r_ekurz?vne"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
-msgstr "Prihl?si? _nov? kan?l..."
+msgstr "Prihl?si? _nov? kan?l?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
 msgid "Create new _folder..."
-msgstr "V_ytvori? nov? zlo?ku..."
+msgstr "V_ytvori? nov? zlo?ku?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:54
 msgid "Import feed list..."
-msgstr "Importova? zoznam kan?lov..."
+msgstr "Importova? zoznam kan?lov?"
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
 msgid "Remove tree"
@@ -13626,14 +13885,12 @@ msgid "My Feeds"
 msgstr "Moje kan?ly"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Vyberte s?bor Pine"
+msgstr "Vyberte s?bor cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Pou?i? predvolen? interval aktualiz?cie"
+msgstr "Predvolen? interval obnovenia"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
@@ -13652,13 +13909,12 @@ msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Cesta k s?boru cookies.txt obsahuj?cemu va?e cookies v ?t?le Netscape"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Obnovi?"
+msgstr "Obnovovanie"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Bezpe?nos? a s?kromie"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -13729,7 +13985,7 @@ msgstr ""
 #: src/plugins/rssyl/rssyl_update_feed.c:224
 #, c-format
 msgid "Updating feed '%s'..."
-msgstr "Aktualiz?cia kan?la ?%s?..."
+msgstr "Aktualiz?cia kan?la ?%s??"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:246
 #, c-format
@@ -13823,11 +14079,11 @@ msgstr ""
 
 #: src/plugins/spam_report/spam_report.c:293
 msgid "Reporting spam..."
-msgstr "Ohlasovanie SPAM..."
+msgstr "Ohlasovanie SPAM?"
 
 #: src/plugins/spam_report/spam_report.c:328
 msgid "Report spam online..."
-msgstr "Ohl?si? SPAM online..."
+msgstr "Ohl?si? SPAM online?"
 
 #: src/plugins/spam_report/spam_report.c:339
 #: src/plugins/spam_report/spam_report.c:377
@@ -14042,11 +14298,11 @@ msgstr ""
 
 #: src/plugins/vcalendar/common-views.c:62
 msgid "_Edit this meeting..."
-msgstr "Upravi? toto str_etnutie..."
+msgstr "Upravi? toto str_etnutie?"
 
 #: src/plugins/vcalendar/common-views.c:63
 msgid "_Cancel this meeting..."
-msgstr "_Zru?i? toto stretnutie..."
+msgstr "_Zru?i? toto stretnutie?"
 
 #: src/plugins/vcalendar/common-views.c:65
 msgid "_Create new meeting..."
@@ -14187,7 +14443,7 @@ msgstr ""
 "Po?iadavky na stretnutie, ktor? prijmete, bud? zobrazen? v pr?slu?nej podobe "
 "a Vy ich budete m?c? prija? alebo odmietnu?.\n"
 "Na vytvorenie stretnutia kliknite prav?m tla?idlom na zlo?ku vCalendar alebo "
-"Stretnutia a zvo?te ?Nov? stretnutie...?.\n"
+"Stretnutia a zvo?te ?Nov? stretnutie??.\n"
 "\n"
 "M??ete sa tie? prihl?si? k extern?m kan?lom webCal, exportova? svoje "
 "stretnutia a kalend?re, zverej?ova? inform?cie o svojom ?ase a prij?ma? "
@@ -14199,7 +14455,7 @@ msgstr "Kalend?r"
 
 #: src/plugins/vcalendar/vcalendar.c:100
 msgid "Create meeting from message..."
-msgstr "Vytvori? zo spr?vy stretnutie..."
+msgstr "Vytvori? zo spr?vy stretnutie?"
 
 #: src/plugins/vcalendar/vcalendar.c:120
 #, c-format
@@ -14209,7 +14465,7 @@ msgstr "Vytv?rate %d stretnutia, jedno po druhom. Chcete pokra?ova??"
 
 #: src/plugins/vcalendar/vcalendar.c:139
 msgid "Creating meeting..."
-msgstr "Vytv?ranie stretnutia..."
+msgstr "Vytv?ranie stretnutia?"
 
 #: src/plugins/vcalendar/vcalendar.c:158
 msgid "no subject"
@@ -14324,11 +14580,11 @@ msgstr "Odpoveda?"
 
 #: src/plugins/vcalendar/vcalendar.c:1220
 msgid "Edit meeting..."
-msgstr "Upravi? stretnutie..."
+msgstr "Upravi? stretnutie?"
 
 #: src/plugins/vcalendar/vcalendar.c:1221
 msgid "Cancel meeting..."
-msgstr "Zru?i? stretnutie..."
+msgstr "Zru?i? stretnutie?"
 
 #: src/plugins/vcalendar/vcalendar.c:1222
 msgid "Launch website"
@@ -14381,19 +14637,19 @@ msgstr "Akcia:"
 
 #: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
-msgstr "_Nov? stretnutie..."
+msgstr "_Nov? stretnutie?"
 
 #: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
-msgstr "_Exportova? kalend?r..."
+msgstr "_Exportova? kalend?r?"
 
 #: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to webCal..."
-msgstr "Prihl?_si? sa do webCal..."
+msgstr "Prihl?_si? sa do webCal?"
 
 #: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
-msgstr "P_remenova?..."
+msgstr "P_remenova??"
 
 #: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
@@ -14619,7 +14875,7 @@ msgstr "Miestnos?"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Add..."
-msgstr "Prida?..."
+msgstr "Prida??"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:779
 msgid ""
@@ -14768,7 +15024,7 @@ msgstr "Posla? i tak"
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:981
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
-"Nikto nie je dostupn?. Pozrite si n?strojov? tipy s ?al??mi inform?ciami..."
+"Nikto nie je dostupn?. Pozrite si n?strojov? tipy s ?al??mi inform?ciami?"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
 #, c-format
@@ -14941,12 +15197,6 @@ msgstr "Kalend?r m??ete exportova? do lok?lneho s?boru alebo URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Zadajte umiestnenie s?boru alebo URL (http://server/cesta/s?bor.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Prihlasovacie meno"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "V exporte zahrn?? webcal prihl?senia"
@@ -15088,10 +15338,6 @@ msgstr "Cel? meno"
 msgid "Mail address"
 msgstr "Emailov? adresa"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Inform?cie o servere"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Automatick? konfigur?cia"
@@ -15198,14 +15444,6 @@ msgstr "Maxim?lny po?et pr?spevkov na stiahnutie"
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzen?, ak je zadan? 0"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Met?da autentifik?cie"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatick?"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Zlo?ka servera IMAP"
@@ -17672,9 +17910,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cyrilika (KOI8-R)"
+msgstr "Cyrilika (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -19243,10 +19480,6 @@ msgstr ""
 "Niektor? pravidl? patria konkr?tnemu ??tu.\n"
 "Pros?m vyberte si, ako pristupova? k t?mto pravidl?m:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filtrova?"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrujem?"
@@ -20260,6 +20493,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Pou?i? toto"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Nemo?no za?ifrova? spr?vu: %s"
diff --git a/po/sv.po b/po/sv.po
index 3912f66..2997969 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,34 +1,34 @@
 # Swedish translation of Claws Mail.
-# Copyright (C) 2006-2014 The Claws Mail team
+# Copyright (C) 2006-2015 The Claws Mail team
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
 # Anders Trob?ck <sylpheed at troback.com>, 2006.
-# Andreas R?nnquist <gusnan at gusnan.se>, 2012-2014.
+# Andreas R?nnquist <gusnan at openmailbox.org>, 2012-2015.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.10.0\n"
+"Project-Id-Version: Claws Mail 3.11.1git202\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-13 20:44+0100\n"
-"Last-Translator: Andreas R?nnquist <gusnan at gusnan.se>\n"
+"POT-Creation-Date: 2015-07-09 13:19+0200\n"
+"PO-Revision-Date: 2015-07-09 13:57+0100\n"
+"Last-Translator: Andreas R?nnquist <gusnan at openmailbox.org>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: src/account.c:392 src/account.c:459
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
-"Det finns n?got Skriv meddelande-f?nster ?ppet.\n"
-"St?ng alla Skriv meddelande-f?nster innan du redigerar konton."
+"Det finns n?got \"Skriv meddelande\"-f?nster ?ppet.\n"
+"St?ng alla \"Skriv meddelande\"-f?nster innan du redigerar konton."
 
 #: src/account.c:437
 msgid "Can't create folder."
@@ -84,13 +84,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'H?mta e-post' h?mtar e-post fr?n valda e-postkonton"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -428,7 +429,7 @@ msgstr "Adress_bok"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Redigera"
 
@@ -471,10 +472,14 @@ msgid "_Delete book"
 msgstr "_Ta bort adressbok"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Spara"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "St_?ng"
 
@@ -488,11 +493,12 @@ msgstr "Klipp _ut"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Kopiera"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "Kli_stra in"
 
@@ -952,12 +958,12 @@ msgstr "Adress(er) uppdaterade"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. ?ndringar inte skrivna till Katalogen."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1529,15 +1535,15 @@ msgstr "E_rs?tt signatur"
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_?ngra"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "G?_r om"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
@@ -1558,6 +1564,7 @@ msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "Markera _alla"
 
@@ -1622,6 +1629,7 @@ msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_S?k"
 
@@ -1922,7 +1930,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?r du s?ker?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Infoga"
 
@@ -2019,7 +2027,7 @@ msgstr "K?a det ?nd??"
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2029,7 +2037,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenupps?ttning."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2039,7 +2047,7 @@ msgstr ""
 "\n"
 "Kunde inte f? tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2106,67 +2114,72 @@ msgstr ""
 "\n"
 "Skicka ?nd??"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Kunde inte dekryptera e-posten: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+F_orts?tt"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto f?r att skicka e-post tillg?ngligt!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto ?r inte NNTP: Om?jligt att skicka."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte l?ngre. Ignorera?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Avbryt s?ndning"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "L?gg till i adress_boken"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Ta bort inneh?llet i inmatningsf?ltet"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Anv?nd <tabb> f?r automatisk ifyllning fr?n adressbok"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Mime typ"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2177,24 +2190,23 @@ msgstr "Spara meddelande i "
 msgid "_Browse"
 msgstr "_Bl?ddra"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
-msgstr "?vriga"
+msgstr "?v_rigt"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
 msgstr "?mne:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2203,25 +2215,24 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Fr?n: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Fr?n:"
+msgstr "_Fr?n:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Konto att anv?nda f?r denna e-post"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Avs?ndaradress att anv?ndas"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2230,68 +2241,68 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallens meddelandetext har ett fel p? rad %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Fel i Fr?n-mallformat."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Fel i Till-mallformat."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Fel i Kopia-mallformat."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Fel i Blindkopia-mallformat."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Fel i malformat f?r Svara-Till."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Fel i ?rende-mallformat."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ"
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller ?r tom."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "S?kv?g"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2302,17 +2313,17 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail beh?ver vara uppkopplad mot ett n?tverk f?r att kunna skicka "
 "denna e-post."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Kunde inte k?a meddelandet."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2323,15 +2334,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2339,24 +2350,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_?verge e-post"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "V?lj fil"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte l?sas."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2365,62 +2376,62 @@ msgstr ""
 "Filen '%s' inneh?ller ogiltiga tecken\n"
 "f?r den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "?verge meddelande"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ?ndrats. Vill du ?verge det?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_?verge"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Spara ?ndringar"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ?ndrats. Vill du spara de senaste ?ndringarna?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+_Spara till Utkast"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du anv?nda mallen '%s' ?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Anv?nd mall"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Ers?tt"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2428,16 +2439,16 @@ msgstr ""
 "Vill du infoga inneh?llet i filen(-erna) i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel p? rad %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3646,9 +3657,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserar %s f?r fr?nkopplad anv?ndning...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "En mapp kan inte flyttas mellan olika brevl?dor."
+msgstr "Ett mappnamn kan inte b?rja eller sluta med punkt."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3688,9 +3698,8 @@ msgid "Mark all re_ad"
 msgstr "_Markera alla som l?sta"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Markera alla som l?sta"
+msgstr "Markera alla som l?sta rekursi_vt"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3738,104 +3747,112 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "St?ller in mappinfo..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Markera alla som l?sta"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
+"l?sta?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Vill du verkligen markera alla meddelanden i denna mapp som l?sta?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Markera alla som l?sta"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avs?ker mapp %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avs?ker mapp %s...."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Den lokala bufferten kommer att tas bort om du uppdaterar mapplistan. Vill "
 "du forts?tta?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "S?ker igenom mapplistan..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunde inte genoms?ka mapp %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "St?nger mapp %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "?ppnar mapp %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte ?ppnas."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "T?m papperskorg"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande fr?n papperskorgen?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_T?m papperskorg"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Varning om fr?nkopplat l?ge"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Du arbetar fr?nkopplad. ?sidos?tta?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Skicka k?ade meddelanden"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Skicka alla k?ade meddelanden?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "N?gra fel uppstod vid avs?ndande av meddelanden i k?."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3844,64 +3861,64 @@ msgstr ""
 "N?gra fel uppstod vid skickande av k?ade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vill du verkligen kopiera mappen '%s' i '%s'?"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vill du verkligen g?ra mappen '%s' till en undermapp till '%s' ?"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "K?lla och destination ?r de samma."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan inte kopiera en mapp till ett av dess barn."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "Kan inte flytta en mapp till ett av dess barn."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevl?dor."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration f?r mappen %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara anv?ndas till att spara undermappar."
 
@@ -3994,7 +4011,6 @@ msgstr ""
 "till Claws Mail-projektet kan du g?ra det p?:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4004,7 +4020,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "Claws Mail-teamet\n"
 " och Hiroyuki Yamamoto"
 
@@ -4227,13 +4243,12 @@ msgid "About Claws Mail"
 msgstr "Om Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "Claws-Mail-teamet\n"
 "och Hiroyuki Yamamoto"
 
@@ -5029,6 +5044,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5085,11 +5101,12 @@ msgstr "Sidindex"
 msgid "_Hide"
 msgstr "_D?lj"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Konto"
 
@@ -5308,9 +5325,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "N?got gick fel under s?kning. V?nligen kontrollera dina loggar."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Fr?n/Till/?mne/Etiketter"
+msgstr "Fr?n/Till/CC/?mne/Etiketter"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5775,7 +5791,6 @@ msgstr ""
 "st?d och om DIGEST-MD5 SASL insticksmodulen ?r installerad."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5784,8 +5799,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
-"st?d och om CRAM-MD5 SASL insticksmodulen ?r installerad."
+"SCRAM-SHA-1-inloggning fungerar endast om libetpan har kompilerats med SASL-"
+"st?d och om SCRAM SASL-insticksmodulen ?r installerad."
 
 #: src/imap.c:959
 #, c-format
@@ -5934,13 +5949,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "Anslutning till %s misslyckades: servern kr?ver TLS, men Claws-Mail har "
-"kompilerats utan st?d f?r OpenSSL.\n"
+"kompilerats utan st?d f?r TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6374,7 +6389,7 @@ msgstr "Klart (inga nya meddelande)"
 msgid "Connection failed"
 msgstr "F?rbindelse misslyckades"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
@@ -6418,7 +6433,8 @@ msgstr "Kan inte ansluta till POP3-server: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentiserar"
 
@@ -8148,12 +8164,15 @@ msgid "Remove _mailbox..."
 msgstr "Ta bort brev_l?da"
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Kan inte ta bort mappen '%s'."
+msgstr ""
+"Kan inte ta bort mappen '%s'\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8544,9 +8563,8 @@ msgid "Address Keeper"
 msgstr "Adress Keeper"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "S?kv?g till adressbok"
+msgstr "Plats f?r Adressboken"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
@@ -8567,7 +8585,7 @@ msgstr "V?lj ..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "F?lt att beh?lla adresser fr?n"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8582,12 +8600,9 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Beh?ll adresser som finns i 'Bcc'-brevhuvuden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
-msgstr ""
-"Exkludera adresser som matchar f?ljande regulj?ra uttryck:\n"
-"(en per rad)"
+msgstr "Exkludera adresser som matchar f?ljande regulj?ra uttryck (en per rad)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9137,9 +9152,8 @@ msgid "attach"
 msgstr "bifoga"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Ett av f?ljande regulj?ra uttryck matchar (en per rad):"
+msgstr "Ett av f?ljande regulj?ra uttryck matchar (en per rad)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9321,19 +9335,16 @@ msgid "KB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Ta bort etikett"
+msgstr "Ta bort skr?ppost"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Spara skr?ppost i"
+msgstr "Spara skr?ppost i..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Markera som skr?p"
+msgstr "Markera endast som skr?p"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9844,9 +9855,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Anv?nd proxyinst?llningar fr?n GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Anv?nd proxy:"
+msgstr "Anv?nd proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9872,9 +9882,8 @@ msgid "Enable loading of remote content"
 msgstr "Aktivera laddning av fj?rrinneh?ll"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Vid klickning av l?nkar, som standard:"
+msgstr "Vid klickning av l?nkar, som standard"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -10032,9 +10041,8 @@ msgid "Add fetchinfo headers"
 msgstr "L?gg till brevhuvuden f?r fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Avs?ndaradress att anv?ndas"
+msgstr "Huvuden som skall l?ggas till"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10044,6 +10052,8 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"L?gger till X-FETCH-UIDL-huvudet med meddelandets unika ID-identifierare "
+"(POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10051,7 +10061,7 @@ msgstr "Kontonamn"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "L?gger till X-FETCH-ACCOUNT-huvudet med kontonamnet"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10059,7 +10069,7 @@ msgstr "Mottagarserver"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "L?gger till X-FETCH-SERVER-huvudet med mottagandeserver"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10067,7 +10077,7 @@ msgstr "Anv?ndarID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "L?gger till X-FETCH-USERID-huvudet med anv?ndarID"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10078,11 +10088,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"L?gger till X-FETCH-TIME-huvudet med datum och tid f?r mottagande av "
+"meddelande i RFC822-format"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "Insticksmodulen GData: Autentiseringsfel: %s\n"
+msgstr "GData-insticksmodulen: Auktorisering kr?vs"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10094,25 +10105,29 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Du m?ste till?ta Claws Mail att f? tillg?ng till din Google-kontaktlista f?r "
+"att anv?nda insticksmodulen GData.\n"
+"\n"
+"Bes?k Google's auktorisering genom att klicka p? knappen nedan. Efter att du "
+"har bekr?ftat godk?nnandet kommer du att f? en auktoriseringskod. Mata in "
+"den koden i f?ltet nedan f?r att ge Claws Mail ?tkomst till din Google-"
+"kontaktlista."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Stega"
+msgstr "Steg 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Klicka h?r f?r att ?ppna Google's auktoriseringsssida i en webbl?sare"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Stega"
+msgstr "Steg 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Gr?nssnitt"
+msgstr "Mata in kod:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10151,47 +10166,46 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "Insticksmodulen GData: Startar asynkron gruppf?rfr?gan\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "Insticksmodulen GData: Autentiseringsfel: %s\n"
+msgstr "GData-insticksmodul: Autentiseringsfel: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "Insticksmodulen GData: Autentiseringsfel: %s\n"
+msgstr "GData-insticksmodul: Auktorisering framg?ngsrik\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Insticksmodulen GData: Startar asynkron autentisering\n"
+msgstr "GData-insticksmodul: Startar interaktiv auktorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "Insticksmodulen GData: Startar asynkron autentisering\n"
+msgstr ""
+"GData-insticksmodul: Fick auktoriseringskod, efterfr?gar auktorisering\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"GData-insticksmodul: Ingen auktoriseringskod mottagen, "
+"auktoriseringsf?rfr?gan avvisad\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Insticksmodulen GData: Autentiseringsfel: %s\n"
+msgstr "GData-Insticksmodul: Auktoriseringf?nyelsefel: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Insticksmodulen GData: Autentiseringsfel: %s\n"
+msgstr "GData-insticksmodul: Auktoriseringsf?rnyelse framg?ngsrik\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Insticksmodulen GData: Startar asynkron autentisering\n"
+msgstr "GData-insticksmodul: F?rs?ker f?rnya auktorisering\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -11344,9 +11358,8 @@ msgstr ""
 "Feedback till <ricardo at mones.org> v?lkomnas.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Din e-postadress:</span>"
+msgstr "<span color=\"red\">Fel vid l?sning av cachestatistik</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11354,25 +11367,25 @@ msgid ""
 "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
 "errors</span>"
 msgstr ""
+"<span color=\"red\">Anv?nder %s i %d filer, %d mappar, %d ?rigt och %d fel</"
+"span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Anv?nder %s i %d filer, %d mappar och %d ?vrigt"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Ikoncache"
+msgstr "Rensa ikoncache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "?r du s?ker p? att du vill ta bort detta tema?"
+msgstr "?r du s?ker p? att du vill ta bort alla cachade avatarikoner?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Inte tillr?ckligt med ledigt minne f?r handlingen"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11381,10 +11394,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Ikoncache rensades framg?ngsrikt:\n"
+"? %u saknade inl?gg borttagna.\n"
+"? %u filer borttagna."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">Ikoncache rensades framg?ngsrikt!</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11395,10 +11411,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Fel vid rensning av ikoncache:\n"
+"? %u saknade inl?gg borttagna.\n"
+"? %u filer borttagna.\n"
+"? %u filer misslyckades att l?sas.\n"
+"? %u filer kunde inte tas bort."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Fel vid rensning av ikoncache.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11477,6 +11498,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Mata in URLen som du vill bli omdirigerad till n?r ingen ikon finns "
+"tillg?nglig. L?mna en tom URL f?r att anv?nda libravatars orangef?rgade "
+"standardikon."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11563,6 +11587,270 @@ msgstr ""
 "Alla mappar och meddelanden under '%s' kommer att tas bort.\n"
 "Vill du verkligen forts?tta?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Ingen Sieve-autentiseringsmetod tillg?nglig\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "Vald Sieve-autentiseringsmetod finns inte tillg?nglig\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Fr?nkopplad"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Fr?nkopplad: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "ohanterat meddelande i Sieve-session: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS misslyckades"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "fel uppstod I Sieve-sessionen\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "fel uppstod i Sieve-sessionen. data: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "ohanterat meddelande i Sieve-session: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: f?rs?ker autentisera igen\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "Autentiseringsmetoden inte tillg?nglig"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filter"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "_Kontrollera Syntax"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "?ngra"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Kunde inte h?mta inneh?llet i skriptet"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "?ngrar..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "?ngra skript"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Detta skript har ?ndrats. ?ngra de icke sparade f?r?ndringarna?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "?ngra"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Skript sparades framg?ngsrikt."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Sparar..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Kontrollerar syntax..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Detta skript har ?ndrats. Vill du spara de senaste ?ndringarna?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Spara"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve Filter%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "L?gg till Sieveskript"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Ange namnet p? ett nytt Sieve-filterskript."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Ange ett nytt namn f?r skriptet."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Vill du verkligen ta bort filtret '%s'?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Ta bort filter"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Ett konto kan endast ha ett aktivt skript ?t g?ngen."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Kunde inte ansluta"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Listar skript..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Hantera Sieve-filter"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "F?r att anv?nda Sieve, aktivera det i kontoinst?llningarna."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Hantera Sievefilter..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr "Hantera sievefilter p? en server som anv?nder protokollet ManageSieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Aktivera Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Serverinformation"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Servernamn"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Anslut till denna v?rd ist?llet f?r v?rden som anv?nds f?r att ta emot e-post"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Serverport"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Anslut till denna port ist?llet f?r standardporten"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Ingen TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Anv?nd TLS n?r det finns tillg?ngligt"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Kr?v TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Ingen autentisering"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Anv?nt samma autentisering f?r mottagning av e-post"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Specificera autentisering"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Anv?ndar-ID"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "L?senord"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Autentiseringsmetod"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatiskt"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Sieve-servern f?r inte inneh?lla mellanslag."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Har inte anslutit till Sieve-servern."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NewMail"
@@ -11838,14 +12126,12 @@ msgid "News folders"
 msgstr "Nyhetsmappar"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "RSSmappar"
+msgstr "RSSyl-mappar"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Kalendermappar"
+msgstr "vCalendarmappar"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11891,23 +12177,20 @@ msgid "Banner speed"
 msgstr "Banderollhastighet"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Maximalt antal resultat:"
+msgstr "Maximalt antal meddelanden"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "Maximalt antal meddelanden (0 betyder obegr?nsat)"
+msgstr "Begr?nsa antalet visade meddelanden, anv?nd 0 f?r obegr?nsat"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Banderollhastighet"
+msgstr "Banderollbredd"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Begr?nsa storleken p? banderollen, anv?nd 0 f?r sk?rmbredd"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11937,9 +12220,8 @@ msgid "Select folders..."
 msgstr "V?lj mappar..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Mappf?rg"
+msgstr "Banderollf?rger"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -11975,16 +12257,14 @@ msgstr "Aktivera popup"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Tidsgr?ns f?r popup:"
+msgstr "Tidsgr?ns f?r popup"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "sekunder"
+msgstr "sekund(er)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12012,18 +12292,16 @@ msgid "Done"
 msgstr "F?rdig"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Skalkommando"
+msgstr "V?lj kommando"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Aktivera kommando"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Kommando att k?ra:"
+msgstr "Kommando att k?ra"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12034,9 +12312,8 @@ msgid "Enable LCD"
 msgstr "Aktivera LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "V?rdnamn:Port f?r LCD-server:"
+msgstr "V?rdnamn:Port f?r LCD-server"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12094,9 +12371,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "V?xla minimera:"
+msgstr "V?xla minimera"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12666,54 +12942,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan inte h?mta nyckel - ingen gpg-agent k?rs."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Bra signatur fr?n %s."
+msgstr "Bra signatur fr?n \"%s\" [f?rbeh?llsl?s]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Bra signatur fr?n %s."
+msgstr "Bra signatur fr?n \"%s\" [fullst?ndig]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Bra signatur fr?n %s."
+msgstr "Bra signatur fr?n \"%s\" [marginell]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Bra signatur fr?n %s."
+msgstr "Bra signatur fr?n \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Utg?ngen signatur fr?n %s."
+msgstr "Utg?ngen signatur fr?n \"%s\"."
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Bra signatur fr?n %s, men nyckeln har utg?tt."
+msgstr "Bra signatur fr?n \"%s\", men nyckeln har utg?tt"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Bra signatur fr?n %s, men nyckeln har makulerats."
+msgstr "Bra signatur fr?n \"%s\", men nyckeln har makulerats"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Ogiltig signatur fr?n %s."
+msgstr "Ogiltig signatur fr?n \"%s\"."
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Nyckel 0x%s ?r inte tillg?nglig f?r att verifiera denna signatur."
+msgstr "Nyckel 0x%s ?r inte tillg?nglig f?r att verifiera denna signatur"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "Signaturen har inte kontrollerats."
+msgstr "Signaturen har inte kontrollerats"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -13147,7 +13422,6 @@ msgstr ""
 "insticksmodulen Python"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13224,7 +13498,7 @@ msgstr ""
 "Exekveras n?r insticksmodulen st?ngs ner\n"
 "\n"
 "\n"
-"F?r den mest uppdaterade API-dokumentationen, skriv\n"
+"F?r den senast uppdaterade API-dokumentationen, skriv\n"
 "\n"
 " help(clawsmail)\n"
 "\n"
@@ -13322,7 +13596,6 @@ msgid "'%c' can't be used in folder name."
 msgstr "'%c' kan inte anv?ndas i mappnamn."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail beh?ver n?tverks?tkomst f?r att kunna uppdatera fl?det."
@@ -13386,15 +13659,9 @@ msgstr "RSSyl: Kunde inte behandla fl?de vid '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Applikationen avslutas, kunde inte uppdatera fl?de vid '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Anv?nd autentisering"
-
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Anv?nd autentisering"
+msgstr "HTTP Enkel autentisering"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -13455,17 +13722,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>URL k?lla:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Anv?ndarnamn:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "L?senord"
+msgstr "Anv?ndarnamn"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13551,14 +13809,12 @@ msgid "My Feeds"
 msgstr "Mina fl?den"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "V?lj Pine Fil"
+msgstr "V?lj kak-fil"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Anv?nd standard uppdateringsintervall"
+msgstr "Sstandard uppdateringsintervall"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
@@ -13577,13 +13833,12 @@ msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "S?kv?g till Netscape-formatterad cookies.txt som inneh?ller dina kakor"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Uppdatera"
+msgstr "Uppdaterar"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "S?kerhet och integritet"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -14878,12 +15133,6 @@ msgstr "Du kan exportera till en lokal fil eller URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specificera en lokal fil eller URL (http://server/mapp/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Anv?ndar-ID"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Inkludera webcal-prenumerationer i export"
@@ -15025,10 +15274,6 @@ msgstr "Fullst. namn"
 msgid "Mail address"
 msgstr "Epostadress"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Serverinformation"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Auto-konfiguration"
@@ -15135,14 +15380,6 @@ msgstr "Maximalt antal artiklar att ladda ner"
 msgid "unlimited if 0 is specified"
 msgstr "obegr?nsad om 0 v?ljs"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Autentiseringsmetod"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatiskt"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Mapp p? IMAP server"
@@ -17618,9 +17855,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Kyrillisk (KOI8-R)"
+msgstr "Kyrillisk (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -19201,10 +19437,6 @@ msgstr ""
 "Det finns n?gra filtreringsregler som tillh?r ett konto.\n"
 "V?lj vad som skall g?ras med dessa regler:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filter"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrerar..."
@@ -20015,213 +20247,3 @@ msgid ""
 msgstr ""
 "Claws ?r nu klart att anv?ndas.\n"
 "Klicka Spara f?r att starta."
-
-#~ msgid "E-mail client"
-#~ msgstr "E-postklient"
-
-#~ msgid "Lightweight and Fast GTK+ based Mail Client"
-#~ msgstr "L?ttviktig och snabb GTK+-baserad E-postklient"
-
-#~ msgid ""
-#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-#~ msgstr ""
-#~ "l?ttviktig;snabb;gui;ut?kningsbar;insticksmoduler;pop;pop3;imap;imap4;"
-#~ "nntp;news;"
-
-#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
-#~ msgstr ""
-#~ "Claws Mail ?r en snabb, kraftfull och v?ldigt ut?kningsbar e-postklient."
-
-#~ 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 ?r mycket anpassningsbar och hanterar hundratusentals e-"
-#~ "postmeddelanden med l?tthet. Meddelanden hanteras i ?ppet format och ?r "
-#~ "enkla att handha."
-
-#~ 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 ""
-#~ "Mycket extra funktionalitet tillhandah?lls av till?ggsmoduler, s? som PGP-"
-#~ "signaturer och kryptering, en RSS-l?sare, en kalender, ett kraftfullt "
-#~ "skr?ppostfilter, Perl och Pythoninteraktioner, rendering av HTML- och PDF-"
-#~ "meddelanden, och mycket mer."
-
-#~ msgid "Enables mail notification via LEDs on some laptops"
-#~ msgstr "Aktiverar notifiering av ny e-post via LEDs p? vissa laptops"
-
-#~ msgid ""
-#~ "Allows saving outgoing addresses to a designated folder in the address "
-#~ "book"
-#~ msgstr ""
-#~ "M?jligg?r lagring av utg?ende adresser till en best?md mapp i adressboken"
-
-#~ msgid "Allows to make tars or zips of old folders"
-#~ msgstr "Till?ter att skapa tar- eller zip-filer av gamla mappar"
-
-#~ msgid "Lets you remove attachments from emails"
-#~ msgstr "L?ter dig ta bort bifogade filer fr?n e-post"
-
-#~ msgid ""
-#~ "Warns when a message mentioning an attachment in the message body without "
-#~ "attaching any files"
-#~ msgstr ""
-#~ "Varnar n?r ett meddelande som n?mner en bifogad fil i meddelandekroppen "
-#~ "utan att bifoga n?gra filer"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using Bogofilter"
-#~ msgstr ""
-#~ "Aktiverar avl?sning av inkommande e-post mottagen fr?n POP-, IMAP- elller "
-#~ "LOCAL-konto med hj?lp av Bogofilter"
-
-#~ msgid ""
-#~ "Check all messages that are received from an IMAP, LOCAL or POP account "
-#~ "for spam using Bsfilter"
-#~ msgstr ""
-#~ "S?k igenom alla meddelanden som tas emot fr?n ett IMAP-, LOCAL- eller POP-"
-#~ "konto efter skr?ppost med hj?lp av Bsfilter"
-
-#~ msgid ""
-#~ "Scans all messages that are received from an IMAP, LOCAL or POP account "
-#~ "using clamd (Clam AV)"
-#~ msgstr ""
-#~ "Avs?ker alla meddelanden som har mottagits fr?n ett IMAP-, LOCAL-, eller "
-#~ "POP-konto med hj?lp av clamd (Clam AV)"
-
-#~ msgid "Renders HTML e-mail using the WebKit library"
-#~ msgstr "Renderar HTML-e-post med hj?lp av biblioteket WebKit"
-
-#~ msgid ""
-#~ "Inserts headers containing: UIDL, Claws' account name, POP server, user "
-#~ "ID and retrieval time"
-#~ msgstr ""
-#~ "L?gger till huvuden som inneh?ller: UIDL, kontonamn f?r Claws, POP-"
-#~ "server, anv?ndar-ID och mottagningstid"
-
-#~ msgid "Provides an interface to Google services"
-#~ msgstr "Tillhandah?ller ett gr?nssnitt till Googletj?nster"
-
-#~ msgid "Provides GeoLocation functionality"
-#~ msgstr "Tillhandah?ller GeoLocation-funktionalitet"
-
-#~ msgid ""
-#~ "Displays libravatar/gravatar profiles' images or a dynamically generated "
-#~ "or predefined alternative"
-#~ msgstr ""
-#~ "Visar profilbild fr?n libravatar/gravatar eller ett dynamiskt genererat "
-#~ "eller f?rdefinierat alternativ"
-
-#~ msgid "Direct support for mailboxes in mbox format"
-#~ msgstr "Direkt st?d f?r brevl?dor i mbox-format"
-
-#~ msgid ""
-#~ "Writes a msg header summary to a log file on arrival of new mail after "
-#~ "sorting"
-#~ msgstr ""
-#~ "Skriver en sammanfattning av meddelandehuvuden till en loggfil n?r ny e-"
-#~ "post kommer efter sortering"
-
-#~ msgid "Provides various ways to notify the user of new and unread email"
-#~ msgstr ""
-#~ "Tillhandah?ller olika s?tt att notifiera anv?ndaren om ny och ol?st e-post"
-
-#~ msgid ""
-#~ "Enables the viewing of PDF and PostScript attachments using the Poppler "
-#~ "library and GhostScript"
-#~ msgstr ""
-#~ "Aktiverar visning av PDF- och Postscript-bilagor med hj?lp av biblioteket "
-#~ "Poppler och Ghostscript"
-
-#~ msgid "Allowing the use of full Perl power in email filters"
-#~ msgstr "Till?ter full anv?ndning av Perl-kraft i e-postfilter"
-
-#~ msgid ""
-#~ "Handles core PGP functions and is a dependency of both the PGP/Inline and "
-#~ "PGP/MIME plugins."
-#~ msgstr ""
-#~ "Hanterar PGPs grundfunktioner och ?r ett beroende f?r b?da "
-#~ "insticksmodulerna PGP/Inline och PGP/MIME"
-
-#~ msgid "Handles PGP/Inline signed and/or encrypted mails"
-#~ msgstr "Hanterar PGP/Inline-signerad och/eller -krypterad e-post"
-
-#~ msgid "Handles PGP/MIME signed and/or encrypted mails"
-#~ msgstr "Hanterar PGP/MIME-signerad och/eller -krypterad e-post"
-
-#~ msgid ""
-#~ "Offers a Python scripting. Code can be entered into an embedded Python "
-#~ "console or stored"
-#~ msgstr ""
-#~ "Tillhandah?ller Pythonskriptning. Kod kan matas in i en inb?ddad "
-#~ "Pythonkonsol eller lagras"
-
-#~ msgid "Read your RSS favourite newsfeeds"
-#~ msgstr "L?s dina favorit-RSS-nyhetsfl?den"
-
-#~ msgid "Handles S/MIME signed and/or encrypted mails"
-#~ msgstr "Hanterar S/MIME-signerad och/eller -krypterad e-post"
-
-#~ msgid "Reports spam to various places"
-#~ msgstr "Rapporterar skr?ppost till olika platser"
-
-#~ msgid ""
-#~ "Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL "
-#~ "account using SpamAssassin"
-#~ msgstr ""
-#~ "Aktiverar avs?kning av inkommande e-post fr?n ett POP, IMAP, eller LOCAL-"
-#~ "konto med hj?lp av SpamAssassin"
-
-#~ msgid "Enables reading application/ms-tnef attachments"
-#~ msgstr "Aktiverar l?sning av bifogad application/ms-tnef-fil"
-
-#~ msgid ""
-#~ "Enables vCalendar message handling and handles webCal subscriptions. "
-#~ "Provides a calendar import"
-#~ msgstr ""
-#~ "Aktiverar vCalendar-meddelandehantering och hanterar webCal-"
-#~ "prenumerationer. Tillhandah?ller kalenderimport"
-
-#~ msgid "_Subject:"
-#~ msgstr "?mne:"
-
-#~ msgid "Keep 'To' addresses"
-#~ msgstr "Beh?ll 'Till'-adresser"
-
-#~ msgid "Keep 'Cc' addresses"
-#~ msgstr "Beh?ll 'CC'-adresser"
-
-#~ msgid "Keep 'Bcc' addresses"
-#~ msgstr "Beh?ll 'Bcc'-adresser"
-
-#~ msgid "Stylesheet:"
-#~ msgstr "Stilmall:"
-
-#~ msgid "GData plugin: Authenticated\n"
-#~ msgstr "Insticksmodulen GData: Autentiserad\n"
-
-#~ msgid "slow"
-#~ msgstr "l?ngsam"
-
-#~ msgid "fast"
-#~ msgstr "snabb"
-
-#~ msgid "Banner width in pixels (0 means screen size)"
-#~ msgstr "Bredd p? banderoll i pixlar (0 betyder sk?rmstorlek)"
-
-#~ msgid "Enable Popup"
-#~ msgstr "Aktivera Popup"
-
-#~ msgid "Default refresh interval in minutes"
-#~ msgstr "Standard uppdateringsintervall i minuter"
-
-#~ msgid "Use this"
-#~ msgstr "Anv?nd detta"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Kunde inte kryptera meddelandet: %s"

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 11:39:40 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 11:39:40 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-238-gbf1ab46
Message-ID: <20150719093940.6B1B036A440B@mx.colino.net>

The branch, master has been updated
       via  bf1ab46a189e499e0fbc2268b153af95d61d9d79 (commit)
      from  93afe88d2eb6c54241d2a8e89f76edd819eaf9a2 (commit)

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


- Log -----------------------------------------------------------------
commit bf1ab46a189e499e0fbc2268b153af95d61d9d79
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 10:39:36 2015 +0100

    update translators list

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index f719e4b..a9daacb 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -34,18 +34,19 @@ NULL
 
 static char *TRANS_TEAM_LIST[] = {
 "[bg] Yasen Pramatarov <yasen at lindeas.com>",
+"[ca] Carles Tubio Terr?n <c at rles-tub.io>",
 "[cs] David Vachulka <david at konstrukce-cad.com>",
 "[de] Thomas Bellmann <ThomasBellmann at gmx.net>",
 "[en_GB] Paul Mangan <paul at claws-mail.org>",
 "[eo] Sian Mountbatten <poenikatu at fastmail.co.uk>",
 "[es] Ricardo Mones Lastra <ricardo at mones.org>",
 "[fi] Flammie Pirinen <flammie at iki.fi>",
-"[fr] Colin Leroy <colin at colino.net>",
-"[he] Genghis Khan <genghiskhan at gmx.ca>",
+"[fr] Tristan Chabredier <wwp at claws-mail.org>",
+"[he] Isratine Citizen <genghiskhan at gmx.ca>",
 "[hu] P?der Rezs? <rezso at rezso.net>",
 "[id] MSulchan Darmawan <bleketux at gmail.com>",
 "[lt] Mindaugas Baranauskas <embar at super.lt>",
-"[nb] Eyolf ?strem <eyolf at oestrem.com>",
+"[nb] Petter Adsen <petter at synth.no>",
 "[pt_BR] Frederico Goncalves Guimaraes <frederico at teia.bio.br>",
 "[ru] Aleksei Miheev <aleksei at miheev.info>",
 "[sk] Slavko <slavino at slavino.sk>",

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 11:42:35 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 11:42:35 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-239-g818e1ca
Message-ID: <20150719094235.6FC8036A440B@mx.colino.net>

The branch, master has been updated
       via  818e1ca6a64dda1168add712d34ccce68f785632 (commit)
      from  bf1ab46a189e499e0fbc2268b153af95d61d9d79 (commit)

Summary of changes:
 AUTHORS           |    2 +-
 src/gtk/authors.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 818e1ca6a64dda1168add712d34ccce68f785632
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 10:42:31 2015 +0100

    add Charles to list of team members

diff --git a/AUTHORS b/AUTHORS
index cf309b8..56756a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Claws Mail (http://www.claws-mail.org)
 	Tristan Chabredier	<wwp at claws-mail.org>
 	Andrej Kacian		<ticho at claws-mail.org> 
 	Darko Koruga		<darko at users.sourceforge.net>
+	Charles Lehner		<charles at claws-mail.org>
 	Colin Leroy		<colin at colino.net>
 	Paul Mangan		<paul at claws-mail.org>
 	Ricardo Mones Lastra 	<ricardo at mones.org>
@@ -312,6 +313,5 @@ contributors (in addition to the above; based on Changelog)
 	Anton Butanaev
 	Daniel Zaoui
 	Johan Vromans
-	Charles Lehner
 	Robert David
 	Oliver Schneider
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index a9daacb..048efed 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -3,6 +3,7 @@ static char *TEAM_LIST[] = {
 "Tristan Chabredier <wwp at claws-mail.org>",
 "Andrej Kacian <andrej at kacian.sk>",
 "Darko Koruga <darko at users.sf.net>",
+"Charles Lehner <charles at claws-mail.org",
 "Colin Leroy <colin at colino.net>",
 "Paul Mangan <paul at claws-mail.org>",
 "Ricardo Mones Lastra <ricardo at mones.org>",
@@ -183,7 +184,6 @@ static char *CONTRIBS_LIST[] = {
 "Abhay S. Kushwaha",
 "Joshua M. Kwan",
 "Jean-Yves Lefort",
-"Charles Lehner",
 "J?r?me Lelong",
 "Eric Limpens",
 "Thomas Link",

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 12:07:33 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 12:07:33 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-240-g0f59e75
Message-ID: <20150719100733.6F6F136A4400@mx.colino.net>

The branch, master has been updated
       via  0f59e75fd30490722d37d2edf908966e480dbbeb (commit)
      from  818e1ca6a64dda1168add712d34ccce68f785632 (commit)

Summary of changes:
 AUTHORS           |   20 +++++---------------
 configure.ac      |    2 +-
 src/gtk/authors.h |    3 ---
 3 files changed, 6 insertions(+), 19 deletions(-)


- Log -----------------------------------------------------------------
commit 0f59e75fd30490722d37d2edf908966e480dbbeb
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 11:07:28 2015 +0100

    remove translations that have been unmaintained for 3 releases

diff --git a/AUTHORS b/AUTHORS
index 56756a8..76dcaa1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,35 +42,25 @@ Claws Mail on Maemo
 Claws Mail translation team
 
 	[bg]	Yasen Pramatarov 	<yasen at lindeas.com>
-	[ca]	Miquel Oliete 		<ktalanet at yahoo.es>
+	[ca]	Carles Tubio Terr?n 	<c at rles-tub.io>
 	[cs] 	David Vachulka 		<david at konstrukce-cad.com>
-	[de]	Stephan Sachse 		<white at dev-zero.com>
+	[de]	Thomas Bellmann 	<ThomasBellmann at gmx.net>
 	[en_GB]	Paul Mangan		<paul at claws-mail.org>
-	[el] 	Stavros Giannouris 	<stavrosg2002 at freemail.gr>
 	[eo]	Sian Mountbatten	<poenikatu at fastmail.co.uk>
 	[es]	Ricardo Mones Lastra 	<ricardo at mones.org>
 	[fi]	Flammie Pirinen 	<flammie at iki.fi>
 	[fr]	Tristan Chabredier	<wwp at claws-mail.org>
-	[he] 	Ghengis Khan 		<genghiskhan at gmx.ca>
-	[hr]	Dragan 			<drleskov at inet.hr>
+	[he] 	Isratine Citizen 	<genghiskhan at gmx.ca>
 	[hu] 	Pader Rezso 		<rezso at rezso.net>
 	[id]	MSulchan Darmawan 	<bleketux at gmail.com>
-	[it]	Andrea Spadaccini 	<a.spadaccini at catania.linux.it>
-	[ja]	kazken3 		<kazken3 at gmail.com>
-	[ko]	SungHyun Nam 		<namsh at kldp.org>
 	[lt]	Mindaugas Baranauskas	<embar at super.lt>
-	[nb]	Eyolf ?strem 		<eyolf at oestrem.com>
+	[nb]	Petter Adsen 		<petter at synth.no>
 	[nl]	Marcel Pol		<mpol at gmx.net>
 	[pl]	Emilian Nowak		<eminowbl at posejdon.wpk.p.lodz.pl>
 	[pt_BR] Frederico Goncalves Guimaraes 
 					<frederico at teia.bio.br>
-	[pt_PT]	Tiago Faria 		<gouki at goukihq.org>
-	[ru]	Aleksei Miheev		<aleksei at miheev.info>
 	[sk]	Slavko 			<slavino at slavino.sk>
-	[sr]	Aleksandar Urosevic 	<urke at users.sourceforge.net>
-	[sv]	Lars Persson Fink	<lars.p.fink at gmail.com>
-	[zh_CN] Ralgh Young 		<bamanzi at gmail.com>
-	[zh_TW]	Wei-Lun Chao 		<chaoweilun at pcmail.com.tw>
+	[sv]	Andreas R?nnquist 	<gusnan at gusnan.se>
 
 Claws Mail documentation team
 
diff --git a/configure.ac b/configure.ac
index 0ce8dd9..2dbb4d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu id_ID it ja lt nb nl pl pt_BR pt_PT ru sk sv uk zh_CN zh_TW"
+ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu id_ID lt nb nl pl pt_BR sk sv"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 048efed..288992b 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -49,11 +49,8 @@ static char *TRANS_TEAM_LIST[] = {
 "[lt] Mindaugas Baranauskas <embar at super.lt>",
 "[nb] Petter Adsen <petter at synth.no>",
 "[pt_BR] Frederico Goncalves Guimaraes <frederico at teia.bio.br>",
-"[ru] Aleksei Miheev <aleksei at miheev.info>",
 "[sk] Slavko <slavino at slavino.sk>",
 "[sv] Andreas R??nnquist <gusnan at gusnan.se>",
-"[zh_CN] Rob <rbnwmk at gmail.com>",
-"[zh_TW] Rob <rbnwmk at gmail.com>",
 NULL
 };
 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 12:14:24 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 12:14:24 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-241-gee5075d
Message-ID: <20150719101424.3F58336A4400@mx.colino.net>

The branch, master has been updated
       via  ee5075d7b6d900ee5e611cdd8f18b5c2fc024958 (commit)
      from  0f59e75fd30490722d37d2edf908966e480dbbeb (commit)

Summary of changes:
 po/es.po |  876 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 558 insertions(+), 318 deletions(-)


- Log -----------------------------------------------------------------
commit ee5075d7b6d900ee5e611cdd8f18b5c2fc024958
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 11:14:19 2015 +0100

    updated Spanish translation
    
    hail RA MONES III

diff --git a/po/es.po b/po/es.po
index 9b84b99..8f38166 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,25 @@
 # Spanish translation of Claws Mail.
-# Copyright ? 2000-2014 The Claws Mail team.
+# Copyright ? 2000-2015 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Ricardo Mones <ricardo at mones.org>, 2000-2014.
+# Ricardo Mones <ricardo at mones.org>, 2000-2015.
+# Carles Tubio Terr?n <c at rles-tub.io>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.11.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-10-17 23:27+0100\n"
-"Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
+"POT-Creation-Date: 2015-07-12 20:01+0200\n"
+"PO-Revision-Date: 2015-07-13 23:58+0200\n"
+"Last-Translator: Carles Tubio <c at rles-tub.io>\n"
 "Language-Team: Ricardo Mones <ricardo at mones.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.2\n"
 
 #: src/account.c:392 src/account.c:459
 msgid ""
@@ -81,13 +83,14 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "?Recibir correo? recupera el correo de las cuentas marcadas"
 
 #: src/account.c:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -425,7 +428,7 @@ msgstr "_Agenda"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -468,10 +471,14 @@ msgid "_Delete book"
 msgstr "_Borrar agenda"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "_Guardar..."
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -485,11 +492,12 @@ msgstr "C_ortar"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -950,12 +958,12 @@ msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Fall? la actualizaci?n. No se escribieron los cambios en el directorio."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Notificaci?n"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -1524,15 +1532,15 @@ msgstr "_Reemplazar firma"
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "Cor_tar"
 
@@ -1553,6 +1561,7 @@ msgid "_Unwrapped"
 msgstr "_Sin recortar"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "_Seleccionar todo"
 
@@ -1617,6 +1626,7 @@ msgid "Delete to end of line"
 msgstr "Borrar hasta el final de la l?nea"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "_Buscar"
 
@@ -1919,7 +1929,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?Est? seguro?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Insertar"
 
@@ -2020,7 +2030,7 @@ msgstr "?Ponerlo en la cola igualmente?"
 msgid "Send later"
 msgstr "Enviar despu?s"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2030,7 +2040,7 @@ msgstr ""
 "\n"
 "Fall? la conversi?n del conjunto caracteres."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2040,7 +2050,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2107,67 +2117,72 @@ msgstr ""
 "\n"
 "?Enviarlo de todas formas?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "No se puede cifrar el correo: %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Aviso de cifrado"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+C_ontinuar"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "?No hay ninguna cuenta disponible para enviar correos!"
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
 
-#: src/compose.c:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "El adjunto %s ya no existe. ?Ignorar?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Cancelar env?o"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorar adjunto"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Parte original %s"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "A?adir a la agen_da"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Borrar contenidos de la cuenta"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 src/plugins/vcalendar/vcal_meeting_gtk.c:289
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar ?tab? para autocompletar con la agenda"
 
-#: src/compose.c:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Tama?o"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2178,24 +2193,23 @@ msgstr "Guardar mensaje en "
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "_Cabecera"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "_Adjuntos"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "Ot_ros"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Asunto:"
+msgstr "As_unto:"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2204,25 +2218,24 @@ msgstr ""
 "No se puede iniciar el corrector ortogr?fico.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "Desde: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "Desde:"
+msgstr "_Desde:"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Direcci?n del remitente a usar"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2231,68 +2244,68 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad ?%s?. No ser? posible firmar "
 "o cifrar este mensaje."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Error en el cuerpo de la plantilla en la l?nea %d."
 
-#: src/compose.c:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Error de formato en el Desde de la plantilla."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
-#: src/compose.c:8753
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
 msgstr "Error de formato en el Reply-To de la plantilla."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inv?lido."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o est? vac?o."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Codificaci?n"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2303,15 +2316,15 @@ msgstr ""
 "?Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
-#: src/compose.c:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2322,15 +2335,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "No se puede guardar el borrador"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2338,24 +2351,24 @@ msgstr ""
 "No se ha podido guardar el borrador.\n"
 "?Desea cancelar la salida o descartar este correo?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "_Cancelar salida"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Descartar correo"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero ?%s?."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2364,62 +2377,62 @@ msgstr ""
 "El fichero ?%s? conten?a caracteres inv?lidos para\n"
 "la codificaci?n actual, la inserci?n puede ser incorrecta."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ?Desea descartarlo?"
 
-#: src/compose.c:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Este mensaje se ha modificado. ?Guardar los ?ltimos cambios?"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_No guardar"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "+Guardar en _Borradores"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "?Quiere aplicar la plantilla ?%s??"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "?Insertar o adjuntar?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -2427,16 +2440,16 @@ msgstr ""
 "?Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Adjuntar"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de formato de cita en la l?nea %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3652,7 +3665,7 @@ msgstr "Moviendo %s a %s...\n"
 #: src/folder.c:3564
 #, c-format
 msgid "Updating cache for %s..."
-msgstr "Actualizando cache para %s..."
+msgstr "Actualizando cach? para %s..."
 
 #: src/folder.c:4427
 msgid "Processing messages..."
@@ -3664,9 +3677,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexi?n...\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr "No se pueden mover carpetas entre buzones distintos."
+msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -3706,9 +3718,8 @@ msgid "Mark all re_ad"
 msgstr "Marcar todos como l_e?dos"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Marcar todos como le?dos"
+msgstr "Marcar todos como le?dos recursi_vamente"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -3756,103 +3767,111 @@ msgstr "N?"
 msgid "Setting folder info..."
 msgstr "Estableciendo informaci?n de carpeta..."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Marcar todo como le?do"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"?Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
+"le?dos?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "?Quiere realmente marcar todos los correos en la carpeta como le?dos?"
 
-#: src/folderview.c:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Marcar todo como le?do"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Revisando carpeta %s%c%s..."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Revisando carpeta %s..."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Reconstruir ?rbol de carpetas"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Reconstruir el ?rbol de carpetas eliminar? la cach? local. ?Desea continuar?"
 
-#: src/folderview.c:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo ?rbol de carpetas..."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Explorando ?rbol de carpetas..."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Cerrando carpeta %s..."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abriendo carpeta %s..."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "?Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Notificaci?n conexi?n"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 src/toolbar.c:2608
 msgid "You're working offline. Override?"
 msgstr "Est? trabajando sin conexi?n ?Ignorar?"
 
-#: src/folderview.c:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "?Enviar todos los mensajes en la cola?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 src/toolbar.c:2647
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
-#: src/folderview.c:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3861,64 +3880,64 @@ msgstr ""
 "Hubo alg?n error enviando los mensajes en la cola:\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "?Quiere realmente copiar la carpeta ?%s? a ?%s??"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2478
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "?Quiere realmente hacer de la carpeta ?%s? una subcarpeta de ?%s??"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2526
+#: src/folderview.c:2529
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
-#: src/folderview.c:2529
+#: src/folderview.c:2532
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "?Copiar fall?!"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "?Mover fall?!"
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuraci?n de procesamiento para la carpeta ?%s?"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr "La carpeta destino s?lo puede usarse para almacenar subcarpetas."
 
@@ -4010,7 +4029,6 @@ msgstr ""
 "realizar alguna donaci?n al proyecto Claws Mail puede hacerlo en:\n"
 
 #: src/gtk/about.c:158
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -4020,7 +4038,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "El equipo de Claws Mail\n"
 " e Hiroyuki Yamamoto"
 
@@ -4242,13 +4260,12 @@ msgid "About Claws Mail"
 msgstr "Acerca de Claws Mail"
 
 #: src/gtk/about.c:831
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2015\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2014\n"
+"Copyright (C) 1999-2015\n"
 "El equipo de Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
@@ -5045,6 +5062,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5101,11 +5119,12 @@ msgstr "P?gina ?ndice"
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Cuenta"
 
@@ -5323,9 +5342,8 @@ msgid "Something went wrong during search. Please check your logs."
 msgstr "Algo fall? durante la b?squeda. Por favor compruebe la traza."
 
 #: src/gtk/quicksearch.c:676
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "Desde/Para/Asunto/Etiqueta"
+msgstr "Desde/Para/Cc/Asunto/Etiqueta"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -5532,7 +5550,7 @@ msgstr "Error:"
 #: src/image_viewer.c:299 src/mimeview.c:2545
 #: src/plugins/pdf_viewer/poppler_viewer.c:698
 msgid "Filename:"
-msgstr "Nombre:"
+msgstr "Nombre del fichero:"
 
 #: src/image_viewer.c:306
 msgid "Filesize:"
@@ -5789,7 +5807,6 @@ msgstr ""
 "compilada con soporte SASL y el m?dulo DIGEST-MD5 de SASL est? instalado."
 
 #: src/imap.c:952
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -5798,8 +5815,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Las autenticaciones con CRAM-MD5 s?lo funcionar?n si libetpan ha sido "
-"compilada con soporte SASL y el m?dulo CRAM-MD5 de SASL est? instalado."
+"Las autenticaciones con SCRAM-SHA-1 s?lo funcionar?n si libetpan ha sido "
+"compilada con soporte SASL y el m?dulo SCRAM de SASL est? instalado."
 
 #: src/imap.c:959
 #, c-format
@@ -5948,13 +5965,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "La conexi?n con %s fall?: el servidor necesita TLS, pero Claws Mail ha sido "
-"compilado sin soporte OpenSSL.\n"
+"compilado sin soporte TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6389,7 +6406,7 @@ msgstr "Hecho (no hay mensajes nuevos)"
 msgid "Connection failed"
 msgstr "Conexi?n fallida"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Autorizaci?n fallida"
 
@@ -6433,7 +6450,8 @@ msgstr "No se puede conectar al servidor POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
@@ -7372,17 +7390,17 @@ msgstr "_Autom?tico"
 #: src/mainwindow.c:739 src/mainwindow.c:745 src/mainwindow.c:848
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _From"
-msgstr "Por el Desde"
+msgstr "Por el _Desde"
 
 #: src/mainwindow.c:740 src/mainwindow.c:746 src/mainwindow.c:849
 #: src/messageview.c:321 src/messageview.c:327
 msgid "By _To"
-msgstr "Por el Para"
+msgstr "Por el _Para"
 
 #: src/mainwindow.c:741 src/mainwindow.c:747 src/messageview.c:322
 #: src/messageview.c:328
 msgid "By _Subject"
-msgstr "Por el Asunto"
+msgstr "Por el A_sunto"
 
 #: src/mainwindow.c:743 src/messageview.c:324 src/summaryview.c:432
 msgid "Create processing rule"
@@ -8166,12 +8184,15 @@ msgid "Remove _mailbox..."
 msgstr "Eliminar _buz?n..."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "No se puede eliminar la carpeta ?%s?."
+msgstr ""
+"No se puede eliminar la carpeta ?%s?\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -8561,7 +8582,6 @@ msgid "Address Keeper"
 msgstr "Guardi?n de direcciones"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
 msgstr "Ruta a la agenda de direcciones"
 
@@ -8584,7 +8604,7 @@ msgstr "Seleccionar..."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+msgstr "Campos de los cuales se mantendr?n las direcciones"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:144
 msgid "Keep addresses which appear in 'To' headers"
@@ -8599,12 +8619,11 @@ msgid "Keep addresses which appear in 'Bcc' headers"
 msgstr "Guardar las direcciones que aparezcan en cabeceras ?Bcc?"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Excluir direcciones que coincidan con alguna de las siguientes expresiones "
-"regulares (una por cada l?nea):"
+"regulares (una por cada l?nea)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9154,10 +9173,9 @@ msgid "attach"
 msgstr "adjunt"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
-"Alguna de las siguientes expresiones regulares coincide (una por l?nea):"
+"Alguna de las siguientes expresiones regulares coincide (una por l?nea)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -9341,19 +9359,16 @@ msgid "KB"
 msgstr "kB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Borrar etiqueta"
+msgstr "Borrar basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Guardar correo basura en"
+msgstr "Guardar correo basura en..."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Marcar como basura"
+msgstr "Solo marcar como basura"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -9875,9 +9890,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Utilizar la configuraci?n del proxy de GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Usar proxy:"
+msgstr "Usar proxy"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -9902,9 +9916,8 @@ msgid "Enable loading of remote content"
 msgstr "Permitir la carga de contenidos remotos"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Al pulsar en un enlace, por omisi?n:"
+msgstr "Al pulsar en un enlace, por omisi?n"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -10060,9 +10073,8 @@ msgid "Add fetchinfo headers"
 msgstr "A?adir cabeceras de fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Direcci?n del remitente a usar"
+msgstr "Cabeceras que se a?adir?n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10072,6 +10084,8 @@ msgstr "UIDL"
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
+"Agrega la cabecera X-FETCH-UIDL con el ID exclusivo de listado del mensaje "
+"(POP3)"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
@@ -10079,7 +10093,7 @@ msgstr "Nombre de cuenta"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
-msgstr ""
+msgstr "Agrega la cabecera X-FETCH-ACCOUNT con el nombre de la cuenta"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
@@ -10087,7 +10101,7 @@ msgstr "Servidor de recepci?n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Adds the X-FETCH-SERVER header with the receive server"
-msgstr ""
+msgstr "Agrega la cabecera X-FETCH-SERVER con el servidor de recepci?n"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
@@ -10095,7 +10109,7 @@ msgstr "Id. de usuario"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "Adds the X-FETCH-USERID header with the user ID"
-msgstr ""
+msgstr "Agrega la cabecera X-FETCH-USERID con el ID de usuario"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
@@ -10106,11 +10120,12 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
+"Agrega la cabecera X-FETCH-TIME con la fecha y hora de la recuperaci?n del "
+"mensaje en formato RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:125
-#, fuzzy
 msgid "GData plugin: Authorization required"
-msgstr "M?dulo GData: error de identificaci?n: %s\n"
+msgstr "M?dulo GData: Autorizaci?n necesaria"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:127
 msgid ""
@@ -10122,25 +10137,30 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"Necesita autorizar Claws Mail a su lista de contactos de Google para "
+"utilizar el m?dulo de GData.\n"
+"\n"
+"Visite la p?gina de autorizaci?n de Google pulsando el bot?n de abajo. "
+"Despu?s de confirmar la autorizaci?n, recibir? un c?digo de autorizaci?n. "
+"Introduzca dicho c?digo en el siguiente campo para conceder acceso a Claws "
+"Mail a su lista de contactos de Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "Paso"
+msgstr "Paso 1:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
+"Haga clic aqu? para abrir la p?gina de autorizaci?n de Google en el navegador"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "Paso"
+msgstr "Paso 2:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Interfaz"
+msgstr "Introducir c?digo:"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10179,47 +10199,47 @@ msgid "GData plugin: Starting async groups query\n"
 msgstr "M?dulo GData: comenzando solicitud as?ncrona de grupos\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr "M?dulo GData: error de identificaci?n: %s\n"
+msgstr "M?dulo GData: Error de autorizaci?n: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
-#, fuzzy
 msgid "GData plugin: Authorization successful\n"
-msgstr "M?dulo GData: error de identificaci?n: %s\n"
+msgstr "M?dulo GData: Autorizaci?n exitosa\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
-#, fuzzy
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr "M?dulo GData: comenzando la identificaci?n as?ncrona\n"
+msgstr "M?dulo GData: Iniciando la autorizaci?n interactiva\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:469
-#, fuzzy
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "M?dulo GData: comenzando la identificaci?n as?ncrona\n"
+msgstr ""
+"M?dulo GData: Consigui? el c?digo de autorizaci?n, solicitando la "
+"autorizaci?n\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"M?dulo GData: No se recibi? el c?digo de autorizaci?n, cancelada la "
+"solicitud de la autorizaci?n\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "M?dulo GData: error de identificaci?n: %s\n"
+msgstr "M?dulo GData: Error de actualizaci?n de autorizaci?n: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:502
-#, fuzzy
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr "M?dulo GData: error de identificaci?n: %s\n"
+msgstr "M?dulo GData: Actualizaci?n de autorizaci?n correcta\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:555
-#, fuzzy
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "M?dulo GData: comenzando la identificaci?n as?ncrona\n"
+msgstr "M?dulo GData: Tratando de renovar la autorizaci?n\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Autenticaci?n"
 
@@ -11367,9 +11387,8 @@ msgstr ""
 "Comentarios y sugerencias para <ricardo at mones.org> ser?n bienvenidas.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Su direcci?n de correo:</span>"
+msgstr "<span color=\"red\">Error al leer las estad?sticas de la cach?</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -11377,25 +11396,25 @@ msgid ""
 "<span color=\"red\">Using %s in %d files, %d directories, %d others and %d "
 "errors</span>"
 msgstr ""
+"<span color=\"red\">Usando %s en %d archivos,%d directorios, %d otros y %d "
+"errores</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Usando %s en %d archivos,%d directorios y %d otros"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Cach? de avatares"
+msgstr "Limipiar cach? de avatares"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "?Est? seguro de que quiere borrar este tema?"
+msgstr "?Est? seguro de que quiere borrar toda la cach? de avatares?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "No hay suficiente memoria para la operaci?n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -11404,10 +11423,15 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Cach? de avatares eliminada correctamente:\n"
+"? %u entradas perdidas eliminadas.\n"
+"? %u archivos eliminados."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
 msgstr ""
+"<span color=\"#006400\">Se ha limpiado la cach? de avatares correctamente!</"
+"span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -11418,10 +11442,15 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Errores al limpiar la cach? de avatares:\n"
+"? %u entradas perdidas eliminadas.\n"
+"? %u archivos eliminados.\n"
+"? %u archivos que no se han podido leer.\n"
+"? %u archivos que no se han podido eliminar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 msgid "<span color=\"red\">Error clearing icon cache.</span>"
-msgstr ""
+msgstr "<span color=\"red\">Error al borrar la cach? de avatares.</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -11500,6 +11529,9 @@ msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
+"Introduzca la URL a la que desee redirigirse cuando ning?n avatar est? "
+"disponible. Deje el campo vac?o para utilizar el avatar naranja "
+"predeterminado de libravatar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:382
 msgid "_Allow redirects to other sites"
@@ -11587,6 +11619,273 @@ msgstr ""
 "Se borrar?n todas las carpetas y mensajes bajo ?%s?.\n"
 "?Est? seguro de que quiere borrarlos?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Ning?n m?todo de autenticaci?n Sieve disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr ""
+"El m?todo para la autenticaci?n Sieve seleccionado no est? disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "Desconectado: %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "mensaje desconocido en la sesi?n de Sieve: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "TLS fall?"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "hubo un error en la sesi?n Sieve\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "hubo un error en la sesi?n Sieve. data: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "mensaje desconocido en la sesi?n de Sieve: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: reintentar autenticaci?n\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "M?todo de autenticaci?n no disponible"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtrar"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "Comprobar sinta_xis"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "Re_vertir"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "No se puede obtener el contenido del script"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "Revirtiendo..."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "Script de reversi?n"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr "Este script ha sido modificado. ?Revertir los cambios no guardados?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "_Revertir"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Script guardado correctamente."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "Comprobando la sintaxis..."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr "Este script ha sido modificado. ?Guardar los ?ltimos cambios?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+_Guardar"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Sieve Filtro%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "A?adir script Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Introduzca un nombre para el nuevo script Sieve."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Introduzca un nombre para el script."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "?Realmente desea eliminar el filtro ?%s??"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Eliminar filtro"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Activo"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Una cuenta s?lo puede tener un script activo a la vez."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "No se ha podido conectar"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "Listando scripts..."
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Gestionar filtros Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Para usar el Sieve, habilitarlo en las preferencias de la cuenta."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "Gestionar Sieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Gestionar filtros Sieve..."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr ""
+"Gestionar los filtros de Sieve en un servidor usando el protocolo "
+"ManageSieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Activar Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Informaci?n del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Nombre del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Conectar a este servidor en lugar del servidor utilizado para recibir correo"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Puerto del servidor"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Conectar a este puerto en lugar de al predeterminado"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Encriptaci?n"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Sin TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Usar TLS cuando est? disponible"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "Requerir TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Sin autenticaci?n"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Utilizar la misma autenticaci?n que para la recepci?n de correo"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Especificar autenticaci?n"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Usuario"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Contrase?a"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "M?todo de autenticaci?n"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Autom?tico"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "El servidor de Sieve no debe contener un espacio."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "No se especific? el servidor Sieve."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "Registro de correo nuevo"
@@ -11860,14 +12159,12 @@ msgid "News folders"
 msgstr "Carpetas de noticias"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "Carpetas RSS"
+msgstr "Carpetas RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Carpetas de calendario"
+msgstr "Carpetas de vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
 msgid "These settings override folder-specific selections."
@@ -11919,23 +12216,20 @@ msgid "Banner speed"
 msgstr "Velocidad del panel"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "N?mero m?ximo de resultados:"
+msgstr "N?mero m?ximo de mensajes"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
-msgstr "N?mero m?ximo de mensajes (0 significa sin l?mite)"
+msgstr "Limita el n?mero m?ximo de mensajes, 0 significa sin l?mite"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Velocidad del panel"
+msgstr "Anchura del panel"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Limitar el tama?o del panel, utilice 0 para el ancho de la pantalla"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -11965,9 +12259,8 @@ msgid "Select folders..."
 msgstr "Seleccionar carpetas..."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Color de la carpeta"
+msgstr "Colores del panel"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12003,16 +12296,14 @@ msgstr "Activar emergente"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
-msgstr "Tiempo l?mite del emergente:"
+msgstr "Tiempo l?mite del emergente"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "segundos"
+msgstr "segundo(s)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12040,18 +12331,16 @@ msgid "Done"
 msgstr "Hecho"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Orden del int?rprete"
+msgstr "Selecciona orden"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Activar orden"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Orden a ejecutar:"
+msgstr "Orden a ejecutar"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12062,9 +12351,8 @@ msgid "Enable LCD"
 msgstr "Activar pantalla LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
-msgstr "Nombre:Puerto del servidor LCDd:"
+msgstr "Nombre:Puerto del servidor LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1569
 msgid "Enable Trayicon"
@@ -12122,9 +12410,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Cambiar minimizar:"
+msgstr "Cambiar minimizar"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -12693,54 +12980,53 @@ msgstr ""
 "N?cleo PGP: no se puede obtener la clave - gpg-agent no est? ejecut?ndose."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Firma v?lida de %s."
+msgstr "Firma v?lida de \"%s\" [ultimate]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Firma v?lida de %s."
+msgstr "Firma v?lida de \"%s\" [full]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Firma v?lida de %s."
+msgstr "Firma v?lida de \"%s\" [marginal]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Firma v?lida de %s."
+msgstr "Firma v?lida de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Firma caducada de %s."
+msgstr "Firma caducada de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Firma v?lida de %s, pero la clave ha expirado."
+msgstr "Firma v?lida de \"%s\", pero la clave ha expirado."
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Firma v?lida de %s, pero la clave ha sido revocada."
+msgstr "Firma v?lida de \"%s\", pero la clave ha sido revocada."
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Firma inv?lida de %s."
+msgstr "Firma inv?lida de \"%s\""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "La clave 0x%s no est? disponible para verificar esta firma."
+msgstr "La clave 0x%s no est? disponible para verificar esta firma"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "La firma no ha sido comprobada."
+msgstr "La firma no ha sido comprobada"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -13172,7 +13458,6 @@ msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Error al registrar el ?compose create hook? en el m?dulo Python"
 
 #: src/plugins/python/python_plugin.c:738
-#, fuzzy
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13349,7 +13634,6 @@ msgid "'%c' can't be used in folder name."
 msgstr "No se puede usar ?%c? en el nombre de la carpeta."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail necesita acceso a la red para actualizar el canal."
@@ -13415,15 +13699,9 @@ msgstr ""
 "RSSyl: La aplicaci?n est? finalizando, no se pudo finalizar la actualizaci?n "
 "del canal en ?%s?\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Usar autenticaci?n"
-
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Usar autenticaci?n"
+msgstr "Usar autenticaci?n HTTP b?sica"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
@@ -13483,17 +13761,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>URL de origen:</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Usuario:"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Contrase?a"
+msgstr "Nombre de usuario"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -13579,14 +13848,12 @@ msgid "My Feeds"
 msgstr "Mis canales"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "Seleccionar fichero Pine"
+msgstr "Seleccionar fichero de cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Usar el intervalo de refresco predeterminado"
+msgstr "Intervalo de refresco predeterminado"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
@@ -13605,13 +13872,12 @@ msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Ruta al fichero cookies.txt estilo Netscape que contiene sus cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Refrescar"
+msgstr "Refrescando"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "Seguridad y privacidad"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
@@ -14904,12 +15170,6 @@ msgstr "Puede exportarlo a un fichero local o URL"
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Especifique un fichero local o URL (http://servidor/ruta/fichero.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Usuario"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr "Incluir las suscripciones webcal en la exportaci?n"
@@ -15051,10 +15311,6 @@ msgstr "Nombre completo"
 msgid "Mail address"
 msgstr "Direcci?n de correo"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Informaci?n del servidor"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Configuraci?n autom?tica"
@@ -15161,14 +15417,6 @@ msgstr "N?mero m?ximo de art?culos a descargar"
 msgid "unlimited if 0 is specified"
 msgstr "sin l?mite si se especifica 0"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "M?todo de autenticaci?n"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Autom?tico"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
@@ -15916,7 +16164,7 @@ msgstr "Configuraci?n de cabeceras de usuario"
 #: src/prefs_customheader.c:506 src/prefs_display_header.c:599
 #: src/prefs_matcher.c:1595 src/prefs_matcher.c:1610
 msgid "Header name is not set."
-msgstr "No se estableci? el nombre de cabecera"
+msgstr "No se estableci? el nombre de cabecera."
 
 #: src/prefs_customheader.c:516
 msgid "This Header name is not allowed as a custom header."
@@ -16485,7 +16733,7 @@ msgstr "Eliminar cuerpos de mensaje antiguos"
 
 #: src/prefs_folder_item.c:582
 msgid "Discard folder cache"
-msgstr "Descartar la cache de carpeta"
+msgstr "Descartar la cach? de carpeta"
 
 #: src/prefs_folder_item.c:897
 msgid "Request Return Receipt"
@@ -16511,11 +16759,11 @@ msgstr "Cuenta primaria"
 
 #: src/prefs_folder_item.c:1684
 msgid "Discard cache"
-msgstr "Descartar cache"
+msgstr "Descartar cach?"
 
 #: src/prefs_folder_item.c:1685
 msgid "Do you really want to discard the local cached data for this folder?"
-msgstr "?Quiere borrar realmente los datos locales en cache para esta carpeta?"
+msgstr "?Quiere borrar realmente los datos locales en cach? para esta carpeta?"
 
 #: src/prefs_folder_item.c:1687
 msgid "+Discard"
@@ -16528,7 +16776,7 @@ msgstr "Gen?ricas"
 #: src/prefs_folder_item.c:1895
 #, c-format
 msgid "Properties for folder %s"
-msgstr "Propiedades de la carpeta ?%s?"
+msgstr "Propiedades de la carpeta %s"
 
 #: src/prefs_fonts.c:79
 msgid "Folder and Message Lists"
@@ -17647,9 +17895,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cir?lico (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cir?lico (KOI8-R)"
+msgstr "Cir?lico (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -19238,10 +19485,6 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
-#: src/summaryview.c:5631
-msgid "_Filter"
-msgstr "_Filtrar"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrando..."
@@ -19361,7 +19604,7 @@ msgstr ""
 
 #: src/textview.c:909
 msgid "'Network Log'"
-msgstr "Traza de red"
+msgstr "?Traza de red?"
 
 #: src/textview.c:910
 msgid " in the Tools menu for more information."
@@ -20265,6 +20508,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Usar este"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "No se puede cifrar el correo: %s"

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 12:26:56 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 12:26:56 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-242-gde24d5d
Message-ID: <20150719102656.C5BC836A4400@mx.colino.net>

The branch, master has been updated
       via  de24d5dab19a86f63f75ec3326b9abeea7f62dbf (commit)
      from  ee5075d7b6d900ee5e611cdd8f18b5c2fc024958 (commit)

Summary of changes:
 AUTHORS           |    3 ++-
 src/gtk/authors.h |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit de24d5dab19a86f63f75ec3326b9abeea7f62dbf
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 11:26:52 2015 +0100

    update translators info

diff --git a/AUTHORS b/AUTHORS
index 76dcaa1..7194f3c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,7 @@ Claws Mail translation team
 	[en_GB]	Paul Mangan		<paul at claws-mail.org>
 	[eo]	Sian Mountbatten	<poenikatu at fastmail.co.uk>
 	[es]	Ricardo Mones Lastra 	<ricardo at mones.org>
+		Carles Tubio Terr?n 	<c at rles-tub.io>
 	[fi]	Flammie Pirinen 	<flammie at iki.fi>
 	[fr]	Tristan Chabredier	<wwp at claws-mail.org>
 	[he] 	Isratine Citizen 	<genghiskhan at gmx.ca>
@@ -60,7 +61,7 @@ Claws Mail translation team
 	[pt_BR] Frederico Goncalves Guimaraes 
 					<frederico at teia.bio.br>
 	[sk]	Slavko 			<slavino at slavino.sk>
-	[sv]	Andreas R?nnquist 	<gusnan at gusnan.se>
+	[sv]	Andreas R?nnquist 	<gusnan at openmailbox.org>
 
 Claws Mail documentation team
 
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 288992b..4ac5047 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -41,6 +41,7 @@ static char *TRANS_TEAM_LIST[] = {
 "[en_GB] Paul Mangan <paul at claws-mail.org>",
 "[eo] Sian Mountbatten <poenikatu at fastmail.co.uk>",
 "[es] Ricardo Mones Lastra <ricardo at mones.org>",
+"     Carles Tubio Terr??n <c at rles-tub.io>",
 "[fi] Flammie Pirinen <flammie at iki.fi>",
 "[fr] Tristan Chabredier <wwp at claws-mail.org>",
 "[he] Isratine Citizen <genghiskhan at gmx.ca>",
@@ -50,7 +51,7 @@ static char *TRANS_TEAM_LIST[] = {
 "[nb] Petter Adsen <petter at synth.no>",
 "[pt_BR] Frederico Goncalves Guimaraes <frederico at teia.bio.br>",
 "[sk] Slavko <slavino at slavino.sk>",
-"[sv] Andreas R??nnquist <gusnan at gusnan.se>",
+"[sv] Andreas R??nnquist <gusnan at openmailbox.org>",
 NULL
 };
 

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 13:07:54 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 13:07:54 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-243-gbb6c60b
Message-ID: <20150719110755.3354336A4400@mx.colino.net>

The branch, master has been updated
       via  bb6c60b52dd18b2b5bdef70f728db1061e78838a (commit)
      from  de24d5dab19a86f63f75ec3326b9abeea7f62dbf (commit)

Summary of changes:
 po/fr.po | 1241 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 717 insertions(+), 524 deletions(-)


- Log -----------------------------------------------------------------
commit bb6c60b52dd18b2b5bdef70f728db1061e78838a
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 12:07:50 2015 +0100

    updated French translation from wwp

diff --git a/po/fr.po b/po/fr.po
index 5d14121..708a3bf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -440,8 +440,8 @@
 # 	(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'adresse vis? est en lecture seule.
-# 	carnet d'adresse 'vis?' -> 'de destination'
+#  .  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
@@ -499,7 +499,7 @@
 #  .  <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'adresse : Personne -> Contact
+#  .  Carnet d'adresses : Personne -> Contact
 #  .  nom du fichier -> chemin du fichier :
 #     - ('%s' sera remplac? par le nom du fichier)
 #     - Nom du fichier :
@@ -643,19 +643,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2015-07-07 18:48+0200\n"
-"PO-Revision-Date: 2014-06-13 09:36+0100\n"
-"Last-Translator: Colin Leroy <colin at colino.net>\n"
+"POT-Creation-Date: 2015-07-12 07:58+0100\n"
+"PO-Revision-Date: 2015-07-19 12:39+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"
 
 #: src/account.c:392 src/account.c:459
-#, fuzzy
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -714,17 +713,17 @@ msgstr "R"
 
 #: src/account.c:1550
 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:1557 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7215 src/editaddress.c:1263
+#: src/addressbook.c:125 src/compose.c:7213 src/editaddress.c:1263
 #: src/editaddress.c:1320 src/editaddress.c:1340
 #: src/editaddress_other_attributes_ldap.c:302
 #: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
 #: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:173 src/importmutt.c:223 src/importpine.c:222
-#: src/mimeview.c:275 src/plugins/pdf_viewer/poppler_viewer.c:1796
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:479
+#: src/plugins/pdf_viewer/poppler_viewer.c:1796
 #: src/plugins/pgpcore/select-keys.c:396 src/prefs_filtering.c:384
 #: src/prefs_filtering.c:1866 src/prefs_template.c:79
 msgid "Name"
@@ -844,23 +843,20 @@ msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
 #: src/addrclip.c:479
-#, fuzzy
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
-"Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
+"Il n'est pas possible de copier un dossier vers lui-m?me ou vers un de ses "
+"sous-dossiers."
 
 #: src/addrclip.c:502
-#, fuzzy
 msgid "Cannot copy an address book to itself."
-msgstr ""
-"Impossible de coller. Le carnet d'adresse de destination est en lecture "
-"seule."
+msgstr "Impossible de copier un carnet d'adresses vers lui-m?me."
 
 #: src/addrclip.c:593
-#, fuzzy
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
-"Il n'est pas possible de d?placer un dossier vers un de ses SOUS-DOSSIERS."
+"Il n'est pas possible de d?placer un dossier vers lui-m?me ou vers un de ses "
+"sous-dossiers."
 
 #: src/addr_compl.c:685 src/addressbook.c:4873
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
@@ -1074,7 +1070,7 @@ msgstr "_Carnet"
 
 #: src/addressbook.c:403 src/addressbook.c:434 src/addressbook.c:462
 #: src/addressbook.c:479 src/compose.c:581 src/mainwindow.c:506
-#: src/messageview.c:210
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:80
 msgid "_Edit"
 msgstr "_Edition"
 
@@ -1117,10 +1113,14 @@ msgid "_Delete book"
 msgstr "Supp_rimer le carnet"
 
 #: src/addressbook.c:424 src/compose.c:598
+#: src/plugins/managesieve/sieve_editor.c:83
+#: src/plugins/managesieve/sieve_editor.c:607
 msgid "_Save"
 msgstr "Enregi_strer"
 
 #: src/addressbook.c:425 src/compose.c:602 src/messageview.c:223
+#: src/plugins/managesieve/sieve_editor.c:86
+#: src/plugins/managesieve/sieve_editor.c:605
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -1134,11 +1134,12 @@ msgstr "Co_uper"
 
 #: src/addressbook.c:431 src/addressbook.c:470 src/addressbook.c:486
 #: src/compose.c:610 src/mainwindow.c:540 src/messageview.c:226
+#: src/plugins/managesieve/sieve_editor.c:94
 msgid "_Copy"
 msgstr "_Copier"
 
 #: src/addressbook.c:432 src/addressbook.c:471 src/addressbook.c:487
-#: src/compose.c:611
+#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:95
 msgid "_Paste"
 msgstr "Co_ller"
 
@@ -1324,7 +1325,7 @@ msgstr ""
 #: src/addressbook.c:2190
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
-"Impossible de coller. Le carnet d'adresse de destination est en lecture "
+"Impossible de coller. Le carnet d'adresses de destination est en lecture "
 "seule."
 
 #: src/addressbook.c:2200
@@ -1513,7 +1514,7 @@ msgstr "Veuillez sp?cifier le nom du carnet d'adresses."
 
 #: src/addrgather.c:179
 msgid "No available address book."
-msgstr "Pas de carnet d'adresse disponible."
+msgstr "Pas de carnet d'adresses disponible."
 
 #: src/addrgather.c:200
 msgid "Please select the mail headers to search."
@@ -1608,12 +1609,12 @@ msgstr ""
 "La mise ? jour a ?chou?. Les modifications ne seront pas appliqu?es au "
 "r?pertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9404
+#: src/alertpanel.c:146 src/compose.c:9402
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6198
-#: src/compose.c:11761 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:159 src/compose.c:5673 src/compose.c:6196
+#: src/compose.c:11779 src/file_checker.c:78 src/file_checker.c:100
 #: src/messageview.c:855 src/messageview.c:868
 #: src/plugins/pgpcore/sgpgme.c:732 src/plugins/vcalendar/vcalendar.c:125
 #: src/summaryview.c:4871
@@ -2187,15 +2188,15 @@ msgstr "_Remplacer la signature"
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: src/compose.c:605
+#: src/compose.c:605 src/plugins/managesieve/sieve_editor.c:89
 msgid "_Undo"
 msgstr "Ann_uler"
 
-#: src/compose.c:606
+#: src/compose.c:606 src/plugins/managesieve/sieve_editor.c:90
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: src/compose.c:609
+#: src/compose.c:609 src/plugins/managesieve/sieve_editor.c:93
 msgid "Cu_t"
 msgstr "Co_uper"
 
@@ -2216,6 +2217,7 @@ msgid "_Unwrapped"
 msgstr "Texte _non justifi?"
 
 #: src/compose.c:618 src/mainwindow.c:541
+#: src/plugins/managesieve/sieve_editor.c:97
 msgid "Select _all"
 msgstr "_S?lectionner tout"
 
@@ -2280,6 +2282,7 @@ msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'? la fin de la ligne"
 
 #: src/compose.c:637 src/messageview.c:229
+#: src/plugins/managesieve/sieve_editor.c:100
 msgid "_Find"
 msgstr "Chercher dans le _message.."
 
@@ -2582,7 +2585,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "?tes-vous s?r ?"
 
-#: src/compose.c:3611 src/compose.c:11243
+#: src/compose.c:3611 src/compose.c:11261
 msgid "+_Insert"
 msgstr "+_Ins?rer"
 
@@ -2644,8 +2647,8 @@ msgstr "Envoyer"
 #: src/compose.c:5026
 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:5027 src/compose.c:5059 src/compose.c:5092 src/compose.c:5615
 #: src/plugins/attachwarner/attachwarner.c:209
@@ -2683,7 +2686,7 @@ msgstr "Voulez-vous quand m?me le mettre en file d'attente d'envoi ?"
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5152 src/compose.c:9840
+#: src/compose.c:5152 src/compose.c:9858
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2693,7 +2696,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caract?res a ?chou?."
 
-#: src/compose.c:5155 src/compose.c:9843
+#: src/compose.c:5155 src/compose.c:9861
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2703,7 +2706,7 @@ msgstr ""
 "\n"
 "La cl? de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5161 src/compose.c:9837
+#: src/compose.c:5161 src/compose.c:9855
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2771,70 +2774,75 @@ msgstr ""
 "\n"
 "Voulez-vous quand m?me l'envoyer ?"
 
-#: src/compose.c:5903
+#: src/compose.c:5780
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "Impossible de chiffrer le message : %s"
+
+#: src/compose.c:5901
 msgid "Encryption warning"
 msgstr "Avertissement pour le chiffrement"
 
-#: src/compose.c:5904
+#: src/compose.c:5902
 msgid "+C_ontinue"
 msgstr "+_Poursuivre"
 
-#: src/compose.c:5953
+#: src/compose.c:5951
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:5962
+#: src/compose.c:5960
 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:6197
+#: src/compose.c:6195
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pi?ce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6198 src/mainwindow.c:650 src/toolbar.c:231
+#: src/compose.c:6196 src/mainwindow.c:650 src/toolbar.c:231
 #: src/toolbar.c:2167
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6198
+#: src/compose.c:6196
 msgid "Ignore attachment"
 msgstr "Ignorer cette pi?ce jointe"
 
-#: src/compose.c:6238
+#: src/compose.c:6236
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:6820
+#: src/compose.c:6818
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:6977
+#: src/compose.c:6975
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:6981 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:6979 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:7203
+#: src/compose.c:7201
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7209 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
+#: src/compose.c:7207 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:394
 #: src/prefs_matcher.c:630 src/prefs_summary_column.c:85 src/summaryview.c:445
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7272
+#: src/compose.c:7270
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7309 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7307 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1021
 #: src/plugins/bogofilter/bogofilter_gtk.c:229
@@ -2845,24 +2853,23 @@ msgstr "Enregistrer le message dans "
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: src/compose.c:7782
+#: src/compose.c:7780
 msgid "Hea_der"
 msgstr "E_n-t?te"
 
-#: src/compose.c:7787
+#: src/compose.c:7785
 msgid "_Attachments"
 msgstr "Pi?ces _jointes"
 
-#: src/compose.c:7801
+#: src/compose.c:7799
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:7816
-#, fuzzy
+#: src/compose.c:7814
 msgid "S_ubject:"
-msgstr "Sujet :"
+msgstr "S_ujet :"
 
-#: src/compose.c:8039
+#: src/compose.c:8037
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2871,25 +2878,24 @@ msgstr ""
 "Le correcteur orthographique n'a pu ?tre lanc?.\n"
 "%s"
 
-#: src/compose.c:8148
-#, fuzzy, c-format
+#: src/compose.c:8146
+#, c-format
 msgid "<i>%s</i>"
-msgstr "De: <i>%s</i>"
+msgstr "<i>%s</i>"
 
-#: src/compose.c:8178
-#, fuzzy
+#: src/compose.c:8176
 msgid "_From:"
-msgstr "De :"
+msgstr "_De :"
 
-#: src/compose.c:8195
+#: src/compose.c:8193
 msgid "Account to use for this email"
 msgstr "Compte ? utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8197
+#: src/compose.c:8195
 msgid "Sender address to be used"
 msgstr "Adresse email ? utiliser en tant qu'exp?diteur"
 
-#: src/compose.c:8363
+#: src/compose.c:8361
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2898,69 +2904,68 @@ msgstr ""
 "Le syst?me de confidentialit? '%s' ne peut ?tre charg?. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8464 src/plugins/archive/archiver_gtk.c:1073
+#: src/compose.c:8462 src/plugins/archive/archiver_gtk.c:1073
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8565 src/prefs_template.c:760
+#: src/compose.c:8563 src/prefs_template.c:760
 #, 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:8681
+#: src/compose.c:8679
 msgid "Template From format error."
 msgstr "Erreur de formatage dans l'en-t?te ? De: ? du mod?le."
 
-#: src/compose.c:8699
+#: src/compose.c:8697
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-t?te ? ?: ? du mod?le."
 
-#: src/compose.c:8717
+#: src/compose.c:8715
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cc: ? du mod?le."
 
-#: src/compose.c:8735
+#: src/compose.c:8733
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-t?te ? Cci: ? du mod?le."
 
-#: src/compose.c:8753
-#, fuzzy
+#: src/compose.c:8751
 msgid "Template Reply-To format error."
-msgstr "Erreur de formatage dans l'en-t?te ? ?: ? du mod?le."
+msgstr "Erreur de formatage dans l'en-t?te ? Reply-To: ? du mod?le."
 
-#: src/compose.c:8772
+#: src/compose.c:8770
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du mod?le."
 
-#: src/compose.c:9041
+#: src/compose.c:9039
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9056
+#: src/compose.c:9054
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9130
+#: src/compose.c:9128
 msgid "Properties"
 msgstr "Propri?t?s"
 
-#: src/compose.c:9147
+#: src/compose.c:9145
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9188
+#: src/compose.c:9186
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9208
+#: src/compose.c:9206
 msgid "Path"
 msgstr "Chemin d'acc?s"
 
-#: src/compose.c:9209
+#: src/compose.c:9207
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9401
+#: src/compose.c:9399
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2971,15 +2976,15 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:9806 src/messageview.c:1097
+#: src/compose.c:9824 src/messageview.c:1097
 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:9832
+#: src/compose.c:9850
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
-#: src/compose.c:9834
+#: src/compose.c:9852
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2990,15 +2995,15 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:10012
+#: src/compose.c:10030
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10016
+#: src/compose.c:10034
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10017
+#: src/compose.c:10035
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -3007,24 +3012,24 @@ msgstr ""
 "Souhaitez-vous annuler la fermeture de l'application ou simplement "
 "interrompre l'?dition de ce message ?"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10019
+#: src/compose.c:10037
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10179 src/compose.c:10193
+#: src/compose.c:10197 src/compose.c:10211
 msgid "Select file"
 msgstr "Veuillez s?lectionner un fichier"
 
-#: src/compose.c:10207
+#: src/compose.c:10225
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "?chec lors de la lecture de ? %s ?."
 
-#: src/compose.c:10209
+#: src/compose.c:10227
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -3033,66 +3038,66 @@ msgstr ""
 "Le fichier ? %s ? contient des caract?res n'appartenant pas\n"
 "? l'encodage courant : l'insertion peut ?tre incorrecte."
 
-#: src/compose.c:10296
+#: src/compose.c:10314
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10297
+#: src/compose.c:10315
 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:10298
+#: src/compose.c:10316 src/plugins/managesieve/sieve_editor.c:409
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10298
+#: src/compose.c:10316
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10300
+#: src/compose.c:10318 src/plugins/managesieve/sieve_editor.c:407
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10301
+#: src/compose.c:10319
 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:10302
+#: src/compose.c:10320
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10302
+#: src/compose.c:10320
 msgid "+_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10372
+#: src/compose.c:10390
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le mod?le ? %s ? ?"
 
-#: src/compose.c:10374
+#: src/compose.c:10392
 msgid "Apply template"
 msgstr "Utiliser le mod?le"
 
-#: src/compose.c:10375 src/prefs_actions.c:329
+#: src/compose.c:10393 src/prefs_actions.c:329
 #: src/prefs_filtering_action.c:610 src/prefs_filtering.c:477
 #: src/prefs_matcher.c:775 src/prefs_template.c:311 src/prefs_toolbar.c:1050
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:10375
+#: src/compose.c:10393
 msgid "_Insert"
 msgstr "_Ins?rer"
 
-#: src/compose.c:11240
+#: src/compose.c:11258
 msgid "Insert or attach?"
 msgstr "Ins?rer ou joindre ?"
 
-#: src/compose.c:11241
+#: src/compose.c:11259
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
@@ -3100,16 +3105,16 @@ msgstr ""
 "Voulez-vous ins?rer le contenu du(des) fichier(s) directement dans le corps "
 "du message ou le(s) joindre en tant que pi?ce(s) jointe(s) ?"
 
-#: src/compose.c:11243
+#: src/compose.c:11261
 msgid "_Attach"
 msgstr "_Joindre"
 
-#: src/compose.c:11460
+#: src/compose.c:11478
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation ? la ligne %d."
 
-#: src/compose.c:11755
+#: src/compose.c:11773
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -3459,10 +3464,10 @@ msgid ""
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Nom du serveur LDAP. Par exemple, ? ldap.mondomaine.com ? peut ?tre "
-"appropri? pour l'organisation ? mondomaine.com ?. 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?."
+"Nom du serveur LDAP. Par exemple, ? ldap.mondomaine.com ? peut ?tre appropri? "
+"pour l'organisation ? mondomaine.com ?. 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 "TLS"
@@ -3725,7 +3730,7 @@ msgstr "Ajouter une entr?e vCard"
 
 #: src/etpan/etpan-ssl.c:167
 msgid "Impossible to set the client certificate.\n"
-msgstr ""
+msgstr "Impossible de d?finir le certificat client.\n"
 
 #: src/exphtmldlg.c:106
 msgid "Please specify output directory and file to create."
@@ -3928,7 +3933,7 @@ msgid ""
 "to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"L'identificateur unique (ID) du carnet d'adresse est utilis? pour cr?er un "
+"L'identificateur unique (ID) du carnet d'adresses est utilis? pour cr?er un "
 "nom absolu (DN) format? comme suit :\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
@@ -3988,10 +3993,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:544
 msgid "Use DN attribute if present in data"
@@ -4004,9 +4009,9 @@ msgid ""
 "address book data, may be used in the exported LDIF file. The RDN selected "
 "above will be used if the DN user attribute is not found."
 msgstr ""
-"Le carnet d'adresse peut contenir des entr?es qui ?taient pr?c?demment "
+"Le carnet d'adresses peut contenir des entr?es qui ?taient pr?c?demment "
 "import?es d'un fichier LDIF. L'attribut utilisateur ? nom absolu ? (DN), si "
-"pr?sent dans les donn?es du carnet d'adresse, peut ?tre utilis? dans le "
+"pr?sent dans les donn?es du carnet d'adresses, peut ?tre utilis? dans le "
 "fichier LDIF export?. S'il n'est pas pr?sent, le RDN (nom relatif) ci-dessus "
 "sera utilis?."
 
@@ -4107,15 +4112,15 @@ 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 ?"
 
 #: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
 msgid "rule is not account-based\n"
-msgstr ""
+msgstr "R?gle non bas?e sur un compte\n"
 
 #: src/filtering.c:607
 #, c-format
@@ -4128,7 +4133,7 @@ msgstr ""
 #: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
 #: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
 msgid "NON_EXISTENT"
-msgstr ""
+msgstr "NON_EXISTENT"
 
 #: src/filtering.c:617
 msgid ""
@@ -4167,8 +4172,8 @@ msgstr ""
 #: 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 ""
 
 #: src/filtering.c:700
@@ -4178,73 +4183,67 @@ 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 ""
 
 #: src/filtering.c:752
 #, c-format
 msgid "applying action [ %s ]\n"
-msgstr ""
+msgstr "application de l'action [ %s ]\n"
 
 #: src/filtering.c:757
 msgid "action could not apply\n"
-msgstr ""
+msgstr "application de l'action impossible\n"
 
 #: src/filtering.c:759
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr ""
+msgstr "pas de traitement apr?s l'action [ %s ]\n"
 
 #: src/filtering.c:810
-#, fuzzy, c-format
+#, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "Ex?c_uter les r?gles de traitement"
+msgstr "r?gle de traitement '%s' [ %s]\n"
 
 #: src/filtering.c:814
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "traitement de la r?gle <sansnom> [ %s ]\n"
 
 #: src/filtering.c:832
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr ""
+msgstr "r?gle '%s' d?sactiv?e [ %s ]\n"
 
 #: src/filtering.c:836
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr ""
+msgstr "r?gle <sansnom> d?sactiv?e [ %s ]\n"
 
 #: src/filtering.c:874
-#, fuzzy
 msgid "undetermined"
-msgstr "Ind?finie"
+msgstr "ind?fini"
 
 #: src/filtering.c:878
-#, fuzzy
 msgid "incorporation"
-msgstr "Filtrage ? la r?ception"
+msgstr "filtrage ? la r?ception"
 
 #: src/filtering.c:882
-#, fuzzy
 msgid "manually"
-msgstr "_Manuel"
+msgstr "manuellement"
 
 #: src/filtering.c:886
-#, fuzzy
 msgid "folder processing"
-msgstr "Ex?c_uter les r?gles de traitement du dossier courant"
+msgstr "traitement du dossier"
 
 #: src/filtering.c:890
-#, fuzzy
 msgid "pre-processing"
-msgstr "P_r?-traitement.."
+msgstr "pr?-traitement"
 
 #: src/filtering.c:894
-#, fuzzy
 msgid "post-processing"
-msgstr "P_ost-traitement.."
+msgstr "post-traitement"
 
 #: src/filtering.c:911
 #, c-format
@@ -4256,10 +4255,16 @@ msgid ""
 "%s%s %s\n"
 "%s%s %s\n"
 msgstr ""
+"filtrage du message (%s%s%s)\n"
+"%sfichier message : %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
+"%s%s %s\n"
 
 #: src/filtering.c:913 src/filtering.c:922
 msgid ": "
-msgstr ""
+msgstr " : "
 
 #: src/filtering.c:920
 #, c-format
@@ -4267,6 +4272,8 @@ msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
+"filtrage du message (%s%s%s)\n"
+"%sfichier message : %s\n"
 
 #: src/folder.c:1565 src/foldersel.c:403 src/prefs_folder_item.c:306
 msgid "Inbox"
@@ -4319,10 +4326,8 @@ msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
 
 #: src/folder.c:4820
-#, fuzzy
 msgid "A folder name cannot begin or end with a dot."
-msgstr ""
-"Un dossier ne peut ?tre d?plac? ? travers diff?rentes bo?tes aux lettres."
+msgstr "Un nom de dossier ne peut commencer ou finir par un point."
 
 #: src/foldersel.c:247
 msgid "Select folder"
@@ -4362,9 +4367,8 @@ msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
 #: src/folderview.c:237
-#, fuzzy
 msgid "Mark all read recursi_vely"
-msgstr "Marquer _tous comme lus"
+msgstr "Marquer comme lu r?cursivement"
 
 #: src/folderview.c:239
 msgid "R_un processing rules"
@@ -4412,107 +4416,115 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Initialisation des donn?es des dossiers.."
 
-#: src/folderview.c:840 src/summaryview.c:4127 src/summaryview.c:4129
-msgid "Mark all as read"
-msgstr "Marquer tous les messages comme lus"
+#: src/folderview.c:839
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"read?"
+msgstr ""
+"Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
+"dossiers comme lus ?"
 
 #: src/folderview.c:841 src/summaryview.c:4128
 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:1004 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
+#: src/folderview.c:845 src/summaryview.c:4127
+msgid "Mark all as read"
+msgstr "Marquer tous les messages comme lus"
+
+#: src/folderview.c:1007 src/imap.c:4586 src/mainwindow.c:5159 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/folderview.c:1008 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
+#: src/folderview.c:1011 src/imap.c:4591 src/mainwindow.c:5164 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1039
+#: src/folderview.c:1042
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1040
+#: src/folderview.c:1043
 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:1050
+#: src/folderview.c:1053
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1052
+#: src/folderview.c:1055
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1143
+#: src/folderview.c:1146
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1200
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2070
+#: src/folderview.c:2073
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2165
+#: src/folderview.c:2168
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2186
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu ?tre ouvert."
 
-#: src/folderview.c:2326 src/mainwindow.c:2889 src/mainwindow.c:2893
+#: src/folderview.c:2329 src/mainwindow.c:2889 src/mainwindow.c:2893
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2327
+#: src/folderview.c:2330
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2328
+#: src/folderview.c:2331
 msgid "+_Empty trash"
 msgstr "+_Vider"
 
-#: src/folderview.c:2372 src/inc.c:1540 src/toolbar.c:2607
+#: src/folderview.c:2375 src/inc.c:1540 src/toolbar.c:2607
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
-#: src/folderview.c:2373 src/toolbar.c:2608
+#: src/folderview.c:2376 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:2384 src/toolbar.c:2627
+#: src/folderview.c:2387 src/toolbar.c:2627
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
-#: src/folderview.c:2385 src/toolbar.c:2628
+#: src/folderview.c:2388 src/toolbar.c:2628
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
-#: src/folderview.c:2386 src/messageview.c:856 src/messageview.c:873
+#: src/folderview.c:2389 src/messageview.c:856 src/messageview.c:873
 #: src/toolbar.c:2629
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/folderview.c:2394 src/toolbar.c:2647
+#: src/folderview.c:2397 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:2397 src/main.c:2714 src/toolbar.c:2650
+#: src/folderview.c:2400 src/main.c:2714 src/toolbar.c:2650
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4521,67 +4533,67 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, 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:2475
+#: src/folderview.c:2478
 #, 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:2477
+#: src/folderview.c:2480
 msgid "Copy folder"
 msgstr "Copie du dossier"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2480
 msgid "Move folder"
 msgstr "D?placement du dossier"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s.."
 
-#: src/folderview.c:2488
+#: src/folderview.c:2491
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "D?placement de %s vers %s.."
 
-#: src/folderview.c:2522
+#: src/folderview.c:2525
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
-#: src/folderview.c:2525
+#: src/folderview.c:2528
 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:2526
+#: src/folderview.c:2529
 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:2529
+#: src/folderview.c:2532
 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:2532
+#: src/folderview.c:2535
 msgid "Copy failed!"
 msgstr "La copie a ?chou?."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2535
 msgid "Move failed!"
 msgstr "Le d?placement a ?chou?."
 
-#: src/folderview.c:2583
+#: src/folderview.c:2586
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3011 src/summaryview.c:4568 src/summaryview.c:4666
+#: src/folderview.c:3014 src/summaryview.c:4568 src/summaryview.c:4666
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut ?tre utilis? seulement pour stocker des "
@@ -5134,12 +5146,11 @@ msgstr ""
 
 #: src/gtk/gtkutils.c:1909
 msgid "Failed."
-msgstr ""
+msgstr "?chec."
 
 #: src/gtk/gtkutils.c:1972
-#, fuzzy
 msgid "Configuring..."
-msgstr "_Configuration"
+msgstr "Configuration.."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
 #: src/prefs_matcher.c:2174 src/prefs_summary_column.c:84 src/quote_fmt.c:49
@@ -5720,6 +5731,7 @@ msgstr ""
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:136
 #: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/managesieve/sieve_prefs.c:397
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -5776,11 +5788,12 @@ msgstr "Pr?f?rences"
 msgid "_Hide"
 msgstr "_Pas de barre d'outils"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:3233
-#: src/prefs_account.c:3251 src/prefs_account.c:3269 src/prefs_account.c:3287
-#: src/prefs_account.c:3305 src/prefs_account.c:3323 src/prefs_account.c:3342
-#: src/prefs_account.c:3434 src/prefs_filtering_action.c:1421
-#: src/prefs_filtering.c:397 src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:663
+#: src/prefs_account.c:3233 src/prefs_account.c:3251 src/prefs_account.c:3269
+#: src/prefs_account.c:3287 src/prefs_account.c:3305 src/prefs_account.c:3323
+#: src/prefs_account.c:3342 src/prefs_account.c:3434
+#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1875
 msgid "Account"
 msgstr "Compte"
 
@@ -6003,9 +6016,8 @@ 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
-#, fuzzy
 msgid "From/To/Cc/Subject/Tag"
-msgstr "De/?/Sujet/Label"
+msgstr "De/?/Cc/Sujet/Label"
 
 #: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
 msgid "Recursive"
@@ -6632,13 +6644,13 @@ msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafra?chir la liste des facilit?s IMAP.\n"
 
 #: src/imap.c:4064
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without TLS support.\n"
 msgstr ""
 "La connection vers %s a ?chou? : le serveur n?cessite TLS, mais Claws Mail a "
-"?t? compil? sans le support OpenSSL.\n"
+"?t? compil? sans le support TLS.\n"
 
 #: src/imap.c:4072
 msgid "Server logins are disabled.\n"
@@ -6975,12 +6987,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:823
 msgid "The LDIF field can be renamed to the User Attribute name."
@@ -6992,7 +7004,7 @@ msgstr "S?lectionner pour l'import"
 
 #: src/importldif.c:833
 msgid "Select the LDIF field for import into the address book."
-msgstr "S?lectionner le champ LDIF pour l'importer dans le carnet d'adresse."
+msgstr "S?lectionner le champ LDIF pour l'importer dans le carnet d'adresses."
 
 #: src/importldif.c:835
 msgid " Modify "
@@ -7084,7 +7096,7 @@ msgstr "Termin? (aucun nouveau message)"
 msgid "Connection failed"
 msgstr "La connexion a ?chou?"
 
-#: src/inc.c:655
+#: src/inc.c:655 src/plugins/managesieve/managesieve.c:743
 msgid "Auth failed"
 msgstr "Authorisation ?chou?e"
 
@@ -7128,7 +7140,8 @@ msgstr "Impossible de se connecter au serveur POP3 : %s:%d."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
 
-#: src/inc.c:934 src/send_message.c:494
+#: src/inc.c:934 src/plugins/managesieve/managesieve.c:278
+#: src/send_message.c:494
 msgid "Authenticating..."
 msgstr "Authentification.."
 
@@ -7276,7 +7289,7 @@ msgstr "_Seulement pour cette fois-ci"
 
 #: src/ldapupdate.c:1056
 msgid "Some SN"
-msgstr ""
+msgstr "Un SN"
 
 #: src/ldif.c:759
 msgid "Nick Name"
@@ -8223,7 +8236,7 @@ msgstr "_Travailler hors-ligne"
 
 #: src/mainwindow.c:808
 msgid "Men_ubar"
-msgstr ""
+msgstr "Barre de Men_u"
 
 #: src/mainwindow.c:809
 msgid "_Message view"
@@ -8891,12 +8904,15 @@ msgid "Remove _mailbox..."
 msgstr "Enlever la _bo?te aux lettres.."
 
 #: src/mh_gtk.c:224
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
 "\n"
 "%s."
-msgstr "Impossible de supprimer le dossier '%s'."
+msgstr ""
+"Impossible de supprimer le dossier '%s'\n"
+"\n"
+"%s."
 
 #: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
@@ -9029,7 +9045,7 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 "Cette pi?ce jointe est un fichier ex?cutable. L'ex?cution de binaires dont "
-"la provenance est inconnu est une op?ration dangereuse qui pourrait "
+"la provenance est inconnue est une op?ration dangereuse qui pourrait "
 "compromettre votre ordinateur.\n"
 "\n"
 "Voulez-vous ex?cuter ce binaire ?"
@@ -9301,9 +9317,8 @@ msgid "Address Keeper"
 msgstr "Collecteur d'adresses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:106
-#, fuzzy
 msgid "Address book location"
-msgstr "Chemin dans le carnet"
+msgstr "Chemin du carnet d'adresses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Keep to folder"
@@ -9311,7 +9326,7 @@ msgstr "Dossier o? conserver les adresses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:119
 msgid "Address book path where addresses are kept"
-msgstr "Dossier du carnet d'adresse o? conserver les adresses"
+msgstr "Dossier du carnet d'adresses o? conserver les adresses"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:121
 #: src/plugins/bogofilter/bogofilter_gtk.c:278
@@ -9324,7 +9339,7 @@ msgstr "S?lectionner.."
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:137
 msgid "Fields to keep addresses from"
-msgstr ""
+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"
@@ -9339,13 +9354,11 @@ 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:168
-#, fuzzy
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 "Exclure les adresses correspondant aux expressions r?guli?res suivantes (une "
-"par ligne) :\n"
-"(une par ligne)"
+"par ligne)"
 
 #: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
 msgid "Mail Archiver"
@@ -9899,11 +9912,10 @@ msgid "attach"
 msgstr "attach"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-#, fuzzy
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
-"Une ou plusieurs des expressions r?guli?res suivantes sont pr?sentes:\n"
-"(une par ligne)"
+"Au moins une des expressions r?guli?res suivantes est pr?sente (une par "
+"ligne)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:87
 msgid "Expressions are case sensitive"
@@ -10093,19 +10105,16 @@ msgid "KB"
 msgstr "ko"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:200
-#, fuzzy
 msgid "Delete spam"
-msgstr "Suppression du label"
+msgstr "Suppression du pourriel"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:207
-#, fuzzy
 msgid "Save spam in..."
-msgstr "Enregistrer le pourriel dans"
+msgstr "Enregistrer le pourriel dans.."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:214
-#, fuzzy
 msgid "Only mark as spam"
-msgstr "Marquer comme pourriel"
+msgstr "Marquer comme pourriel seulement"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:227
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
@@ -10170,7 +10179,7 @@ msgstr ""
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Veuillez utiliser ce bouton pour s?lectionner un carnet ou dossier de votre "
-"carnet d'adresse."
+"carnet d'adresses."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:284
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
@@ -10233,8 +10242,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:501
 msgid "Bsfilter: learning from message..."
@@ -10631,9 +10640,8 @@ msgid "Use GNOME's proxy settings"
 msgstr "Utiliser les param?tres de proxy de GNOME"
 
 #: src/plugins/fancy/fancy_prefs.c:219
-#, fuzzy
 msgid "Use proxy"
-msgstr "Utiliser un serveur mandataire :"
+msgstr "Utiliser un serveur mandataire"
 
 #: src/plugins/fancy/fancy_prefs.c:237
 msgid "Remote resources"
@@ -10659,9 +10667,8 @@ msgid "Enable loading of remote content"
 msgstr "Activer le chargement du contenu distant"
 
 #: src/plugins/fancy/fancy_prefs.c:276
-#, fuzzy
 msgid "When clicking on a link, by default"
-msgstr "Lorsqu'un lien est cliqu?, par d?faut :"
+msgstr "Lorsqu'un lien est cliqu?, par d?faut"
 
 #: src/plugins/fancy/fancy_prefs.c:284
 msgid "Open in external browser"
@@ -10669,7 +10676,7 @@ msgstr "Ouvrir dans le navigateur"
 
 #: src/plugins/fancy/fancy_prefs.c:298
 msgid "The CSS in this file will be applied to all HTML parts"
-msgstr ""
+msgstr "Le CSS de ce fichiers sera appliqu? ? toutes les parties HTML"
 
 #: src/plugins/fancy/fancy_prefs.c:308
 #: src/plugins/notification/notification_prefs.c:1347
@@ -10680,9 +10687,8 @@ msgid "Bro_wse"
 msgstr "Pa_rcourir"
 
 #: src/plugins/fancy/fancy_prefs.c:350
-#, fuzzy
 msgid "Select stylesheet"
-msgstr "Feuille de style"
+msgstr "Choix de la feuille de style"
 
 #: src/plugins/fancy/fancy_viewer.c:395
 msgid "Remote content loading is disabled."
@@ -10822,9 +10828,8 @@ msgid "Add fetchinfo headers"
 msgstr "Ajout des en-t?tes de fetchinfo"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:96
-#, fuzzy
 msgid "Headers to be added"
-msgstr "Adresse email ? utiliser en tant qu'exp?diteur"
+msgstr "En-t?te ? ajouter"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid "UIDL"
@@ -10886,23 +10891,21 @@ msgid ""
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:142
-#, fuzzy
 msgid "Step 1:"
-msgstr "par pas de"
+msgstr "?tape 1 :"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:148
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
+"Cliquer ici pour ouvrir la page d'autorisation Google dans un navigateur"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:152
-#, fuzzy
 msgid "Step 2:"
-msgstr "par pas de"
+msgstr "?tape 2 :"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:158
-#, fuzzy
 msgid "Enter code:"
-msgstr "Interface"
+msgstr "Saisie du code :"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:324
 #, c-format
@@ -10965,6 +10968,8 @@ msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"Module GData : code d'autorisation non re?u, requ?te d'autorisation "
+"annul?e\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:493
 #, fuzzy, c-format
@@ -10981,7 +10986,8 @@ msgstr "Module GData : erreur d'identification : %s\n"
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Module GData : lancement asynchrone de l'identification\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:77 src/prefs_account.c:1745
+#: src/plugins/gdata/cm_gdata_prefs.c:77
+#: src/plugins/managesieve/sieve_prefs.c:188 src/prefs_account.c:1745
 msgid "Authentication"
 msgstr "Authentification"
 
@@ -11048,23 +11054,21 @@ msgstr "Int?gration de GData"
 #: src/plugins/geolocation/geolocation_plugin.c:349
 #, c-format
 msgid "Found location: (%.2f,%.2f)"
-msgstr ""
+msgstr "Localisation trouv?e : (%.2f,%.2f)"
 
 #. TRANSLATORS: The country name is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:369
 msgid "Alleged country of origin: "
-msgstr ""
+msgstr "Pays d'origine tel que d?clar? :"
 
 #. TRANSLATORS: The IP address is appended to the string
 #: src/plugins/geolocation/geolocation_plugin.c:373
-#, fuzzy
 msgid "Could not resolve location of IP address "
-msgstr "?chec lors de la lecture de l'index des adresses"
+msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:512
-#, fuzzy
 msgid "Try to locate sender"
-msgstr "Pr?nom de l'exp?diteur"
+msgstr "Localisation de l'?metteur"
 
 #: src/plugins/geolocation/geolocation_plugin.c:528
 msgid "Andorra"
@@ -11107,9 +11111,8 @@ msgid "Antarctica"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:538
-#, fuzzy
 msgid "Argentina"
-msgstr "Magenta"
+msgstr "Argentine"
 
 #: src/plugins/geolocation/geolocation_plugin.c:539
 msgid "American Samoa"
@@ -11244,14 +11247,12 @@ msgid "Cameroon"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:572
-#, fuzzy
 msgid "China"
-msgstr "Chinois"
+msgstr "Chine"
 
 #: src/plugins/geolocation/geolocation_plugin.c:573
-#, fuzzy
 msgid "Colombia"
-msgstr "Colorier"
+msgstr "Colombie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:574
 msgid "Costa Rica"
@@ -11286,9 +11287,8 @@ msgid "Djibouti"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:582
-#, fuzzy
 msgid "Denmark"
-msgstr "D?marquer"
+msgstr "Danemark"
 
 #: src/plugins/geolocation/geolocation_plugin.c:583
 msgid "Dominica"
@@ -11315,9 +11315,8 @@ msgid "Egypt"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:589
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Europe de l'Ouest"
+msgstr "Sahara Occidental"
 
 #: src/plugins/geolocation/geolocation_plugin.c:590
 msgid "Eritrea"
@@ -11352,9 +11351,8 @@ msgid "Faroe Islands"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:598
-#, fuzzy
 msgid "France"
-msgstr "Annuler"
+msgstr "France"
 
 #: src/plugins/geolocation/geolocation_plugin.c:599
 msgid "France, Metropolitan"
@@ -11386,14 +11384,12 @@ msgid "Ghana"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:606
-#, fuzzy
 msgid "Gibraltar"
-msgstr "Libravatar"
+msgstr "Gibraltar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:607
-#, fuzzy
 msgid "Greenland"
-msgstr "Vert"
+msgstr "Groenland"
 
 #: src/plugins/geolocation/geolocation_plugin.c:608
 msgid "Gambia"
@@ -11412,9 +11408,8 @@ msgid "Equatorial Guinea"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:612
-#, fuzzy
 msgid "Greece"
-msgstr "Vert"
+msgstr "Gr?ce"
 
 #: src/plugins/geolocation/geolocation_plugin.c:613
 msgid "South Georgia And The South Sandwich Islands"
@@ -11473,9 +11468,8 @@ msgid "Israel"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:627
-#, fuzzy
 msgid "India"
-msgstr "Indicateur"
+msgstr "Inde"
 
 #: src/plugins/geolocation/geolocation_plugin.c:628
 msgid "British Indian Ocean Territory"
@@ -11506,9 +11500,8 @@ msgid "Jordan"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:635
-#, fuzzy
 msgid "Japan"
-msgstr "Japonais"
+msgstr "Japon"
 
 #: src/plugins/geolocation/geolocation_plugin.c:636
 msgid "Kenya"
@@ -11527,9 +11520,8 @@ msgid "Kiribati"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:640
-#, fuzzy
 msgid "Comoros"
-msgstr "demain"
+msgstr "Comores"
 
 #: src/plugins/geolocation/geolocation_plugin.c:641
 msgid "Saint Kitts And Nevis"
@@ -11616,9 +11608,8 @@ msgid "Madagascar"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:662
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Marquer tous les messages comme lus"
+msgstr "?les Marshall"
 
 #: src/plugins/geolocation/geolocation_plugin.c:663
 msgid "Macedonia, The Former Yugoslav Republic Of"
@@ -11629,9 +11620,8 @@ msgid "Mali"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:665
-#, fuzzy
 msgid "Myanmar"
-msgstr "D?marquer"
+msgstr "Birmanie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:666
 msgid "Mongolia"
@@ -11690,9 +11680,8 @@ msgid "Namibia"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:680
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Nouveaux contacts"
+msgstr "Nouvelle Cal?donie"
 
 #: src/plugins/geolocation/geolocation_plugin.c:681
 msgid "Niger"
@@ -11715,9 +11704,8 @@ msgid "Netherlands"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:686
-#, fuzzy
 msgid "Norway"
-msgstr "Transf?rer"
+msgstr "Norv?ge"
 
 #: src/plugins/geolocation/geolocation_plugin.c:687
 msgid "Nepal"
@@ -11756,9 +11744,8 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:696
-#, fuzzy
 msgid "Philippines"
-msgstr "lignes"
+msgstr "Philippines"
 
 #: src/plugins/geolocation/geolocation_plugin.c:697
 msgid "Pakistan"
@@ -11781,9 +11768,8 @@ msgid "Puerto Rico"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:702
-#, fuzzy
 msgid "Portugal"
-msgstr "Port"
+msgstr "Portugal"
 
 #: src/plugins/geolocation/geolocation_plugin.c:703
 msgid "Palau"
@@ -11794,9 +11780,8 @@ msgid "Paraguay"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:705
-#, fuzzy
 msgid "Qatar"
-msgstr "Wavatar"
+msgstr "Qatar"
 
 #: src/plugins/geolocation/geolocation_plugin.c:706
 msgid "Reunion"
@@ -11871,9 +11856,8 @@ msgid "Somalia"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:724
-#, fuzzy
 msgid "Suriname"
-msgstr "Nom d'utilisateur SMTP :"
+msgstr "Surinam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:725
 msgid "Sao Tome And Principe"
@@ -11908,9 +11892,8 @@ msgid "Togo"
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:733
-#, fuzzy
 msgid "Thailand"
-msgstr "Tha?landais"
+msgstr "Tha?lande"
 
 #: src/plugins/geolocation/geolocation_plugin.c:734
 msgid "Tajikistan"
@@ -12001,9 +11984,8 @@ msgid "Virgin Islands, U.S."
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:757
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Chemin du fichier"
+msgstr "Vi?t Nam"
 
 #: src/plugins/geolocation/geolocation_plugin.c:758
 msgid "Vanuatu"
@@ -12047,27 +12029,24 @@ msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:777
 #: src/plugins/geolocation/geolocation_plugin.c:862
-#, fuzzy
 msgid "GeoLocation"
-msgstr "Endroit :"
+msgstr "GeoLocation"
 
 #: src/plugins/geolocation/geolocation_plugin.c:782
-#, fuzzy
 msgid "Could not initialize clutter"
-msgstr "Impossible d'initialiser le correcteur orthographique %s."
+msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:788
 #: src/plugins/geolocation/geolocation_plugin.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create regular expression: %s\n"
-msgstr "Impossible de cr?er un fichier temporaire : %s"
+msgstr "Impossible de cr?er l'expression r?guli?re : %s\n"
 
 #: src/plugins/geolocation/geolocation_plugin.c:803
-#, fuzzy
 msgid "Failed to register messageview_show hook in the GeoLocation plugin"
 msgstr ""
-"Impossible d'enregistrer le connecteur 'theme change' dans le module "
-"Notification"
+"Impossible d'enregistrer le connecteur 'messageview_show' dans le module "
+"GeoLocation"
 
 #: src/plugins/geolocation/geolocation_plugin.c:867
 msgid ""
@@ -12087,9 +12066,8 @@ msgid ""
 msgstr ""
 
 #: src/plugins/geolocation/geolocation_plugin.c:900
-#, fuzzy
 msgid "GeoLocation integration"
-msgstr "Int?gration de GData"
+msgstr "Int?gration de GeoLocation"
 
 #: src/plugins/libravatar/libravatar.c:360
 #: src/plugins/libravatar/libravatar.c:431
@@ -12148,9 +12126,9 @@ msgstr ""
 "org>.\n"
 
 #: src/plugins/libravatar/libravatar_prefs.c:137
-#, fuzzy
 msgid "<span color=\"red\">Error reading cache stats</span>"
-msgstr "<span weight=\"bold\">Votre adresse email :</span>"
+msgstr ""
+"<span color=\"red\">Erreur lors de lecture des statistiques du cache</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:141
 #, c-format
@@ -12158,25 +12136,26 @@ 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
-msgstr ""
+msgstr "Utilisation de %s dans %d fichiers, %d r?pertoires et %d autres"
 
 #: src/plugins/libravatar/libravatar_prefs.c:164
-#, fuzzy
 msgid "Clear icon cache"
-msgstr "Cache des ic?nes"
+msgstr "Effacer le cache des ic?nes"
 
 #: src/plugins/libravatar/libravatar_prefs.c:165
-#, fuzzy
 msgid "Are you sure you want to remove all cached avatar icons?"
-msgstr "Voulez-vous vraiment supprimer ce th?me ?"
+msgstr ""
+"Voulez-vous vraiment supprimer le contenu du cache des ic?nes d'avatar ?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Not enough memory for operation"
-msgstr ""
+msgstr "Pas assez de m?moire disponible pour cette op?ration"
 
 #: src/plugins/libravatar/libravatar_prefs.c:183
 #, c-format
@@ -12185,10 +12164,13 @@ msgid ""
 "? %u missing entries removed.\n"
 "? %u files removed."
 msgstr ""
+"Cache des ic?nes effac? avec succ?s :\n"
+"? %u entr?es manquantes supprim?es,\n"
+"? %u fichiers supprim?s."
 
 #: src/plugins/libravatar/libravatar_prefs.c:188
 msgid "<span color=\"#006400\">Icon cache succesfully cleared!</span>"
-msgstr ""
+msgstr "<span color=\"#006400\">Cache des ic?nes effac? avec succ?ss !</span>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:191
 #, c-format
@@ -12199,10 +12181,17 @@ msgid ""
 "? %u files failed to be read.\n"
 "? %u files couldn't be removed."
 msgstr ""
+"Erreurs lors de la suppression du contenu du cache des ic?nes :\n"
+"? %u entr?es manquantes supprim?es,\n"
+"? %u fichiers supprim?s,\n"
+"\"? %u ?checs de lecture de fichiers,\n"
+"? %u ?checs de suppression de fichiers."
 
 #: src/plugins/libravatar/libravatar_prefs.c:198
 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>"
 
 #: src/plugins/libravatar/libravatar_prefs.c:213
 msgid "_Use cached icons"
@@ -12304,9 +12293,8 @@ msgstr ""
 "Obtenir l'avatar ? partir du serveur libravatar du domaine de l'?metteur"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
-#, fuzzy
 msgid "Request timeout"
-msgstr "Session expir?e\n"
+msgstr "D?lait d'expiration de requ?te."
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 #: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:558
@@ -12368,6 +12356,274 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les supprimer ?"
 
+#: src/plugins/managesieve/managesieve.c:290
+msgid "No Sieve auth method available\n"
+msgstr "Aucune m?thode d'authentification Sieve disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:294
+msgid "Selected Sieve auth method not available\n"
+msgstr "M?thode d'authentification Sieve s?lectionn?e non disponible\n"
+
+#: src/plugins/managesieve/managesieve.c:518
+msgid "Disconnected"
+msgstr "D?connect?"
+
+#: src/plugins/managesieve/managesieve.c:522
+#, c-format
+msgid "Disconnected: %s"
+msgstr "D?connect? : %s"
+
+#: src/plugins/managesieve/managesieve.c:570
+#: src/plugins/managesieve/managesieve.c:729
+#, c-format
+msgid "unhandled message on Sieve session: %s\n"
+msgstr "message non reconnu lors de la session Sieve: %s\n"
+
+#: src/plugins/managesieve/managesieve.c:577
+msgid "TLS failed"
+msgstr "?chec TLS"
+
+#: src/plugins/managesieve/managesieve.c:651
+#: src/plugins/managesieve/managesieve.c:664
+msgid "error occurred on SIEVE session\n"
+msgstr "erreur pendant la session Sieve\n"
+
+#: src/plugins/managesieve/managesieve.c:725
+#, c-format
+msgid "error occurred on Sieve session. data: %s\n"
+msgstr "erreur pendant la session Sieve. Donn?es : %s\n"
+
+#: src/plugins/managesieve/managesieve.c:734
+#, c-format
+msgid "unhandled message on Sieve session: %d\n"
+msgstr "message non reconnu lors de la session Sieve: %d\n"
+
+#: src/plugins/managesieve/managesieve.c:930
+msgid "Sieve: retrying auth\n"
+msgstr "Sieve: nouvel essai d'authentification\n"
+
+#: src/plugins/managesieve/managesieve.c:932
+msgid "Auth method not available"
+msgstr "M?thode d'authentification non disponible"
+
+#: src/plugins/managesieve/sieve_editor.c:79 src/summaryview.c:5631
+msgid "_Filter"
+msgstr "_Filtrer"
+
+#: src/plugins/managesieve/sieve_editor.c:84
+#: src/plugins/managesieve/sieve_editor.c:606
+msgid "Chec_k Syntax"
+msgstr "V?rifier la syntaxe"
+
+#: src/plugins/managesieve/sieve_editor.c:85
+msgid "Re_vert"
+msgstr "R?tablir"
+
+#: src/plugins/managesieve/sieve_editor.c:282
+#: src/plugins/managesieve/sieve_manager.c:178
+msgid "Unable to get script contents"
+msgstr "Impossible d'obtenir le contenu du script"
+
+#: src/plugins/managesieve/sieve_editor.c:312
+msgid "Reverting..."
+msgstr "R?tablissement.."
+
+#: src/plugins/managesieve/sieve_editor.c:321
+msgid "Revert script"
+msgstr "R?tablir le script"
+
+#: src/plugins/managesieve/sieve_editor.c:322
+msgid "This script has been modified. Revert the unsaved changes?"
+msgstr ""
+"Ce script a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
+"modifications ?"
+
+#: src/plugins/managesieve/sieve_editor.c:323
+msgid "_Revert"
+msgstr "_R?tablir"
+
+#: src/plugins/managesieve/sieve_editor.c:338
+msgid "Script saved successfully."
+msgstr "Script enregistr? avec succ?s."
+
+#: src/plugins/managesieve/sieve_editor.c:348
+msgid "Saving..."
+msgstr "Enregistrement.."
+
+#: src/plugins/managesieve/sieve_editor.c:375
+msgid "Checking syntax..."
+msgstr "V?rification de la syntaxe en cours.."
+
+#: src/plugins/managesieve/sieve_editor.c:408
+msgid "This script has been modified. Save the latest changes?"
+msgstr ""
+"Ce script a ?t? modifi?. Souhaitez-vous enregistrer les derni?res "
+"modifications ?"
+
+#: src/plugins/managesieve/sieve_editor.c:409
+msgid "+_Save"
+msgstr "+Enregi_strer"
+
+#: src/plugins/managesieve/sieve_editor.c:666
+#, c-format
+msgid "%s - Sieve Filter%s"
+msgstr "%s - Fitlre Sieve%s"
+
+#: src/plugins/managesieve/sieve_manager.c:156
+#: src/plugins/managesieve/sieve_manager.c:249
+msgid "Add Sieve script"
+msgstr "Ajout d'un filtre Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:157
+msgid "Enter name for a new Sieve filter script."
+msgstr "Veuillez saisir le nom du nouveau script Sieve."
+
+#: src/plugins/managesieve/sieve_manager.c:250
+msgid "Enter new name for the script."
+msgstr "Veuillez saisir le nouveau nom pour le script."
+
+#: src/plugins/managesieve/sieve_manager.c:338
+#, c-format
+msgid "Do you really want to delete the filter '%s'?"
+msgstr "Voulez-vous vraiment supprimer le filtre '%s' ?"
+
+#: src/plugins/managesieve/sieve_manager.c:339
+msgid "Delete filter"
+msgstr "Suppression du filtre"
+
+#: src/plugins/managesieve/sieve_manager.c:492
+msgid "Active"
+msgstr "Actif"
+
+#: src/plugins/managesieve/sieve_manager.c:498
+msgid "An account can only have one active script at a time."
+msgstr "Un compte ne peut avoir qu'un seul script Sieve actif ? la fois."
+
+#: src/plugins/managesieve/sieve_manager.c:574
+msgid "Unable to connect"
+msgstr "Impossible de se connecter"
+
+#: src/plugins/managesieve/sieve_manager.c:616
+msgid "Listing scripts..."
+msgstr "?tablissement de la liste des scripts"
+
+#: src/plugins/managesieve/sieve_manager.c:619
+msgid "Connecting..."
+msgstr "Connexion.."
+
+#: src/plugins/managesieve/sieve_manager.c:649
+msgid "Manage Sieve Filters"
+msgstr "Gestion des filtres Sieve"
+
+#: src/plugins/managesieve/sieve_manager.c:780
+msgid "To use Sieve, enable it in an account's preferences."
+msgstr "Afin d'utiliser Sieve, activer le dans les pr?f?rences de compte."
+
+#: src/plugins/managesieve/sieve_plugin.c:35
+#: src/plugins/managesieve/sieve_plugin.c:150
+msgid "ManageSieve"
+msgstr "ManageSieve"
+
+#: src/plugins/managesieve/sieve_plugin.c:45
+msgid "Manage Sieve Filters..."
+msgstr "Gestion des filtres Sieve.."
+
+#: src/plugins/managesieve/sieve_plugin.c:110
+msgid "Manage sieve filters on a server using the ManageSieve protocol."
+msgstr ""
+
+#: src/plugins/managesieve/sieve_prefs.c:134
+msgid "Enable Sieve"
+msgstr "Activer Sieve"
+
+#: src/plugins/managesieve/sieve_prefs.c:141 src/prefs_account.c:1096
+msgid "Server information"
+msgstr "Configuration des serveurs"
+
+#: src/plugins/managesieve/sieve_prefs.c:150
+msgid "Server name"
+msgstr "Nom du serveur"
+
+#: src/plugins/managesieve/sieve_prefs.c:159
+msgid "Connect to this host instead of the host used for receiving mail"
+msgstr ""
+"Connection ? cet h?te au lieu de l'h?te utilis? pour la r?ception des emails"
+
+#: src/plugins/managesieve/sieve_prefs.c:163
+msgid "Server port"
+msgstr "Port de serveur"
+
+#: src/plugins/managesieve/sieve_prefs.c:170
+msgid "Connect to this port instead of the default"
+msgstr "Connection ? ce port au lieu du port par d?faut"
+
+#: src/plugins/managesieve/sieve_prefs.c:174
+msgid "Encryption"
+msgstr "Chiffrage"
+
+#: src/plugins/managesieve/sieve_prefs.c:179
+msgid "No TLS"
+msgstr "Pas de TLS"
+
+#: src/plugins/managesieve/sieve_prefs.c:181
+msgid "Use TLS when available"
+msgstr "Utiliser TLS quand disponible"
+
+#: src/plugins/managesieve/sieve_prefs.c:183
+msgid "Require TLS"
+msgstr "TLS requis"
+
+#: src/plugins/managesieve/sieve_prefs.c:191
+#: src/plugins/rssyl/rssyl_feed_props.c:268
+msgid "No authentication"
+msgstr "Pas d'authentification"
+
+#: src/plugins/managesieve/sieve_prefs.c:193
+msgid "Use same authentication as for receiving mail"
+msgstr "Utiliser la m?me authentification que pour la r?ception des emails"
+
+#: src/plugins/managesieve/sieve_prefs.c:195
+msgid "Specify authentication"
+msgstr "Utiliser l'authentification"
+
+#: src/plugins/managesieve/sieve_prefs.c:225
+#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
+#: src/prefs_account.c:1791
+msgid "User ID"
+msgstr "Nom d'utilisateur"
+
+#: src/plugins/managesieve/sieve_prefs.c:235
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
+#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
+#: src/wizard.c:1205 src/wizard.c:1620
+msgid "Password"
+msgstr "Mot de passe"
+
+#: src/plugins/managesieve/sieve_prefs.c:251 src/prefs_account.c:1569
+#: src/prefs_account.c:1763
+msgid "Authentication method"
+msgstr "Authentification"
+
+#: src/plugins/managesieve/sieve_prefs.c:260 src/prefs_account.c:1579
+#: src/prefs_account.c:1772 src/prefs_send.c:291
+msgid "Automatic"
+msgstr "Automatique"
+
+#: src/plugins/managesieve/sieve_prefs.c:367
+msgid "Sieve server must not contain a space."
+msgstr "Le nom de serveur Sieve ne peut contenir d'espace."
+
+#: src/plugins/managesieve/sieve_prefs.c:373
+msgid "Sieve server is not entered."
+msgstr "Le serveur Sieve est non sp?cifi?."
+
+#: src/plugins/managesieve/sieve_prefs.c:398
+msgid "Sieve"
+msgstr "Sieve"
+
 #: src/plugins/newmail/newmail.c:110 src/plugins/newmail/newmail.c:153
 msgid "NewMail"
 msgstr "NewMail"
@@ -12642,17 +12898,14 @@ msgid "News folders"
 msgstr "Dossiers Usenet (News)"
 
 #: src/plugins/notification/notification_prefs.c:633
-#, fuzzy
 msgid "RSSyl folders"
-msgstr "Dossiers RSS"
+msgstr "Dossiers RSSyl"
 
 #: src/plugins/notification/notification_prefs.c:641
-#, fuzzy
 msgid "vCalendar folders"
-msgstr "Dossiers Calendrier"
+msgstr "Dossiers vCalendar"
 
 #: src/plugins/notification/notification_prefs.c:649
-#, fuzzy
 msgid "These settings override folder-specific selections."
 msgstr "Ces r?glages ont pr?c?dence sur les s?lections de dossiers."
 
@@ -12700,23 +12953,20 @@ msgid "Banner speed"
 msgstr "Vitesse de la banni?re"
 
 #: src/plugins/notification/notification_prefs.c:827
-#, fuzzy
 msgid "Maximum number of messages"
-msgstr "Nombre de r?sultats :"
+msgstr "Nombre maximum de messages"
 
 #: src/plugins/notification/notification_prefs.c:833
-#, fuzzy
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Nombre maximum de messages (0 pour illimit?)"
 
 #: src/plugins/notification/notification_prefs.c:842
-#, fuzzy
 msgid "Banner width"
-msgstr "Vitesse de la banni?re"
+msgstr "Largeur de banni?re"
 
 #: src/plugins/notification/notification_prefs.c:848
 msgid "Limit the size of banner, use 0 for screen width"
-msgstr ""
+msgstr "Limite de taille de banni?re (0 pour utiliser la taille de l'?cran)"
 
 #: src/plugins/notification/notification_prefs.c:850 src/prefs_message.c:189
 #: src/prefs_message.c:223
@@ -12746,9 +12996,8 @@ msgid "Select folders..."
 msgstr "S?lectionner des dossiers.."
 
 #: src/plugins/notification/notification_prefs.c:898
-#, fuzzy
 msgid "Banner colors"
-msgstr "Couleur du dossier"
+msgstr "Couleur de banni?re"
 
 #: src/plugins/notification/notification_prefs.c:902
 #: src/plugins/notification/notification_prefs.c:1123
@@ -12784,16 +13033,14 @@ msgstr "Activer la popup"
 
 #: src/plugins/notification/notification_prefs.c:1063
 #: src/plugins/notification/notification_prefs.c:1665
-#, fuzzy
 msgid "Popup timeout"
 msgstr "D?lai de disparition de la popup"
 
 #: src/plugins/notification/notification_prefs.c:1073
 #: src/plugins/notification/notification_prefs.c:1368
 #: src/plugins/notification/notification_prefs.c:1674
-#, fuzzy
 msgid "second(s)"
-msgstr "secondes"
+msgstr "seconde(s)"
 
 #: src/plugins/notification/notification_prefs.c:1102
 msgid "Make popup sticky"
@@ -12821,18 +13068,16 @@ msgid "Done"
 msgstr "Termin?"
 
 #: src/plugins/notification/notification_prefs.c:1294
-#, fuzzy
 msgid "Select command"
-msgstr "Commande externe"
+msgstr "S?lectionner la commande"
 
 #: src/plugins/notification/notification_prefs.c:1323
 msgid "Enable command"
 msgstr "Activer la commande"
 
 #: src/plugins/notification/notification_prefs.c:1340
-#, fuzzy
 msgid "Command to execute"
-msgstr "Commande ? ex?cuter :"
+msgstr "Commande ? ex?cuter"
 
 #: src/plugins/notification/notification_prefs.c:1358
 msgid "Block command after execution for"
@@ -12843,7 +13088,6 @@ msgid "Enable LCD"
 msgstr "Activer le LCD"
 
 #: src/plugins/notification/notification_prefs.c:1484
-#, fuzzy
 msgid "Hostname:Port of LCDd server"
 msgstr "H?te:port du serveur LCDd"
 
@@ -12903,9 +13147,8 @@ msgid "<alt>N"
 msgstr "<alt>N"
 
 #: src/plugins/notification/notification_prefs.c:1971
-#, fuzzy
 msgid "Toggle minimize"
-msgstr "Minimisation :"
+msgstr "Changer l'?tat de minimisation"
 
 #: src/plugins/notification/notification_trayicon.c:114
 msgid "_Get Mail"
@@ -13034,7 +13277,7 @@ msgstr "sur %d"
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1358
 msgid "PDF rendering failed for an unknown reason."
-msgstr ""
+msgstr "Le rendu PDF a ?chou? pour une raison inconnue."
 
 #: src/plugins/pdf_viewer/poppler_viewer.c:1721
 #: src/plugins/pdf_viewer/poppler_viewer.c:1939
@@ -13130,7 +13373,7 @@ msgstr ""
 
 #: src/plugins/perl/perl_gtk.c:50
 msgid "Edit perl filter rules (ext)..."
-msgstr ""
+msgstr "?diter les r?gles des filtres Perl (ext).."
 
 #: src/plugins/pgpcore/autocompletion.c:125
 msgid "Failed to register PGP address autocompletion hook"
@@ -13459,7 +13702,7 @@ msgstr "Pas de signature trouv?e"
 
 #: src/plugins/pgpcore/sgpgme.c:160
 msgid "Untrusted"
-msgstr ""
+msgstr "Inconnu"
 
 #: src/plugins/pgpcore/sgpgme.c:200 src/plugins/pgpcore/sgpgme.c:219
 #, c-format
@@ -13475,54 +13718,53 @@ msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core : Impossible d'obtenir la cl? - aucun gpg-agent disponible."
 
 #: src/plugins/pgpcore/sgpgme.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [ultimate]"
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \" [ultime]"
 
 #: src/plugins/pgpcore/sgpgme.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [full]"
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \" [compl?te]"
 
 #: src/plugins/pgpcore/sgpgme.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\" [marginal]"
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \" [marginale]"
 
 #: src/plugins/pgpcore/sgpgme.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \"."
 
 #: src/plugins/pgpcore/sgpgme.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Signature expir?e de %s."
+msgstr "Signature expir?e de \" %s \"."
 
 #: src/plugins/pgpcore/sgpgme.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has expired"
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \", mais la cl? a expir?"
 
 #: src/plugins/pgpcore/sgpgme.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
-msgstr "Signature correcte de ? %s ?."
+msgstr "Signature correcte de \" %s \", mais la cl? a ?t? r?voqu?e"
 
 #: src/plugins/pgpcore/sgpgme.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Bad signature from \"%s\""
-msgstr "Mauvaise signature de %s."
+msgstr "Mauvaise signature de \" %s \""
 
 #: src/plugins/pgpcore/sgpgme.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Key 0x%s not available to verify this signature"
-msgstr "Cl? 0x%s non disponible pour v?rifier cette signature."
+msgstr "Cl? 0x%s non disponible pour v?rifier cette signature"
 
 #: src/plugins/pgpcore/sgpgme.c:266
-#, fuzzy
 msgid "The signature has not been checked"
-msgstr "La signature n'a pas ?t? v?rifi?e."
+msgstr "La signature n'a pas ?t? v?rifi?e"
 
 #: src/plugins/pgpcore/sgpgme.c:285
 msgid "Error checking signature: no status\n"
@@ -13544,9 +13786,9 @@ msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signature correcte de ? %s ? (Confiance : %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "Expired key uid \"%s\"\n"
-msgstr "Cl? expir?e de %s."
+msgstr "UID de cl? \"%s\" expir?\n"
 
 #: src/plugins/pgpcore/sgpgme.c:337
 #, c-format
@@ -13556,7 +13798,7 @@ msgstr "Signature expir?e de ? %s ? (Confiance : %s)\n"
 #: src/plugins/pgpcore/sgpgme.c:342
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
-msgstr ""
+msgstr "UID de cl? \"%s\" revoqu?e\n"
 
 #: src/plugins/pgpcore/sgpgme.c:347
 #, c-format
@@ -13570,12 +13812,12 @@ msgstr "                alias ? %s ? (Confiance: %s)\n"
 
 #: src/plugins/pgpcore/sgpgme.c:360
 msgid "Revoked"
-msgstr ""
+msgstr "R?voqu?"
 
 #: src/plugins/pgpcore/sgpgme.c:364
 #, c-format
 msgid "Owner Trust: %s\n"
-msgstr ""
+msgstr "Confiance dans le possesseur : %s\n"
 
 #: src/plugins/pgpcore/sgpgme.c:367
 msgid "Primary key fingerprint:"
@@ -13860,8 +14102,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"
@@ -13888,7 +14130,7 @@ msgstr "Impossible de cr?er un fichier temporaire : %s"
 
 #: src/plugins/pgpmime/pgpmime.c:595
 msgid "OpenPGP digital signature"
-msgstr ""
+msgstr "Signature digitale OpenPGP"
 
 #: src/plugins/pgpmime/pgpmime.c:617
 msgid ""
@@ -13923,8 +14165,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"
@@ -14057,32 +14299,36 @@ msgid "Python integration"
 msgstr "Int?gration ? Python"
 
 #: src/plugins/rssyl/old_feeds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
 "%s"
 msgstr ""
-"Impossible de cr?er le fichier mbox :\n"
-"%s\n"
+"Impossible de lire le contenu de l'ancien fichier feeds.xml :\n"
+"%s"
 
 #: src/plugins/rssyl/opml_export.c:110
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
+"RSSyl : Erreur lors de l'?criture de '%s' lors de l'export de la liste des "
+"flux.\n"
 
 #: src/plugins/rssyl/opml_export.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
-msgstr "Impossible d'ouvrir le fichier de log %s : %s\n"
+msgstr "RSSyl : Impossible de supprimer l'ancien fichier OPML '%s' : %s\n"
 
 #: src/plugins/rssyl/opml_export.c:141
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
+"RSSyl : Impossible d'ouvrir le fichier '%s' lors de l'export de la liste des "
+"flux : %s\n"
 
 #: src/plugins/rssyl/opml_export.c:182
 msgid "RSSyl: Error during writing feed export file.\n"
-msgstr ""
+msgstr "RSSyl : Erreur d'?criture lors de l'export de la liste des flux.\n"
 
 #: src/plugins/rssyl/opml_import.c:109
 #, c-format
@@ -14092,6 +14338,10 @@ msgid ""
 "\n"
 "Folder name '%s' is not allowed."
 msgstr ""
+"Erreur de la souscription du flux\n"
+"%s\n"
+"\n"
+"Le nom de dossier '%s' n'est pas valide."
 
 #: src/plugins/rssyl/plugin.c:65
 msgid ""
@@ -14113,10 +14363,9 @@ msgid "RSS feed"
 msgstr "flux RSS"
 
 #: src/plugins/rssyl/rssyl_add_item.c:295
-#, fuzzy
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
-msgstr "(g?n?ralement nul)"
+msgstr "(vide)"
 
 #: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
 msgid "Refresh all feeds"
@@ -14131,52 +14380,48 @@ msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Veuillez saisir l'adresse du flux auquel vous voulez vous abonner :"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' n'est pas un caract?re valide dans le nom d'un dossier."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:255
-#, fuzzy
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail n?cessite un acc?s r?seau pour mettre ? jour le flux."
 msgstr[1] "Claws Mail n?cessite un acc?s r?seau pour mettre ? jour les flux."
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Really remove the feed tree `%s' ?\n"
-msgstr ""
-"Voulez-vous vraiment supprimer le dossier '%s' et ses sous-dossiers ?\n"
+msgstr "Voulez-vous vraiment supprimer le dossier du flux '%s' ?\n"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:319
-#, fuzzy
 msgid "Remove feed tree"
-msgstr "Supprimer l'arborescence"
+msgstr "Supprimer l'arborescence du flux"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:354
-#, fuzzy
 msgid "Select an OPML file"
-msgstr "S?lectionnez un fichier .opml"
+msgstr "S?lectionnez un fichier OPML"
 
 #: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't create folder for new feed '%s'."
-msgstr "Impossible de cr?er un fichier temporaire pour l'envoi de l'article."
+msgstr "Impossible de cr?er le dossier pour le nouveau flux '%s'."
 
 #: src/plugins/rssyl/rssyl_feed.h:10
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
-msgstr "RSSyl : mise ? jour du flux '%s'\n"
+msgstr "RSSyl : Mise ? jour du flux '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:11
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
-msgstr ""
+msgstr "RSSyl : Souscription au nouveau flux '%s' (%s)\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:12
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Updating feed: %s\n"
-msgstr "RSSyl : mise ? jour du flux '%s'\n"
+msgstr "RSSyl : Mise ? jour du flux '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:13
 #, c-format
@@ -14184,85 +14429,80 @@ msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl : mise ? jour du flux termin?e : '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:14
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
-msgstr "RSSyl : mise ? jour du flux '%s'\n"
+msgstr "RSSyl : Erreur lors de la r?cup?ration du flux '%s' : %s\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:15
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
-msgstr "RSSyl : mise ? jour du flux '%s'\n"
+msgstr "RSSyl : Pas de flux valide '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:16
-#, fuzzy, c-format
+#, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
-msgstr "Impossible d'exporter les informations de disponibilit? vers '%s'\n"
+msgstr "RSSyl : impossible de traiter le flux '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed.h:17
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:268
-#, fuzzy
-msgid "No authentication"
-msgstr "Utiliser l'authentification (SMTP AUTH)"
+"RSSyl : L'application est en cours de fermeture, impossible de finir la mise "
+"? jour du flux '%s'\n"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:274
-#, fuzzy
 msgid "HTTP Basic authentication"
-msgstr "Utiliser l'authentification (SMTP AUTH)"
+msgstr "Authentification HTTP simple"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Utiliser l'intervalle de mise ? jour par d?faut"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:303
-#, fuzzy
 msgid "Keep old items"
-msgstr "Dossier o? conserver les adresses"
+msgstr "Conserver les vieux articles"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
-msgstr ""
+msgstr "_Rognage"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
+"Mise ? jour du flux, suppression des articles qui ne sont plus dans la liste "
+"du flux"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "R?cup?rer les commentaires si possible"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:339
-#, fuzzy
 msgid "Always mark as new"
 msgstr "Toujours marquer comme non lu"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:345
-#, fuzzy
 msgid "If only its text changed"
-msgstr "Seulement si uniquement son texte a chang?"
+msgstr "Seulement si son texte a chang?"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:351
-#, fuzzy
 msgid "Never mark as new"
 msgstr "Ne jamais marquer comme non lu"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid "Add item title to top of message"
-msgstr ""
+msgstr "Ajouter le titre d'article en haut du message"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:363
-#, fuzzy
 msgid "Ignore title rename"
-msgstr "Ignorer du f_il de discussion"
+msgstr "Ignorer le changement de titre"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
+"Si coch?, conserve le nom de dossier actuel, m?me si le titre du flux change "
+"? l'avenir."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:372
 #: src/plugins/vcalendar/vcal_prefs.c:518
@@ -14274,17 +14514,8 @@ msgid "<b>Source URL:</b>"
 msgstr "<b>URL source :</b>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:410
-#, fuzzy
 msgid "User name"
-msgstr "Utilisateur :"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:413
-#: src/plugins/vcalendar/vcal_prefs.c:337
-#: src/plugins/vcalendar/vcal_prefs.c:443 src/prefs_account.c:1286
-#: src/prefs_account.c:1811 src/prefs_account.c:2517 src/prefs_account.c:2539
-#: src/wizard.c:1205 src/wizard.c:1620
-msgid "Password"
-msgstr "Mot de passe"
+msgstr "Utilisateur"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:433
 msgid ""
@@ -14304,7 +14535,6 @@ msgstr ""
 "small>"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-#, fuzzy
 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>"
 
@@ -14321,25 +14551,22 @@ msgid "_Refresh feed"
 msgstr "Mett_re ? jour le flux"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
-#, fuzzy
 msgid "Feed pr_operties"
-msgstr "Pr_opri?t?s du flux.."
+msgstr "Pr_opri?t?s du flux"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
 msgstr "Reno_mmer.."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
-#, fuzzy
 msgid "R_efresh recursively"
-msgstr "Rechercher r?cursivement"
+msgstr "Mise ? jour r?cursive"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
 msgstr "S'abonner ? un _nouveau flux.."
 
 #: src/plugins/rssyl/rssyl_gtk.c:53
-#, fuzzy
 msgid "Create new _folder..."
 msgstr "Cr?er un nouveau _dossier.."
 
@@ -14348,9 +14575,8 @@ msgid "Import feed list..."
 msgstr "Importer une liste de flux.."
 
 #: src/plugins/rssyl/rssyl_gtk.c:56
-#, fuzzy
 msgid "Remove tree"
-msgstr "Suppression apr?s"
+msgstr "Supprimer l'arborescence"
 
 #: src/plugins/rssyl/rssyl_gtk.c:126
 msgid "Add RSS folder tree"
@@ -14375,23 +14601,20 @@ msgid "My Feeds"
 msgstr "Mes flux"
 
 #: src/plugins/rssyl/rssyl_prefs.c:111
-#, fuzzy
 msgid "Select cookies file"
-msgstr "S?lection d'un carnet d'adresses Pine"
+msgstr "S?lection du fichier des cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:141
-#, fuzzy
 msgid "Default refresh interval"
-msgstr "Utiliser l'intervalle de mise ? jour par d?faut"
+msgstr "Intervalle de mise ? jour par d?faut"
 
 #: src/plugins/rssyl/rssyl_prefs.c:161
 msgid "Refresh all feeds on application start"
 msgstr "Mettre ? jour tous les flux au d?marrage"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-#, fuzzy
 msgid "Verify SSL certificates validity for new feeds"
-msgstr "V?rifier la validit? du certificat SSL des nouveaux flux"
+msgstr "V?rifier la validit? des certificats SSL des nouveaux flux"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -14404,38 +14627,37 @@ msgstr ""
 "cookies"
 
 #: src/plugins/rssyl/rssyl_prefs.c:195
-#, fuzzy
 msgid "Refreshing"
-msgstr "Rafra?chir"
+msgstr "Mise ? jour"
 
 #: src/plugins/rssyl/rssyl_prefs.c:199
 msgid "Security and privacy"
-msgstr ""
+msgstr "S?curit? et vie priv?e"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
-#, fuzzy
 msgid "Subscribe new feed?"
-msgstr "S'abonner ? un _nouveau flux.."
+msgstr "S'abonner ? un _nouveau flux ?"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
-#, fuzzy
 msgid "<b>Feed folder:</b>"
-msgstr "<b> le :</b>"
+msgstr "<b> Dossier de flux :</b>"
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
+"Au lieu d'utiliser le titre du flux, vous pouvez d?finir un nom de dossier "
+"personnalis?."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
 msgid "_Edit feed properties after subscribing"
-msgstr ""
+msgstr "?dition des propri?t?s du flux apr?s souscription"
 
 #: src/plugins/rssyl/rssyl_update_comments.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Updating comments for '%s'..."
-msgstr "Mise ? jour du cache pour %s.."
+msgstr "Mise ? jour des commentaires pour %s.."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:105
 #: src/plugins/vcalendar/vcal_folder.c:1598
@@ -14453,9 +14675,9 @@ msgid "404 (Not found)"
 msgstr "404 (Non trouv?)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error %d"
-msgstr "Erreur %ld"
+msgstr "Erreur %d"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:127
 #, c-format
@@ -14473,9 +14695,11 @@ msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
+"Impossible de trouver un flux valide\n"
+"<b>%s</b>"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Updating feed '%s'..."
 msgstr "Mise ? jour du flux '%s'.."
 
@@ -14489,9 +14713,8 @@ msgid ""
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:330
-#, fuzzy
 msgid "Claws Mail needs network access in order to update your feeds."
-msgstr "Claws Mail n?cessite un acc?s r?seau pour mettre ? jour le flux."
+msgstr "Claws Mail n?cessite un acc?s r?seau pour mettre ? jour les flux."
 
 #: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
@@ -14527,8 +14750,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"
@@ -15015,8 +15238,8 @@ msgstr "%s <span weight=\"bold\">(cet ?v?nement est r?current)</span>"
 msgid ""
 "%s <span weight=\"bold\">(this event is part of a recurring event)</span>"
 msgstr ""
-"%s <span weight=\"bold\">(cet ?v?nement fait partie d'un ?v?nement "
-"r?current)</span>"
+"%s <span weight=\"bold\">(cet ?v?nement fait partie d'un ?v?nement r?current)"
+"</span>"
 
 #: src/plugins/vcalendar/vcalendar.c:749
 msgid "You have received an answer to an unknown meeting proposal."
@@ -15257,9 +15480,9 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_folder.c:1851
 #: src/plugins/vcalendar/vcal_folder.c:1854
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create directory %s"
-msgstr "Impossible de cr?er le dossier de destination %s."
+msgstr "Impossible de cr?er le dossier %s."
 
 #: src/plugins/vcalendar/vcal_folder.c:1892
 msgid "Claws Mail needs network access in order to update the Webcal feed."
@@ -15695,12 +15918,6 @@ msgstr ""
 "Veuillez saisir le chemin d'un fichier ou d'une URL (http://server/path/file."
 "ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
-#: src/plugins/vcalendar/vcal_prefs.c:435 src/prefs_account.c:1280
-#: src/prefs_account.c:1791
-msgid "User ID"
-msgstr "Nom d'utilisateur"
-
 #: src/plugins/vcalendar/vcal_prefs.c:351
 msgid "Include webcal subscriptions in export"
 msgstr ""
@@ -15847,10 +16064,6 @@ msgstr "Nom complet"
 msgid "Mail address"
 msgstr "Adresse email"
 
-#: src/prefs_account.c:1096
-msgid "Server information"
-msgstr "Configuration des serveurs"
-
 #: src/prefs_account.c:1129 src/wizard.c:1475
 msgid "Auto-configure"
 msgstr "Auto-configurer"
@@ -15959,14 +16172,6 @@ msgstr "Nombre maximum d'articles ? r?cup?rer"
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est sp?cifi?"
 
-#: src/prefs_account.c:1569 src/prefs_account.c:1763
-msgid "Authentication method"
-msgstr "Authentification"
-
-#: src/prefs_account.c:1579 src/prefs_account.c:1772 src/prefs_send.c:291
-msgid "Automatic"
-msgstr "Automatique"
-
 #: src/prefs_account.c:1592
 msgid "IMAP server directory"
 msgstr "R?pertoire sur le serveur IMAP4"
@@ -17036,9 +17241,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
@@ -17214,8 +17418,8 @@ msgid ""
 msgstr ""
 "<i>Attention, les param?tres de ce m?ta-dossier (bo?te aux lettres) NE "
 "seront PAS enregistr?s. 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 ?.</i>"
+"appliquer ? l'ensemble des sous-dossiers de la bo?te aux lettres en cochant ? "
+"Appliquer aux sous-dossiers ?.</i>"
 
 #: src/prefs_folder_item.c:280 src/prefs_folder_item.c:888
 msgid ""
@@ -17611,9 +17815,8 @@ msgid "headers part"
 msgstr "En-t?tes du message"
 
 #: src/prefs_matcher.c:384
-#, fuzzy
 msgid "headers values"
-msgstr "Ligne d'en-t?te"
+msgstr "valeurs d'en-t?te"
 
 #: src/prefs_matcher.c:385
 msgid "body part"
@@ -17800,8 +18003,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"
@@ -17814,9 +18017,8 @@ msgid "Headers part"
 msgstr "En-t?tes du message"
 
 #: src/prefs_matcher.c:1846
-#, fuzzy
 msgid "Headers values"
-msgstr "En-t?te"
+msgstr "Valeurs d'en-t?te"
 
 #: src/prefs_matcher.c:1850
 msgid "Body part"
@@ -17903,9 +18105,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 :"
@@ -18493,9 +18695,8 @@ msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
 #: src/prefs_send.c:245
-#, fuzzy
 msgid "Cyrillic (X-MAC-CYRILLIC)"
-msgstr "Cyrillique (KOI8-R)"
+msgstr "Cyrillique (X-MAC-CYRILLIC)"
 
 #: src/prefs_send.c:246
 msgid "Cyrillic (KOI8-U)"
@@ -18817,8 +19018,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:679
 msgid "Summaries"
@@ -18957,10 +19158,9 @@ 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
-#, fuzzy
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "Le champ \"?\" du mod?le contient une adresse email invalide."
+msgstr "Le champ \"Reply-To\" du mod?le contient une adresse email invalide."
 
 #: src/prefs_template.c:841
 msgid "The \"Subject\" field of the template is invalid."
@@ -20098,10 +20298,6 @@ 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:5631
-msgid "_Filter"
-msgstr "_Filtrer"
-
 #: src/summaryview.c:5659
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
@@ -20986,7 +21182,7 @@ msgstr ""
 #~ msgstr "Activer la popup"
 
 #~ msgid "Good signature (untrusted) from %s."
-#~ msgstr "Signature correcte (non de confiance) de ? %s ?."
+#~ msgstr "Signature correcte (inconnue) de ? %s ?."
 
 #~ msgid "Cannot open temporary file"
 #~ msgstr "Impossible d'ouvrir un fichier temporaire"
@@ -21114,6 +21310,3 @@ msgstr ""
 
 #~ msgid "Use this"
 #~ msgstr "Choisir"
-
-#~ msgid "Couldn't encrypt the email: %s"
-#~ msgstr "Impossible de chiffrer le message : %s"

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 13:17:38 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 13:17:38 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.11.1-244-g75995c6
Message-ID: <20150719111738.555CD36A4400@mx.colino.net>

The branch, master has been updated
       via  75995c653f563bc3d65e4ce104263c96f5b26d76 (commit)
      from  bb6c60b52dd18b2b5bdef70f728db1061e78838a (commit)

Summary of changes:
 NEWS          |   99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README        |    3 +-
 RELEASE_NOTES |   99 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 190 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 75995c653f563bc3d65e4ce104263c96f5b26d76
Author: Paul <paul at claws-mail.org>
Date:   Sun Jul 19 12:17:32 2015 +0100

    ready for release 3.12.0

diff --git a/NEWS b/NEWS
index 85f286a..fa7af53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,104 @@
 Changes of the  Claws Mail GTK2 branch
 
+* 3.12.0
+--------
+
+* New plugin: ManageSieve. Manage sieve filters on a server using
+  the ManageSieve protocol.
+
+* Filtering/Processing: increase range for age matcher condition.
+
+* Filtering/Processing: 'mark_as_spam' now only marks as spam, it
+  does not do an additional move.
+
+* Compose window: From line gets its own label with mnemonic.
+
+* Compose window: more intuitive right-click behaviour in attachments
+  list.
+
+* QuickSearch: 'Cc' added to the mixed search: From/To/Cc/Subject/Tag.
+
+* Folder list: Added 'Mark all read recursively' to context menu.
+
+* Support for Mac-cyrillic encoding.
+
+* IMAP: Support for SCRAM-SHA-1 authentication mechanism.
+
+* PGP plugins: Display validity of signatures
+
+* Bogofilter plugin: 3rd spam handling option, 'Only mark as spam'.
+
+* RSSyl plugin: Per-feed support for HTTP basic auth.
+
+* GData plugin: minimum requirement: libgdata 0.17.1
+
+* Several layout improvements to preferences pages.
+
+* Updated user manual.
+
+* Updated man page.
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Dutch,
+  French, German, Hebrew, Hungarian, Norwegian Bokm?l, Slovak, 
+  Spanish, Swedish.
+
+...and so much more!
+
+* Bug fixes:
+	o bug 1769, 'vCalendar timezone glitches'
+	o bug 1901, 'More descriptive error msgs when attempting to 
+		     delete a folder'
+	o bug 2435, 'Infinite loop+crash when refreshing folders from
+		     dovecot mbox based mailbox'
+	o bug 2577, 'improve focus rectangle removal in summaryview'
+	o bug 2601, '"if item changes... never mark as unread" marks
+		     new items as read'
+	o bug 2965, 'Encrypted mails are stored unencrypted in
+		     'Queue' while sending via IMAP'
+	o bug 2981, 'claws-mail-3.9.3 compilation warnings'
+	o bug 3211, 'Fails to build in Debian hurd-i386'
+	o bug 3321, 'revert "Remove unreachable code"'
+	o bug 3345, 'Ability to choose other From values via keyboard
+		     has been lost'
+	o bug 3349, 'Unable to insert a file into a message during
+		     compose.'
+	o bug 3351, 'Two problems when re-sending a file with an
+		     attachment'
+	o bug 3354, 'Event cancellation uses incorrect method
+		     parameter for Content-Type header'
+	o bug 3364, 'segfault in src/prefs_account.c'
+	o bug 3365, 'segfault in src/wizard.c'
+	o bug 3380, 'Initialize widget before callback handler for
+		     'clicked''
+	o bug 3389, 'document 'F12' shortcut'
+	o bug 3407, 'Pressing the "Date" column header to "sort by
+		     date" causes all columns to have a sort arrow.'
+	o bug 3419, 'Saving/appending messages to an mbox file
+		     violates RFC#4155'
+	o bug 3421, 'Recipients list doesn't scroll when moving with
+		     arrow keys.'
+	o bug 3432, 'Google ClientLogin has been deprecated, should
+		     be migrated to OAuth 2.0'
+	o bug 3438, 'Filter to add address to Addressbook duplicates
+		     address in Name field'
+	o bug 3466, 'address auto-complete does not work on plasma5'
+	o Debian bug 771360, CVE 2010-5109
+	o Debian bug 771737, 'Segfaults when trying to open folder'
+	o Debian bug 779824, 'claws-mail depends on plugins 
+			      libraries'
+	o Fix LDAP access using TLS protocol
+	o claws-mail.desktop installation
+	o Compose window Subject mnemonic
+	o Archiver plguin: compatibility with libarchive 2.8.x
+	o Remove draft when cancelling a message written with an
+	  external editor
+	o Remove superfluous dynamic link against libarchive
+	o Fix labels referring to 'SSL' instead of 'TLS'
+	o Allow single-click to select mailboxes in the mailbox order
+	  dialog.
+	o tbird2claws.py: set encoding to UTF-8.
+
+
 * 3.11.1
 --------
 
diff --git a/README b/README
index 0ed6b9a..101b815 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Claws Mail - a GTK+ based, lightweight, and fast e-mail client
 
 ---------------------------------------------------------------------
 
-   Copyright(C) 1999-2014 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
+   Copyright(C) 1999-2015 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
    Claws Mail Team
 
    This program is free software; you can redistribute it and/or modify
@@ -823,6 +823,7 @@ http://www.thewildbeast.co.uk/claws-mail/bugzilla/index.cgi
 
 GTK 2 Version
 -------------
+2015-07-19	3.12.0
 2014-10-27	3.11.1
 2014-10-20	3.11.0
 2014-06-09	3.10.1
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 9a601fa..e1e74ee 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-27th October 2014                                   Claws Mail 3.11.1
+19th July 2015                                      Claws Mail 3.12.0
 
 		    CLAWS MAIL  RELEASE NOTES
                     http://www.claws-mail.org
@@ -9,21 +9,100 @@ email client.
 New in this release:
 ~~~~~~~~~~~~~~~~~~~~
 
-* Use 'gnutls_priority' hidden account preference for POP3 and
-  STARTTLS connections, in addition to SMTP.
+* New plugin: ManageSieve. Manage sieve filters on a server using
+  the ManageSieve protocol.
 
-* RSSyl plugin: Enable use of .netrc to store network credentials.
+* Filtering/Processing: increase range for age matcher condition.
 
-* Remove dependency on intltool.
+* Filtering/Processing: 'mark_as_spam' now only marks as spam, it
+  does not do an additional move.
 
-* Remove appdata.
+* Compose window: From line gets its own label with mnemonic.
 
-* Updated translations: Norwegian Bokm?l.
+* Compose window: more intuitive right-click behaviour in attachments
+  list.
+
+* QuickSearch: 'Cc' added to the mixed search: From/To/Cc/Subject/Tag.
+
+* Folder list: Added 'Mark all read recursively' to context menu.
+
+* Support for Mac-cyrillic encoding.
+
+* IMAP: Support for SCRAM-SHA-1 authentication mechanism.
+
+* PGP plugins: Display validity of signatures
+
+* Bogofilter plugin: 3rd spam handling option, 'Only mark as spam'.
+
+* RSSyl plugin: Per-feed support for HTTP basic auth.
+
+* GData plugin: minimum requirement: libgdata 0.17.1
+
+* Several layout improvements to preferences pages.
+
+* Updated user manual.
+
+* Updated man page.
+
+* Updated translations: Brazilian Portuguese, Catalan, Czech, Dutch,
+  French, German, Hebrew, Hungarian, Norwegian Bokm?l, Slovak, 
+  Spanish, Swedish.
+
+...and so much more!
 
 * Bug fixes:
-	o bug 3306, 'HTML tag </b> is not always rendered in error
-		     dialog'
-	o bug 3308, 'build ignores --localedir'
+	o bug 1769, 'vCalendar timezone glitches'
+	o bug 1901, 'More descriptive error msgs when attempting to 
+		     delete a folder'
+	o bug 2435, 'Infinite loop+crash when refreshing folders from
+		     dovecot mbox based mailbox'
+	o bug 2577, 'improve focus rectangle removal in summaryview'
+	o bug 2601, '"if item changes... never mark as unread" marks
+		     new items as read'
+	o bug 2965, 'Encrypted mails are stored unencrypted in
+		     'Queue' while sending via IMAP'
+	o bug 2981, 'claws-mail-3.9.3 compilation warnings'
+	o bug 3211, 'Fails to build in Debian hurd-i386'
+	o bug 3321, 'revert "Remove unreachable code"'
+	o bug 3345, 'Ability to choose other From values via keyboard
+		     has been lost'
+	o bug 3349, 'Unable to insert a file into a message during
+		     compose.'
+	o bug 3351, 'Two problems when re-sending a file with an
+		     attachment'
+	o bug 3354, 'Event cancellation uses incorrect method
+		     parameter for Content-Type header'
+	o bug 3364, 'segfault in src/prefs_account.c'
+	o bug 3365, 'segfault in src/wizard.c'
+	o bug 3380, 'Initialize widget before callback handler for
+		     'clicked''
+	o bug 3389, 'document 'F12' shortcut'
+	o bug 3407, 'Pressing the "Date" column header to "sort by
+		     date" causes all columns to have a sort arrow.'
+	o bug 3419, 'Saving/appending messages to an mbox file
+		     violates RFC#4155'
+	o bug 3421, 'Recipients list doesn't scroll when moving with
+		     arrow keys.'
+	o bug 3432, 'Google ClientLogin has been deprecated, should
+		     be migrated to OAuth 2.0'
+	o bug 3438, 'Filter to add address to Addressbook duplicates
+		     address in Name field'
+	o bug 3466, 'address auto-complete does not work on plasma5'
+	o Debian bug 771360, CVE 2010-5109
+	o Debian bug 771737, 'Segfaults when trying to open folder'
+	o Debian bug 779824, 'claws-mail depends on plugins 
+			      libraries'
+	o Fix LDAP access using TLS protocol
+	o claws-mail.desktop installation
+	o Compose window Subject mnemonic
+	o Archiver plguin: compatibility with libarchive 2.8.x
+	o Remove draft when cancelling a message written with an
+	  external editor
+	o Remove superfluous dynamic link against libarchive
+	o Fix labels referring to 'SSL' instead of 'TLS'
+	o Allow single-click to select mailboxes in the mailbox order
+	  dialog.
+	o tbird2claws.py: set encoding to UTF-8.
 
 For further details of the numbered bugs and RFEs listed above
 consult http://www.thewildbeast.co.uk/claws-mail/bugzilla/

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Sun Jul 19 13:18:45 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Sun, 19 Jul 2015 13:18:45 +0200 (CEST)
Subject: [Commits] [SCM] claws annotated tag, 3.12.0, created. 3.12.0
Message-ID: <20150719111846.0EA2C36A4400@mx.colino.net>

The annotated tag, 3.12.0 has been created
        at  77537441fe2472906a302856114d6241a60af658 (tag)
   tagging  75995c653f563bc3d65e4ce104263c96f5b26d76 (commit)
  replaces  3.11.1
 tagged by  Paul
        on  Sun Jul 19 12:18:34 2015 +0100

- Log -----------------------------------------------------------------
3.12.0 Unleashed

Andreas R?nnquist (1):
      Set focus row to top item if marking a message above previous

Andrej Kacian (88):
      When copying a folder, copy its metadata before copying contents.
      Revert "RSSyl: Lose the .deleted file on folder move for now" - it will work now, after last commit
      Increase allowed range for age matcher condition widget. 10000 should be enough for everyone.
      Bogofilter: In addition to deleting or saving a spam message, allow third option, where such message is only marked as spam, but is let through for user to handle it further (perhaps via filtering rules).
      Use GLib's implementation of Base64 instead of our own.
      Fix SMTP LOGIN auth method.
      Get rid of a forgotten debug_print().
      Remove double-free in SMTP AUTH PLAIN handling code.
      RSSyl: Convert relative URLs in Atom entries to absolute URLs, using feed's <link> tag, if possible.
      RSSyl: fix crash introduced by previous commit
      RSSyl: Wrote more robust replacing of HTML character references. We now handle decimal references (&#1234;), in addition to few selected named references.
      RSSyl: Fix allocated buffer size in previous commit to include space for terminating null byte; Fix minor logic bug.
      RSSyl: Do not run html entity replacement on URL and item id strings when adding an item.
      RSSyl: Ignore rel="..." feed link in Atom parser.
      RSSyl: Fix argument order for strstr() in Atom parser.
      Compose window: activating the GtkEntry with sender address activates the account selection combobox. Closes bug #3345, reported by  Barry Warsaw.
      Properly allocate buffer in conv_encode_header_full() for quoted-printable encoding. Closes bug #3338, reported by Michael Hughes.
      Compose window: sender address line gets its own label with a mnemonic, similar to Subject line.
      Compose window: Change Subject mnemonic from 's' to 'u', since 's' is already used by Spelling menu.
      Use AC_CHECK_LIB instead of AC_SEARCH_LIBS, to prevent adding -larchive to global LIBS variable. This gets rid of superfluous dynamic link against libarchive in all built executables (claws-mail and plugins).
      RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only thing missing was that HAVE_ICONV macro (from config.h) was not defined in parser.c, so our "unknown encoding" expat handler function did nothing. Fixes bug #3339.
      RSSyl: Day-of-week name in RFC822 timestamps is optional.
      Add support for SCRAM-SHA-1 authentication mechanism (via libetpan) to IMAP.
      Change "OpenSSL support" to "TLS support" in a dialog message.
      Removed unused MBOX_CACHE_DIR from defs.h.
      Allow single-click to select mailboxes in the mailbox order dialog.
      In mailbox order dialog, set selection mode after the list has been
      Compose window: Fix bug #3421 - Recipients list doesn't scroll when moving with arrow keys.
      Update AUTHORS and README regarding the Managesieve plugin.
      RSSyl: use procheader_date_parse() instead of parseRFC822Date().
      RSSyl: Strip leading and trailing whitespace from XML tag contents.
      RSSyl: Leave unread flag on new items regardless of silent_update setting.
      RSSyl: Fix compilation on OS X.
      Fix typo in variable name in Windows g_open() implementation.
      RSSyl: Remove unnecessary use of link() in rssyl_add_msgs().
      RSSyl: struct dirent doesn't have d_type member on Windows.
      RSSyl: Updated list of symbols needed from claws-mail core.
      Rewrote parsing of RFC3339 datetime strings.
      RSSyl: Use procheader_date_parse() for RFC3339 date strings.
      Use pkg-config to detect Expat library.
      Pass --export-* flags correctly to the linker, depending on platform.
      RSSyl: Reworked item comparing logic, partly based on bug #3429.
      Re-add old method for Expat library detection during configure.
      Use 'GStatBuf' instead of 'struct stat' type where possible.
      Add a missing include to make commit f061b67 work on Win32.
      Fancy: updated list of exports from core claws-mail for win32 build.
      RSSyl: Got rid of opendir/readdir/closedir in favour of Glib functions.
      RSSyl: Use g_mkstemp() instead of mkstemp()
      RSSyl: Free GError from memory where necessary.
      RSSyl: Allow giving custom CA cert file to libfeed
      RSSyl: If given, set CURLOPT_CAINFO regardless of libcurl version.
      RSSyl: Use our CA certificate bundle on Windows.
      Various small fix ups needed for mingw-w64 build.
      The "mark_as_spam" filtering action does not move message.
      Do not free LDAP error string on Windows.
      Allow TLS connections to LDAP on Windows.
      Use g_mkstemp() instead of mkstemp().
      Removed an unneeded ifdef in my_tmpfile().
      Allow 'Z' as time zone in procheader_scan_date_string()
      Fix a mistake in previous commit.
      Encrypt message just before writing it to queue dir.
      Remove plaintext_file member of struct MsgInfo.
      Revert "Remove plaintext_file member of struct MsgInfo."
      Do not use MsgInfo's plaintext_file for message file.
      Handle an unlikely fopen failure in compose_write_to_file()
      Use g_dir_open() and friends instead of opendir() and friends.
      Get rid of last remaining "struct stat" variables.
      Windows build needs to link against pthread, not pthreadGC2.
      Updated plugins' claws.def files as needed for Windows build.
      RSSyl: Variable typo fix in Windows-specific code.
      Do not use GStatBuf with non-Glib *stat() functions.
      Managesieve: use accessor for common preferences
      Managesieve: Fix parsing config string on Windows
      Reenable transient windows for win32. Fixes bug #2866.
      Disallow folder names to begin or end with a dot on Windows.
      Fix a logic error introduced in previous commit.
      Fix a Win32-specific syntax error.
      Use accessor for common preferences in all plugins.
      Avoid some unnecessary foldertree redraws.
      Fix another win32 specific syntax error.
      RSSyl: add a missing symbol to claws.def for Windows build.
      Fix filtering action configuration dialog modality on Windows.
      Make right-click behavior more intuitive in compose attachment list.
      Use g_win32_getlocale() in manual availability detection on Windows.
      Fix folder selection dialog modality and focus on Windows.
      Fix Escape key closing color dialogs in /Display/Color common prefs.
      Fix two more issues with modal dialog focus on Windows.
      Fix address autocompletion popup not displaying on Plasma5.

Charles Lehner (27):
      Add callback for session connection result
      Make message_search interface-based
      Add ManageSieve plugin
      Mark string for translation which is already translated
      ManageSieve: use stock refresh button (bug #2923 progress)
      ManageSieve: save manager window size (bug #2923)
      ManageSieve: remove Activate button
      ManageSieve: fix manager window button spacing
      managesieve: remove dialog hint
      Remove extravagant debug message
      managesieve: handle lines starting with "OK"
      managesieve: Fix string memory leaks
      managesieve: fix command aborting and discarding
      managesieve: allow script loading to be interrupted
      managesieve: fix connecting with TLS not available
      managesieve: consolidate popping send queue
      managesieve: discard manager window's callbacks when it closes
      managesieve: don't reset status while appending text
      managesieve: remove unused function sieve_session_add_script
      managesieve: let refresh button always be sensitive
      managesieve: if new script name is in use, open existing script
      managesieve: add newly created scripts to manager window list
      managesieve: handle putting/checking empty scripts
      managesieve: show warnings received when setting active script
      managesieve: add back dialog hint
      managesieve: Localize Rename button. Fix bug 3469
      managesieve: prevent session list corruption

Christian Hesse (8):
      Fix inconsistent use of tabs and spaces in indentation.
      Let git ignore also *.tar.xz tarballs
      Fix type in yacc file
      Remove unused variables
      Do not redefine MIN and MAX
      Remove useless rule
      Finish 439a5cffca5bcdefc6d4d552af64aa2e10c5ab5d
      Libravatar: this is rootdir, not subdir

Colin Leroy (10):
      Fix double free
      Fix use after free
      Add a wrapper function to decode base64, returning a null-terminated string.
      * Add a warning in case the length of the string isn't the length of
      Merge remote-tracking branch 'jakub-kicinski/for-master'
      Better fix for bug #3349 (almost all the needed code was there :-)
      Fix bug #3354, "Event cancellation uses incorrect method parameter for Content-Type header"
      Fix bug #3364, segfault in src/wizard.c: add missing return
      Fix english (I think)
      Fix missing null pointer check

Holger Berndt (11):
      GData plugin: Harden against missing fields
      Notification plugin: Remove spurious warning
      Python plugin: Silence parasite glib warnings
      GData plugin: Drop support for libgdata < 0.9
      GData plugin: Change debug output order during plugin load
      GData plugin: Switch from ClientLogin to OAuth2
      GData plugin: Remove now obsolete password pref
      Gdata plugin: Remove now obsolete CM_GDATA_CLIENT_ID macro def
      Update sample jhbuildrc file
      GData plugin: Support cold-start
      GData plugin: Make it possible to compile with libgdata 0.17.1

Jakub Kicinski (3):
      Swap return value and argument of imap_threaded_capability()
      Synchronize mailimap deletion against async operations
      Use memset to initialize struct etpan_thread_op

Michael Rasmussen (5):
      remove unused code relating to old unsupported version of libarchive
      Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
      fix a couple of memory leaks
      Fix bug #3380. Initialize widget before callback handler for 'clicked'
      Added FreeBSD patch, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167460. Fixes claws-mail bug #3457

Paul (32):
      build libindicate support with indicate 0.6 and indicate 0.7
      implement RFE 3314, 'user can't see validity of gpg signatures' [SIC]
      update sf.net project link
      better implementation of 420e8349978b7c927a80f1a5dd63fd737526feed. thanks to Ticho for the push.
      when cancelling a msg written with an external editor, get rid of the draft copy. thanks to Darko Koruga.
      fix bug 3351, 'Two problems when re-sending a file with an attachment' (really one problem, though)
      add support for x-mac-cyrillic encoding.
      Mac-Cyrillic menu updates. patch by Anton Butanaev
      fix bug 1769, ' vCalendar timezone glitches'
      for Python 2.x set encoding to UTF-8
      fix bug 3407, 'Pressing the "Date" column header to "sort by date" causes all columns to have a sort arrow.'
      Fix LDAP access using TLS protocol
      fix last commit
      fix error on load: 'undefined symbol: response_is_ok'
      make filtering action 'mark_as_unread' set the unread flag AND remove the new flag
      fix dialogue question when recursively marking all as read
      make 'mark all as read' dialogue button style match that in folderview
      add managesieve plugin files
      don't offer an empty string for translation
      remove unneeded and crash-causing g_free()
      fix bug 2435, ' Infinite loop+crash when refreshing folders from dovecot mbox based mailbox'
      revert, it's string-freeze right now
      revert without breaking stuff
      revert the revert
      updated translations
      update translators list
      add Charles to list of team members
      remove translations that have been unmaintained for 3 releases
      updated Spanish translation
      update translators info
      updated French translation from wwp
      ready for release 3.12.0

Ricardo Mones (57):
      Fix categories and recover keywords in desktop file
      Recover desktop file installation
      Fix bug #3211 ?Fails to build in Debian hurd-i386?
      Fix bug #3321 ? revert "Remove unreachable code"
      Fix address out of bounds crash while decoding mails
      Bug #2577 ? improve focus rectangle removal in summaryview
      Fix possible buffer overflow (CVE 2010-5109)
      Fix crash opening folder (Debian bug #771737)
      Improve feedback to user when bug #3349
      Fix bug #1797 ?quicksearch could also search the Cc field?
      RSSyl: support HTTP basic auth in libfeed
      RSSyl: preferences for HTTP auth basic
      Fix bug# 3098: add auth to context and handle error
      Remove GTK+ checks lower than required version
      AttachWarner: rearrange checkbox, standardise labels
      AddressKeeper: improve preferences panel
      Libravatar: more compact prefs, add hint to entry
      Fancy: improve readability and standardise labels
      Fix bug #3363 ?preferences page composition seems weird?
      Notification plugin: standardise preferences
      Fix widget spacing in toolbar preferences pages
      Fetchinfo: slightly improve prefs, add hints
      Fix bug #3389 ?document 'F12' shortcut?
      Sync Spanish manual translation
      Do not link main binary to GPGME libraries
      Adjust templates panel of folder properties
      Fix bug #3419 ?Saving/appending messages to an mbox file violates RFC#4155?
      Reuse PLUGINS_URI #define
      Add author of Managesieve plugin also to About dialog
      Fix 'make dist' for Managesieve plugin
      Fix bug #2981 and other two implicit...
      Fix GLib-GObject-CRITICAL message when printing
      Update summary view status after "Find all"
      Switch core from strerror to g_strerror
      Almost switch plugins from strerror to g_strerror
      Fix bug #1941 ?recursive "mark read all"?
      Document more accurately --debug option on Windows
      Fix a couple of format warnings
      And other format warning less
      Fix low probability resource leak
      Libravatar: use accessor for common preferences
      Add missing page weights on some plugins
      Remove unnecessary ?Use this? for changing theme
      Fix leak on failing realloc
      Remove unchecked realloc which is unnecessary
      Fix bug #1901 ?More descriptive error msgs when attempting to delete a folder?
      Fix incorrect HTML preventing label from appearing
      Update year for incoming release
      Libravatar: refactor and fix leak on corner case
      Fix bug #3438 ?Filter to add address to Addressbook duplicates address in Name field?
      Libravatar: fix copyright headers
      Libravatar: fix g_warning strings
      AddressKeeper: fix copyright and g_warning strings
      AttachWarner: fix copyright and g_warning string
      Libravatar: cache usage info label
      Libravatar: clean cache button
      Fix build with hardened compiler flags

wwp (2):
      Fix compat with libarchive 2.8.x (killed by 3.10.1-85-ga5e54ec).
      Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Sun Jul 19 17:19:41 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Sun, 19 Jul 2015 17:19:41 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-1-g3bedb72
Message-ID: <20150719151941.64B7636A4400@mx.colino.net>

The branch, master has been updated
       via  3bedb72424128c1c08b15b814ab1f0585b1c06d1 (commit)
      from  75995c653f563bc3d65e4ce104263c96f5b26d76 (commit)

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


- Log -----------------------------------------------------------------
commit 3bedb72424128c1c08b15b814ab1f0585b1c06d1
Author: Charles Lehner <charles at claws-mail.org>
Date:   Sun Jul 19 11:17:39 2015 -0400

    Fix typo in email address

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 4ac5047..8dc55a6 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -3,7 +3,7 @@ static char *TEAM_LIST[] = {
 "Tristan Chabredier <wwp at claws-mail.org>",
 "Andrej Kacian <andrej at kacian.sk>",
 "Darko Koruga <darko at users.sf.net>",
-"Charles Lehner <charles at claws-mail.org",
+"Charles Lehner <charles at claws-mail.org>",
 "Colin Leroy <colin at colino.net>",
 "Paul Mangan <paul at claws-mail.org>",
 "Ricardo Mones Lastra <ricardo at mones.org>",

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Jul 20 11:20:47 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 20 Jul 2015 11:20:47 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-3-g06ba5f4
Message-ID: <20150720092047.5864436A43C8@mx.colino.net>

The branch, master has been updated
       via  06ba5f471bcf6a01a8672e71f061d3b7a511638d (commit)
       via  e28cdcce437f378d9e5cdb70a3ab71d89da85f6b (commit)
      from  3bedb72424128c1c08b15b814ab1f0585b1c06d1 (commit)

Summary of changes:
 src/gtk/authors.h          |    1 +
 tools/claws.i18n.status.pl |   17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 06ba5f471bcf6a01a8672e71f061d3b7a511638d
Author: Paul <paul at claws-mail.org>
Date:   Mon Jul 20 10:20:42 2015 +0100

    add missing NL, sorry Marcel

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 8dc55a6..9880919 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -48,6 +48,7 @@ static char *TRANS_TEAM_LIST[] = {
 "[hu] P?der Rezs? <rezso at rezso.net>",
 "[id] MSulchan Darmawan <bleketux at gmail.com>",
 "[lt] Mindaugas Baranauskas <embar at super.lt>",
+"[nl] Marcel Pol <mpol at gmx.net>",
 "[nb] Petter Adsen <petter at synth.no>",
 "[pt_BR] Frederico Goncalves Guimaraes <frederico at teia.bio.br>",
 "[sk] Slavko <slavino at slavino.sk>",

commit e28cdcce437f378d9e5cdb70a3ab71d89da85f6b
Author: Paul <paul at claws-mail.org>
Date:   Mon Jul 20 10:20:14 2015 +0100

    updated

diff --git a/tools/claws.i18n.status.pl b/tools/claws.i18n.status.pl
index 8804b45..609f627 100644
--- a/tools/claws.i18n.status.pl
+++ b/tools/claws.i18n.status.pl
@@ -10,7 +10,7 @@
 
 %langname = (
 	'bg.po' => 'Bulgarian',
-#	'ca.po'	=> 'Catalan',
+	'ca.po'	=> 'Catalan',
 	'cs.po'	=> 'Czech',
 	'de.po' => 'German',
 	'en_GB.po' => 'British English',
@@ -24,16 +24,17 @@
 #	'it.po' => 'Italian',
 #	'ja.po' => 'Japanese',
 	'lt.po' => 'Lithuanian',
+	'nb.po' => 'Norwegian Bokm&aring;l',
 	'nl.po' => 'Dutch',
 #	'pl.po' => 'Polish',
 	'pt_BR.po' => 'Brazilian Portuguese',
 #	'pt_PT.po' => 'Portuguese',
-	'ru.po' => 'Russian',
+#	'ru.po' => 'Russian',
 	'sk.po' => 'Slovak',
 	'sv.po' => 'Swedish',
 #	'uk.po' => 'Ukrainian',
-	'zh_CN.po' => 'Simplified Chinese',
-	'zh_TW.po' => 'Traditional Chinese',
+#	'zh_CN.po' => 'Simplified Chinese',
+#	'zh_TW.po' => 'Traditional Chinese',
 );
 
 %lasttranslator = (
@@ -46,7 +47,7 @@
 	'es.po' => 'Ricardo Mones Lastra <ricardo at mones.org>',
 	'fi.po'	=> 'Flammie Pirinen <flammie at iki.fi>',
 	'fr.po' => 'Tristan Chabredier <wwp at claws-mail.org>',
-	'he.po' => 'Genghis Khan <genghiskhan at gmx.ca>',
+	'he.po' => 'Isratine Citizen <genghiskhan at gmx.ca>',
 	'hu.po' => 'P&aacute;der Rezs&#337; <rezso at rezso.net>',
 	'id_ID.po' => 'MSulchan Darmawan <bleketux at gmail.com>',
 #	'it.po' => 'Andrea Spadaccini <a.spadaccini at catania.linux.it>',
@@ -56,12 +57,12 @@
 #	'pl.po' => 'Emilian Nowak <emil5 at go2.pl>',
 	'pt_BR.po' => 'Frederico Goncalves Guimaraes <fggdebian at yahoo.com.br>',
 #	'pt_PT.po' => 'Tiago Faria <gouki at goukihq.org>',
-	'ru.po' => 'Aleksei Miheev <aleksei at miheev.info>',
+#	'ru.po' => 'Aleksei Miheev <aleksei at miheev.info>',
 	'sk.po' => 'Slavko <slavino at slavino.sk>',
 	'sv.po' => 'Andreas R?nnquist <gusnan at gusnan.se>',
 #	'uk.po' => 'YUP <yupadmin at gmail.com>',
-	'zh_CN.po' => 'Rob <rbnwmk at gmail.com>',
-	'zh_TW.po' => 'Rob <rbnwmk at gmail.com>',
+#	'zh_CN.po' => 'Rob <rbnwmk at gmail.com>',
+#	'zh_TW.po' => 'Rob <rbnwmk at gmail.com>',
 );
 
 %barcolornorm = (

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Mon Jul 20 12:59:35 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Mon, 20 Jul 2015 12:59:35 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-4-gf085d05
Message-ID: <20150720105935.E540236A4415@mx.colino.net>

The branch, master has been updated
       via  f085d057cdee7b1a3747f06f68e18d2379e45cf4 (commit)
      from  06ba5f471bcf6a01a8672e71f061d3b7a511638d (commit)

Summary of changes:
 tools/claws.i18n.status.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit f085d057cdee7b1a3747f06f68e18d2379e45cf4
Author: Paul <paul at claws-mail.org>
Date:   Mon Jul 20 11:59:31 2015 +0100

    update Andreas' email address

diff --git a/tools/claws.i18n.status.pl b/tools/claws.i18n.status.pl
index 609f627..df5c760 100644
--- a/tools/claws.i18n.status.pl
+++ b/tools/claws.i18n.status.pl
@@ -59,7 +59,7 @@
 #	'pt_PT.po' => 'Tiago Faria <gouki at goukihq.org>',
 #	'ru.po' => 'Aleksei Miheev <aleksei at miheev.info>',
 	'sk.po' => 'Slavko <slavino at slavino.sk>',
-	'sv.po' => 'Andreas R?nnquist <gusnan at gusnan.se>',
+	'sv.po' => 'Andreas R?nnquist <gusnan at openmailbox.org>',
 #	'uk.po' => 'YUP <yupadmin at gmail.com>',
 #	'zh_CN.po' => 'Rob <rbnwmk at gmail.com>',
 #	'zh_TW.po' => 'Rob <rbnwmk at gmail.com>',

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Mon Jul 20 19:57:26 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Mon, 20 Jul 2015 19:57:26 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-5-gaab231b
Message-ID: <20150720175726.5DA1436A4419@mx.colino.net>

The branch, master has been updated
       via  aab231b16fd07a9196fe882205658d33c78752d2 (commit)
      from  f085d057cdee7b1a3747f06f68e18d2379e45cf4 (commit)

Summary of changes:
 src/common/utils.h |    8 ++++++++
 1 file changed, 8 insertions(+)


- Log -----------------------------------------------------------------
commit aab231b16fd07a9196fe882205658d33c78752d2
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Jul 20 19:57:05 2015 +0200

    Fix building on GLib older than 2.25.

diff --git a/src/common/utils.h b/src/common/utils.h
index ff01d83..3771d45 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -75,6 +75,14 @@ typedef gint64 goffset;
   #define HAVE_U32_TYPEDEF
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 25, 0)
+# ifdef G_OS_WIN32
+	typedef _g_stat_struct GStatBuf;
+# else
+	typedef struct stat GStatBuf;
+# endif
+#endif
+
 #ifndef BIG_ENDIAN_HOST
   #if (G_BYTE_ORDER == G_BIG_ENDIAN)
     #define BIG_ENDIAN_HOST 1

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Mon Jul 20 22:14:03 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Mon, 20 Jul 2015 22:14:03 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-6-g897a5ed
Message-ID: <20150720201403.E6AC836A441E@mx.colino.net>

The branch, master has been updated
       via  897a5ed7241c371232c816d26c4b577dd36899e3 (commit)
      from  aab231b16fd07a9196fe882205658d33c78752d2 (commit)

Summary of changes:
 src/plugins/managesieve/sieve_manager.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 897a5ed7241c371232c816d26c4b577dd36899e3
Author: Charles Lehner <charles at claws-mail.org>
Date:   Mon Jul 20 16:13:21 2015 -0400

    managesieve: fix list header tooltip

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index bae6afd..b2bff52 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -450,6 +450,7 @@ static void filters_create_list_view_columns(SieveManagerPage *page,
 {
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
+	GtkWidget *label;
 
 	/* Name */
 	renderer = gtk_cell_renderer_text_new();
@@ -472,8 +473,14 @@ static void filters_create_list_view_columns(SieveManagerPage *page,
 		 NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
 	gtk_tree_view_column_set_alignment (column, 0.5);
-	CLAWS_SET_TIP(gtk_tree_view_column_get_widget(column),
+
+	/* the column header needs a widget to have a tooltip */
+	label = gtk_label_new(gtk_tree_view_column_get_title(column));
+	gtk_widget_show(label);
+	gtk_tree_view_column_set_widget(column, label);
+	CLAWS_SET_TIP(label,
 			_("An account can only have one active script at a time."));
+
 	g_signal_connect(G_OBJECT(renderer), "toggled",
 			 G_CALLBACK(filter_active_toggled), page);
 

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Tue Jul 21 04:57:07 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Tue, 21 Jul 2015 04:57:07 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-8-g69d2e1d
Message-ID: <20150721025707.3E88536A4428@mx.colino.net>

The branch, master has been updated
       via  69d2e1d0e9599636cde034e6c7e8967b75f4980c (commit)
       via  38ea0d67f58b56a028a50e5c421e1d29c95298e4 (commit)
      from  897a5ed7241c371232c816d26c4b577dd36899e3 (commit)

Summary of changes:
 src/plugins/managesieve/sieve_editor.c  |    3 ++-
 src/plugins/managesieve/sieve_editor.h  |    1 +
 src/plugins/managesieve/sieve_manager.c |    9 ++++++++-
 src/plugins/managesieve/sieve_manager.h |    1 +
 src/plugins/managesieve/sieve_plugin.c  |    3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 69d2e1d0e9599636cde034e6c7e8967b75f4980c
Author: Charles Lehner <charles at claws-mail.org>
Date:   Mon Jul 20 22:39:54 2015 -0400

    managesieve: ensure space above Refresh button

diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 2dcdf71..afdb36a 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -731,7 +731,7 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	/* Buttons */
 
-	vbox_allbuttons = gtk_vbox_new (FALSE, 0);
+	vbox_allbuttons = gtk_vbox_new (FALSE, 8);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox_allbuttons, FALSE, FALSE, 0);
 
 	/* buttons that depend on there being a connection */

commit 38ea0d67f58b56a028a50e5c421e1d29c95298e4
Author: Charles Lehner <charles at claws-mail.org>
Date:   Mon Jul 20 22:23:15 2015 -0400

    managesieve: close windows when unloading
    
    fixes crash on plugin unload

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index e085dcb..f8b43ee 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -106,8 +106,9 @@ static GtkActionEntry sieve_editor_entries[] =
 void sieve_editors_close()
 {
 	if (editors) {
-		g_slist_free_full(editors, (GDestroyNotify)sieve_editor_close);
+		GSList *list = editors;
 		editors = NULL;
+		g_slist_free_full(list, (GDestroyNotify)sieve_editor_close);
 	}
 }
 
diff --git a/src/plugins/managesieve/sieve_editor.h b/src/plugins/managesieve/sieve_editor.h
index 60d3d86..18228c4 100644
--- a/src/plugins/managesieve/sieve_editor.h
+++ b/src/plugins/managesieve/sieve_editor.h
@@ -45,6 +45,7 @@ struct SieveEditorPage
 	gpointer on_load_error_data;
 };
 
+void sieve_editors_close();
 SieveEditorPage *sieve_editor_new(SieveSession *session, gchar *script_name);
 SieveEditorPage *sieve_editor_get(SieveSession *session, gchar *script_name);
 void sieve_editor_load(SieveEditorPage *page,
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index b2bff52..2dcdf71 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -80,6 +80,13 @@ static GSList *manager_pages = NULL;
 		if ((page = (SieveManagerPage *)cur->data) && \
 			page->active_session == session)
 
+void sieve_managers_done()
+{
+	GSList *list = manager_pages;
+	manager_pages = NULL;
+	g_slist_free_full(list, (GDestroyNotify)sieve_manager_done);
+}
+
 static void filters_list_clear(SieveManagerPage *page)
 {
 	GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(page->filters_list)));
diff --git a/src/plugins/managesieve/sieve_manager.h b/src/plugins/managesieve/sieve_manager.h
index 58f08f0..fb5c9ba 100644
--- a/src/plugins/managesieve/sieve_manager.h
+++ b/src/plugins/managesieve/sieve_manager.h
@@ -36,6 +36,7 @@ struct SieveManagerPage
 	gboolean	got_list;
 };
 
+void sieve_managers_done(void);
 void sieve_manager_show(void);
 void sieve_manager_done(SieveManagerPage *page);
 void sieve_manager_script_created(SieveSession *session,
diff --git a/src/plugins/managesieve/sieve_plugin.c b/src/plugins/managesieve/sieve_plugin.c
index 363a584..09264fc 100644
--- a/src/plugins/managesieve/sieve_plugin.c
+++ b/src/plugins/managesieve/sieve_plugin.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "sieve_prefs.h"
 #include "sieve_manager.h"
+#include "sieve_editor.h"
 
 #define PLUGIN_NAME (_("ManageSieve"))
 
@@ -84,6 +85,8 @@ gboolean plugin_done(void)
 	MainWindow *mainwin = mainwindow_get_mainwindow();
 
 	sieve_prefs_done();
+	sieve_managers_done();
+	sieve_editors_close();
 	sieve_sessions_close();
 
 	if (mainwin)

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Tue Jul 21 10:20:11 2015
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Tue, 21 Jul 2015 10:20:11 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-10-ge333ca5
Message-ID: <20150721082011.3F9F236A3FB9@mx.colino.net>

The branch, master has been updated
       via  e333ca5752105fdd084e7fbd8e3c8f35061e4172 (commit)
       via  1fed809dccd921468e53cdc8bce245131992b7dd (commit)
      from  69d2e1d0e9599636cde034e6c7e8967b75f4980c (commit)

Summary of changes:
 README |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit e333ca5752105fdd084e7fbd8e3c8f35061e4172
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jul 21 10:19:53 2015 +0200

    Add Libravatar also to README

diff --git a/README b/README
index 0325407..14df1dd 100644
--- a/README
+++ b/README
@@ -140,6 +140,10 @@ All plugin preferences can be found under
     Tab-address completion on compose window, using the GData library.
     Gdata library is available from https://live.gnome.org/libgdata/.
 
+  o Libravatar
+    Displays sender avatars from https://www.libravatar.org/, from own
+    sender's domain if enabled or even an automatically generated one.
+
   o MailMbox
     Handles mailboxes in Mbox format using the libEtPan! library. Mbox 
     files can be added to the folder tree and used like regular mailboxes.

commit 1fed809dccd921468e53cdc8bce245131992b7dd
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jul 21 10:06:02 2015 +0200

    Update statement wording for GPLv3
    
    From http://www.gnu.org/licenses/gpl-howto.en.html

diff --git a/README b/README
index 101b815..0325407 100644
--- a/README
+++ b/README
@@ -2,13 +2,13 @@ Claws Mail - a GTK+ based, lightweight, and fast e-mail client
 
 ---------------------------------------------------------------------
 
-   Copyright(C) 1999-2015 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
+   Copyright (C) 1999-2015 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
    Claws Mail Team
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@ Claws Mail - a GTK+ based, lightweight, and fast e-mail client
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-   MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    For more details see the file COPYING.
 

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Tue Jul 21 10:29:30 2015
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Tue, 21 Jul 2015 10:29:30 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-11-g1748226
Message-ID: <20150721082931.17A6936A3FB9@mx.colino.net>

The branch, master has been updated
       via  17482260eebb41638d96ee48e5d9be52f54d7c02 (commit)
      from  e333ca5752105fdd084e7fbd8e3c8f35061e4172 (commit)

Summary of changes:
 po/es.po |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 17482260eebb41638d96ee48e5d9be52f54d7c02
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jul 21 10:29:22 2015 +0200

    Minor fixes to es.po

diff --git a/po/es.po b/po/es.po
index 8f38166..adf76a6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Claws Mail 3.11.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
 "POT-Creation-Date: 2015-07-12 20:01+0200\n"
-"PO-Revision-Date: 2015-07-13 23:58+0200\n"
+"PO-Revision-Date: 2015-07-21 10:28+0200\n"
 "Last-Translator: Carles Tubio <c at rles-tub.io>\n"
 "Language-Team: Ricardo Mones <ricardo at mones.org>\n"
 "Language: es\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.8.2\n"
 
 #: src/account.c:392 src/account.c:459
 msgid ""
@@ -10205,7 +10204,7 @@ msgstr "M?dulo GData: Error de autorizaci?n: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:449
 msgid "GData plugin: Authorization successful\n"
-msgstr "M?dulo GData: Autorizaci?n exitosa\n"
+msgstr "M?dulo GData: Autorizaci?n realizada con ?xito\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:459
 msgid "GData plugin: Starting interactive authorization\n"
@@ -18564,7 +18563,7 @@ msgstr "El elemento no tiene un texto definido."
 
 #: src/prefs_toolbar.c:916
 msgid "Toolbar item"
-msgstr "?tem de herramientas"
+msgstr "?tem de la barra de herramientas"
 
 #: src/prefs_toolbar.c:932
 msgid "Item type"
@@ -18588,7 +18587,7 @@ msgstr "Evento ejecutado al pulsar"
 
 #: src/prefs_toolbar.c:991
 msgid "Toolbar text"
-msgstr "Texto de herramientas"
+msgstr "Texto asociado"
 
 #: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
 msgid "Icon"

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Tue Jul 21 14:34:37 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Tue, 21 Jul 2015 14:34:37 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-12-gbd4e7f8
Message-ID: <20150721123437.9CC2136A429D@mx.colino.net>

The branch, master has been updated
       via  bd4e7f852004067a820a9f4fd9036ebfc235b1bb (commit)
      from  17482260eebb41638d96ee48e5d9be52f54d7c02 (commit)

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


- Log -----------------------------------------------------------------
commit bd4e7f852004067a820a9f4fd9036ebfc235b1bb
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Jul 21 14:33:48 2015 +0200

    Fix a small (copy&paste ?) typo in time zone parsing.

diff --git a/src/common/utils.c b/src/common/utils.c
index 0ad18cf..af1bb20 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3522,7 +3522,7 @@ time_t remote_tzoffset_sec(const gchar *zone)
 		if (c == '-')
 			remoteoffset = -remoteoffset;
 	} else if (!strncmp(zone, "UT" , 2) ||
-		   !strncmp(zone, "GMT", 2)) {
+		   !strncmp(zone, "GMT", 3)) {
 		remoteoffset = 0;
 	} else if (strlen(zone3) == 3) {
 		for (p = ustzstr; *p != '\0'; p += 3) {

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Wed Jul 22 03:34:56 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Wed, 22 Jul 2015 03:34:56 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-15-g8be3195
Message-ID: <20150722013456.E1E6D36A4431@mx.colino.net>

The branch, master has been updated
       via  8be31955028980da209a38dea361c57d43fba96b (commit)
       via  510d72d37de71c76e5ab11fd673e8f5685505c0a (commit)
       via  a5fcd7b5d797115135e308e9a25f8436c0462714 (commit)
      from  bd4e7f852004067a820a9f4fd9036ebfc235b1bb (commit)

Summary of changes:
 src/plugins/managesieve/managesieve.c  |  277 +++++++++++++++++++++++++-------
 src/plugins/managesieve/managesieve.h  |    2 -
 src/plugins/managesieve/sieve_editor.c |   12 +-
 3 files changed, 224 insertions(+), 67 deletions(-)


- Log -----------------------------------------------------------------
commit 8be31955028980da209a38dea361c57d43fba96b
Author: Charles Lehner <charles at claws-mail.org>
Date:   Tue Jul 21 21:18:33 2015 -0400

    managesieve: read literals in chunks, not line-by-line
    
    This adds a way to read data chunks with a known length from a Session, rather
    than until a newline or terminator string is reached. It is used to let Sieve
    scripts be loaded faster.

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 4e7508a..1a09620 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -21,6 +21,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "claws.h"
 #include "account.h"
@@ -42,6 +43,9 @@ static void sieve_session_reset(SieveSession *session);
 static void command_free(SieveCommand *cmd);
 static void command_abort(SieveCommand *cmd);
 static void command_cb(SieveCommand *cmd, gpointer result);
+static gint sieve_session_recv_chunk(SieveSession *, guint len);
+static void sieve_read_chunk(SieveSession *, gchar *data, guint len);
+static gint sieve_read_chunk_done(SieveSession *session);
 
 void sieve_sessions_close()
 {
@@ -127,6 +131,125 @@ static void sieve_connected(SieveSession *session, gboolean connected)
 		session->on_connected(session, connected, session->cb_data);
 }
 
+static gboolean sieve_read_chunk_cb(SockInfo *source,
+		GIOCondition condition, gpointer data)
+{
+	SieveSession *sieve_session = SIEVE_SESSION(data);
+	Session *session = &sieve_session->session;
+	gint data_len;
+	gint ret;
+
+	cm_return_val_if_fail(condition == G_IO_IN, FALSE);
+
+	session_set_timeout(session, session->timeout_interval);
+
+	if (session->read_buf_len == 0) {
+		gint read_len = -1;
+
+		if (session->sock)
+			read_len = sock_read(session->sock,
+					session->read_buf,
+					SESSION_BUFFSIZE - 1);
+
+		if (read_len == -1 &&
+				session->state == SESSION_DISCONNECTED) {
+			g_warning ("sock_read: session disconnected\n");
+			if (session->io_tag > 0) {
+				g_source_remove(session->io_tag);
+				session->io_tag = 0;
+			}
+			return FALSE;
+		}
+
+		if (read_len == 0) {
+			g_warning("sock_read: received EOF\n");
+			session->state = SESSION_EOF;
+			return FALSE;
+		}
+
+		if (read_len < 0) {
+			switch (errno) {
+			case EAGAIN:
+				return TRUE;
+			default:
+				g_warning("sock_read: %s\n",
+						g_strerror(errno));
+				session->state = SESSION_ERROR;
+				return FALSE;
+			}
+		}
+
+		session->read_buf_len = read_len;
+	}
+
+	data_len = MIN(session->read_buf_len,
+			sieve_session->octets_remaining);
+	sieve_session->octets_remaining -= data_len;
+	session->read_buf_len -= data_len;
+	session->read_buf_p[data_len] = '\0';
+
+	/* progress callback */
+	sieve_read_chunk(sieve_session, session->read_buf_p, data_len);
+
+	if (session->read_buf_len == 0) {
+		session->read_buf_p = session->read_buf;
+	} else {
+		session->read_buf_p += data_len;
+	}
+
+	/* incomplete read */
+	if (sieve_session->octets_remaining > 0)
+		return TRUE;
+
+	/* complete */
+	if (session->io_tag > 0) {
+		g_source_remove(session->io_tag);
+		session->io_tag = 0;
+	}
+
+	/* completion callback */
+	ret = sieve_read_chunk_done(sieve_session);
+
+	if (ret < 0)
+		session->state = SESSION_ERROR;
+
+	return FALSE;
+}
+
+static gboolean sieve_read_chunk_idle_cb(gpointer data)
+{
+	Session *session = SESSION(data);
+	gboolean ret;
+
+	ret = sieve_read_chunk_cb(session->sock, G_IO_IN, session);
+
+	if (ret == TRUE)
+		session->io_tag = sock_add_watch(session->sock, G_IO_IN,
+				sieve_read_chunk_cb, session);
+
+	return G_SOURCE_REMOVE;
+}
+
+/* Get data of specified length.
+ * If needed elsewhere, this should be put in session.c */
+static gint sieve_session_recv_chunk(SieveSession *sieve_session,
+		guint bytes)
+{
+	Session *session = &sieve_session->session;
+	cm_return_val_if_fail(session->read_msg_buf->len == 0, -1);
+
+	session->state = SESSION_RECV;
+	sieve_session->octets_remaining = bytes;
+
+	if (session->read_buf_len > 0)
+		g_idle_add(sieve_read_chunk_idle_cb, session);
+	else
+		session->io_tag = sock_add_watch(session->sock, G_IO_IN,
+						 sieve_read_chunk_cb, session);
+	return 0;
+}
+
+
 static gint sieve_auth_recv(SieveSession *session, const gchar *msg)
 {
 	gchar buf[MESSAGEBUFSIZE], *tmp;
@@ -328,9 +451,18 @@ static gint sieve_auth(SieveSession *session)
 static void sieve_session_putscript_cb(SieveSession *session, SieveResult *result)
 {
 	/* Remove script name from the beginning the response,
-	 * which are added by Dovecot/Pigeonhole */
+	 * which is added by Dovecot/Pigeonhole */
 	gchar *start, *desc = result->description;
-	if (desc) {
+	gchar *end = NULL;
+	if (!desc) {
+		/* callback just for the status */
+		command_cb(session->current_cmd, result);
+	}
+	while (desc && desc[0]) {
+		if ((end = strchr(desc, '\r')) ||
+		    (end = strchr(desc, '\n')))
+			while (*end == '\n' || *end == '\r')
+				*end++ = '\0';
 		if (g_str_has_prefix(desc, "NULL_") && (start = strchr(desc+5, ':'))) {
 			desc = start+1;
 			while (*desc == ' ')
@@ -342,9 +474,9 @@ static void sieve_session_putscript_cb(SieveSession *session, SieveResult *resul
 			desc = start+2;
 		}
 		result->description = desc;
+		command_cb(session->current_cmd, result);
+		desc = end;
 	}
-	/* pass along the callback */
-	command_cb(session->current_cmd, result);
 }
 
 static inline gboolean response_is_ok(const char *msg)
@@ -536,27 +668,21 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 	SieveResult result;
 	gint ret = SE_OK;
 
-	switch (sieve_session->state) {
-	case SIEVE_GETSCRIPT_DATA:
-		log_print(LOG_PROTOCOL, "Sieve< [GETSCRIPT data]\n");
-		break;
-	default:
-		log_print(LOG_PROTOCOL, "Sieve< %s\n", msg);
-		if (response_is_bye(msg)) {
-			gchar *status;
-			parse_response((gchar *)msg, &result);
-			if (!result.description)
-				status = g_strdup(_("Disconnected"));
-			else if (g_str_has_prefix(result.description, "Disconnected"))
-				status = g_strdup(result.description);
-			else
-				status = g_strdup_printf(_("Disconnected: %s"), result.description);
-			sieve_session->error = SE_ERROR;
-			sieve_error(sieve_session, status);
-			sieve_session->state = SIEVE_DISCONNECTED;
-			g_free(status);
-			return -1;
-		}
+	log_print(LOG_PROTOCOL, "Sieve< %s\n", msg);
+	if (response_is_bye(msg)) {
+		gchar *status;
+		parse_response((gchar *)msg, &result);
+		if (!result.description)
+			status = g_strdup(_("Disconnected"));
+		else if (g_str_has_prefix(result.description, "Disconnected"))
+			status = g_strdup(result.description);
+		else
+			status = g_strdup_printf(_("Disconnected: %s"), result.description);
+		sieve_session->error = SE_ERROR;
+		sieve_error(sieve_session, status);
+		sieve_session->state = SIEVE_DISCONNECTED;
+		g_free(status);
+		return -1;
 	}
 
 	switch (sieve_session->state) {
@@ -596,6 +722,8 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		}
 		break;
 	case SIEVE_READY:
+		if (!msg[0])
+			break;
 		log_warning(LOG_PROTOCOL,
 				_("unhandled message on Sieve session: %s\n"), msg);
 		break;
@@ -688,18 +816,8 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
 		if (result.has_octets) {
-			sieve_session->octets_remaining = result.octets;
-			sieve_session->state = SIEVE_SETACTIVE_DATA;
-		} else {
-			sieve_session->state = SIEVE_READY;
-		}
-		break;
-	case SIEVE_SETACTIVE_DATA:
-		/* Dovecot shows a script's warnings when making it active */
-		sieve_session->octets_remaining -= strlen(msg) + 1;
-		if (sieve_session->octets_remaining > 0) {
-			/* TODO: buffer multi-line message */
-			sieve_error(sieve_session, msg);
+			return sieve_session_recv_chunk(sieve_session,
+					result.octets);
 		} else {
 			sieve_session->state = SIEVE_READY;
 		}
@@ -711,41 +829,31 @@ static gint sieve_session_recv_msg(Session *session, const gchar *msg)
 		} else {
 			parse_response((gchar *)msg, &result);
 			sieve_session->state = SIEVE_GETSCRIPT_DATA;
-			/* account for newline */
-			sieve_session->octets_remaining = result.octets + 1;
+			return sieve_session_recv_chunk(sieve_session,
+					result.octets);
 		}
 		break;
 	case SIEVE_GETSCRIPT_DATA:
-		if (sieve_session->octets_remaining > 0) {
-			command_cb(sieve_session->current_cmd, (gchar *)msg);
-			sieve_session->octets_remaining -= strlen(msg) + 1;
-		} else if (response_is_ok(msg)) {
-			sieve_session->state = SIEVE_READY;
+		if (!msg[0])
+			break;
+		sieve_session->state = SIEVE_READY;
+		if (response_is_ok(msg)) {
 			command_cb(sieve_session->current_cmd, NULL);
-		} else {
+		} else if (msg[0]) {
 			log_warning(LOG_PROTOCOL, _("error occurred on SIEVE session\n"));
 		}
 		break;
 	case SIEVE_PUTSCRIPT:
+		if (!msg[0])
+			break;
 		parse_response((gchar *)msg, &result);
+		sieve_session_putscript_cb(sieve_session, &result);
 		if (result.has_octets) {
-			sieve_session->state = SIEVE_PUTSCRIPT_DATA;
+			return sieve_session_recv_chunk(sieve_session,
+					result.octets);
 		} else {
 			sieve_session->state = SIEVE_READY;
 		}
-		sieve_session_putscript_cb(sieve_session, &result);
-		break;
-	case SIEVE_PUTSCRIPT_DATA:
-		if (!msg[0]) {
-			sieve_session->state = SIEVE_READY;
-		} else {
-			result.has_status = FALSE;
-			result.has_octets = FALSE;
-			result.success = -1;
-			result.code = SIEVE_CODE_NONE;
-			result.description = (gchar *)msg;
-			sieve_session_putscript_cb(sieve_session, &result);
-		}
 		break;
 	case SIEVE_DELETESCRIPT:
 		parse_response((gchar *)msg, &result);
@@ -793,6 +901,57 @@ static gint sieve_recv_message(Session *session, const gchar *msg,
 	return 0;
 }
 
+static void sieve_read_chunk(SieveSession *session, gchar *data, guint len)
+{
+	log_print(LOG_PROTOCOL, "Sieve< [%u bytes]\n", len);
+
+	switch (session->state) {
+	case SIEVE_GETSCRIPT_DATA:
+		command_cb(session->current_cmd, (gchar *)data);
+		break;
+	case SIEVE_SETACTIVE:
+		/* Dovecot shows a script's warnings when making it active */
+		/* TODO: append message in case it is very long*/
+		strretchomp(data);
+		sieve_error(session, data);
+		break;
+	case SIEVE_PUTSCRIPT: {
+		SieveResult result = {.description = (gchar *)data};
+		sieve_session_putscript_cb(session, &result);
+		break;
+	}
+	default:
+		log_warning(LOG_PROTOCOL,
+				_("error occurred on SIEVE session\n"));
+	}
+}
+
+static gint sieve_read_chunk_done(SieveSession *session)
+{
+	gint ret = SE_OK;
+
+	switch (session->state) {
+	case SIEVE_GETSCRIPT_DATA:
+		/* wait for ending "OK" response */
+		break;
+	case SIEVE_SETACTIVE:
+	case SIEVE_PUTSCRIPT:
+		session->state = SIEVE_READY;
+		break;
+	default:
+		log_warning(LOG_PROTOCOL,
+				_("error occurred on SIEVE session\n"));
+	}
+
+	if (ret == SE_OK && session->state == SIEVE_READY)
+		ret = sieve_pop_send_queue(session);
+
+	if (ret == SE_OK)
+		return session_recv_msg(SESSION(session));
+
+	return 0;
+}
+
 static gint sieve_cmd_noop(SieveSession *session)
 {
 	log_print(LOG_PROTOCOL, "Sieve> NOOP\n");
diff --git a/src/plugins/managesieve/managesieve.h b/src/plugins/managesieve/managesieve.h
index f5c5fbb..cf26ed0 100644
--- a/src/plugins/managesieve/managesieve.h
+++ b/src/plugins/managesieve/managesieve.h
@@ -71,11 +71,9 @@ typedef enum
 	SIEVE_AUTH_CRAM_MD5,
 	SIEVE_RENAMESCRIPT,
 	SIEVE_SETACTIVE,
-	SIEVE_SETACTIVE_DATA,
 	SIEVE_GETSCRIPT,
 	SIEVE_GETSCRIPT_DATA,
 	SIEVE_PUTSCRIPT,
-	SIEVE_PUTSCRIPT_DATA,
 	SIEVE_DELETESCRIPT,
 	SIEVE_ERROR,
 	SIEVE_DISCONNECTED,
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 5dc56a1..8c41f68 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -313,7 +313,6 @@ static void got_data_reverting(SieveSession *session, gboolean abort,
 		/* append data */
 		gtk_text_buffer_insert(buffer, &end, contents, strlen(contents));
 	} else {
-		sieve_editor_append_text(page, "\n", 1);
 		sieve_editor_append_text(page, contents, strlen(contents));
 	}
 }
@@ -729,8 +728,6 @@ static void got_data_loading(SieveSession *session, gboolean aborted,
 	if (page->first_line) {
 		page->first_line = FALSE;
 		sieve_editor_show(page);
-	} else {
-		sieve_editor_append_text(page, "\n", 1);
 	}
 	sieve_editor_append_text(page, contents, strlen(contents));
 }

commit 510d72d37de71c76e5ab11fd673e8f5685505c0a
Author: Charles Lehner <charles at claws-mail.org>
Date:   Tue Jul 21 21:11:15 2015 -0400

    managesieve: count script length in bytes, not characters

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 2931c86..5dc56a1 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -140,7 +140,8 @@ static gint sieve_editor_get_text(SieveEditorPage *page, gchar **text)
 	gtk_text_buffer_get_start_iter(buffer, &start);
 	gtk_text_buffer_get_end_iter(buffer, &end);
 	*text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-	return gtk_text_iter_get_offset(&end) - gtk_text_iter_get_offset(&start);
+	/* return length in bytes */
+	return strlen(*text);
 }
 
 static void sieve_editor_set_status(SieveEditorPage *page, const gchar *status)

commit a5fcd7b5d797115135e308e9a25f8436c0462714
Author: Charles Lehner <charles at claws-mail.org>
Date:   Tue Jul 21 20:43:44 2015 -0400

    managesieve: fix memory leak

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index f8b43ee..2931c86 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -158,12 +158,14 @@ static void sieve_editor_set_status_icon(SieveEditorPage *page, const gchar *img
 }
 
 static void sieve_editor_append_status(SieveEditorPage *page,
-		const gchar *status)
+		const gchar *new_status)
 {
 	GtkLabel *label = GTK_LABEL(page->status_text);
 	const gchar *prev_status = gtk_label_get_text(label);
 	const gchar *sep = prev_status && prev_status[0] ? "\n" : "";
-	gtk_label_set_text(label, g_strconcat(prev_status, sep, status, NULL));
+	gchar *status = g_strconcat(prev_status, sep, new_status, NULL);
+	gtk_label_set_text(label, status);
+	g_free(status);
 }
 
 /* Update the status icon and text from a response. */

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


hooks/post-receive
-- 
Claws Mail

From miras at claws-mail.org  Wed Jul 22 03:53:37 2015
From: miras at claws-mail.org (miras at claws-mail.org)
Date: Wed, 22 Jul 2015 03:53:37 +0200 (CEST)
Subject: [Commits] [SCM] contacts branch, master,
	updated. 27405d4d2b44155750e2df419022cd6801cb4b76
Message-ID: <20150722015337.D303D36A4431@mx.colino.net>

The branch, master has been updated
       via  27405d4d2b44155750e2df419022cd6801cb4b76 (commit)
      from  5c40728159d9d1de30607d09b790e47b8add1f25 (commit)

Summary of changes:
 dbus-client/Makefile.am            |    8 +++-----
 extensions/example/src/Makefile.am |    9 ++++-----
 extensions/export/Makefile.am      |    8 +++-----
 extensions/import/Makefile.am      |    8 +++-----
 extensions/vcard/src/Makefile.am   |   11 ++++-------
 libversit/Makefile.am              |    8 +++-----
 plugins/example/src/Makefile.am    |    9 ++++-----
 plugins/ldap/Makefile.am           |   10 ++++------
 plugins/xml/Makefile.am            |    8 +++-----
 src/Makefile.am                    |   14 ++++++--------
 src/dbus/Makefile.am               |    8 +++-----
 xmllib/Makefile.am                 |    8 +++-----
 12 files changed, 43 insertions(+), 66 deletions(-)


- Log -----------------------------------------------------------------
commit 27405d4d2b44155750e2df419022cd6801cb4b76
Author: Michael Rasmussen <mir at datanom.net>
Date:   Wed Jul 22 03:53:32 2015 +0200

    Fix deprecated INCLUDES

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


hooks/post-receive
-- 
Claws Mail Contacts

From miras at claws-mail.org  Wed Jul 22 03:55:11 2015
From: miras at claws-mail.org (miras at claws-mail.org)
Date: Wed, 22 Jul 2015 03:55:11 +0200 (CEST)
Subject: [Commits] [SCM] contacts branch, master,
	updated. 25ce16af66e82f37204dcebb51d8c7c7d25745ee
Message-ID: <20150722015511.A7ED436A4431@mx.colino.net>

The branch, master has been updated
       via  25ce16af66e82f37204dcebb51d8c7c7d25745ee (commit)
      from  27405d4d2b44155750e2df419022cd6801cb4b76 (commit)

Summary of changes:
 extensions/example/src/example-extension.c |   22 +++---
 extensions/export/ldifexport_extension.c   |    8 +-
 extensions/export/wizard.c                 |    2 +-
 extensions/import/ldifimport_extension.c   |   10 +--
 extensions/import/ldifimport_parser.c      |   20 ++---
 extensions/vcard/src/vcard-extension.c     |   30 ++++----
 src/contactwindow.c                        |   20 ++++-
 src/mainwindow.c                           |  115 ++++++++++++++++++----------
 src/utils.c                                |   20 +++++
 src/utils.h                                |    1 +
 10 files changed, 162 insertions(+), 86 deletions(-)


- Log -----------------------------------------------------------------
commit 25ce16af66e82f37204dcebb51d8c7c7d25745ee
Author: Michael Rasmussen <mir at datanom.net>
Date:   Wed Jul 22 03:55:02 2015 +0200

    Add patch from P?der Rezs? <rezso at rezso.net> to supports the Eastern name order. Add more localized strings

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


hooks/post-receive
-- 
Claws Mail Contacts

From claws at claws-mail.org  Wed Jul 22 10:50:25 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Wed, 22 Jul 2015 10:50:25 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-16-g0cbcaf7
Message-ID: <20150722085026.0392A36A4434@mx.colino.net>

The branch, master has been updated
       via  0cbcaf7e74815e0a568b5f710aceeda2d92786ff (commit)
      from  8be31955028980da209a38dea361c57d43fba96b (commit)

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


- Log -----------------------------------------------------------------
commit 0cbcaf7e74815e0a568b5f710aceeda2d92786ff
Author: Paul <paul at claws-mail.org>
Date:   Wed Jul 22 09:50:18 2015 +0100

    after deleting/trashing msg, select next msg depending on sort order

diff --git a/src/summaryview.c b/src/summaryview.c
index 1f6308c..aee456d 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4429,7 +4429,8 @@ void summary_delete(SummaryView *summaryview)
 	folder_item_set_batch(summaryview->folder_item, FALSE);
 	END_LONG_OPERATION(summaryview);
 
-	node = summary_find_next_msg(summaryview, sel_last);
+	if (summaryview->sort_type == SORT_ASCENDING)
+		node = summary_find_next_msg(summaryview, sel_last);
 	if (!node)
 		node = summary_find_prev_msg(summaryview, sel_last);
 
@@ -4587,7 +4588,9 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 	if (prefs_common.immediate_exec) {
 		summary_execute(summaryview);
 	} else {
-		GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
+		GtkCMCTreeNode *node;
+		if (summaryview->sort_type == SORT_ASCENDING)
+			node = summary_find_next_msg(summaryview, sel_last);
 		if (!node)
 			node = summary_find_prev_msg(summaryview, sel_last);
 		summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
@@ -4948,7 +4951,8 @@ gboolean summary_execute(SummaryView *summaryview)
 		if (!new_selected &&
 		    gtkut_ctree_node_is_selected(ctree, node)) {
 			summary_unselect_all(summaryview);
-			new_selected = summary_find_next_msg(summaryview, node);
+			if (summaryview->sort_type == SORT_ASCENDING)
+				new_selected = summary_find_next_msg(summaryview, node);
 			if (!new_selected)
 				new_selected = summary_find_prev_msg
 					(summaryview, node);

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


hooks/post-receive
-- 
Claws Mail

From cucchilou at neuf.fr  Wed Jul 22 13:40:02 2015
From: cucchilou at neuf.fr (Conso Free)
Date: Wed, 22 Jul 2015 13:40:02 +0200
Subject: [Commits] Cancellation of mailing list
Message-ID: <20150722114003.D6F2570000A3@msfrf2208.sfr.fr>

Please take me out of your mailing list.
Thank you!

Best regards

From claws at thewildbeast.co.uk  Wed Jul 22 13:48:08 2015
From: claws at thewildbeast.co.uk (Paul)
Date: Wed, 22 Jul 2015 12:48:08 +0100
Subject: [Commits] Cancellation of mailing list
In-Reply-To: <20150722114003.D6F2570000A3@msfrf2208.sfr.fr>
References: <20150722114003.D6F2570000A3@msfrf2208.sfr.fr>
Message-ID: <20150722124808.2a86065f@kujata>

On Wed, 22 Jul 2015 13:40:02 +0200
Conso Free <cucchilou at neuf.fr> wrote: 

> Please take me out of your mailing list.
> Thank you!
> 
> Best regards

Unsubscribe yourself. Info is included in every message.

with regards

Paul

From mones at claws-mail.org  Fri Jul 24 14:06:16 2015
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Fri, 24 Jul 2015 14:06:16 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-17-gd059f92
Message-ID: <20150724120616.CDBBF36A4440@mx.colino.net>

The branch, master has been updated
       via  d059f927816a4fa40c7e5131ca1db52cbf631ad0 (commit)
      from  0cbcaf7e74815e0a568b5f710aceeda2d92786ff (commit)

Summary of changes:
 INSTALL |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit d059f927816a4fa40c7e5131ca1db52cbf631ad0
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 24 14:06:02 2015 +0200

    Updated to match current configure options

diff --git a/INSTALL b/INSTALL
index 75c3abb..04fd910 100644
--- a/INSTALL
+++ b/INSTALL
@@ -99,7 +99,7 @@ Python
 SpamAssassin
     for SpamAssassin plugin support
     http://spamassassin.apache.org/
- 
+
 Options for configure script
 ============================
 Most options are automatically enabled if the dependencies
@@ -108,39 +108,43 @@ are matched.
   --with-config-dir=RCDIR      	    local config dir (default: ~/.claws-mail)
   --disable-compface  		    disable compface (X-Face) support
   --disable-ipv6      		    disable IPv6 support
+  --disable-libsm                   disable Session Management support
   --disable-gnutls    		    disable GnuTLS support
   --disable-libetpan		    disable IMAP4 and NNTP support
-  --disable-gnomeprint		    disable libgnomeprint support
   --disable-enchant     	    disable Enchant support
+  --disable-dbus                    disable D-Bus support
   --disable-ldap       		    disable LDAP support
   --disable-jpilot     		    disable JPilot support
+  --disable-networkmanager          disable NetworkManager support
   --disable-startup-notification    disable startup notification support
   --disable-valgrind                disable valgrind support for debugging
   --enable-crash-dialog   	    enable crash dialog
   --disable-startup-notification    disable startup notification support
-  --disable-trayicon-plugin         do not build System Tray Icon plugin
-  --disable-spamassassin-plugin     do not build SpamAssassin plugin
-  --disable-pgpcore-plugin	    do not build PGP/Core plugin
-  --disable-pgpmime-plugin          do not build PGP/MIME plugin
-  --disable-pgpinline-plugin        do not build PGP/Inline plugin
-  --disable-smime-plugin            do not build S/Mime plugin
-  --disable-bogofilter-plugin       do not build Bogofilter plugin
+  --disable-acpi_notifier-plugin    do not build ACPI notifier plugin
   --disable-address_keeper-plugin   do not build Address Keeper plugin
   --disable-archive-plugin          do not build Archive plugin
   --disable-att_remover-plugin      do not build Att Remover plugin
   --disable-attachwarner-plugin     do not build Attachwarner plugin
+  --disable-bogofilter-plugin       do not build Bogofilter plugin
   --disable-bsfilter-plugin         do not build BSfilter plugin
   --disable-clamd-plugin            do not build Clamd plugin
   --disable-fancy-plugin            do not build Fancy plugin
   --disable-fetchinfo-plugin        do not build Fetchinfo plugin
   --disable-gdata-plugin            do not build GData plugin
+  --disable-geolocation-plugin      do not build GeoLocation plugin
+  --disable-libravatar-plugin       do not build Libravatar plugin
   --disable-mailmbox-plugin         do not build MailMbox plugin
+  --disable-managesieve-plugin      do not build ManageSieve plugin
   --disable-newmail-plugin          do not build NewMail plugin
   --disable-notification-plugin     do not build Notification plugin
   --disable-pdf_viewer-plugin       do not build PDF Viewer plugin
   --disable-perl-plugin             do not build Perl plugin
   --disable-python-plugin           do not build Python plugin
+  --disable-pgpcore-plugin          do not build PGP/Core plugin
+  --disable-pgpmime-plugin          do not build PGP/MIME plugin
+  --disable-pgpinline-plugin        do not build PGP/Inline plugin
   --disable-rssyl-plugin            do not build RSSyl plugin
+  --disable-smime-plugin            do not build S/MIME plugin
   --disable-spamassassin-plugin     do not build SpamAssassin plugin
   --disable-spam_report-plugin      do not build Spam Report plugin
   --disable-tnef_parse-plugin       do not build TNEF Parse plugin

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


hooks/post-receive
-- 
Claws Mail

From mones at claws-mail.org  Fri Jul 24 14:17:45 2015
From: mones at claws-mail.org (mones at claws-mail.org)
Date: Fri, 24 Jul 2015 14:17:45 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-18-g360b657
Message-ID: <20150724121745.D875836A4440@mx.colino.net>

The branch, master has been updated
       via  360b6573433c02150051866161b82b87013c804c (commit)
      from  d059f927816a4fa40c7e5131ca1db52cbf631ad0 (commit)

Summary of changes:
 appdata/Makefile.am                            |    3 ++-
 appdata/claws-mail-managesieve.metainfo.xml.in |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 appdata/claws-mail-managesieve.metainfo.xml.in


- Log -----------------------------------------------------------------
commit 360b6573433c02150051866161b82b87013c804c
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 24 14:17:35 2015 +0200

    Add ManageSieve to appdata

diff --git a/appdata/Makefile.am b/appdata/Makefile.am
index e3ce681..e22701b 100644
--- a/appdata/Makefile.am
+++ b/appdata/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 the Claws Mail team.
+# Copyright 1999-2015 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
@@ -20,6 +20,7 @@ appdata_in_files = claws-mail.appdata.xml.in \
 	claws-mail-geolocation.metainfo.xml.in \
 	claws-mail-libravatar.metainfo.xml.in \
 	claws-mail-mailmbox.metainfo.xml.in \
+	claws-mail-managesieve.metainfo.xml.in \
 	claws-mail-newmail.metainfo.xml.in \
 	claws-mail-notification.metainfo.xml.in \
 	claws-mail-pdf_viewer.metainfo.xml.in \
diff --git a/appdata/claws-mail-managesieve.metainfo.xml.in b/appdata/claws-mail-managesieve.metainfo.xml.in
new file mode 100644
index 0000000..914e832
--- /dev/null
+++ b/appdata/claws-mail-managesieve.metainfo.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 the Claws Mail team -->
+<component type="addon">
+<id>claws-mail-managesieve</id>
+<extends>claws-mail.desktop</extends>
+<name>ManageSieve</name>
+<_summary>Provides an interface for managing Sieve filters on IMAP servers. Those filters are used for server-side mail filtering.</_summary>
+<url type="homepage">http://claws-mail.org/plugin.php?plugin=managesieve</url>
+<metadata_license>CC0-1.0</metadata_license>
+<project_license>GPL-3.0+</project_license>
+<updatecontact>devel at lists.claws-mail.org</updatecontact>
+</component>

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Fri Jul 24 16:17:45 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Fri, 24 Jul 2015 16:17:45 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-19-g3a0460c
Message-ID: <20150724141745.8BDBC36A4441@mx.colino.net>

The branch, master has been updated
       via  3a0460c255c4307ac52b6453d756bdf9cc277cda (commit)
      from  360b6573433c02150051866161b82b87013c804c (commit)

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


- Log -----------------------------------------------------------------
commit 3a0460c255c4307ac52b6453d756bdf9cc277cda
Author: Paul <paul at claws-mail.org>
Date:   Fri Jul 24 15:17:40 2015 +0100

    remove useless check

diff --git a/src/summaryview.c b/src/summaryview.c
index aee456d..c4be0d0 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4953,9 +4953,8 @@ gboolean summary_execute(SummaryView *summaryview)
 			summary_unselect_all(summaryview);
 			if (summaryview->sort_type == SORT_ASCENDING)
 				new_selected = summary_find_next_msg(summaryview, node);
-			if (!new_selected)
-				new_selected = summary_find_prev_msg
-					(summaryview, node);
+			else
+				new_selected = summary_find_prev_msg(summaryview, node);
 		}
 
 		gtk_sctree_remove_node((GtkSCTree *)ctree, node);

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Fri Jul 24 18:47:44 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Fri, 24 Jul 2015 18:47:44 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-20-gf0b7352
Message-ID: <20150724164744.72E7636A4441@mx.colino.net>

The branch, master has been updated
       via  f0b7352b384ee88c1202378483ec213395ccf94b (commit)
      from  3a0460c255c4307ac52b6453d756bdf9cc277cda (commit)

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


- Log -----------------------------------------------------------------
commit f0b7352b384ee88c1202378483ec213395ccf94b
Author: Paul <paul at claws-mail.org>
Date:   Fri Jul 24 17:47:39 2015 +0100

    fix crasher when using descending sort and deleting a msg

diff --git a/src/summaryview.c b/src/summaryview.c
index c4be0d0..8222618 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4431,6 +4431,8 @@ void summary_delete(SummaryView *summaryview)
 
 	if (summaryview->sort_type == SORT_ASCENDING)
 		node = summary_find_next_msg(summaryview, sel_last);
+	else
+		node = summary_find_prev_msg(summaryview, sel_last);
 	if (!node)
 		node = summary_find_prev_msg(summaryview, sel_last);
 
@@ -4591,6 +4593,8 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 		GtkCMCTreeNode *node;
 		if (summaryview->sort_type == SORT_ASCENDING)
 			node = summary_find_next_msg(summaryview, sel_last);
+		else
+			node = summary_find_prev_msg(summaryview, sel_last);
 		if (!node)
 			node = summary_find_prev_msg(summaryview, sel_last);
 		summary_select_node(summaryview, node, summaryview->display_msg, TRUE);

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


hooks/post-receive
-- 
Claws Mail

From ticho at claws-mail.org  Sat Jul 25 14:03:52 2015
From: ticho at claws-mail.org (ticho at claws-mail.org)
Date: Sat, 25 Jul 2015 14:03:52 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-21-g3b14f47
Message-ID: <20150725120353.12EC636A444B@mx.colino.net>

The branch, master has been updated
       via  3b14f476066860518abe501187f600125832f2ad (commit)
      from  f0b7352b384ee88c1202378483ec213395ccf94b (commit)

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


- Log -----------------------------------------------------------------
commit 3b14f476066860518abe501187f600125832f2ad
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Jul 25 14:02:33 2015 +0200

    Fixed handling of drag&drop onto compose text area on Windows.
    
    Fixes bug #3475.

diff --git a/src/compose.c b/src/compose.c
index 959f6fc..13a7def 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -11144,11 +11144,8 @@ static void compose_attach_drag_received_cb (GtkWidget		*widget,
 	GdkAtom type;
 
 	type = gtk_selection_data_get_data_type(data);
-	if (((gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list"))
-#ifdef G_OS_WIN32
-	 || (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND"))
-#endif
-	   ) && gtk_drag_get_source_widget(context) != 
+	if ((gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list"))
+	   && gtk_drag_get_source_widget(context) !=
 	        summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
 		list = uri_list_extract_filenames(
 			(const gchar *)gtk_selection_data_get_data(data));
@@ -11231,11 +11228,7 @@ static void compose_insert_drag_received_cb (GtkWidget		*widget,
 	/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
 	 * does not work */
 	type = gtk_selection_data_get_data_type(data);
-#ifndef G_OS_WIN32
 	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list")) {
-#else
-	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND")) {
-#endif
 		AlertValue val = G_ALERTDEFAULT;
 		const gchar* ddata = (const gchar *)gtk_selection_data_get_data(data);
 

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Mon Jul 27 21:07:40 2015
From: colin at claws-mail.org (Colin)
Date: Mon, 27 Jul 2015 21:07:40 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-22-ga17f73d
Message-ID: <20150727190740.49C9C36A447A@mx.colino.net>

The branch, master has been updated
       via  a17f73dec5d986cadd7da0fc30d00d8d27bd9778 (commit)
      from  3b14f476066860518abe501187f600125832f2ad (commit)

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


- Log -----------------------------------------------------------------
commit a17f73dec5d986cadd7da0fc30d00d8d27bd9778
Author: Colin Leroy <colin at colino.net>
Date:   Mon Jul 27 21:07:34 2015 +0200

    test push

diff --git a/README b/README
index 14df1dd..37f4967 100644
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
+Just testing.
 Claws Mail - a GTK+ based, lightweight, and fast e-mail client
 
 ---------------------------------------------------------------------

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Mon Jul 27 21:08:08 2015
From: colin at claws-mail.org (Colin)
Date: Mon, 27 Jul 2015 21:08:08 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-23-g8ebc74d
Message-ID: <20150727190809.1A23C36A447A@mx.colino.net>

The branch, master has been updated
       via  8ebc74df9aabfc8f12f9e059be60268c7d3f6b39 (commit)
      from  a17f73dec5d986cadd7da0fc30d00d8d27bd9778 (commit)

Summary of changes:
 README |    1 -
 1 file changed, 1 deletion(-)


- Log -----------------------------------------------------------------
commit 8ebc74df9aabfc8f12f9e059be60268c7d3f6b39
Author: Colin Leroy <colin at colino.net>
Date:   Mon Jul 27 21:08:03 2015 +0200

    rm test

diff --git a/README b/README
index 37f4967..14df1dd 100644
--- a/README
+++ b/README
@@ -1,4 +1,3 @@
-Just testing.
 Claws Mail - a GTK+ based, lightweight, and fast e-mail client
 
 ---------------------------------------------------------------------

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Mon Jul 27 21:11:31 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Mon, 27 Jul 2015 21:11:31 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-24-ge8fd963
Message-ID: <20150727191131.C869336A447F@mx.colino.net>

The branch, master has been updated
       via  e8fd963967880024d58e52b758ce5f9759880cb5 (commit)
      from  8ebc74df9aabfc8f12f9e059be60268c7d3f6b39 (commit)

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


- Log -----------------------------------------------------------------
commit e8fd963967880024d58e52b758ce5f9759880cb5
Author: Charles Lehner <charles at claws-mail.org>
Date:   Fri Jul 24 09:09:12 2015 -0400

    Remove use of G_SOURCE_REMOVE (convenience typedef)
    
    Support GLib < 2.32

diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index 1a09620..f49e29b 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -227,7 +227,7 @@ static gboolean sieve_read_chunk_idle_cb(gpointer data)
 		session->io_tag = sock_add_watch(session->sock, G_IO_IN,
 				sieve_read_chunk_cb, session);
 
-	return G_SOURCE_REMOVE;
+	return FALSE;
 }
 
 /* Get data of specified length.

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Thu Jul 30 09:33:06 2015
From: colin at claws-mail.org (Colin)
Date: Thu, 30 Jul 2015 09:33:06 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-30-gfc3ea24
Message-ID: <20150730073307.14D7936A4495@mx.colino.net>

The branch, master has been updated
       via  fc3ea24a27ca8498087f1a6e3cb9668d6bf6e147 (commit)
      from  a6f69f305b6e788e6e6ec7f5d0b52445cce7d602 (commit)

Summary of changes:
 test |    1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test


- Log -----------------------------------------------------------------
commit fc3ea24a27ca8498087f1a6e3cb9668d6bf6e147
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jul 30 09:33:32 2015 +0200

    test

diff --git a/test b/test
new file mode 100644
index 0000000..fbcf12d
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+toto

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Thu Jul 30 09:35:31 2015
From: colin at claws-mail.org (Colin)
Date: Thu, 30 Jul 2015 09:35:31 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-31-ge1bb5a3
Message-ID: <20150730073531.230A936A4493@mx.colino.net>

The branch, master has been updated
       via  e1bb5a3ea176c24a9375bcb02f5d5bd70617bc65 (commit)
      from  fc3ea24a27ca8498087f1a6e3cb9668d6bf6e147 (commit)

Summary of changes:
 test |    1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test


- Log -----------------------------------------------------------------
commit e1bb5a3ea176c24a9375bcb02f5d5bd70617bc65
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jul 30 09:35:58 2015 +0200

    test

diff --git a/test b/test
deleted file mode 100644
index fbcf12d..0000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-toto

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Thu Jul 30 09:35:53 2015
From: colin at claws-mail.org (Colin)
Date: Thu, 30 Jul 2015 09:35:53 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-32-g26b0652
Message-ID: <20150730073553.E9C9936A4494@mx.colino.net>

The branch, master has been updated
       via  26b0652923937ef48f4ebaf7a8e0c219c828c9fe (commit)
      from  e1bb5a3ea176c24a9375bcb02f5d5bd70617bc65 (commit)

Summary of changes:
 test2 |    1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test2


- Log -----------------------------------------------------------------
commit 26b0652923937ef48f4ebaf7a8e0c219c828c9fe
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jul 30 09:36:21 2015 +0200

    test2

diff --git a/test2 b/test2
new file mode 100644
index 0000000..fbcf12d
--- /dev/null
+++ b/test2
@@ -0,0 +1 @@
+toto

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


hooks/post-receive
-- 
Claws Mail

From colin at claws-mail.org  Thu Jul 30 09:36:05 2015
From: colin at claws-mail.org (Colin)
Date: Thu, 30 Jul 2015 09:36:05 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-33-g8d0c5b7
Message-ID: <20150730073605.DE7CF36A4494@mx.colino.net>

The branch, master has been updated
       via  8d0c5b700ff4773aeca743cf5a8494c89f81bf3b (commit)
      from  26b0652923937ef48f4ebaf7a8e0c219c828c9fe (commit)

Summary of changes:
 test2 |    1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test2


- Log -----------------------------------------------------------------
commit 8d0c5b700ff4773aeca743cf5a8494c89f81bf3b
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jul 30 09:36:33 2015 +0200

    done

diff --git a/test2 b/test2
deleted file mode 100644
index fbcf12d..0000000
--- a/test2
+++ /dev/null
@@ -1 +0,0 @@
-toto

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


hooks/post-receive
-- 
Claws Mail

From claws at claws-mail.org  Thu Jul 30 09:47:29 2015
From: claws at claws-mail.org (claws at claws-mail.org)
Date: Thu, 30 Jul 2015 09:47:29 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-34-gb499a35
Message-ID: <20150730074729.2312036A4493@mx.colino.net>

The branch, master has been updated
       via  b499a35e93a8580816899b13f6ef76cb5062c741 (commit)
      from  8d0c5b700ff4773aeca743cf5a8494c89f81bf3b (commit)

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


- Log -----------------------------------------------------------------
commit b499a35e93a8580816899b13f6ef76cb5062c741
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 30 08:47:23 2015 +0100

    fix spacing around dictionary prefs

diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index bf0a66d..02f8259 100644
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -154,7 +154,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
 	
 	table = gtk_table_new(6, 4, FALSE);
 	gtk_widget_show(table);
-	gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+	gtk_container_set_border_width(GTK_CONTAINER(table), 0);
  	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
  	gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Thu Jul 30 10:13:14 2015
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Thu, 30 Jul 2015 10:13:14 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-35-gcf35c41
Message-ID: <20150730081314.EC63736A4494@mx.colino.net>

The branch, master has been updated
       via  cf35c411534a9b0b27040777628cd78a8aa1dd93 (commit)
      from  b499a35e93a8580816899b13f6ef76cb5062c741 (commit)

Summary of changes:
 src/addr_compl.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit cf35c411534a9b0b27040777628cd78a8aa1dd93
Author: wwp <wwp at free.fr>
Date:   Thu Jul 30 10:13:06 2015 +0200

    Fix crash in address completion when matching group name.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index c3ffefb..b3398f6 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -231,7 +231,14 @@ static gint addr_comparison_func(gconstpointer a, gconstpointer b)
 		return 1;
 	else {
 	    cmp = strcmp(a_ref->name, b_ref->name);
-	    return cmp ? cmp :  strcmp(a_ref->address, b_ref->address);
+		if (cmp)
+		    return cmp;
+		else {
+			if (a_ref->address && b_ref->address)
+				return strcmp(a_ref->address, b_ref->address);
+			else
+				return -1;
+		}
 	}
 }
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Jul 31 00:17:43 2015
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri, 31 Jul 2015 00:17:43 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-36-g5eeace7
Message-ID: <20150730221744.1650A36A4496@mx.colino.net>

The branch, master has been updated
       via  5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f (commit)
      from  cf35c411534a9b0b27040777628cd78a8aa1dd93 (commit)

Summary of changes:
 src/addr_compl.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f
Author: wwp <wwp at free.fr>
Date:   Fri Jul 31 00:17:10 2015 +0200

    Better fix for 3.12.0-35, thanks to Michael Rasmussen.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b3398f6..975db50 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -230,15 +230,7 @@ static gint addr_comparison_func(gconstpointer a, gconstpointer b)
 	else if (a_weight > b_weight)
 		return 1;
 	else {
-	    cmp = strcmp(a_ref->name, b_ref->name);
-		if (cmp)
-		    return cmp;
-		else {
-			if (a_ref->address && b_ref->address)
-				return strcmp(a_ref->address, b_ref->address);
-			else
-				return -1;
-		}
+		return cmp ? cmp : g_strcmp0(a_ref->address, b_ref->address);
 	}
 }
 

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


hooks/post-receive
-- 
Claws Mail

From wwp at claws-mail.org  Fri Jul 31 07:19:08 2015
From: wwp at claws-mail.org (wwp at claws-mail.org)
Date: Fri, 31 Jul 2015 07:19:08 +0200 (CEST)
Subject: [Commits] [SCM] claws branch, master, updated. 3.12.0-37-g8d1abd7
Message-ID: <20150731051908.D666636A4496@mx.colino.net>

The branch, master has been updated
       via  8d1abd7c17753de5498dd429d5897128ea0e34a9 (commit)
      from  5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f (commit)

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


- Log -----------------------------------------------------------------
commit 8d1abd7c17753de5498dd429d5897128ea0e34a9
Author: wwp <wwp at free.fr>
Date:   Fri Jul 31 07:18:09 2015 +0200

    Oops, added back one line, swallowed by 3.12.0-36, fixing address completion
    again.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 975db50..ad1840b 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -230,6 +230,7 @@ static gint addr_comparison_func(gconstpointer a, gconstpointer b)
 	else if (a_weight > b_weight)
 		return 1;
 	else {
+		cmp = strcmp(a_ref->name, b_ref->name);
 		return cmp ? cmp : g_strcmp0(a_ref->address, b_ref->address);
 	}
 }

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


hooks/post-receive
-- 
Claws Mail

From charles at claws-mail.org  Fri Jul 31 15:55:52 2015
From: charles at claws-mail.org (charles at claws-mail.org)
Date: Fri, 31 Jul 2015 15:55:52 +0200 (CEST)
Subject: [Commits] [SCM] claws-mail-plugin-reloader branch, master,
	updated. 055cafb2818506f0c8fb5437451ecee071ac210d
Message-ID: <20150731135552.2343F36A4498@mx.colino.net>

The branch, master has been updated
       via  055cafb2818506f0c8fb5437451ecee071ac210d (commit)
       via  6e00fa27540c5a6fca7503f059f6462111661774 (commit)
       via  78ff39d1079199bcb145f9e0c9afb569c2eec0c4 (commit)
       via  47b60e710342b150e1133d2339c69b993f046df7 (commit)
      from  8bc7c6e0421817c2986fba8f0662455185ed14e2 (commit)

Summary of changes:
 .gitignore        |    2 ++
 Makefile          |    6 +++---
 plugin-reloader.c |    1 +
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore


- Log -----------------------------------------------------------------
commit 055cafb2818506f0c8fb5437451ecee071ac210d
Author: Charles Lehner <charles at claws-mail.org>
Date:   Fri Jul 31 09:47:26 2015 -0400

    Use mkdir only when needed

diff --git a/Makefile b/Makefile
index 505d3da..86e77d8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,11 @@ LDFLAGS += `pkg-config --libs gtk+-2.0 claws-mail`
 $(LIB): $(OBJ)
 	$(CC) $(LDFLAGS) -shared $^ -o $@
 
-$(PLUGINS_DIR):
+$(DESTDIR)$(PLUGINS_DIR):
 	mkdir -p $@
 
-install: $(LIB) | $(PLUGINS_DIR)
-	mkdir -p $(DESTDIR)$(PLUGINS_DIR)
-	cp $< $(DESTDIR)$|
+install: $(LIB) | $(DESTDIR)$(PLUGINS_DIR)
+	cp $< $|
 
 uninstall:
 	rm $(DESTDIR)$(PLUGINS_DIR)/$(LIB)

commit 6e00fa27540c5a6fca7503f059f6462111661774
Author: Christian Hesse <mail at eworm.de>
Date:   Fri Jul 31 14:49:55 2015 +0200

    introduce .gitignore
    
    Signed-off-by: Christian Hesse <mail at eworm.de>

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9ac518d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+plugin-reloader.o
+plugin-reloader.so

commit 78ff39d1079199bcb145f9e0c9afb569c2eec0c4
Author: Christian Hesse <mail at eworm.de>
Date:   Fri Jul 31 14:49:54 2015 +0200

    use DESTDIR for easy packaging
    
    Signed-off-by: Christian Hesse <mail at eworm.de>

diff --git a/Makefile b/Makefile
index 4f3f7df..505d3da 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ $(PLUGINS_DIR):
 	mkdir -p $@
 
 install: $(LIB) | $(PLUGINS_DIR)
-	cp $< $|
+	mkdir -p $(DESTDIR)$(PLUGINS_DIR)
+	cp $< $(DESTDIR)$|
 
 uninstall:
-	rm $(PLUGINS_DIR)/$(LIB)
+	rm $(DESTDIR)$(PLUGINS_DIR)/$(LIB)
 
 clean:
 	rm -f *.o $(LIB)

commit 47b60e710342b150e1133d2339c69b993f046df7
Author: Christian Hesse <mail at eworm.de>
Date:   Fri Jul 31 14:17:30 2015 +0200

    include missing header file
    
    Signed-off-by: Christian Hesse <mail at eworm.de>

diff --git a/plugin-reloader.c b/plugin-reloader.c
index 7f2f9f0..82be700 100644
--- a/plugin-reloader.c
+++ b/plugin-reloader.c
@@ -26,6 +26,7 @@
 #include "plugin.h"
 #include "mainwindow.h"
 #include "menu.h"
+#include "alertpanel.h"
 
 #define PLUGIN_NAME (_("Plugin Reloader"))
 #define VERSION "1.0.0"

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


hooks/post-receive
-- 
Plugin Reloader Plugin