[Commits] [SCM] claws branch, master, updated. 3.11.1-237-g93afe88

claws at claws-mail.org claws at claws-mail.org
Sun Jul 19 09:23:59 CEST 2015


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 <%s>\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@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@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@server/path/file."
-"ifb)"
+msgstr "Angabe einer lokalen Datei oder einer URL (http://user:pass@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@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@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 <%s>\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 "_Prechádzať"
 
-#: 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"
 "Tí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 "Vybrať..."
+msgstr "Vybrať…"
 
 #: 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


More information about the Commits mailing list