2007-07-02 [paul] 2.9.2cvs78

	* po/de.po
	* po/en_GB.po
	* po/es.po
	* po/fr.po
	* po/hu.po
	* po/pt_BR.po
	* po/ru.po
	* po/zh_CN.po
		updated by Stephan Sachse, me, Ricardo Mones
		Lastra, Fabien Vantard, Pader Rezso, Frederico
		Goncalves Guimaraes, Pavlo Bohmat, and Ralgh Young

diff --git a/ChangeLog b/ChangeLog
index cabff237d6bd1ed6e372abd50db7a2ec251faa46..dab3cd6e43d1aff54884c91a20e57b68dafd38c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-02 [paul]      2.9.2cvs78
+
+       * po/de.po
+       * po/en_GB.po
+       * po/es.po
+       * po/fr.po
+       * po/hu.po
+       * po/pt_BR.po
+       * po/ru.po
+       * po/zh_CN.po
+               updated by Stephan Sachse, me, Ricardo Mones
+               Lastra, Fabien Vantard, Pader Rezso, Frederico
+               Goncalves Guimaraes, Pavlo Bohmat, and Ralgh Young
+

 2007-07-02 [paul]      2.9.2cvs77
 
        * AUTHORS
 2007-07-02 [paul]      2.9.2cvs77
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index e9a4161cf9027beb124c8f0cb62727e1c9e065f2..adbd5b016fcf9c64394c9555f3f56856e6322f8a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2653,3 +2653,4 @@
 ( cvs diff -u -r 1.207.2.165 -r 1.207.2.166 src/folderview.c;  ) > 2.9.2cvs75.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/headers.h;  ) > 2.9.2cvs76.patchset
 ( cvs diff -u -r 1.100.2.50 -r 1.100.2.51 AUTHORS;  ) > 2.9.2cvs77.patchset
 ( cvs diff -u -r 1.207.2.165 -r 1.207.2.166 src/folderview.c;  ) > 2.9.2cvs75.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/headers.h;  ) > 2.9.2cvs76.patchset
 ( cvs diff -u -r 1.100.2.50 -r 1.100.2.51 AUTHORS;  ) > 2.9.2cvs77.patchset

+( cvs diff -u -r 1.58.2.31 -r 1.58.2.32 po/de.po;  cvs diff -u -r 1.12.2.14 -r 1.12.2.15 po/en_GB.po;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 po/es.po;  cvs diff -u -r 1.42.2.31 -r 1.42.2.32 po/fr.po;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 po/hu.po;  cvs diff -u -r 1.50.2.25 -r 1.50.2.26 po/pt_BR.po;  cvs diff -u -r 1.17.2.14 -r 1.17.2.15 po/ru.po;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 po/zh_CN.po;  ) > 2.9.2cvs78.patchset

diff --git a/configure.ac b/configure.ac
index 2e0ee725bc50fb9a121512df15b266253e6b3453..6ef460a76134ab8d18641fd3c97ef1ae88ee2881 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=77
+EXTRA_VERSION=78

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/po/de.po b/po/de.po
index dbe7c5b1574e7a8519de11809e40a22d14151da3..94b0669ea3ce82664d8bea4071e4481333c1349f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,17 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-04-13 18:27+0200\n"
-"PO-Revision-Date: 2007-04-14 13:26+0100\n"
+"POT-Creation-Date: 2007-06-29 17:09+0200\n"
+"PO-Revision-Date: 2007-06-30 18:31+0100\n"

 "Last-Translator: Stephan Sachse <white@dev-zero.com>\n"
 "Language-Team:  <sylpheed-claws-translators@lists.sourceforge.net>\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"
 "Last-Translator: Stephan Sachse <white@dev-zero.com>\n"
 "Language-Team:  <sylpheed-claws-translators@lists.sourceforge.net>\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-Poedit-Basepath: ../\n"

 
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -28,15 +27,15 @@ msgstr ""
 "Es sind einige Fenster zum Verfassen von Nachrichten geöffnet.\n"
 "Bitte schließen Sie diese Fenster vor dem Bearbeiten der Konten."
 
 "Es sind einige Fenster zum Verfassen von Nachrichten geöffnet.\n"
 "Bitte schließen Sie diese Fenster vor dem Bearbeiten der Konten."
 

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr "Ordner konnte nicht erstellt werden."
 
 msgid "Can't create folder."
 msgstr "Ordner konnte nicht erstellt werden."
 

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "Konten bearbeiten"
 
 msgid "Edit accounts"
 msgstr "Konten bearbeiten"
 

-#: src/account.c:701
+#: src/account.c:715

 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "


@@ -46,63 +45,63 @@ msgstr ""
 "Reihenfolge abrufen. Das Häkchen in der 'G' Spalte gibt an welche Konten in "
 "'Hole Alle' einbezogen werden."
 
 "Reihenfolge abrufen. Das Häkchen in der 'G' Spalte gibt an welche Konten in "
 "'Hole Alle' einbezogen werden."
 

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr " Als Standardkonto setzen "
 
 msgid " _Set as default account "
 msgstr " Als Standardkonto setzen "
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konten mit Remoteordnern können nicht kopiert werden."
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konten mit Remoteordnern können nicht kopiert werden."
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Soll das Konto '%s' wirklich gelöscht werden?"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Soll das Konto '%s' wirklich gelöscht werden?"
 

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 
 msgid "(Untitled)"
 msgstr "(Unbenannt)"
 

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "Konto löschen"
 
 msgid "Delete account"
 msgstr "Konto löschen"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "D"
 
 msgid "Accounts List Default Column Name|D"
 msgstr "D"
 

-#: src/account.c:1472 src/prefs_folder_item.c:740
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "Standardkonto"
 
 msgid "Default account"
 msgstr "Standardkonto"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "G"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "G"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgid "'Get Mail' retrieves mail from the checked accounts"

-msgstr "'Hole alle' ruft Nachrichten der ausgewählten Konten ab"
+msgstr "'Abrufen' ruft Nachrichten der ausgewählten Konten ab"

 
 

-#: src/account.c:1493 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5870 src/compose.c:6181 src/editaddress.c:1043
-#: src/editaddress.c:1092 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6036 src/compose.c:6349 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480 src/prefs_template.c:185
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr "Name"
 
 msgid "Name"
 msgstr "Name"
 

-#: src/account.c:1500 src/prefs_account.c:1258 src/prefs_account.c:2849
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "Protokoll"
 
 msgid "Protocol"
 msgstr "Protokoll"
 

-#: src/account.c:1507 src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Server"
 
 msgid "Server"
 msgstr "Server"
 


@@ -162,25 +161,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1153 src/action.c:1303
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr "Erledigt"
 
 msgid "Completed"
 msgstr "Erledigt"
 

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -191,11 +190,11 @@ msgstr ""
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 
 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -206,345 +205,354 @@ msgstr ""
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 

-#: src/addr_compl.c:597 src/addressbook.c:4403
+#: src/addr_compl.c:597 src/addressbook.c:4596

 msgid "Group"
 msgstr "Gruppe"
 
 msgid "Group"
 msgstr "Gruppe"
 

-#: src/addressadd.c:174 src/prefs_filtering_action.c:179
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr "Zum Adressbuch hinzufügen"
 
 msgid "Add to address book"
 msgstr "Zum Adressbuch hinzufügen"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:479
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "Adresse"
 
 msgid "Address"
 msgstr "Adresse"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:851
-#: src/editaddress.c:915 src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Kommentar"
 
 msgid "Remarks"
 msgstr "Kommentar"
 

-#: src/addressadd.c:240 src/addressbook_foldersel.c:164
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 
 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 

-#: src/addressbook.c:133 src/editaddress.c:849 src/editaddress.c:897
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "Adresse(n) hinzufügen"
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "Die angegebene Adresse konnte nicht hinzugefügt werden"
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591

-#: src/exporthtml.c:755 src/ldif.c:779
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/Adressb_uch"
 
 msgid "/_Book"
 msgstr "/Adressb_uch"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/Adressb_uch/Neues _Adressbuch"
 
 msgid "/_Book/New _Book"
 msgstr "/Adressb_uch/Neues _Adressbuch"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr "/Adressb_uch/Neuer _Ordner"
 
 msgid "/_Book/New _Folder"
 msgstr "/Adressb_uch/Neuer _Ordner"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/Adressb_uch/Neue _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/Adressb_uch/Neue _vCard"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/Adressb_uch/Neuer _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/Adressb_uch/Neuer _JPilot"
 

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/Adressb_uch/Neuer LDAP-S_erver"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/Adressb_uch/Neuer LDAP-S_erver"
 

-#: src/addressbook.c:436 src/addressbook.c:439
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/Adressb_uch/---"
 
 msgid "/_Book/---"
 msgstr "/Adressb_uch/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/Adressb_uch/Adressbuch _bearbeiten"
 
 msgid "/_Book/_Edit book"
 msgstr "/Adressb_uch/Adressbuch _bearbeiten"
 

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/Adressb_uch/Adressbuch _löschen"
 
 msgid "/_Book/_Delete book"
 msgstr "/Adressb_uch/Adressbuch _löschen"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/Adressb_uch/_Speichern"
 
 msgid "/_Book/_Save"
 msgstr "/Adressb_uch/_Speichern"
 

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/Adressb_uch/S_chließen"
 
 msgid "/_Book/_Close"
 msgstr "/Adressb_uch/S_chließen"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/_Adresse"
 
 msgid "/_Address"
 msgstr "/_Adresse"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/_Adresse/_Löschen/_Adresse/all_e auswählen"
 
 msgid "/_Address/_Select all"
 msgstr "/_Adresse/_Löschen/_Adresse/all_e auswählen"
 

-#: src/addressbook.c:444 src/addressbook.c:448 src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/_Adresse/A_usschneiden"
 
 msgid "/_Address/C_ut"
 msgstr "/_Adresse/A_usschneiden"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/_Adresse/_Kopieren"
 
 msgid "/_Address/_Copy"
 msgstr "/_Adresse/_Kopieren"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/_Adresse/E_infügen"
 
 msgid "/_Address/_Paste"
 msgstr "/_Adresse/E_infügen"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr "/_Adresse/_Mail an"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Adresse/_Mail an"
 

-#: src/addressbook.c:456 src/compose.c:790 src/mainwindow.c:814
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814

 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/E_xtras"
 
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/E_xtras"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_xtras/_LDIF-Datei importieren..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_xtras/_LDIF-Datei importieren..."
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_xtras/M_utt-Datei importieren..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_xtras/M_utt-Datei importieren..."
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_xtras/_Pine-Datei importieren..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_xtras/_Pine-Datei importieren..."
 

-#: src/addressbook.c:460 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846

 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/E_xtras/---"
 
 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/E_xtras/---"
 

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/E_xtras/Als HTML exportieren..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/E_xtras/Als HTML exportieren..."
 

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_xtras/Als LDI_F exportieren..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_xtras/Als LDI_F exportieren..."
 

-#: src/addressbook.c:463 src/compose.c:795 src/mainwindow.c:892
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892

 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Hilfe"
 
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Hilfe"
 

-#: src/addressbook.c:464 src/compose.c:796 src/mainwindow.c:898
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898

 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 

-#: src/addressbook.c:469 src/addressbook.c:485 src/compose.c:563
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574

 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 

-#: src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/_Löschen"
 
 msgid "/_Delete"
 msgstr "/_Löschen"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/Neues _Adressbuch"
 
 msgid "/New _Book"
 msgstr "/Neues _Adressbuch"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr "/Neuer _Ordner"
 
 msgid "/New _Folder"
 msgstr "/Neuer _Ordner"
 

-#: src/addressbook.c:474 src/addressbook.c:489
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 

-#: src/addressbook.c:476 src/addressbook.c:491
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/_Ausschneiden"
 
 msgid "/C_ut"
 msgstr "/_Ausschneiden"
 

-#: src/addressbook.c:477 src/addressbook.c:492
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/_Kopieren"
 
 msgid "/_Copy"
 msgstr "/_Kopieren"
 

-#: src/addressbook.c:478 src/addressbook.c:493
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/_Einfügen"
 
 msgid "/_Paste"
 msgstr "/_Einfügen"
 

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "All_e auswählen"
 
 msgid "/_Select all"
 msgstr "All_e auswählen"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/_Mail an"
 
 msgid "/_Mail To"
 msgstr "/_Mail an"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/Eintrag ü_berfliegen"
 
 msgid "/_Browse Entry"
 msgstr "/Eintrag ü_berfliegen"
 

-#: src/addressbook.c:511 src/crash.c:451 src/crash.c:470 src/importldif.c:119
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120

 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Unbekannt"
 

-#: src/addressbook.c:518 src/addressbook.c:537 src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr "Erfolg"
 
 msgid "Success"
 msgstr "Erfolg"
 

-#: src/addressbook.c:519 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr "Falsches Argument"
 
 msgid "Bad arguments"
 msgstr "Falsches Argument"
 

-#: src/addressbook.c:520 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr "Datei nicht angegeben"
 
 msgid "File not specified"
 msgstr "Datei nicht angegeben"
 

-#: src/addressbook.c:521 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 

-#: src/addressbook.c:522 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 

-#: src/addressbook.c:523 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr "Dateiende erreicht"
 
 msgid "End of file encountered"
 msgstr "Dateiende erreicht"
 

-#: src/addressbook.c:524 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "Fehler bei Speicherreservierung"
 
 msgid "Error allocating memory"
 msgstr "Fehler bei Speicherreservierung"
 

-#: src/addressbook.c:525 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr "Ungültiges Dateiformat"
 
 msgid "Bad file format"
 msgstr "Ungültiges Dateiformat"
 

-#: src/addressbook.c:526 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben der Datei"
 
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben der Datei"
 

-#: src/addressbook.c:527 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr "Fehler beim Öffnen des Verzeichnisses"
 
 msgid "Error opening directory"
 msgstr "Fehler beim Öffnen des Verzeichnisses"
 

-#: src/addressbook.c:528 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "Fehler beim Verbinden mit dem LDAP-Server"
 
 msgid "Error connecting to LDAP server"
 msgstr "Fehler beim Verbinden mit dem LDAP-Server"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "Fehler beim LDAP-Start"
 
 msgid "Error initializing LDAP"
 msgstr "Fehler beim LDAP-Start"
 

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "Fehler beim Binden an den LDAP-Server"
 
 msgid "Error binding to LDAP server"
 msgstr "Fehler beim Binden an den LDAP-Server"
 

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "Fehler beim Suchen in der LDAP-Datenbank"
 
 msgid "Error searching LDAP database"
 msgstr "Fehler beim Suchen in der LDAP-Datenbank"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "Timeout während des LDAP-Befehls"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Timeout während des LDAP-Befehls"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "Fehler im LDAP-Suchkriterium"
 
 msgid "Error in LDAP search criteria"
 msgstr "Fehler im LDAP-Suchkriterium"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr "Keine LDAP-Einträge für das Suchkriterium gefunden"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Keine LDAP-Einträge für das Suchkriterium gefunden"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "LDAP-Suche auf Verlangen abgebrochen"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP-Suche auf Verlangen abgebrochen"
 

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "Fehler beim Starten der TLS-Verbindung"
 
 msgid "Error starting TLS connection"
 msgstr "Fehler beim Starten der TLS-Verbindung"
 

-#: src/addressbook.c:920
+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"
+msgstr "Distinguished Name (dn) fehlt"
+
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "benötigte Informationen fehlen"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "Es existiert bereits ein anderer Kontakt mit diesem Index"
+
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "Stärkere Authentifizierung benötigt"
+
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "Quellen"
 
 msgid "Sources"
 msgstr "Quellen"
 

-#: src/addressbook.c:924 src/prefs_other.c:513 src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "Adressbuch"
 
 msgid "Address book"
 msgstr "Adressbuch"
 

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "Suchname:"
 
 msgid "Lookup name:"
 msgstr "Suchname:"
 

-#: src/addressbook.c:1129 src/compose.c:2131 src/compose.c:4481
-#: src/compose.c:5705 src/compose.c:6519 src/compose.c:9648 src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "An:"
-
-#: src/addressbook.c:1133 src/compose.c:2115 src/compose.c:4217
-#: src/compose.c:4480 src/compose.c:9657 src/matcher.c:770
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1137 src/compose.c:2118 src/compose.c:4248
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: src/addressbook.c:1387 src/addressbook.c:1433
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Diese Adressdaten sind nur lesbar und können nicht gelöscht werden."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Diese Adressdaten sind nur lesbar und können nicht gelöscht werden."
 

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "Gruppe löschen"
 
 msgid "Delete group"
 msgstr "Gruppe löschen"
 

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -552,29 +560,29 @@ msgstr ""
 "Diese Gruppe(n) wirklich löschen?\n"
 "Die enthaltenen Adressen gehen nicht verloren"
 
 "Diese Gruppe(n) wirklich löschen?\n"
 "Die enthaltenen Adressen gehen nicht verloren"
 

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Einfügen nicht möglich, da das Zieladressbuch nur lesbar ist."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Einfügen nicht möglich, da das Zieladressbuch nur lesbar ist."
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "Einfügen in eine Adressgruppe nicht möglich."
 
 msgid "Cannot paste into an address group."
 msgstr "Einfügen in eine Adressgruppe nicht möglich."
 

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Sollen die Suchergebnisse und Adressen in '%s' gelöscht werden?"
 
 #, c-format
 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:2735 src/addressbook.c:2761 src/addressbook.c:2768
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Löschen"
 
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Löschen"
 

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -583,19 +591,19 @@ msgstr ""
 "Soll '%s' gelöscht werden? Wenn nur der Ordner gelöscht wird, werden die "
 "Adressen in den darüberliegenden Ordner verschoben."
 
 "Soll '%s' gelöscht werden? Wenn nur der Ordner gelöscht wird, werden die "
 "Adressen in den darüberliegenden Ordner verschoben."
 

-#: src/addressbook.c:2747 src/imap_gtk.c:302 src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Ordner löschen"
 
 msgid "Delete folder"
 msgstr "Ordner löschen"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+nur Ordner löschen"
 
 msgid "+Delete _folder only"
 msgstr "+nur Ordner löschen"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "Ordner und Adressen löschen"
 
 msgid "Delete folder and _addresses"
 msgstr "Ordner und Adressen löschen"
 

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -604,7 +612,7 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen nicht verloren."
 
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen nicht verloren."
 

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -613,19 +621,28 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen verloren."
 
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen verloren."
 

-#: src/addressbook.c:3638
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr "Suche '%s'"
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "Neue Kontakte"
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, Indexdatei konnte nicht gespeichert werden."
 
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, Indexdatei konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, Adressbuchdatei konnte nicht gespeichert werden."
 
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, Adressbuchdatei konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -633,7 +650,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "Indexdatei des neuen Adressbuches konnte nicht gespeichert werden."
 
 "Altes Adressbuch konvertiert,\n"
 "Indexdatei des neuen Adressbuches konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -641,7 +658,7 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
 "aber eine leere, neue Adressbuchdatei wurde erstellt."
 
 "Adressbuch konnte nicht konvertiert werden,\n"
 "aber eine leere, neue Adressbuchdatei wurde erstellt."
 

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -649,7 +666,7 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
 "neue Adressindexdatei konnte nicht erstellt werden."
 
 "Adressbuch konnte nicht konvertiert werden,\n"
 "neue Adressindexdatei konnte nicht erstellt werden."
 

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -657,71 +674,66 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden\n"
 "und eine neue Adressbuchdatei konnte nicht erstellt werden."
 
 "Adressbuch konnte nicht konvertiert werden\n"
 "und eine neue Adressbuchdatei konnte nicht erstellt werden."
 

-#: src/addressbook.c:3688 src/addressbook.c:3694
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "Adressindex konnte nicht gelesen werden."
 
 msgid "Could not read address index"
 msgstr "Adressindex konnte nicht gelesen werden."
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "Beschäftigt mit Suchen..."
 
 msgid "Busy searching..."
 msgstr "Beschäftigt mit Suchen..."
 

-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr "Suche '%s'"
-
-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 

-#: src/addressbook.c:4355 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:394 src/exporthtml.c:973 src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr "Adressbuch"
 
 msgid "Address Book"
 msgstr "Adressbuch"
 

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "Person"
 
 msgid "Person"
 msgstr "Person"
 

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "E-Mail-Adresse"
 
 msgid "EMail Address"
 msgstr "E-Mail-Adresse"
 

-#: src/addressbook.c:4419 src/exporthtml.c:875 src/folderview.c:469
-#: src/prefs_account.c:2542 src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Ordner"
 
 msgid "Folder"
 msgstr "Ordner"
 

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4451 src/addressbook.c:4467
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "LDAP-Server"
 
 msgid "LDAP servers"
 msgstr "LDAP-Server"
 

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 
 msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 

-#: src/addressbook.c:4822 src/addressbook_foldersel.c:389 src/matcher.c:312
-#: src/matcher.c:1097 src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67 src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527 src/prefs_matcher.c:1347 src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366 src/prefs_matcher.c:2119 src/prefs_matcher.c:2123
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "Alles"
 
 msgid "Any"
 msgstr "Alles"
 


@@ -760,7 +772,7 @@ msgid "Folder :"
 msgstr "Ordner :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
 msgstr "Ordner :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr "Adressbuch :"
 
 msgid "Address Book :"
 msgstr "Adressbuch :"
 


@@ -784,8 +796,8 @@ msgstr "Kopfzeilenname"
 msgid "Address Count"
 msgstr "Adresszahl"
 
 msgid "Address Count"
 msgstr "Adresszahl"
 

-#: src/addrgather.c:537 src/alertpanel.c:155 src/compose.c:4832
-#: src/compose.c:9569 src/messageview.c:589 src/messageview.c:602
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4910
+#: src/compose.c:9841 src/messageview.c:589 src/messageview.c:602

 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Warnung"
 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Warnung"


@@ -795,7 +807,7 @@ msgid "Header Fields"
 msgstr "Kopfzeilenfelder"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
 msgstr "Kopfzeilenfelder"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "Ende"
 
 msgid "Finish"
 msgstr "Ende"
 


@@ -807,36 +819,46 @@ msgstr "E-Mail-Adressen sammeln - aus gewählten Nachrichten"
 msgid "Harvest Email Addresses - from Folder"
 msgstr "E-Mail-Adressen sammeln - aus Ordner"
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr "E-Mail-Adressen sammeln - aus Ordner"
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "Allgemeine Adressen"
 
 msgid "Common addresses"
 msgstr "Allgemeine Adressen"
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "Persönliche Adressen"
 
 msgid "Personal addresses"
 msgstr "Persönliche Adressen"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "Allgemeine Adresse"
 
 msgid "Common address"
 msgstr "Allgemeine Adresse"
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 

-#: src/alertpanel.c:142 src/compose.c:7673
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "Adressen aktualisieren"
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr ""
+"Aktualisierung fehlgeschlagen. Änderungen wurden nicht in das Verzeichnis "
+"geschrieben."
+
+#: src/alertpanel.c:145 src/compose.c:7902

 msgid "Notice"
 msgstr "Notiz"
 
 msgid "Notice"
 msgstr "Notiz"
 

-#: src/alertpanel.c:168 src/alertpanel.c:191 src/compose.c:4772 src/inc.c:619
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4850 src/inc.c:619

 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Fehler"
 
 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Fehler"
 

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "Protokoll Anzeigen"
 
 msgid "_View log"
 msgstr "Protokoll Anzeigen"
 

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "Diese Nachricht das nächste Mal anzeigen"
 
 msgid "Show this message next time"
 msgstr "Diese Nachricht das nächste Mal anzeigen"
 


@@ -865,7 +887,7 @@ msgstr "Attributname"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Keine Verbindung mit NNTP-Server: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Keine Verbindung mit NNTP-Server: %s:%d\n"
 

-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:848
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "SSL-Verbindung fehlgeschlagen\n"
 
 msgid "SSL handshake failed\n"
 msgstr "SSL-Verbindung fehlgeschlagen\n"
 


@@ -886,39 +908,39 @@ msgstr "Fehler beim Senden\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fehler beim Senden des Kommandos\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Fehler beim Senden des Kommandos\n"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr "Nichts"
 
 msgid "Nothing"
 msgstr "Nichts"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr "ein Betrachter"
 
 msgid "a viewer"
 msgstr "ein Betrachter"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "folders"
 msgstr "Ordner"
 
 msgid "folders"
 msgstr "Ordner"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr "Filter"
 
 msgid "filtering"
 msgstr "Filter"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 
 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr "ein Benachrichtiger"
 
 msgid "a notifier"
 msgstr "ein Benachrichtiger"
 

-#: src/common/plugin.c:61
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr "ein Werkzeug"
 
 msgid "an utility"
 msgstr "ein Werkzeug"
 

-#: src/common/plugin.c:62
+#: src/common/plugin.c:63

 msgid "things"
 msgstr "Dinge"
 
 msgid "things"
 msgstr "Dinge"
 

-#: src/common/plugin.c:260
+#: src/common/plugin.c:269

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."


@@ -926,23 +948,23 @@ msgstr ""
 "Dieses Plugin stellt %s (%s) zur Verfügung, welches bereits vom Plugin %s "
 "zur Verfügung gestellt wird"
 
 "Dieses Plugin stellt %s (%s) zur Verfügung, welches bereits vom Plugin %s "
 "zur Verfügung gestellt wird"
 

-#: src/common/plugin.c:295
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr "Plugin bereits geladen"
 
 msgid "Plugin already loaded"
 msgstr "Plugin bereits geladen"
 

-#: src/common/plugin.c:305
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr "Speicherreservierung für das Plugin fehlgeschlagen"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Speicherreservierung für das Plugin fehlgeschlagen"
 

-#: src/common/plugin.c:332
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Diese Modul ist nicht unter einer GPL kompatiblen Lizenz lizenziert."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Diese Modul ist nicht unter einer GPL kompatiblen Lizenz lizenziert."
 

-#: src/common/plugin.c:339
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr "Dies ist ein Plugin für Claws Mail GTK1."
 
 msgid "This module is for Claws Mail GTK1."
 msgstr "Dies ist ein Plugin für Claws Mail GTK1."
 

-#: src/common/plugin.c:555
+#: src/common/plugin.c:599

 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "


@@ -951,7 +973,7 @@ msgstr ""
 "Die Claws Mail Version ist neuer als die Version mit der das '%s' Plugin "
 "kompiliert wurde."
 
 "Die Claws Mail Version ist neuer als die Version mit der das '%s' Plugin "
 "kompiliert wurde."
 

-#: src/common/plugin.c:558
+#: src/common/plugin.c:602

 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."


@@ -959,12 +981,12 @@ msgstr ""
 "Die Claws Mail Version ist neuer als die Version mit der das Plugin "
 "kompiliert wurde."
 
 "Die Claws Mail Version ist neuer als die Version mit der das Plugin "
 "kompiliert wurde."
 

-#: src/common/plugin.c:567
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Die Claws Mail Version ist zu alt für das '%s' Plugin."
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Die Claws Mail Version ist zu alt für das '%s' Plugin."
 

-#: src/common/plugin.c:569
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Die Claws Mail Version ist zu alt für das Plugin."
 
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Die Claws Mail Version ist zu alt für das Plugin."
 


@@ -980,7 +1002,7 @@ msgstr "Falsche SMTP-Antwort\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Fehler bei der SMTP-Sitzung\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "Fehler bei der SMTP-Sitzung\n"
 

-#: src/common/smtp.c:548 src/pop.c:881
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "Fehler bei der Anmeldung\n"
 
 msgid "error occurred on authentication\n"
 msgstr "Fehler bei der Anmeldung\n"
 


@@ -989,11 +1011,11 @@ msgstr "Fehler bei der Anmeldung\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Nachricht ist zu groß (Maximalgröße ist %s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Nachricht ist zu groß (Maximalgröße ist %s)\n"
 

-#: src/common/smtp.c:635 src/pop.c:874
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "TLS-Sitzung kann nicht gestartet werden\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "TLS-Sitzung kann nicht gestartet werden\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "schreibe auf fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "schreibe auf fd%d: %s\n"


@@ -1010,9 +1032,9 @@ msgstr "SSL-Verbindung fehlgeschlagen (%s)\n"
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244

-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<nicht im Zertifikat>"
 
 msgid "<not in certificate>"
 msgstr "<nicht im Zertifikat>"
 


@@ -1037,714 +1059,730 @@ msgstr "X509 Standardpfad konnte nicht geladen werden"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Betreff gelöscht durch RegExp)"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "(Betreff gelöscht durch RegExp)"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Sonntag"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Sonntag"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "Montag"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Montag"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Dienstag"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Dienstag"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Mittwoch"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Mittwoch"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Donnerstag"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Donnerstag"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "Freitag"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Freitag"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Samstag"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Samstag"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "Januar"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "Januar"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "Februar"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "Februar"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "März"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "März"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "April"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "April"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "Mai"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "Mai"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "Juni"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "Juni"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "Juli"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "Juli"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "August"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "August"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "September"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "September"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "Oktober"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "Oktober"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "November"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "November"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "Dezember"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "Dezember"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "So"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "So"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Mo"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Mo"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Di"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Di"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mi"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mi"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Do"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Do"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Fr"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Fr"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sa"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sa"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Feb"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Feb"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mär"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mär"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Apr"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Apr"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aug"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aug"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Okt"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Okt"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dez"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dez"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %H:%M:%S %Y"
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %H:%M:%S %Y"
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d.%m.%y"
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d.%m.%y"
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/_Entfernen"
 
 msgid "/_Remove"
 msgstr "/_Entfernen"
 

-#: src/compose.c:543 src/folderview.c:293
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 

-#: src/compose.c:548 src/mainwindow.c:755 src/messageview.c:289
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr "/_Nachricht"
 
 msgid "/_Message"
 msgstr "/_Nachricht"
 

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/_Nachricht/Sen_den"
 
 msgid "/_Message/S_end"
 msgstr "/_Nachricht/Sen_den"
 

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 
 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 

-#: src/compose.c:553 src/compose.c:557 src/compose.c:560 src/mainwindow.c:765
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765

 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/_Nachricht/Datei an_hängen"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Nachricht/Datei an_hängen"
 

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/_Nachricht/Datei _einfügen"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Nachricht/Datei _einfügen"
 

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Nachricht/_Unterschrift einfügen"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Nachricht/_Unterschrift einfügen"
 

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/_Nachricht/_Speichern"
 
 msgid "/_Message/_Save"
 msgstr "/_Nachricht/_Speichern"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/_Nachricht/S_chliessen"
 
 msgid "/_Message/_Close"
 msgstr "/_Nachricht/S_chliessen"
 

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 

-#: src/compose.c:566 src/compose.c:654 src/compose.c:657 src/compose.c:663
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674

 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 

-#: src/compose.c:568 src/mainwindow.c:531 src/messageview.c:169
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/_Bearbeiten/_Spezielles Einfügen"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Bearbeiten/_Spezielles Einfügen"
 

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/als _Zitat"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/als _Zitat"
 

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_umgebrochen"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_umgebrochen"
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_nicht umgebrochen"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_nicht umgebrochen"
 

-#: src/compose.c:577 src/mainwindow.c:532 src/messageview.c:170
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lles markieren"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lles markieren"
 

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/Erwei_tert"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/Erwei_tert"
 

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts"
 

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts"
 

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts"
 

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts"
 

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenanfang"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenanfang"
 

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenende"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenende"
 

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur vorherigen Zeile"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur vorherigen Zeile"
 

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur nächsten Zeile"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur nächsten Zeile"
 

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts löschen"
 

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts löschen"
 

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts löschen"
 

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts löschen"
 

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/Erwei_tert/Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/Erwei_tert/Zeile löschen"
 

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/Erwei_tert/Ganze Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/Erwei_tert/Ganze Zeile löschen"
 

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Bis zum Ende der Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Bis zum Ende der Zeile löschen"
 

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/_Bearbeiten/Su_chen"
 
 msgid "/_Edit/_Find"
 msgstr "/_Bearbeiten/Su_chen"
 

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz _umbrechen"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz _umbrechen"
 

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen _Zeilen umbrechen"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen _Zeilen umbrechen"
 

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Automatisch um_brechen"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Automatisch um_brechen"
 

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Mit e_xternem Editor bearbeiten"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Mit e_xternem Editor bearbeiten"
 

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 
 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/_Rechtschreibung/Optionen"
 
 msgid "/_Spelling/Options"
 msgstr "/_Rechtschreibung/Optionen"
 

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/_Optionen"
 
 msgid "/_Options"
 msgstr "/_Optionen"
 

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/_Optionen/Antwort_methode"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Optionen/Antwort_methode"
 

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Optionen/Antwort_methode/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Optionen/Antwort_methode/_Normal"
 

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Optionen/Antwort_methode/A_lle"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Optionen/Antwort_methode/A_lle"
 

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Optionen/Antwort_methode/Ab_sender"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Optionen/Antwort_methode/Ab_sender"
 

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Optionen/Antwort_methode/_Mailingliste"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Optionen/Antwort_methode/_Mailingliste"
 

-#: src/compose.c:686 src/compose.c:691 src/compose.c:698 src/compose.c:700
-#: src/compose.c:702
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/_Optionen/---"
 
 msgid "/_Options/---"
 msgstr "/_Optionen/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/_Optionen/Datenschutz_system"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Optionen/Datenschutz_system"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Optionen/Datenschutz/Keines"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Optionen/Datenschutz/Keines"
 

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/_Optionen/Digital _unterschreiben"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Optionen/Digital _unterschreiben"
 

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/_Optionen/_Verschlüsseln"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Optionen/_Verschlüsseln"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/_Optionen/_Priorität"
 
 msgid "/_Options/_Priority"
 msgstr "/_Optionen/_Priorität"
 

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Optionen/Priorität/_Höchste"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Optionen/Priorität/_Höchste"
 

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Optionen/Priorität/H_och"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Optionen/Priorität/H_och"
 

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Optionen/Priorität/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Optionen/Priorität/_Normal"
 

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Optionen/Priorität/Nie_drig"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Optionen/Priorität/Nie_drig"
 

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Optionen/Priorität/Nied_rigste"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Optionen/Priorität/Nied_rigste"
 

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Optionen/_Empfangsbestätigung fordern"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Optionen/_Empfangsbestätigung fordern"
 

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/_Optionen/_Referenzen entfernen"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Optionen/_Referenzen entfernen"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/_Ansicht/Zeichen_kodierung"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Ansicht/Zeichen_kodierung"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Ansicht/Zeichen_kodierung/_Automatisch erkennen"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Ansicht/Zeichen_kodierung/_Automatisch erkennen"
 

-#: src/compose.c:711 src/compose.c:717 src/compose.c:725 src/compose.c:729
-#: src/compose.c:735 src/compose.c:739 src/compose.c:745 src/compose.c:751
-#: src/compose.c:755 src/compose.c:765 src/compose.c:769 src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Ansicht/Zeichen_kodierung/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Ansicht/Zeichen_kodierung/---"
 

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/Zeichen_kodierung/7bit ascii (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/Zeichen_kodierung/7bit ascii (US-ASC_II)"
 

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Unicode (_UTF-8)"
 

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-1)"
 

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-_15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-_15)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (Windows-1252)"
 

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/Zeichen_kodierung/Mitteleuropäisch (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/Zeichen_kodierung/Mitteleuropäisch (ISO-8859-_2)"
 

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/Zeichen_kodierung/_Baltisch (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/Zeichen_kodierung/_Baltisch (ISO-8859-13)"
 

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/Zeichen_kodierung/Baltisch (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/Zeichen_kodierung/Baltisch (ISO-8859-_4)"
 

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/Zeichen_kodierung/Griechisch (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/Zeichen_kodierung/Griechisch (ISO-8859-_7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (ISO-8859-_8)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (Windows-1255)"
 

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (ISO-8859-_6)"
 

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (Windows-1256)"
 

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/Zeichen_kodierung/Türkisch (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/Zeichen_kodierung/Türkisch (ISO-8859-_9)"
 

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (ISO-8859-_5)"
 

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-_R)"
 

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-U)"
 

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (Windows-1251)"
 

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/Zeichen_kodierung/Japanisch (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/Zeichen_kodierung/Japanisch (ISO-2022-_JP)"
 

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (_Big5)"
 

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (EUC-_TW)"
 

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/Zeichen_kodierung/Koreanisch (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/Zeichen_kodierung/Koreanisch (EUC-_KR)"
 

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (TIS-620)"
 

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (Windows-874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/E_xtras/_Lineal anzeigen"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/E_xtras/_Lineal anzeigen"
 

-#: src/compose.c:792 src/messageview.c:307
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr "/E_xtras/_Adressbuch"
 
 msgid "/_Tools/_Address book"
 msgstr "/E_xtras/_Adressbuch"
 

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/E_xtras/_Vorlagen"
 
 msgid "/_Tools/_Template"
 msgstr "/E_xtras/_Vorlagen"
 

-#: src/compose.c:794 src/mainwindow.c:849 src/messageview.c:334
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr "/E_xtras/A_ktionen"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xtras/A_ktionen"
 

-#: src/compose.c:1049 src/prefs_compose_writing.c:369
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "neue Nachricht Betreff Formatierungsfehler."
 
 msgid "New message subject format error."
 msgstr "neue Nachricht Betreff Formatierungsfehler."
 

-#: src/compose.c:1078 src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "neue Nachricht Formatierungsfehler."
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "neue Nachricht Formatierungsfehler in Zeile %d."

 
 

-#: src/compose.c:1440 src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "Antwort Formatierungsfehler."
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "Antwort Formatierungsfehler in Zeile %d."

 
 

-#: src/compose.c:1557 src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "Weiterleitung Formatierungsfehler."
+#: src/compose.c:1614 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "Weiterleitung Formatierungsfehler in Zeile %d."

 
 

-#: src/compose.c:1677
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "Umleitung Formatierungsfehler."
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "Umleitung Formatierungsfehler in Zeile %d."
+
+#: src/compose.c:2176 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"

 
 

-#: src/compose.c:2121
+#: src/compose.c:2179 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: src/compose.c:2182 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 msgid "Reply-To:"
 msgstr "Antwort an:"
 

-#: src/compose.c:2124 src/compose.c:5702 src/compose.c:6521 src/compose.c:9667
+#: src/compose.c:2185 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 

-#: src/compose.c:2127
+#: src/compose.c:2188 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr "Followup an:"
 
 msgid "Followup-To:"
 msgstr "Followup an:"
 

-#: src/compose.c:2306
+#: src/compose.c:2192 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "An:"
+
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "Die Datei '%s' wurde angehängt."
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "Die Datei '%s' wurde angehängt."
 

-#: src/compose.c:2310
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Datei konnte nicht angehängt werden (Zeichensatzkonvertierung "
 "fehlgeschlagen)."
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Datei konnte nicht angehängt werden (Zeichensatzkonvertierung "
 "fehlgeschlagen)."
 

-#: src/compose.c:2541
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr "Zitatzeichen-Formatfehler."
 
 msgid "Quote mark format error."
 msgstr "Zitatzeichen-Formatfehler."
 

-#: src/compose.c:3146
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 

-#: src/compose.c:3150
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr "%s konnte nicht gelesen werden."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "%s konnte nicht gelesen werden."
 

-#: src/compose.c:3177
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 

-#: src/compose.c:3998
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 

-#: src/compose.c:4005
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 

-#: src/compose.c:4008
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 

-#: src/compose.c:4010
+#: src/compose.c:4085

 msgid "Compose message"
 msgstr "Nachricht verfassen"
 
 msgid "Compose message"
 msgstr "Nachricht verfassen"
 

-#: src/compose.c:4037 src/messageview.c:624
+#: src/compose.c:4112 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1752,32 +1790,32 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 

-#: src/compose.c:4230 src/compose.c:4261 src/compose.c:4293 src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4305 src/compose.c:4336 src/compose.c:4368
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr "Senden"
 
 msgid "Send"
 msgstr "Senden"
 

-#: src/compose.c:4231
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard Cc Adresse. Trotzdem senden?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard Cc Adresse. Trotzdem senden?"
 

-#: src/compose.c:4232 src/compose.c:4263 src/compose.c:4295 src/compose.c:4772
+#: src/compose.c:4307 src/compose.c:4338 src/compose.c:4370 src/compose.c:4850

 msgid "+_Send"
 msgstr "+_Senden"
 
 msgid "+_Send"
 msgstr "+_Senden"
 

-#: src/compose.c:4262
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzigste Empfänger ist die Standard Bcc Adresse. Trotzdem senden?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzigste Empfänger ist die Standard Bcc Adresse. Trotzdem senden?"
 

-#: src/compose.c:4279
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 

-#: src/compose.c:4294
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 

-#: src/compose.c:4341 src/compose.c:8026
+#: src/compose.c:4416 src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1787,7 +1825,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung fehlgeschlagen."
 
 "\n"
 "Zeichensatz-Konvertierung fehlgeschlagen."
 

-#: src/compose.c:4344 src/compose.c:8029
+#: src/compose.c:4419 src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1797,7 +1835,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers konnte nicht geholt werden."
 
 "\n"
 "Schlüssel des Empfängers konnte nicht geholt werden."
 

-#: src/compose.c:4348 src/compose.c:8023
+#: src/compose.c:4425 src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1808,7 +1846,7 @@ msgstr ""
 "\n"
 "Signieren fehlgeschlagen: %s"
 
 "\n"
 "Signieren fehlgeschlagen: %s"
 

-#: src/compose.c:4351
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1819,11 +1857,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4353
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht für das Senden zwischengespeichert werden"
 
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht für das Senden zwischengespeichert werden"
 

-#: src/compose.c:4368 src/compose.c:4429
+#: src/compose.c:4445 src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1832,17 +1870,16 @@ msgstr ""
 "gesendet werden. Benutzen Sie 'Wartende Nachrichten senden'\n"
 "aus dem Hauptmenu zum Wiederholen."
 
 "gesendet werden. Benutzen Sie 'Wartende Nachrichten senden'\n"
 "aus dem Hauptmenu zum Wiederholen."
 

-#: src/compose.c:4423
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"

-"Benutzen Sie \"Wartende Nachrichten senden\" aus dem Hauptmenu zum "
-"Wiederholen."
+"Benutzen Sie \"Senden\" im Hauptfenster zum Wiederholen"

 
 

-#: src/compose.c:4769
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1853,7 +1890,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 

-#: src/compose.c:4828
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1866,62 +1903,74 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
 "\n"
 "Trotzdem senden?"
 

-#: src/compose.c:5016
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr "Verschlüsslungwarnung"
+
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr "+fortfahren"
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 

-#: src/compose.c:5026
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgstr "Kein Konto zum Versenden von News vorhanden!"
 
 msgid "No account for posting news available!"
 msgstr "Kein Konto zum Versenden von News vorhanden!"
 

-#: src/compose.c:5719
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr "Zum Adressbuch hinzufügen"
+
+#: src/compose.c:5876

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "benutze <tab> um automatisch aus dem Adressbuch zu vervollständigen"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "benutze <tab> um automatisch aus dem Adressbuch zu vervollständigen"
 

-#: src/compose.c:5858
+#: src/compose.c:6024

 msgid "Mime type"
 msgstr "MIME-Typ"
 
 msgid "Mime type"
 msgstr "MIME-Typ"
 

-#: src/compose.c:5864 src/compose.c:6180 src/mimeview.c:212
+#: src/compose.c:6030 src/compose.c:6348 src/mimeview.c:214

 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86

-#: src/summaryview.c:495
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "Größe"
 
 msgid "Size"
 msgstr "Größe"
 

-#: src/compose.c:5934
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 

-#: src/compose.c:5956 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:6122 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383 src/prefs_spelling.c:207
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Durchsuchen"
 
 msgid "_Browse"
 msgstr "_Durchsuchen"
 

-#: src/compose.c:6179 src/compose.c:7433
+#: src/compose.c:6347 src/compose.c:7662

 msgid "MIME type"
 msgstr "MIME-Typ"
 
 msgid "MIME type"
 msgstr "MIME-Typ"
 

-#: src/compose.c:6253
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr "_Kopfzeilen"
 
 msgid "Hea_der"
 msgstr "_Kopfzeilen"
 

-#: src/compose.c:6257
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr "_Anhänge"
 
 msgid "_Attachments"
 msgstr "_Anhänge"
 

-#: src/compose.c:6261
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr "Weite_res"
 
 msgid "Othe_rs"
 msgstr "Weite_res"
 

-#: src/compose.c:6276 src/summary_search.c:370
+#: src/compose.c:6445 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr "Betreff:"
 
 msgid "Subject:"
 msgstr "Betreff:"
 

-#: src/compose.c:6483
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1930,20 +1979,20 @@ msgstr ""
 "Die Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
 "Die Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr "benutztes Konto für diese E-Mail"
 
 msgid "Account to use for this email"
 msgstr "benutztes Konto für diese E-Mail"
 

-#: src/compose.c:6632
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr "zu benutzende Absenderadresse"
 
 msgid "Sender address to be used"
 msgstr "zu benutzende Absenderadresse"
 

-#: src/compose.c:6793
+#: src/compose.c:6967

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1952,51 +2001,52 @@ 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:6955 src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "Vorlage Formatierungsfehler."
+#: src/compose.c:7167 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "Vorlage Formatierungsfehler in Zeile %d."

 
 

-#: src/compose.c:7063 src/prefs_template.c:587
+#: src/compose.c:7277 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "Vorlage An Formatierungsfehler."
 
 msgid "Template To format error."
 msgstr "Vorlage An Formatierungsfehler."
 

-#: src/compose.c:7076 src/prefs_template.c:592
+#: src/compose.c:7295 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "Vorlage Cc Formatierungsfehler."
 
 msgid "Template Cc format error."
 msgstr "Vorlage Cc Formatierungsfehler."
 

-#: src/compose.c:7089 src/prefs_template.c:597
+#: src/compose.c:7313 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "Vorlage Bcc Formatierungsfehler."
 
 msgid "Template Bcc format error."
 msgstr "Vorlage Bcc Formatierungsfehler."
 

-#: src/compose.c:7103 src/prefs_template.c:602
+#: src/compose.c:7332 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "Vorlage Betreff Formatierungsfehler."
 
 msgid "Template subject format error."
 msgstr "Vorlage Betreff Formatierungsfehler."
 

-#: src/compose.c:7327
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ"
 
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ"
 

-#: src/compose.c:7342
+#: src/compose.c:7571

 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 

-#: src/compose.c:7415
+#: src/compose.c:7644

 msgid "Properties"
 msgstr "Eigenschaften"
 
 msgid "Properties"
 msgstr "Eigenschaften"
 

-#: src/compose.c:7466
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 

-#: src/compose.c:7486
+#: src/compose.c:7715

 msgid "Path"
 msgstr "Pfad"
 
 msgid "Path"
 msgstr "Pfad"
 

-#: src/compose.c:7487 src/prefs_toolbar.c:1069
+#: src/compose.c:7716 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr "Dateiname"
 
 msgid "File name"
 msgstr "Dateiname"
 

-#: src/compose.c:7670
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -2007,19 +2057,19 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom übergeordneten Prozess\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom übergeordneten Prozess\n"
 

-#: src/compose.c:7993 src/messageview.c:729
+#: src/compose.c:8222 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt einen Netzwerkzugang um diese E-Mail zu senden."
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail benötigt einen Netzwerkzugang um diese E-Mail zu senden."
 

-#: src/compose.c:8018
+#: src/compose.c:8247

 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht zwischengespeichert werden."
 
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht zwischengespeichert werden."
 

-#: src/compose.c:8020
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2029,20 +2079,40 @@ msgstr ""
 "Nachricht konnte nicht zwischengespeichert werden\n"
 "%s."
 
 "Nachricht konnte nicht zwischengespeichert werden\n"
 "%s."
 

-#: src/compose.c:8193
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 

-#: src/compose.c:8271 src/compose.c:8294
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr "Entwurf konnte nicht gespeichert werden"
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"Entwurf konnte nicht gespeichert werden.\n"
+"Soll das Beenden abgebrochen werden oder die Nachricht verworfen werden?"
+
+#: src/compose.c:8393
+msgid "_Cancel exit"
+msgstr "Beenden _Abbrechen"
+
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr "_Verwerfe Nachricht"
+
+#: src/compose.c:8527 src/compose.c:8550

 msgid "Select file"
 msgstr "Datei auswählen"
 
 msgid "Select file"
 msgstr "Datei auswählen"
 

-#: src/compose.c:8307
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 

-#: src/compose.c:8309
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2051,44 +2121,44 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 

-#: src/compose.c:8362
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 

-#: src/compose.c:8363
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr "_Verwerfen"
 
 msgid "_Discard"
 msgstr "_Verwerfen"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 

-#: src/compose.c:8408
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Soll die Vorlage '%s' angewendet werden?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Soll die Vorlage '%s' angewendet werden?"
 

-#: src/compose.c:8410
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr "Ersetzen"
 
 msgid "_Replace"
 msgstr "Ersetzen"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr "Einfügen"
 
 msgid "_Insert"
 msgstr "Einfügen"
 

-#: src/compose.c:9142
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 

-#: src/compose.c:9143
+#: src/compose.c:9417

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -2096,19 +2166,20 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen, oder an "
 "die Mail anhängen?"
 
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen, oder an "
 "die Mail anhängen?"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr "+Einfügen"
 
 msgid "+_Insert"
 msgstr "+Einfügen"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr "Anhang"
 
 msgid "_Attach"
 msgstr "Anhang"
 

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "Zitatzeichen-Formatfehler."
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "Zitatzeichen-Formatfehler in Zeile %d."

 
 

-#: src/compose.c:9563
+#: src/compose.c:9835

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -2139,7 +2210,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug Protokoll"
 
 msgid "Debug log"
 msgstr "Debug Protokoll"
 

-#: src/crash.c:251 src/toolbar.c:483 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr "Schließen"
 
 msgid "Close"
 msgstr "Schließen"
 


@@ -2151,73 +2222,73 @@ msgstr "Speichern..."
 msgid "Create bug report"
 msgstr "Bugreport erstellen"
 
 msgid "Create bug report"
 msgstr "Bugreport erstellen"
 

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "Crash-Informationen speichern"
 
 msgid "Save crash information"
 msgstr "Crash-Informationen speichern"
 

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 
 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "Personendetails bearbeiten"
 
 msgid "Edit Person Details"
 msgstr "Personendetails bearbeiten"
 

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 
 msgid "An Email address must be supplied."
 msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Wert angegeben werden."
 
 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Wert angegeben werden."
 

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "Verwerfen"
 
 msgid "Discard"
 msgstr "Verwerfen"
 

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "Anwenden"
 
 msgid "Apply"
 msgstr "Anwenden"
 

-#: src/editaddress.c:651 src/editaddress.c:700
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "Personendaten bearbeiten"
 
 msgid "Edit Person Data"
 msgstr "Personendaten bearbeiten"
 

-#: src/editaddress.c:761 src/expldifdlg.c:508 src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "Anzeigename"
 
 msgid "Display Name"
 msgstr "Anzeigename"
 

-#: src/editaddress.c:767 src/editaddress.c:771 src/ldif.c:771
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr "Nachname"
 
 msgid "Last Name"
 msgstr "Nachname"
 

-#: src/editaddress.c:768 src/editaddress.c:770 src/ldif.c:767
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr "Vorname"
 
 msgid "First Name"
 msgstr "Vorname"
 

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "Spitzname"
 
 msgid "Nickname"
 msgstr "Spitzname"
 

-#: src/editaddress.c:850 src/editaddress.c:906
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:1044 src/editaddress.c:1101 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:536
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "Wert"
 
 msgid "Value"
 msgstr "Wert"
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "_persönliche Daten"
 
 msgid "_User Data"
 msgstr "_persönliche Daten"
 

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "_E-Mail-Adressen"
 
 msgid "_Email Addresses"
 msgstr "_E-Mail-Adressen"
 

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "andere Eigenschaf_ten"
 
 msgid "O_ther Attributes"
 msgstr "andere Eigenschaf_ten"
 


@@ -2242,7 +2313,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:2004
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr "Datei"
 
 msgid "File"
 msgstr "Datei"
 


@@ -2388,7 +2459,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
 msgid "TLS"
 msgstr "TLS"
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 


@@ -2571,7 +2642,7 @@ msgstr ""
 "Die maximale Zahl von Einträgen, die im Suchresultat zurückgeliefert werden "
 "sollen."
 
 "Die maximale Zahl von Einträgen, die im Suchresultat zurückgeliefert werden "
 "sollen."
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr "Grundeinstellungen"
 
 msgid "Basic"
 msgstr "Grundeinstellungen"
 


@@ -2579,7 +2650,7 @@ msgstr "Grundeinstellungen"
 msgid "Search"
 msgstr "Suchen"
 
 msgid "Search"
 msgstr "Suchen"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:496
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "Erweitert"
 
 msgid "Extended"
 msgstr "Erweitert"
 


@@ -2654,7 +2725,7 @@ msgid "HTML Output File"
 msgstr "HTML-Ausgabedatei"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 msgstr "HTML-Ausgabedatei"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "Du_rchsuchen"
 
 msgid "B_rowse"
 msgstr "Du_rchsuchen"
 


@@ -2663,8 +2734,8 @@ msgid "Stylesheet"
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
 msgstr "Stylesheet"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661

-#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "Keine"
 
 msgid "None"
 msgstr "Keine"
 


@@ -2716,7 +2787,7 @@ msgstr "E-Mail-Links formatieren"
 msgid "Format User Attributes"
 msgstr "Benutzerattribute formatieren"
 
 msgid "Format User Attributes"
 msgstr "Benutzerattribute formatieren"
 

-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr "Dateiname :"
 
 msgid "File Name :"
 msgstr "Dateiname :"
 


@@ -2728,7 +2799,7 @@ msgstr "Mit Webbrowser öffnen"
 msgid "Export Address Book to HTML File"
 msgstr "Adressbuch in HTML-Datei Exportieren"
 
 msgid "Export Address Book to HTML File"
 msgstr "Adressbuch in HTML-Datei Exportieren"
 

-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr "Dateiinfo"
 
 msgid "File Info"
 msgstr "Dateiinfo"
 


@@ -2894,7 +2965,7 @@ msgstr "Adressbuch in LDIF Datei Exportieren"
 msgid "Distguished Name"
 msgstr "Distguished Name"
 
 msgid "Distguished Name"
 msgstr "Distguished Name"
 

-#: src/export.c:120 src/summaryview.c:6586
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 


@@ -2930,81 +3001,81 @@ msgstr "Export-Datei wählen"
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
 msgid "Full Name"
 msgstr "Vollständiger Name"
 

-#: src/exporthtml.c:762 src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr "Attribute"
 
 msgid "Attributes"
 msgstr "Attribute"
 

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Claws Mail Adressbuch"
 
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail Adressbuch"
 

-#: src/exporthtml.c:1077 src/exportldif.c:551
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr "Name existiert schon, ist aber kein Verzeichnis."
 
 msgid "Name already exists but is not a directory."
 msgstr "Name existiert schon, ist aber kein Verzeichnis."
 

-#: src/exporthtml.c:1080 src/exportldif.c:554
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr "Keine Berechtigung zum Erstellen des Verzeichnisses."
 
 msgid "No permissions to create directory."
 msgstr "Keine Berechtigung zum Erstellen des Verzeichnisses."
 

-#: src/exporthtml.c:1083 src/exportldif.c:557
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr "Name zu lang."
 
 msgid "Name is too long."
 msgstr "Name zu lang."
 

-#: src/exporthtml.c:1086 src/exportldif.c:560
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr "Nicht angegeben."
 
 msgid "Not specified."
 msgstr "Nicht angegeben."
 

-#: src/folder.c:1334 src/foldersel.c:370 src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "Posteingang"
 
 msgid "Inbox"
 msgstr "Posteingang"
 

-#: src/folder.c:1338 src/foldersel.c:374
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr "Gesendet"
 
 msgid "Sent"
 msgstr "Gesendet"
 

-#: src/folder.c:1342 src/foldersel.c:378 src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "Postausgang"
 
 msgid "Queue"
 msgstr "Postausgang"
 

-#: src/folder.c:1346 src/foldersel.c:382 src/prefs_folder_item.c:243
-#: src/toolbar.c:385 src/toolbar.c:428 src/toolbar.c:526
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgstr "Papierkorb"
 
 msgid "Trash"
 msgstr "Papierkorb"
 

-#: src/folder.c:1350 src/foldersel.c:386 src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "Entwürfe"
 
 msgid "Drafts"
 msgstr "Entwürfe"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Alle Nachrichten in %s werden geholt...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Alle Nachrichten in %s werden geholt...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiere %s nach %s...\n"
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiere %s nach %s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s wird nach %s verschoben...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s wird nach %s verschoben...\n"
 

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Zwischenspeicher für %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Zwischenspeicher für %s..."
 

-#: src/folder.c:3864
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 

-#: src/folder.c:3993
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisieren %s für Offline-Nutzung...\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronisieren %s für Offline-Nutzung...\n"


@@ -3067,7 +3138,7 @@ msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:473 src/summaryview.c:496
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 


@@ -3075,21 +3146,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Ordnerinformation werden gesetzt..."
 
 msgid "Setting folder info..."
 msgstr "Ordnerinformation werden gesetzt..."
 

-#: src/folderview.c:816 src/summaryview.c:3555
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 

-#: src/folderview.c:817 src/summaryview.c:3556
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Sollen wirklich alle Mails in diesem Ordner als gelesen markiert werden?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Sollen wirklich alle Mails in diesem Ordner als gelesen markiert werden?"
 

-#: src/folderview.c:1034 src/imap.c:3420 src/mainwindow.c:3897 src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Ordner %s%c%s wird durchsucht ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Ordner %s%c%s wird durchsucht ..."
 

-#: src/folderview.c:1038 src/imap.c:3425 src/mainwindow.c:3902 src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Ordner %s wird durchsucht..."
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Ordner %s wird durchsucht..."


@@ -3118,62 +3189,62 @@ msgstr "Ordnerbaum wird durchsucht..."
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 
 msgid "Couldn't scan folder %s\n"
 msgstr "Ordner %s konnte nicht durchsucht werden\n"
 

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 

-#: src/folderview.c:2059
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Schließe Ordner %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Schließe Ordner %s..."
 

-#: src/folderview.c:2149
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ordner %s wird geöffnet..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ordner %s wird geöffnet..."
 

-#: src/folderview.c:2162
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 

-#: src/folderview.c:2324 src/mainwindow.c:2121
+#: src/folderview.c:2339 src/mainwindow.c:2121

 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 

-#: src/folderview.c:2325
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 

-#: src/folderview.c:2326
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 
 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 

-#: src/folderview.c:2370 src/inc.c:1478 src/toolbar.c:2320
+#: src/folderview.c:2385 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 

-#: src/folderview.c:2371 src/toolbar.c:2321
+#: src/folderview.c:2386 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 

-#: src/folderview.c:2382 src/toolbar.c:2340
+#: src/folderview.c:2397 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "Wartende Nachrichten senden"
 
 msgid "Send queued messages"
 msgstr "Wartende Nachrichten senden"
 

-#: src/folderview.c:2383 src/toolbar.c:2341
+#: src/folderview.c:2398 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr "Alle wartende Nachrichten senden?"
 
 msgid "Send all queued messages?"
 msgstr "Alle wartende Nachrichten senden?"
 

-#: src/folderview.c:2384 src/messageview.c:590 src/messageview.c:607
-#: src/prefs_account.c:1122 src/toolbar.c:2342
+#: src/folderview.c:2399 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "_Senden"
 
 msgid "_Send"
 msgstr "_Senden"
 

-#: src/folderview.c:2392 src/toolbar.c:2360
+#: src/folderview.c:2407 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden von Nachrichten des Postausgangs."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden von Nachrichten des Postausgangs."
 

-#: src/folderview.c:2395 src/main.c:1762 src/toolbar.c:2363
+#: src/folderview.c:2410 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3182,68 +3253,68 @@ msgstr ""
 "Fehler beim Senden der Nachrichten im Postausgangs:\n"
 "%s"
 
 "Fehler beim Senden der Nachrichten im Postausgangs:\n"
 "%s"
 

-#: src/folderview.c:2462
+#: 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?"
 
 #, 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:2463
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Soll Ordner '%s' wirklich in den Unterordner '%s' verschoben werden?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Soll Ordner '%s' wirklich in den Unterordner '%s' verschoben werden?"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 
 msgid "Copy folder"
 msgstr "Kopiere Ordner"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Move folder"
 msgstr "Ordner verschieben"
 
 msgid "Move folder"
 msgstr "Ordner verschieben"
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiere %s nach %s..."
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind identisch."
 
 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind identisch."
 

-#: src/folderview.c:2510
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner kopiert werden."
 
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner kopiert werden."
 

-#: src/folderview.c:2511
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 

-#: src/folderview.c:2514
+#: src/folderview.c:2529

 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr "Kopieren fehlgeschlagen!"
 
 msgid "Copy failed!"
 msgstr "Kopieren fehlgeschlagen!"
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 
 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 

-#: src/folderview.c:2568
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration für Ordner %s wird verarbeitet"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration für Ordner %s wird verarbeitet"
 

-#: src/gedit-print.c:147 src/messageview.c:1544 src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "Drucken"
 
 msgid "Print"
 msgstr "Drucken"
 


@@ -3269,64 +3340,64 @@ msgstr "Druckvorschau"
 msgid "Page %N of %Q"
 msgstr "Seite %N von %Q"
 
 msgid "Page %N of %Q"
 msgstr "Seite %N von %Q"
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "Newsgruppen Abonnement"
 
 msgid "Newsgroup subscription"
 msgstr "Newsgruppen Abonnement"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "Newsgruppen zum Abonnieren auswählen:"
 
 msgid "Select newsgroups for subscription:"
 msgstr "Newsgruppen zum Abonnieren auswählen:"
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "Newsgroups:"
 
 msgid "Find groups:"
 msgstr "Newsgroups:"
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " Suchen "
 
 msgid " Search "
 msgstr " Suchen "
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr "Newsgruppenname"
 
 msgid "Newsgroup name"
 msgstr "Newsgruppenname"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "Nachrichten"
 
 msgid "Messages"
 msgstr "Nachrichten"
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "Typ"
 
 msgid "Type"
 msgstr "Typ"
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "moderiert"
 
 msgid "moderated"
 msgstr "moderiert"
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "nur lesen"
 
 msgid "readonly"
 msgstr "nur lesen"
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "unbekannt"
 
 msgid "unknown"
 msgstr "unbekannt"
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "Gruppenliste konnte nicht empfangen werden."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Gruppenliste konnte nicht empfangen werden."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1367
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr "Fertig."
 
 msgid "Done."
 msgstr "Fertig."
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppen empfangen (%s gelesen)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppen empfangen (%s gelesen)"
 

-#: src/gtk/about.c:79 src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "/Mit Webbrowser öffnen"
 
 msgid "/_Open with Web browser"
 msgstr "/Mit Webbrowser öffnen"
 

-#: src/gtk/about.c:80 src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/Link-Adresse kopieren"
 
 msgid "/Copy this _link"
 msgstr "/Link-Adresse kopieren"
 


@@ -3625,7 +3696,7 @@ msgstr ""
 "Ordner nach oben oder unten verschieben, um die Reihenfolge in der "
 "Ordnerübersicht zu ändern."
 
 "Ordner nach oben oder unten verschieben, um die Reihenfolge in der "
 "Ordnerübersicht zu ändern."
 

-#: src/gtk/foldersort.c:214 src/toolbar.c:409
+#: src/gtk/foldersort.c:214 src/toolbar.c:410

 msgid "Folders"
 msgstr "Ordner"
 
 msgid "Folders"
 msgstr "Ordner"
 


@@ -3853,31 +3924,428 @@ msgstr "Schriftartebeschreibung für Kopf und Fußzeile"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Schriftart für Kopf und Fußzeile (zB \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Schriftart für Kopf und Fußzeile (zB \"Monospace 10\")"
 

-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "neue Nachricht"
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "Datum"

 
 

-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "ungelesene Nachricht"
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "Datum:"

 
 

-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "Nachricht wurde beantwortet"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"
+msgstr "Von"

 
 

-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "Nachricht wurde weitergeleitet"
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "Von:"

 
 

-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "Nachricht ist in einem ignorierten Thread"
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"
+msgstr "Absender"

 
 

-#: src/gtk/icon_legend.c:72
-msgid "Message is spam"
-msgstr "Nachricht ist Spam"
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "Absender:"

 
 

-#: src/gtk/icon_legend.c:74
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "Antwort an"
+
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "An"
+
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "Cc"
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr "Bcc"
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr "Nachrichten-ID"
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr "Nachrichten-ID:"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr "In-Reply-To"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr "In-Reply-To:"
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr "Referenzen"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr "References:"
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr "Betreff"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr "Comments"
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr "Comments:"
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr "Keywords"
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr "Keywords:"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr "Resent-Date"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr "Resent-Date:"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr "Resent-From"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr "Resent-From:"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr "Resent-Sender"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr "Resent-Sender:"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr "Resent-To"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr "Resent-To:"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr "Resent-Cc"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr "Resent-Cc:"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr "Resent-Bcc"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr "Resent-Bcc:"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr "Nachrichten-ID"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr "Nachrichten-ID:"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr "Return-Path"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr "Return-Path:"
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr "Empfangen"
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr "Empfangen:"
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "Newsgruppen"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr "Followup-To"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr "Delivered-To"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr "Delivered-To:"
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr "Gesehen"
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr "Gesehen:"
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "Status"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "Status:"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr "Gesicht"
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr "Face:"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr "Disposition-Notification-To"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr "Disposition-Notification-To:"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr "Empfangsbestätigung An"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr "Empfangsbestätigung An:"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr "Benutzerprogramm"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr "Benutzerprogramm:"
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr "Content-Type:"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr "Übertragungskodierung:"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr "Übertragungskodierung:"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr "MIME-Version"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr "MIME-Version:"
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr "Priorität"
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr "Priorität:"
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "Organisation"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "Mailing-List"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "Mailing-List:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr "List-Post"
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr "List-Post:"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr "Listen-Anmelden"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr "Listen-Anmelden:"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr "Listen-Abmelden"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr "Listen-Abmelden:"
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr "List-Help"
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr "List-Help:"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr "List-Archive"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr "List-Archive:"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr "Listen-Eigentümer"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr "Listen-Eigentümer:"
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr "X-Label"
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr "X-Label:"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr "X-Mailer"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr "X-Mailer:"
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr "X-Status"
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr "X-Status:"
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr "X-Face"
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr "X-Face:"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr "X-No-Archive"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr "X-No-Archive:"
+
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr "In Antwort auf"
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr "In Antwort auf:"
+
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr "An oder Cc"
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr "An oder Cc:"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr "Von, An oder Betreff"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr "Von, An oder Betreff:"
+
+#: src/gtk/icon_legend.c:67
+msgid "New message"
+msgstr "neue Nachricht"
+
+#: src/gtk/icon_legend.c:68
+msgid "Unread message"
+msgstr "ungelesene Nachricht"
+
+#: src/gtk/icon_legend.c:69
+msgid "Message has been replied to"
+msgstr "Nachricht wurde beantwortet"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been forwarded"
+msgstr "Nachricht wurde weitergeleitet"
+
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "Nachricht ist in einem ignorierten Thread"
+
+#: src/gtk/icon_legend.c:72
+msgid "Message is spam"
+msgstr "Nachricht ist Spam"
+
+#: src/gtk/icon_legend.c:74

 msgid "Message has attachment(s)"
 msgstr "Nachricht hat Anhänge"
 
 msgid "Message has attachment(s)"
 msgstr "Nachricht hat Anhänge"
 


@@ -3954,11 +4422,11 @@ msgstr "Kennwort eingeben"
 msgid "Remember this"
 msgstr "merken"
 
 msgid "Remember this"
 msgstr "merken"
 

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "Protokoll löschen"
 
 msgid "Clear _Log"
 msgstr "Protokoll löschen"
 

-#: src/gtk/pluginwindow.c:151 src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3968,19 +4436,19 @@ msgstr ""
 "\n"
 "Version: "
 
 "\n"
 "Version: "
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "Fehler: "
 
 msgid "Error: "
 msgstr "Fehler: "
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "Plugin funktioniert nicht."
 
 msgid "Plugin is not functional."
 msgstr "Plugin funktioniert nicht."
 

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "Zu ladende Plugins auswählen"
 
 msgid "Select the Plugins to load"
 msgstr "Zu ladende Plugins auswählen"
 

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -3991,234 +4459,231 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287 src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Plugins"
 
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Plugins"
 

-#: src/gtk/pluginwindow.c:321 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr "Beschreibung"
 
 msgid "Description"
 msgstr "Beschreibung"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr "Zusätzliche Plugins sind auf der Claws Mail Webseite verfügbar."
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr "Zusätzliche Plugins sind auf der Claws Mail Webseite verfügbar."
 

-#: src/gtk/pluginwindow.c:344 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr "weitere holen..."
 
 msgid "Get more..."
 msgstr "weitere holen..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "Plugin laden..."
 
 msgid "Load Plugin..."
 msgstr "Plugin laden..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "Plugin entladen"
 
 msgid "Unload Plugin"
 msgstr "Plugin entladen"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "hier klicken zum Laden ein oder meherer Plugins"
 
 msgid "Click here to load one or more plugins"
 msgstr "hier klicken zum Laden ein oder meherer Plugins"
 

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "Das gewählte Plugin entladen"
 
 msgid "Unload the selected plugin"
 msgstr "Das gewählte Plugin entladen"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "geladenen Plugins"
 
 msgid "Loaded plugins"
 msgstr "geladenen Plugins"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "Seitenindex"
 
 msgid "Page Index"
 msgstr "Seitenindex"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:842
-#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "Konto"
 
 msgid "Account"
 msgstr "Konto"
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2458
-msgid "Status"
-msgstr "Status"
-
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "Alle Nachrichten"
 
 msgid "all messages"
 msgstr "Alle Nachrichten"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 
 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 
 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 
 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 
 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 
 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "wahr, wenn der Aufruf von 'S' erfolgreich war"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "wahr, wenn der Aufruf von 'S' erfolgreich war"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 
 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 
 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 
 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die mit der Farbe # markiert sind"
 
 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die mit der Farbe # markiert sind"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 
 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "neue Nachrichten"
 
 msgid "new messages"
 msgstr "neue Nachrichten"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "alte Nachrichten"
 
 msgid "old messages"
 msgstr "alte Nachrichten"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "unvollständige Nachricht (nicht komplett heruntergeladen)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "unvollständige Nachricht (nicht komplett heruntergeladen)"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 
 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "gelesene Nachrichten"
 
 msgid "read messages"
 msgstr "gelesene Nachrichten"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 
 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 
 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 
 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 
 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 
 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 
 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 
 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 
 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "markierte Nachrichten"
 
 msgid "marked messages"
 msgstr "markierte Nachrichten"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 
 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 
 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "Nachrichten, die 0 zurückgeben, wenn sie an das Kommando übergeben werden - %"
 "F ist die Datei mit der Nachricht"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "Nachrichten, die 0 zurückgeben, wenn sie an das Kommando übergeben werden - %"
 "F ist die Datei mit der Nachricht"
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 
 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 
 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 
 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 
 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 
 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "alle Filterausdrücke sind erlaubt"
 
 msgid "all filtering expressions are allowed"
 msgstr "alle Filterausdrücke sind erlaubt"
 

-#: src/gtk/quicksearch.c:387 src/summary_search.c:401
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 
 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 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"
 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"


@@ -4230,117 +4695,101 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 

-#: src/gtk/quicksearch.c:484 src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160 src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:48 src/summaryview.c:491
-msgid "Subject"
-msgstr "Betreff"
-
-#: src/gtk/quicksearch.c:488 src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:492
-msgid "From"
-msgstr "Von"
-
-#: src/gtk/quicksearch.c:492 src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "An"
-
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr "Rekursiv"
 
 msgid "Recursive"
 msgstr "Rekursiv"
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr "dauerhaft"
 
 msgid "Sticky"
 msgstr "dauerhaft"
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "Simultan"
 
 msgid "Type-ahead"
 msgstr "Simultan"
 

-#: src/gtk/quicksearch.c:554 src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr "ausführen bei Auswahl"
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr "Leeren"
 
 msgid " Clear "
 msgstr "Leeren"
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "die aktuelle Suche löschen"
 
 msgid "Clear the current search"
 msgstr "die aktuelle Suche löschen"
 

-#: src/gtk/quicksearch.c:577 src/summary_search.c:354
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 
 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 

-#: src/gtk/quicksearch.c:583 src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr " Erweiterte Symbole... "
 
 msgid " Extended Symbols... "
 msgstr " Erweiterte Symbole... "
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr ""
 "Informationen über Symbole die in der erweiterten Suche verwendet werden "
 "können"
 
 msgid "Information about extended symbols"
 msgstr ""
 "Informationen über Symbole die in der erweiterten Suche verwendet werden "
 "können"
 

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "Informationen"
 
 msgid "Info"
 msgstr "Informationen"
 

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "Leeren"
 
 msgid "Clear"
 msgstr "Leeren"
 

-#: src/gtk/quicksearch.c:1090 src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "korrekt"
 
 msgid "correct"
 msgstr "korrekt"
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "Eigentümer"
 
 msgid "Owner"
 msgstr "Eigentümer"
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "Unterzeichner"
 
 msgid "Signer"
 msgstr "Unterzeichner"
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Name: "
 
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Name: "
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Organisation: "
 
 msgid "Organization: "
 msgstr "Organisation: "
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "Ort: "
 
 msgid "Location: "
 msgstr "Ort: "
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "Fingerabdruck: "
 
 msgid "Fingerprint: "
 msgstr "Fingerabdruck: "
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "Signaturstatus: "
 
 msgid "Signature status: "
 msgstr "Signaturstatus: "
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "Läuft ab am: "
 
 msgid "Expires on: "
 msgstr "Läuft ab am: "
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "SSL-Zertifikat für %s"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "SSL-Zertifikat für %s"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -4349,30 +4798,30 @@ msgstr ""
 "Zertifikat für %s ist unbekannt.\n"
 "Soll es akzeptiert werden?"
 
 "Zertifikat für %s ist unbekannt.\n"
 "Soll es akzeptiert werden?"
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "Signaturstatus: %s"
 
 #, c-format
 msgid "Signature status: %s"
 msgstr "Signaturstatus: %s"
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "Zertifikat anzeigen"
 
 msgid "_View certificate"
 msgstr "Zertifikat anzeigen"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "Unbekanntes SSL-Zertifikat"
 
 msgid "Unknown SSL Certificate"
 msgstr "Unbekanntes SSL-Zertifikat"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "Verbindung abbre_chen"
 
 msgid "_Cancel connection"
 msgstr "Verbindung abbre_chen"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "_Akzeptieren und speichern"
 
 msgid "_Accept and save"
 msgstr "_Akzeptieren und speichern"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -4381,40 +4830,40 @@ msgstr ""
 "Zertifikat für %s ist abgelaufen.\n"
 "Wollen Sie fortfahren?"
 
 "Zertifikat für %s ist abgelaufen.\n"
 "Wollen Sie fortfahren?"
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "abgelaufene SSL Zertifikate"
 
 msgid "Expired SSL Certificate"
 msgstr "abgelaufene SSL Zertifikate"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "_Akzeptieren"
 
 msgid "_Accept"
 msgstr "_Akzeptieren"
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "Neues Zertifikat:"
 
 msgid "New certificate:"
 msgstr "Neues Zertifikat:"
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "Unbekanntes Zertifikat:"
 
 msgid "Known certificate:"
 msgstr "Unbekanntes Zertifikat:"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "Zertifikat für %s hat sich geändert. Wollen Sie es akzeptieren?"
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "Zertifikat für %s hat sich geändert. Wollen Sie es akzeptieren?"
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "Zertifikate anzeigen"
 
 msgid "_View certificates"
 msgstr "Zertifikate anzeigen"
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 
 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 

-#: src/headerview.c:195 src/summaryview.c:2866 src/summaryview.c:2877
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(Kein Von)"
 
 msgid "(No From)"
 msgstr "(Kein Von)"
 

-#: src/headerview.c:210 src/summaryview.c:2901 src/summaryview.c:2904
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 


@@ -4430,11 +4879,7 @@ msgstr "Dateigröße:"
 msgid "Load Image"
 msgstr "Bild laden"
 
 msgid "Load Image"
 msgstr "Bild laden"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr "Content-Type:"
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4446,37 +4891,37 @@ msgstr ""
 "CRAM-MD5-Anmeldungen sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "compiliert wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 
 "CRAM-MD5-Anmeldungen sind nur möglich, wenn libetpan mit SASL-Unterstützung "
 "compiliert wurde und das CRAM-MD5 SASL-Plugin installiert ist."
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s fehlgeschlagen: Login abgelehnt.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbindung zu %s fehlgeschlagen: Login abgelehnt.%s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s fehlgeschlagen: Login abgelehnt.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbindung zu %s fehlgeschlagen: Login abgelehnt.%s\n"
 

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s fehlgeschlagen"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbindung zu %s fehlgeschlagen"
 

-#: src/imap.c:666 src/imap.c:669
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 

-#: src/imap.c:718 src/imap.c:2447 src/imap.c:2956 src/imap.c:3041
-#: src/imap.c:3386 src/imap.c:4143
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt Netzwerkzugang um auf diesen IMAP-Server zuzugreifen."
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail benötigt Netzwerkzugang um auf diesen IMAP-Server zuzugreifen."
 

-#: src/imap.c:797 src/inc.c:773 src/news.c:295 src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 

-#: src/imap.c:798 src/inc.c:774 src/news.c:296 src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -4490,105 +4935,105 @@ msgstr ""
 "Soll eine Verbindung zu diesem Server hergestellt werden? Die Übertragung "
 "wäre nicht geschützt."
 
 "Soll eine Verbindung zu diesem Server hergestellt werden? Die Übertragung "
 "wäre nicht geschützt."
 

-#: src/imap.c:804 src/inc.c:780 src/news.c:302 src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Mit dem Verbinden _fortfahren"
 
 msgid "Con_tinue connecting"
 msgstr "Mit dem Verbinden _fortfahren"
 

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Verbindung mit IMAP4-Server: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Verbindung mit IMAP4-Server: %s..."
 

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d"
 

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 

-#: src/imap.c:884 src/imap.c:2764
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Verbindung mit IMAP4-Server %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Verbindung mit IMAP4-Server %s...\n"
 

-#: src/imap.c:932 src/imap.c:935
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s fehlgeschlagen."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s fehlgeschlagen."
 

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 

-#: src/imap.c:1305 src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden\n"
 
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden\n"
 

-#: src/imap.c:1487 src/imap.c:3894
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "Löschen nicht möglich\n"
 
 msgid "can't expunge\n"
 msgstr "Löschen nicht möglich\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Suche nach nicht abonnierten Ordnern in %s..."
 

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche Unterordner von %s..."
 
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Suche Unterordner von %s..."
 

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox konnte nicht erstellt werden: LIST fehlgeschlagen\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox konnte nicht erstellt werden: LIST fehlgeschlagen\n"
 

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "Mailbox konnte nicht erstellt werden\n"
 
 msgid "can't create mailbox\n"
 msgstr "Mailbox konnte nicht erstellt werden\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Neuer Ordnername darf nicht das Trennzeichen des Namensbereichs enthalten"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Neuer Ordnername darf nicht das Trennzeichen des Namensbereichs enthalten"
 

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s konnte nicht in %s umbenannt werden\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s konnte nicht in %s umbenannt werden\n"
 

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "Mailbox konnte nicht gelöscht werden\n"
 
 msgid "can't delete mailbox\n"
 msgstr "Mailbox konnte nicht gelöscht werden\n"
 

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr "LIST fehlgeschlagen\n"
 
 msgid "LIST failed\n"
 msgstr "LIST fehlgeschlagen\n"
 

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s konnte nicht ausgewählt werden\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s konnte nicht ausgewählt werden\n"
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS für die Anmeldung.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS für die Anmeldung.\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "Fähigkeiten konnten nicht neu geladen werden.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Fähigkeiten konnten nicht neu geladen werden.\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "


@@ -4597,34 +5042,34 @@ msgstr ""
 "Verbindung zu %s fehlgeschlagen: Server benötigt TLS, aber Claws Mail wurde "
 "ohne OpenSSL kompiliert.\n"
 
 "Verbindung zu %s fehlgeschlagen: Server benötigt TLS, aber Claws Mail wurde "
 "ohne OpenSSL kompiliert.\n"
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldung wurde deaktiviert.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldung wurde deaktiviert.\n"
 

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv-Konvertierung von %s zu UTF-7 fehlgeschlagen\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv-Konvertierung von %s zu UTF-7 fehlgeschlagen\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv-Konvertierung von UTF-8 zu UTF-7 fehlgeschlagen\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv-Konvertierung von UTF-8 zu UTF-7 fehlgeschlagen\n"
 

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden: %d\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 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 "
 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 "


@@ -4758,7 +5203,7 @@ msgstr "Soll nach nicht abonnierten Unterordnern von '%s' gesucht werden?"
 msgid "Search recursively"
 msgstr "rekursive Suche"
 
 msgid "Search recursively"
 msgstr "rekursive Suche"
 

-#: src/imap_gtk.c:453 src/imap_gtk.c:496
+#: src/imap_gtk.c:453 src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "Abonnements"
 
 msgid "Subscriptions"
 msgstr "Abonnements"
 


@@ -4780,33 +5225,41 @@ msgid "All of them"
 msgstr "alle"
 
 #: src/imap_gtk.c:481
 msgstr "alle"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
+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."

 msgstr ""
 msgstr ""

-"Dieser Ordner ist bereits abonniert und hat keine nicht abonnierten "
-"Unterordner."
+"Dieser Ordner ist bereits abonniert und hat kein nicht abonnierten "
+"Unterordner.\n"
+"\n"
+"Wenn neue Ordner vorhanden sind die von einem anderem Programm erzeugt und "
+"abonniert wurden, benutze \"Auf neue Ordner prüfen\" im Wurzelverzeichniss "
+"des Kontos um diese zu finden."

 
 

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Do you want to %s the '%s' folder?"
 
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Do you want to %s the '%s' folder?"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "abonnieren"
 
 msgid "subscribe"
 msgstr "abonnieren"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "abbestellen"
 
 msgid "unsubscribe"
 msgstr "abbestellen"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgstr "auf Unterordner anwenden"
 
 msgid "Apply to subfolders"
 msgstr "auf Unterordner anwenden"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+_Abonnieren"
 
 msgid "+_Subscribe"
 msgstr "+_Abonnieren"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+_Abbestellen"
 
 msgid "+_Unsubscribe"
 msgstr "+_Abbestellen"
 


@@ -4842,39 +5295,35 @@ msgstr "Der Zielordner wurde nicht gefunden."
 msgid "Select importing file"
 msgstr "Importdatei wählen"
 
 msgid "Select importing file"
 msgstr "Importdatei wählen"
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr "Bitte Adressbuchname und -datei zum Import angeben."
 
 msgid "Please specify address book name and file to import."
 msgstr "Bitte Adressbuchname und -datei zum Import angeben."
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "Bitte die zu importierenden LDIF-Feldnamen wählen und umbenennen."
 
 msgid "Select and rename LDIF field names to import."
 msgstr "Bitte die zu importierenden LDIF-Feldnamen wählen und umbenennen."
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "Datei importiert."
 
 msgid "File imported."
 msgstr "Datei importiert."
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr "Bitte Datei wählen"
 
 msgid "Please select a file."
 msgstr "Bitte Datei wählen"
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "Ein Adressbuchname muss angegeben werden."
 
 msgid "Address book name must be supplied."
 msgstr "Ein Adressbuchname muss angegeben werden."
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "Fehler beim Lesen der LDIF-Felder."
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "LDIF-Datei erfolgreich importiert."
 
 msgid "LDIF file imported successfully."
 msgstr "LDIF-Datei erfolgreich importiert."
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "LDIF-Datei wählen"
 
 msgid "Select LDIF File"
 msgstr "LDIF-Datei wählen"
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."


@@ -4882,51 +5331,47 @@ msgstr ""
 "Bite Name des Adressbuchs angeben, das aus den Daten der LDIF-Datei erzeugt "
 "wird."
 
 "Bite Name des Adressbuchs angeben, das aus den Daten der LDIF-Datei erzeugt "
 "wird."
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "Dateiname"
 
 msgid "File Name"
 msgstr "Dateiname"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "Die vollständige Dateispezifikation der zu importierenden LDIF-Datei."
 
 msgid "The full file specification of the LDIF file to import."
 msgstr "Die vollständige Dateispezifikation der zu importierenden LDIF-Datei."
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "Zu importierende LDIF-Datei wählen."
 
 msgid "Select the LDIF file to import."
 msgstr "Zu importierende LDIF-Datei wählen."
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:726 src/summaryview.c:489
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "LDIF-Feldname"
 
 msgid "LDIF Field Name"
 msgstr "LDIF-Feldname"
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "Attributname"
 
 msgid "Attribute Name"
 msgstr "Attributname"
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "LDIF-Feld"
 
 msgid "LDIF Field"
 msgstr "LDIF-Feld"
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "Attribute"
 
 msgid "Attribute"
 msgstr "Attribute"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Das LDIF-Feld kann in den Benutzerattributnamen umbenannt werden."
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Das LDIF-Feld kann in den Benutzerattributnamen umbenannt werden."
 

-#: src/importldif.c:811
-msgid "???"
-msgstr "???"
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "
 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 "


@@ -4944,30 +5389,34 @@ msgstr ""
 "Umbenennen im Eingabebereich unter der Liste. Ein Doppelklick irgendwo in "
 "der Zeile, wählt das Feld auch für den Import aus."
 
 "Umbenennen im Eingabebereich unter der Liste. Ein Doppelklick irgendwo in "
 "der Zeile, wählt das Feld auch für den Import aus."
 

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "Für Import wählen"
 
 msgid "Select for Import"
 msgstr "Für Import wählen"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "LDIF-Feld zum Import in das Adressbuch wählen."
 
 msgid "Select the LDIF field for import into the address book."
 msgstr "LDIF-Feld zum Import in das Adressbuch wählen."
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " Modifizieren "
 
 msgid " Modify "
 msgstr " Modifizieren "
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr "Diese Schaltfläche aktualisiert obige Liste mit den angegebenen Daten."
 
 msgid "This button will update the list above with the data supplied."
 msgstr "Diese Schaltfläche aktualisiert obige Liste mit den angegebenen Daten."
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "Importierte Einträge :"
 
 msgid "Records Imported :"
 msgstr "Importierte Einträge :"
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "LDIF-Datei in Adressbuch importieren"
 
 msgid "Import LDIF file into Address Book"
 msgstr "LDIF-Datei in Adressbuch importieren"
 

+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr "Verarbeite"
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Fehler beim Importieren der MUTT-Datei"
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Fehler beim Importieren der MUTT-Datei"


@@ -5035,11 +5484,11 @@ msgstr "Verbindung fehlgeschlagen"
 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 

-#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2454
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr "Gesperrt"
 
 msgid "Locked"
 msgstr "Gesperrt"
 

-#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Timeout"
 
 msgid "Timeout"
 msgstr "Timeout"
 


@@ -5202,21 +5651,21 @@ msgstr "Verbindung zu %s:%d abgelaufen."
 msgid "Incorporation cancelled\n"
 msgstr "Verbindung abgebrochen\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Verbindung abgebrochen\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sSie arbeiten offline. %d Minuten lang aufheben?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sSie arbeiten offline. %d Minuten lang aufheben?"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sSie arbeiten offline. Soll dies Aufgehoben werden?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sSie arbeiten offline. Soll dies Aufgehoben werden?"
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "nur einmal"
 
 msgid "On_ly once"
 msgstr "nur einmal"
 

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "Spitzname"
 
 msgid "Nick Name"
 msgstr "Spitzname"
 


@@ -5236,17 +5685,30 @@ msgstr "Beende..."
 #: src/main.c:329
 #, c-format
 msgid ""
 #: src/main.c:329
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Konfiguration für %s (oder älter) gefunden.\n"
+"Konfiguration für %s gefunden.\n"

 "Sollte diese Konfiguration angepasst werden?"
 
 "Sollte diese Konfiguration angepasst werden?"
 

-#: src/main.c:337
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"Die Sylpheed Filterregeln können mit einem Script konvertiert werden welches "
+"unter %s zu finden ist."
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "alte Einstellungen behalten"
 
 msgid "Keep old configuration"
 msgstr "alte Einstellungen behalten"
 

-#: src/main.c:340
+#: src/main.c:347

 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 "
 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 "


@@ -5257,27 +5719,27 @@ msgstr ""
 "zwischengespeicherte IMAP oder Newsdaten vorhanden sind. Außerdem wird die "
 "Sicherheitskopie entsprechend Platz auf der Festplatte benötigen."
 
 "zwischengespeicherte IMAP oder Newsdaten vorhanden sind. Außerdem wird die "
 "Sicherheitskopie entsprechend Platz auf der Festplatte benötigen."
 

-#: src/main.c:349
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 
 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 

-#: src/main.c:360
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "Kopiere Konfiguration... dies kann eine Weile dauern..."
 
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopiere Konfiguration... dies kann eine Weile dauern..."
 

-#: src/main.c:369
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "Umstellung fehlgeschlagen!"
 
 msgid "Migration failed!"
 msgstr "Umstellung fehlgeschlagen!"
 

-#: src/main.c:378
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "Umstellung der Konfiguration..."
 
 msgid "Migrating configuration..."
 msgstr "Umstellung der Konfiguration..."
 

-#: src/main.c:695
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 

-#: src/main.c:701
+#: src/main.c:713

 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "


@@ -5287,7 +5749,7 @@ msgstr ""
 "verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten GTK+ "
 "aktualisieren, oder Claws Mail neu kompilieren."
 
 "verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten GTK+ "
 "aktualisieren, oder Claws Mail neu kompilieren."
 

-#: src/main.c:710
+#: src/main.c:722

 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."


@@ -5296,7 +5758,19 @@ msgstr ""
 "verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten Claws Mail neu "
 "kompilieren."
 
 "verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten Claws Mail neu "
 "kompilieren."
 

-#: src/main.c:995
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (oder älter)"
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (oder älter)"
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (oder älter)"
+
+#: src/main.c:1013

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -5304,7 +5778,7 @@ msgstr ""
 "Einige Plugins konnten nicht geladen werden. Prüfen sie die "
 "Plugineinstellungen für mehr Informationen."
 
 "Einige Plugins konnten nicht geladen werden. Prüfen sie die "
 "Plugineinstellungen für mehr Informationen."
 

-#: src/main.c:1014
+#: src/main.c:1032

 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 "
 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 "


@@ -5314,7 +5788,7 @@ msgstr ""
 "Weise liegt dies an einem fehlerhaften IMAP Konto. \"Ordnerbaum erneuern\" "
 "im Hauptverzeichnis des Postfaches könnte das Problem lösen."
 
 "Weise liegt dies an einem fehlerhaften IMAP Konto. \"Ordnerbaum erneuern\" "
 "im Hauptverzeichnis des Postfaches könnte das Problem lösen."
 

-#: src/main.c:1020
+#: src/main.c:1038

 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 "
 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 "


@@ -5324,21 +5798,21 @@ msgstr ""
 "laden. Diese Mailbox wird vermutlich von einem alten Plugin zur Verfügung "
 "gestellt. Bitte installieren Sie das Plugin neu und versuchen es noch einmal."
 
 "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:1281
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 

-#: src/main.c:1283
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 

-#: src/main.c:1284
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      abonniere die angegebene URI wenn es möglich ist"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      abonniere die angegebene URI wenn es möglich ist"
 

-#: src/main.c:1285
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -5349,23 +5823,23 @@ msgstr ""
 "Datei/-en\n"
 "                         als Anhang"
 
 "Datei/-en\n"
 "                         als Anhang"
 

-#: src/main.c:1288
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 

-#: src/main.c:1289
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Konten"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Konten"
 

-#: src/main.c:1290
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle zwischengespeicherten Nachrichten"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle zwischengespeicherten Nachrichten"
 

-#: src/main.c:1291
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]...   zeigt die Anzahl neuer Nachrichten"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]...   zeigt die Anzahl neuer Nachrichten"
 

-#: src/main.c:1292
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -5373,7 +5847,7 @@ msgstr ""
 "  --status-full [Ordner]...\n"
 "                         zeigt den Status jedes Ordners"
 
 "  --status-full [Ordner]...\n"
 "                         zeigt den Status jedes Ordners"
 

-#: src/main.c:1294
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"


@@ -5382,52 +5856,52 @@ msgstr ""
 "                         Ordner ist eine Ordner-ID wie zB: 'Ordner/"
 "Unterordner'"
 
 "                         Ordner ist eine Ordner-ID wie zB: 'Ordner/"
 "Unterordner'"
 

-#: src/main.c:1296
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               schaltet in den Onlinemodus"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               schaltet in den Onlinemodus"
 

-#: src/main.c:1297
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schaltet in den Offlinemodus"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schaltet in den Offlinemodus"
 

-#: src/main.c:1298
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       beende Claws Mail"
 
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       beende Claws Mail"
 

-#: src/main.c:1299
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 

-#: src/main.c:1300
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h            zeigt diese Hilfe an"
 
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h            zeigt diese Hilfe an"
 

-#: src/main.c:1301
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus und beendet"
 
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v         gibt Versionsinformationen aus und beendet"
 

-#: src/main.c:1302
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt das Konfigurationsverzeichnis aus"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt das Konfigurationsverzeichnis aus"
 

-#: src/main.c:1342
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr "Unbekannter Option\n"
 
 msgid "Unknown option\n"
 msgstr "Unbekannter Option\n"
 

-#: src/main.c:1360
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung läuft (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung läuft (%s)..."
 

-#: src/main.c:1363
+#: src/main.c:1389

 msgid "top level folder"
 msgstr "Oberster Ordner"
 
 msgid "top level folder"
 msgstr "Oberster Ordner"
 

-#: src/main.c:1432
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 

-#: src/main.c:1433
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorhanden. Jetzt beenden?"
 


@@ -5509,7 +5983,7 @@ msgstr "/_Bearbeiten/In Ordner s_uchen..."
 msgid "/_Edit/_Quick search"
 msgstr "/_Bearbeiten/S_chnellsuche"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Bearbeiten/S_chnellsuche"
 

-#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:477
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr "/_Ansicht"
 
 msgid "/_View"
 msgstr "/_Ansicht"
 


@@ -5909,7 +6383,7 @@ msgstr "/_Ansicht/_Dekodierung/_Base64"
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Ansicht/_Dekodierung/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Ansicht/_Dekodierung/_Uuencode"
 

-#: src/mainwindow.c:745 src/summaryview.c:478
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in neuem _Fenster"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in neuem _Fenster"
 


@@ -6218,12 +6692,12 @@ msgid "/_Tools/SSL cer_tificates..."
 msgstr "/E_xtras/SSL-_Zertifikate..."
 
 #: src/mainwindow.c:867
 msgstr "/E_xtras/SSL-_Zertifikate..."
 
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/E_xtras/_Filterprotokoll"
+msgid "/_Tools/Filtering Log"
+msgstr "/E_xtras/Filterprotokoll"

 
 #: src/mainwindow.c:868
 
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/E_xtras/Pr_otokoll..."
+msgid "/_Tools/Network _Log"
+msgstr "/E_xtras/Netzwerkpr_otokoll"

 
 #: src/mainwindow.c:870
 msgid "/_Configuration"
 
 #: src/mainwindow.c:870
 msgid "/_Configuration"


@@ -6309,25 +6783,25 @@ msgstr "Sie sind offline. Klicken Sie auf das Icon, um online zu gehen"
 msgid "Select account"
 msgstr "Konto wählen"
 
 msgid "Select account"
 msgstr "Konto wählen"
 

-#: src/mainwindow.c:1300 src/prefs_logging.c:114
-msgid "Protocol log"
-msgstr "Mitschrift des Protokolls"
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"
+msgstr "Netzwerkprotokoll"

 
 

-#: src/mainwindow.c:1304 src/prefs_logging.c:152
+#: src/mainwindow.c:1304

 msgid "Filtering/processing debug log"
 msgstr "Filter-/Verarbeitungprotokoll"
 
 msgid "Filtering/processing debug log"
 msgstr "Filter-/Verarbeitungprotokoll"
 

-#: src/mainwindow.c:1323 src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"

 msgstr "Filterprotokoll aktiviert\n"
 
 msgstr "Filterprotokoll aktiviert\n"
 

-#: src/mainwindow.c:1325 src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"

 msgstr "Filterprotokoll deaktiviert.\n"
 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871
 msgstr "Filterprotokoll deaktiviert.\n"
 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871

-#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:765
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "Unbenannt"
 
 msgid "Untitled"
 msgstr "Unbenannt"
 


@@ -6346,11 +6820,11 @@ msgstr "Neue Mailbox"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "Geben Sie den Ort der Mailbox an.\n"
 "scanned automatically."
 msgstr ""
 "Geben Sie den Ort der Mailbox an.\n"

-"Wenn die existierende Mailbox angegeben wird,\n"
+"Wenn eine existierende Mailbox angegeben wird,\n"

 "wird sie automatisch durchsucht."
 
 #: src/mainwindow.c:2148
 "wird sie automatisch durchsucht."
 
 #: src/mainwindow.c:2148


@@ -6372,129 +6846,108 @@ msgstr ""
 "Möglicherweise existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 
 "Möglicherweise existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "Der Import der Mbox ist fehlgeschlagen."
 
 msgid "Mbox import has failed."
 msgstr "Der Import der Mbox ist fehlgeschlagen."
 

-#: src/mainwindow.c:3053 src/mainwindow.c:3062
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "Der Export in die mbox ist fehlgeschlagen."
 
 msgid "Export to mbox has failed."
 msgstr "Der Export in die mbox ist fehlgeschlagen."
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr "Beenden"
 
 msgid "Exit"
 msgstr "Beenden"
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail beenden?"
 

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 
 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "Mehrfach vorhandene Nachrichten werden gelöscht..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Mehrfach vorhandene Nachrichten werden gelöscht..."
 

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 

-#: src/mainwindow.c:3774 src/summaryview.c:4907
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ordnerregeln"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ordnerregeln"
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ordnerregeln"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ordnerregeln"
 

-#: src/mainwindow.c:3792 src/summaryview.c:4918
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 
 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 

-#: src/matcher.c:750 src/matcher.c:752
-msgid "subject"
-msgstr "Betreff"
-
-#: src/matcher.c:754 src/matcher.c:756
-msgid "From: header"
-msgstr "Von: Kopfzeile"
-
-#: src/matcher.c:758 src/matcher.c:760 src/matcher.c:766
-msgid "To: header"
-msgstr "An: Kopfzeile"
-
-#: src/matcher.c:762 src/matcher.c:764 src/matcher.c:767
-msgid "Cc: header"
-msgstr "Cc: Kopfzeile"
-
-#: src/matcher.c:975 src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "Newsgroups: Kopfzeile"
-
-#: src/matcher.c:979 src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "InReplyTo: Kopfzeile"
-
-#: src/matcher.c:985 src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr "InReplyTo: Kopfzeile (Referenzen)"
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "%s Kopfzeile"

 
 

-#: src/matcher.c:1071 src/matcher.c:1073
+#: src/matcher.c:1157 src/matcher.c:1159

 msgid "header"
 msgstr "Kopfzeile"
 
 msgid "header"
 msgstr "Kopfzeile"
 

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 msgid "header line"
 msgstr "Kopfzeile"
 
 msgid "header line"
 msgstr "Kopfzeile"
 

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 msgid "headers line"
 msgstr "Kopfzeilen"
 
 msgid "headers line"
 msgstr "Kopfzeilen"
 

-#: src/matcher.c:1086 src/matcher.c:1088
+#: src/matcher.c:1172 src/matcher.c:1174

 msgid "message line"
 msgstr "Nachrichtenzeile"
 
 msgid "message line"
 msgstr "Nachrichtenzeile"
 

-#: src/matcher.c:1099 src/matcher.c:1232 src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344 src/prefs_matcher.c:1361 src/prefs_matcher.c:2116
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "Alle"
 
 msgid "Filtering Matcher Menu|All"
 msgstr "Alle"
 

-#: src/matcher.c:1306 src/matcher.c:1309
+#: src/matcher.c:1392 src/matcher.c:1395

 msgid "body line"
 msgstr "Nachrichtenkörperzeile"
 
 msgid "body line"
 msgstr "Nachrichtenkörperzeile"
 

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "prüfe ob Nachricht auf [ %s ] passt\n"
 
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "prüfe ob Nachricht auf [ %s ] passt\n"
 

-#: src/matcher.c:1542 src/matcher.c:1561 src/matcher.c:1574
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660

 msgid "message matches\n"
 msgstr "Nachricht passt\n"
 
 msgid "message matches\n"
 msgstr "Nachricht passt\n"
 

-#: src/matcher.c:1549 src/matcher.c:1567 src/matcher.c:1576
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662

 msgid "message does not match\n"
 msgstr "Nachricht passt nicht\n"
 
 msgid "message does not match\n"
 msgstr "Nachricht passt nicht\n"
 

-#: src/matcher.c:1829 src/matcher.c:1830 src/matcher.c:1831 src/matcher.c:1832
-#: src/matcher.c:1833 src/matcher.c:1834 src/matcher.c:1835 src/matcher.c:1836
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr "(nichts)"
 
 msgid "(none)"
 msgstr "(nichts)"
 


@@ -6520,8 +6973,8 @@ msgstr "überschreibe mbox Datei"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 

-#: src/mbox.c:531 src/messageview.c:1180 src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "Überschreiben"
 
 msgid "Overwrite"
 msgstr "Überschreiben"
 


@@ -6546,27 +6999,27 @@ msgstr "In aktueller Nachricht suchen"
 msgid "Find text:"
 msgstr "Suchen nach:"
 
 msgid "Find text:"
 msgstr "Suchen nach:"
 

-#: src/message_search.c:210 src/prefs_matcher.c:655 src/summary_search.c:396
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 

-#: src/message_search.c:323 src/summary_search.c:650
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 
 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 

-#: src/message_search.c:324 src/summary_search.c:651
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr "Gesuchte Zeichenkette nicht gefunden."
 
 msgid "Search string not found."
 msgstr "Gesuchte Zeichenkette nicht gefunden."
 

-#: src/message_search.c:333
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr "Anfang der Nachricht erreicht. Weiter vom Ende?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Anfang der Nachricht erreicht. Weiter vom Ende?"
 

-#: src/message_search.c:336
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht. Weiter vom Anfang?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht. Weiter vom Anfang?"
 

-#: src/message_search.c:339 src/summary_search.c:662
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr "Suche beendet"
 
 msgid "Search finished"
 msgstr "Suche beendet"
 


@@ -6645,39 +7098,39 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen die Empfangsbestätigung nicht zu senden."
 
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen die Empfangsbestätigung nicht zu senden."
 

-#: src/messageview.c:817 src/procmime.c:883
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsslung fehlgeschlagen: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsslung fehlgeschlagen: %s"
 

-#: src/messageview.c:1175 src/mimeview.c:1606 src/summaryview.c:4187
-#: src/summaryview.c:4190 src/textview.c:2648
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr "Speichern als"
 
 msgid "Save as"
 msgstr "Speichern als"
 

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 

-#: src/messageview.c:1189 src/summaryview.c:4207 src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "Es wurde eine Empfangsbestätigung für diese Nachricht angefordert."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Es wurde eine Empfangsbestätigung für diese Nachricht angefordert."
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung."
 
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung."
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6685,7 +7138,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt\n"
 "und wurde auf dem Server gelöscht."
 
 "Diese Nachricht wurde teilweise abgeholt\n"
 "und wurde auf dem Server gelöscht."
 

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6694,15 +7147,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß."
 

-#: src/messageview.c:1308 src/messageview.c:1330
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr "Zum Download markieren"
 
 msgid "Mark for download"
 msgstr "Zum Download markieren"
 

-#: src/messageview.c:1309 src/messageview.c:1321
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6711,12 +7164,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß und wird heruntergeladen."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß und wird heruntergeladen."
 

-#: src/messageview.c:1319 src/messageview.c:1332
+#: src/messageview.c:1331 src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Demarkieren"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Demarkieren"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6725,11 +7178,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s und wird gelöscht."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s und wird gelöscht."
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6739,19 +7192,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie für das versenden der "
 "Empfangsbestätigung verwenden möchten:"
 
 "Bitte wählen Sie, welches Konto Sie für das versenden der "
 "Empfangsbestätigung verwenden möchten:"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "_Abbrechen"
 
 msgid "_Cancel"
 msgstr "_Abbrechen"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken nicht möglich: Die Nachricht enthält keinen Text."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken nicht möglich: Die Nachricht enthält keinen Text."
 

-#: src/messageview.c:1545 src/summaryview.c:4247
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6760,7 +7213,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
 "Geben Sie den Druckbefehl ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 

-#: src/messageview.c:1551 src/summaryview.c:4253
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6769,8 +7222,8 @@ msgstr ""
 "Druckbefehl ist ungültig:\n"
 "'%s'"
 
 "Druckbefehl ist ungültig:\n"
 "'%s'"
 

-#: src/messageview.c:1829 src/messageview.c:1835 src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr "beim Lernen ist ein Fehler aufgetreten.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "beim Lernen ist ein Fehler aufgetreten.\n"
 


@@ -6808,88 +7261,92 @@ msgstr "Mailbox entfernen"
 msgid "_Remove"
 msgstr "_Entfernen"
 
 msgid "_Remove"
 msgstr "_Entfernen"
 

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr "/_Öffnen"
-

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
-msgstr "/Öffne _mit..."
+msgid "/_Open (l)"
+msgstr "/_Öffnen (l)"

 
 #: src/mimeview.c:170
 
 #: src/mimeview.c:170

-msgid "/_Display as text"
-msgstr "/_Darstellung als Text"
+msgid "/Open _with (o)..."
+msgstr "/Öffne _mit (o)..."

 
 

-#: src/mimeview.c:171 src/summaryview.c:483
-msgid "/_Save as..."
-msgstr "/_Speichern als..."
+#: src/mimeview.c:171
+msgid "/_Display as text (t)"
+msgstr "/_Darstellung als Text (t)"

 
 #: src/mimeview.c:172
 
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr "/_Speichern als (y)..."
+
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/_Alles speichern..."
 
 msgid "/Save _all..."
 msgstr "/_Alles speichern..."
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr "/Nächster Teil (a)"
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "MIME-Typ"
 
 msgid "MIME Type"
 msgstr "MIME-Typ"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "Unterschrift prüfen"
 
 msgid "Check signature"
 msgstr "Unterschrift prüfen"
 

-#: src/mimeview.c:764 src/mimeview.c:769 src/mimeview.c:774
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr "Vollständige Informationen anzeigen"
 
 msgid "View full information"
 msgstr "Vollständige Informationen anzeigen"
 

-#: src/mimeview.c:779 src/mimeview.c:783
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr "Erneut überprüfen"
 
 msgid "Check again"
 msgstr "Erneut überprüfen"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Klicken Sie auf das Symbol oder drücken Sie die Taste 'C' um sie zu "
 "überprüfen."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Klicken Sie auf das Symbol oder drücken Sie die Taste 'C' um sie zu "
 "überprüfen."
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Zeitüberschreitung beim prüfen der Signatur. Symbol klicken oder 'C' drücken "
 "um es nocheinmal zu versuchen"
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Zeitüberschreitung beim prüfen der Signatur. Symbol klicken oder 'C' drücken "
 "um es nocheinmal zu versuchen"
 

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "Signatur wird überprüft..."
 
 msgid "Checking signature..."
 msgstr "Signatur wird überprüft..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 

-#: src/mimeview.c:1388 src/mimeview.c:1472 src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Ein Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Ein Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden: %s"
 

-#: src/mimeview.c:1461 src/textview.c:2658
+#: src/mimeview.c:1511 src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Soll existierende Datei '%s' überschrieben werden?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Soll existierende Datei '%s' überschrieben werden?"
 

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgstr "Zielordner wählen"
 
 msgid "Select destination folder"
 msgstr "Zielordner wählen"
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Verzeichnis."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Verzeichnis."
 

-#: src/mimeview.c:1734 src/mimeview.c:1742 src/textview.c:2589
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600

 msgid "Open with"
 msgstr "Öffnen mit"
 
 msgid "Open with"
 msgstr "Öffnen mit"
 

-#: src/mimeview.c:1735 src/mimeview.c:1743 src/textview.c:2590
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -7002,25 +7459,25 @@ msgstr "Newsgroup kündigen"
 msgid "_Unsubscribe"
 msgstr "/Newsgroup _kündigen"
 
 msgid "_Unsubscribe"
 msgstr "/Newsgroup _kündigen"
 

-#: src/news_gtk.c:302
+#: src/news_gtk.c:303 src/news_gtk.c:305

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s'."
 
 #: src/plugins/bogofilter/bogofilter.c:77
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s'."
 
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 msgid "Bogofilter"
 msgstr "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: hole Nachricht..."
 
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: hole Nachricht..."
 

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtere Nachricht..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtere Nachricht..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 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"
 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"


@@ -7032,7 +7489,7 @@ msgstr ""
 " Benutze \"/Markieren/als Ham (kein Spam) markieren\" um Bogofilter mit "
 "einigen hundert Spam und nicht Spam Nachrichten zu trainieren."
 
 " Benutze \"/Markieren/als Ham (kein Spam) markieren\" um Bogofilter mit "
 "einigen hundert Spam und nicht Spam Nachrichten zu trainieren."
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "


@@ -7041,21 +7498,21 @@ msgstr ""
 "Das Bogofilterplugin konnte die Nachricht nicht filtern. Das Kommando `%s %s "
 "%s` konnte nicht ausgeführt werden."
 
 "Das Bogofilterplugin konnte die Nachricht nicht filtern. Das Kommando `%s %s "
 "%s` konnte nicht ausgeführt werden."
 

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lerne von Nachricht..."
 
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lerne von Nachricht..."
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Lernen fehlgeschlagen; `%s` wurde mit Status %d beendet."
 
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Lernen fehlgeschlagen; `%s` wurde mit Status %d beendet."
 

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: lerne von Nachrichten..."
 
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: lerne von Nachrichten..."
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"


@@ -7064,11 +7521,11 @@ msgstr ""
 "Lernen fehlgeschlagen; `%s %s %s` wurde mit einem Fehler beendet:\n"
 "%s"
 
 "Lernen fehlgeschlagen; `%s %s %s` wurde mit einem Fehler beendet:\n"
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61

 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:963

 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 "
 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 "


@@ -7096,62 +7553,62 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "Bogofilter"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam detection"
 msgstr "Spamerkennung"
 
 msgid "Spam detection"
 msgstr "Spamerkennung"
 

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594

 msgid "Spam learning"
 msgstr "lernen von Spam"
 
 msgid "Spam learning"
 msgstr "lernen von Spam"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "Nachrichten beim Empfang überprüfen"
 
 msgid "Process messages on receiving"
 msgstr "Nachrichten beim Empfang überprüfen"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "Maximalgröße"
 
 msgid "Maximum size"
 msgstr "Maximalgröße"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr ""
 "Es werden keine Nachrichten überprüft die grösser sind als hier angegeben"
 
 msgid "Messages larger than this will not be checked"
 msgstr ""
 "Es werden keine Nachrichten überprüft die grösser sind als hier angegeben"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "kB"
 
 msgid "kB"
 msgstr "kB"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "Speichere Spam in"
 
 msgid "Save spam in"
 msgstr "Speichere Spam in"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Ordner, der verwendet wird, um Spam zu speichern. Leer lassen, um den "
 "Standard Müllordner zu verwenden"
 
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Ordner, der verwendet wird, um Spam zu speichern. Leer lassen, um den "
 "Standard Müllordner zu verwenden"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem als Spam erkannte "
 "Nachrichten gespeichert werden"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem als Spam erkannte "
 "Nachrichten gespeichert werden"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgstr "Wenn unklar, verschieben nach"
 
 msgid "When unsure, move to"
 msgstr "Wenn unklar, verschieben nach"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:213

 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."


@@ -7159,25 +7616,25 @@ msgstr ""
 "Ordner, der verwendet wird, um Nachrichten zu speichern deren Spamstatus "
 "unklar ist. Leer lassen, um INBOX Ordner zu verwenden"
 
 "Ordner, der verwendet wird, um Nachrichten zu speichern deren Spamstatus "
 "unklar ist. Leer lassen, um INBOX Ordner zu verwenden"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem Nachrichten "
 "gespeichert werden deren Spamstatus unklar ist"
 
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem Nachrichten "
 "gespeichert werden deren Spamstatus unklar ist"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgstr "X-Bogosity Kopfzeile einfügen"
 
 msgid "Insert X-Bogosity header"
 msgstr "X-Bogosity Kopfzeile einfügen"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "nur für Nachrichten in MH Ordnern"
 
 msgid "Only done for messages in MH folders"
 msgstr "nur für Nachrichten in MH Ordnern"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgstr "Adressbuch/Ordner der immer akzeptierten Absender"
 
 msgid "Whitelist senders found in address book/folder"
 msgstr "Adressbuch/Ordner der immer akzeptierten Absender"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:238

 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"


@@ -7185,26 +7642,31 @@ msgstr ""
 "Nachrichten deren Absender im Adressbuch vorhanden ist werden in den "
 "normalen Ordner zugestellt, auch wenn sie als Spam erkannt wurden"
 
 "Nachrichten deren Absender im Adressbuch vorhanden ist werden in den "
 "normalen Ordner zugestellt, auch wenn sie als Spam erkannt wurden"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/plugins/bogofilter/bogofilter_gtk.c:256

 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505

-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "Auswählen ..."
 
 msgid "Select ..."
 msgstr "Auswählen ..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Drücke diesen Knopf um ein Adressbuch oder Ordner aus dem Adressbuch zu "
 "wählen"
 
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Drücke diesen Knopf um ein Adressbuch oder Ordner aus dem Adressbuch zu "
 "wählen"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr "Bogofilteraufruf"
 
 msgid "Bogofilter call"
 msgstr "Bogofilteraufruf"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "Pfad zum Bogofilterprogramm"
 
 msgid "Path to bogofilter executable"
 msgstr "Pfad zum Bogofilterprogramm"
 

+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "Spam als gelesen markieren"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -7218,7 +7680,7 @@ msgstr "ClamAV: Nachricht wird gescannt..."
 msgid "Failed to register mail filtering hook"
 msgstr "mail-filtering-hook konnte nicht registriert werden"
 
 msgid "Failed to register mail filtering hook"
 msgstr "mail-filtering-hook konnte nicht registriert werden"
 

-#: src/plugins/clamav/clamav_plugin.c:303
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -7237,7 +7699,7 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Clam "
 "AntiVirus"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Clam "
 "AntiVirus"
 

-#: src/plugins/clamav/clamav_plugin.c:330
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr "Viruserkennung"
 
 msgid "Virus detection"
 msgstr "Viruserkennung"
 


@@ -7283,7 +7745,7 @@ msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem infizierte e-Mails "
 "abgespeichert werden"
 
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem infizierte e-Mails "
 "abgespeichert werden"
 

-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr "Demo"
 
 msgid "Demo"
 msgstr "Demo"
 


@@ -7291,7 +7753,7 @@ msgstr "Demo"
 msgid "Failed to register log text hook"
 msgstr "Registrierung des \"log text hook\" fehlgeschlagen"
 
 msgid "Failed to register log text hook"
 msgstr "Registrierung des \"log text hook\" fehlgeschlagen"
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 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"


@@ -7332,7 +7794,7 @@ msgstr "Entsprechend Dillo's '--fullwindow' Option"
 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML Betrachter"
 
 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML Betrachter"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -7343,11 +7805,11 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Dillo "
 "Browser"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Dillo "
 "Browser"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "Mantra"
 
 msgid "Passphrase"
 msgstr "Mantra"
 


@@ -7487,7 +7949,7 @@ msgstr "   Dieser Schlüssel ist an Ihrem Schlüsselbund.\n"
 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -7509,71 +7971,71 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94

 msgid "Core operations"
 msgstr "Kernoperationen"
 
 msgid "Core operations"
 msgstr "Kernoperationen"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "Digitale Unterschriften automatisch überprüfen"
 
 msgid "Automatically check signatures"
 msgstr "Digitale Unterschriften automatisch überprüfen"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "gpg-agent für Passwortverwaltung verwenden"
 
 msgid "Use gpg-agent to manage passwords"
 msgstr "gpg-agent für Passwortverwaltung verwenden"
 

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "Passwort im Speicher ablegen"
 
 msgid "Store passphrase in memory"
 msgstr "Passwort im Speicher ablegen"
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "Verfällt nach"
 
 msgid "Expire after"
 msgstr "Verfällt nach"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 

-#: src/plugins/pgpcore/prefs_gpg.c:142 src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr "Minute(n)"
 
 msgid "minute(s)"
 msgstr "Minute(n)"
 

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe bei der Eingabe eines Mantra sperren"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe bei der Eingabe eines Mantra sperren"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Beim Start warnen, wenn GnuPG nicht funktioniert"
 
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Beim Start warnen, wenn GnuPG nicht funktioniert"
 

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 
 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "Voreingestellten GnuPG-Schlüssel benutzen"
 
 msgid "Use default GnuPG key"
 msgstr "Voreingestellten GnuPG-Schlüssel benutzen"
 

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "Schlüssel nach E-Mail Adresse wählen"
 
 msgid "Select key by your email address"
 msgstr "Schlüssel nach E-Mail Adresse wählen"
 

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "kein Schlüssel gefunden."
 
 msgid "No secret key found."
 msgstr "kein Schlüssel gefunden."
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "Erzeuge neues Schlüsselpaar"
 
 msgid "Generate a new key pair"
 msgstr "Erzeuge neues Schlüsselpaar"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr "GPG"
 
 msgid "GPG"
 msgstr "GPG"
 


@@ -7603,7 +8065,7 @@ msgstr "Val"
 msgid "Select"
 msgstr "Wählen"
 
 msgid "Select"
 msgstr "Wählen"
 

-#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:372
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Weiteres"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Weiteres"


@@ -7878,10 +8340,10 @@ msgstr ""
 "Textdaten konnten zu keinem vernünftigen Zeichensatz konvertiert werden."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
 "Textdaten konnten zu keinem vernünftigen Zeichensatz konvertiert werden."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554

-#: src/plugins/pgpinline/pgpinline.c:676 src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:594
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "GPG Kontext konnte nicht initialisiert werden, %s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "GPG Kontext konnte nicht initialisiert werden, %s"


@@ -7937,22 +8399,30 @@ msgstr "Datensignierung fehlgeschlagen, kein Ergebniss."
 msgid "Data signing failed, no contents."
 msgstr "Datensignierung fehlgeschlagen, keine Daten."
 
 msgid "Data signing failed, no contents."
 msgstr "Datensignierung fehlgeschlagen, keine Daten."
 

-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+"Bitte beachte das weder Anhänge noch Kopfzeilen wie Betreff vom PGP/Inline "
+"System nicht verschlüsselt werden."
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "GPG Schlüssel %s konnte nicht hinzugefügt werden, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "GPG Schlüssel %s konnte nicht hinzugefügt werden, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:706 src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei konnte nicht erstellt werden, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei konnte nicht erstellt werden, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:734 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsslung fehlgeschlagen, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsslung fehlgeschlagen, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 


@@ -7960,7 +8430,7 @@ msgstr "PGP/Inline"
 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -8003,7 +8473,15 @@ msgstr "Entschlüsselte Dateiteile konnten nicht analysiert werden."
 msgid "Couldn't create temporary file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Bitte beachte das Kopfzeilen wie z.B. Betreff vom PGP/Mime System nicht "
+"verschlüsselt werden."
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 


@@ -8011,7 +8489,7 @@ msgstr "PGP/Mime"
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59

 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"
 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"


@@ -8037,27 +8515,27 @@ msgstr ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin Plugin kann nicht zum spamd verbinden.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin Plugin kann nicht zum spamd verbinden.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin Filter fehlgeschlagen.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin Filter fehlgeschlagen.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin Plugin ist durch seine Einstellungen deaktiviert.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin Plugin ist durch seine Einstellungen deaktiviert.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Nachricht wird gefiltert..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Nachricht wird gefiltert..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
+#: src/plugins/spamassassin/spamassassin.c:314

 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 "
 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 "


@@ -8067,7 +8545,7 @@ msgstr ""
 "Fehlerursache ist ein nicht erreichbaer spamd Prozess. Bitte stellen Sie "
 "sicher das spamd ausgeführt wird und erreichbar ist."
 
 "Fehlerursache ist ein nicht erreichbaer spamd Prozess. Bitte stellen Sie "
 "sicher das spamd ausgeführt wird und erreichbar ist."
 

-#: src/plugins/spamassassin/spamassassin.c:370
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."


@@ -8075,16 +8553,16 @@ msgstr ""
 "Claws Mail benötigt Netzwerkzugang um diese E-Mail zum lernen an "
 "Spamassassin zu senden."
 
 "Claws Mail benötigt Netzwerkzugang um diese E-Mail zum lernen an "
 "Spamassassin zu senden."
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "der Benutzername konnte nicht ermittelt werden"
 
 msgid "Failed to get username"
 msgstr "der Benutzername konnte nicht ermittelt werden"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin Plugin ist geladen aber durch seine Einstellungen deaktiviert.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin Plugin ist geladen aber durch seine Einstellungen deaktiviert.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:562

 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 "
 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 "


@@ -8109,55 +8587,55 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "SpamAssassin"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "Localhost"
 
 msgid "Localhost"
 msgstr "Localhost"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr "TCP"
 
 msgid "TCP"
 msgstr "TCP"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr "Unix Socket"
 
 msgid "Unix Socket"
 msgstr "Unix Socket"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "SpamAssassin Plugin aktivieren"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "SpamAssassin Plugin aktivieren"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "Transport"
 
 msgid "Transport"
 msgstr "Transport"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "Art der Verbindung"
 
 msgid "Type of transport"
 msgstr "Art der Verbindung"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "Benutzername"
 
 msgid "User"
 msgstr "Benutzername"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "Benutzername mit dem zum spamd Server verbunden wird"
 
 msgid "User to use with spamd server"
 msgstr "Benutzername mit dem zum spamd Server verbunden wird"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr "spamd"
 
 msgid "spamd"
 msgstr "spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "Hostname oder IP-Adresse des spamd-Servers"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "Hostname oder IP-Adresse des spamd-Servers"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "Port des spamd Servers"
 
 msgid "Port of spamd server"
 msgstr "Port des spamd Servers"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "Pfad des Unix Sockets"
 
 msgid "Path of Unix socket"
 msgstr "Pfad des Unix Sockets"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:354

 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."


@@ -8165,8 +8643,8 @@ msgstr ""
 "Erlaubte Zeit für die Überprüfung. Nach Ablauf dieser Zeit wird die "
 "Überprüfung abgebrochen."
 
 "Erlaubte Zeit für die Überprüfung. Nach Ablauf dieser Zeit wird die "
 "Überprüfung abgebrochen."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355 src/prefs_other.c:575
-#: src/prefs_summaries.c:493
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "Sekunden"
 
 msgid "seconds"
 msgstr "Sekunden"
 


@@ -8178,14 +8656,14 @@ msgstr "Ausrichtung"
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung im System Tray."
 
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung im System Tray."
 

-#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:567

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Trayicon"
 
 #: src/plugins/trayicon/trayicon.c:110
 msgid "/_Get Mail"
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Trayicon"
 
 #: src/plugins/trayicon/trayicon.c:110
 msgid "/_Get Mail"

-msgstr "holen"
+msgstr "_Abrufen"

 
 #: src/plugins/trayicon/trayicon.c:112
 msgid "/_Email"
 
 #: src/plugins/trayicon/trayicon.c:112
 msgid "/_Email"


@@ -8218,7 +8696,7 @@ msgstr "/_Datei/_Offline arbeiten"
 
 #: src/plugins/trayicon/trayicon.c:324
 msgid "/Get Mail"
 
 #: src/plugins/trayicon/trayicon.c:324
 msgid "/Get Mail"

-msgstr "/E-Mails holen"
+msgstr "/E-Mails abrufen"

 
 #: src/plugins/trayicon/trayicon.c:404
 msgid "Failed to register folder item update hook"
 
 #: src/plugins/trayicon/trayicon.c:404
 msgid "Failed to register folder item update hook"


@@ -8244,7 +8722,7 @@ msgstr "'close hook' konnte nicht registriert werden"
 msgid "Failed to register got iconified hook"
 msgstr "'got iconified hook' konnte nicht registriert werden"
 
 msgid "Failed to register got iconified hook"
 msgstr "'got iconified hook' konnte nicht registriert werden"
 

-#: src/plugins/trayicon/trayicon.c:484
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -8295,133 +8773,95 @@ msgstr "Erforderlichen APOP-Zeitstempel in der Begrüßung nicht gefunden\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntaxfehler in Begrüßung\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntaxfehler in Begrüßung\n"
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "Zeitstempel-Syntaxfehler in Begrüßung (kein ascii)\n"
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "POP3-Protokollfehler\n"
 
 msgid "POP3 protocol error\n"
 msgstr "POP3-Protokollfehler\n"
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Ungültige UIDL Antwort: %s\n"
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Ungültige UIDL Antwort: %s\n"
 

-#: src/pop.c:817
+#: src/pop.c:822

 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: Verfallene Nachricht %d [%s] wird gelöscht\n"
 
 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: Verfallene Nachricht %d [%s] wird gelöscht\n"
 

-#: src/pop.c:833
+#: src/pop.c:838

 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: Nachricht %d [%s] wird übersprungen (%d bytes)\n"
 
 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: Nachricht %d [%s] wird übersprungen (%d bytes)\n"
 

-#: src/pop.c:865
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "Mailbox ist gesperrt\n"
 
 msgid "mailbox is locked\n"
 msgstr "Mailbox ist gesperrt\n"
 

-#: src/pop.c:868
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "Zeitüberschreitung der Sitzung\n"
 
 msgid "Session timeout\n"
 msgstr "Zeitüberschreitung der Sitzung\n"
 

-#: src/pop.c:887
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "Befehl nicht unterstützt\n"
 
 msgid "command not supported\n"
 msgstr "Befehl nicht unterstützt\n"
 

-#: src/pop.c:892
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "Fehler bei der POP3-Sitzung\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "Fehler bei der POP3-Sitzung\n"
 

-#: src/pop.c:1086
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "TOP Befehl nicht unterstützt\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP Befehl nicht unterstützt\n"
 

-#: src/prefs_account.c:242 src/prefs_account.c:1553 src/prefs_account.c:2286
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:245 src/prefs_account.c:1668 src/prefs_account.c:2299
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:247 src/wizard.c:1154
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr "Lokale mbox-Datei"
 
 msgid "Local mbox file"
 msgstr "Lokale mbox-Datei"
 

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "Keine (nur SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Keine (nur SMTP)"
 

-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
+#: src/prefs_account.c:933
+msgid "Name of account"
+msgstr "Kontoname"

 
 

-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "Einstellungen eines neuen Kontos"
+#: src/prefs_account.c:942
+msgid "Set as default"
+msgstr "Als Standard setzen"

 
 

-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Konteneinstellungen"
+#: src/prefs_account.c:950
+msgid "Personal information"
+msgstr "Persönliche Informationen"

 
 

-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "_Allgemein"
-
-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "_Empfang"
-
-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "_Verfassen"
-
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "_Datenschutz"
-
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "SS_L"
-
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "Er_weitert"
-
-#: src/prefs_account.c:1190
-msgid "Name of account"
-msgstr "Kontoname"
-
-#: src/prefs_account.c:1199
-msgid "Set as default"
-msgstr "Als Standard setzen"
-
-#: src/prefs_account.c:1207
-msgid "Personal information"
-msgstr "Persönliche Informationen"
-
-#: src/prefs_account.c:1216
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr "Vollständiger Name"
 
 msgid "Full name"
 msgstr "Vollständiger Name"
 

-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 

-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "Serverdaten"
 
 msgid "Server information"
 msgstr "Serverdaten"
 

-#: src/prefs_account.c:1287 src/wizard.c:1248
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -8429,92 +8869,93 @@ msgstr ""
 "<span weight=\"bold\">Achtung: diese Version von Claws Mail\n"
 "wurde ohne IMAP Support kompiliert.</span>"
 
 "<span weight=\"bold\">Achtung: diese Version von Claws Mail\n"
 "wurde ohne IMAP Support kompiliert.</span>"
 

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 
 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "Newsserver"
 
 msgid "News server"
 msgstr "Newsserver"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 
 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "Mailkommando anstelle eines SMTP-Servers verwenden"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Mailkommando anstelle eines SMTP-Servers verwenden"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 
 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 

-#: src/prefs_account.c:1420 src/prefs_account.c:1852
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr "Benutzer-ID"
 
 msgid "User ID"
 msgstr "Benutzer-ID"
 

-#: src/prefs_account.c:1426 src/prefs_account.c:1872
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr "Kennwort"
 
 msgid "Password"
 msgstr "Kennwort"
 

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "Konto%d"
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "Lokal"
 
 msgid "Local"
 msgstr "Lokal"
 

-#: src/prefs_account.c:1531 src/prefs_account.c:1620
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "Standard-Eingangsordner"
 
 msgid "Default inbox"
 msgstr "Standard-Eingangsordner"
 

-#: src/prefs_account.c:1538 src/prefs_account.c:1546 src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 

-#: src/prefs_account.c:1543 src/prefs_account.c:1632 src/prefs_account.c:2036
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "Durchsuchen"
 
 msgid "Bro_wse"
 msgstr "Durchsuchen"
 

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "Beim Empfangen Nachrichten vom Server löschen"
 
 msgid "Remove messages on server when received"
 msgstr "Beim Empfangen Nachrichten vom Server löschen"
 

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "Löschen nach"
 
 msgid "Remove after"
 msgstr "Löschen nach"
 

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "0 Tage: Sofort löschen"
 
 msgid "0 days: remove immediately"
 msgstr "0 Tage: Sofort löschen"
 

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "Tagen"
 
 msgid "days"
 msgstr "Tagen"
 

-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "Alle Nachrichten vom Server holen"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 
 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1382

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -8523,73 +8964,87 @@ msgstr ""
 "ausgewählt werden, haben Sie die Möglichkeit diese vollständig zu downloaden "
 "oder zu löschen."
 
 "ausgewählt werden, haben Sie die Möglichkeit diese vollständig zu downloaden "
 "oder zu löschen."
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1642 src/prefs_account.c:2312
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikel"
 
 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikel"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert, wenn 0 angegeben"
 
 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert, wenn 0 angegeben"
 

-#: src/prefs_account.c:1674 src/prefs_account.c:1822
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 

-#: src/prefs_account.c:1684 src/prefs_account.c:1832 src/prefs_send.c:278
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr "Automatisch"
 
 msgid "Automatic"
 msgstr "Automatisch"
 

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 
 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "nur abonnierte Ordner anzeigen"
 
 msgid "Show subscribed folders only"
 msgstr "nur abonnierte Ordner anzeigen"
 

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr "Bandbreiten effizienter Modus"
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr ""
+"Dieser Modus benutzt weniger Bandbreite aber kann mit einigen Servern "
+"langsamer sein."
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "Erlaube das Filtern durch Plugins beim Empfang"
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Alles holen' überprüft, ob neue E-Mails für dieses Konto vorhanden sind"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Alles holen' überprüft, ob neue E-Mails für dieses Konto vorhanden sind"
 

-#: src/prefs_account.c:1783 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "Kopfzeile"
 
 msgid "Header"
 msgstr "Kopfzeile"
 

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "Nachrichten-ID erzeugen"
 
 msgid "Generate Message-ID"
 msgstr "Nachrichten-ID erzeugen"
 

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 
 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "Beglaubigung"
 
 msgid "Authentication"
 msgstr "Beglaubigung"
 

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 

-#: src/prefs_account.c:1894
+#: src/prefs_account.c:1711

 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."


@@ -8597,229 +9052,258 @@ msgstr ""
 "Wenn diese Felder leer gelassen werden, werden die gleiche User-ID und das "
 "gleiche Passwort wie beim Empfang verwendet."
 
 "Wenn diese Felder leer gelassen werden, werden die gleiche User-ID und das "
 "gleiche Passwort wie beim Empfang verwendet."
 

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "Mit POP3 vor dem Senden beglaubigen"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Mit POP3 vor dem Senden beglaubigen"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "POP-Beglaubigung Timeout:"
 
 msgid "POP authentication timeout: "
 msgstr "POP-Beglaubigung Timeout:"
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "Minuten"
 
 msgid "minutes"
 msgstr "Minuten"
 

-#: src/prefs_account.c:1982 src/prefs_account.c:2028
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr "Unterschrift"
 
 msgid "Signature"
 msgstr "Unterschrift"
 

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "Unterschrift automatisch hinzufügen"
 
 msgid "Insert signature automatically"
 msgstr "Unterschrift automatisch hinzufügen"
 

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "Befehlsausgabe"
 
 msgid "Command output"
 msgstr "Befehlsausgabe"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen setzen"
 
 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen setzen"
 

-#: src/prefs_account.c:2057 src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1885 src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:2070 src/prefs_template.c:189
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "Antwort an"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibprüfung"
 
 msgid "Spell check dictionaries"
 msgstr "Wörterbücher für Rechtschreibprüfung"
 

-#: src/prefs_account.c:2107 src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 

-#: src/prefs_account.c:2124 src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "alternatives Standard-Wörterbuch"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "alternatives Standard-Wörterbuch"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr "Spezielles Zitatformat für neue Nachrichten"
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr "Spezielles Zitatformat für Antworten"
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr "Spezielles Zitatformat für Weiterleitungen"
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 
 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 
 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsselt"
 
 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsselt"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten immer verschlüsseln, wenn auf verschlüsselte Nachrichten "
 "geantwortet wird"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten immer verschlüsseln, wenn auf verschlüsselte Nachrichten "
 "geantwortet wird"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Verschlüssle Nachrichten zusätzlich mit dem eigenem Schlüssel"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Verschlüssle Nachrichten zusätzlich mit dem eigenem Schlüssel"
 

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschickte, verschlüsselte Nachrichten im Klartext speichern"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschickte, verschlüsselte Nachrichten im Klartext speichern"
 

-#: src/prefs_account.c:2290 src/prefs_account.c:2303 src/prefs_account.c:2315
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 
 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 

-#: src/prefs_account.c:2296 src/prefs_account.c:2309 src/prefs_account.c:2336
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS-Kommando zum Starten einer SSL-Sitzung verwenden"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS-Kommando zum Starten einer SSL-Sitzung verwenden"
 

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber, wenn nötig, STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber, wenn nötig, STARTTLS)"
 

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockendes SSL verwenden"
 
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockendes SSL verwenden"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Bei Problemen mit der SSL Verbindung diese Option nicht wählen"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Bei Problemen mit der SSL Verbindung diese Option nicht wählen"
 

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "SMTP-Port"
 
 msgid "SMTP port"
 msgstr "SMTP-Port"
 

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "POP3-Port"
 
 msgid "POP3 port"
 msgstr "POP3-Port"
 

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 
 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "NNTP-Port"
 
 msgid "NNTP port"
 msgstr "NNTP-Port"
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "Domäne-Name"
 
 msgid "Domain name"
 msgstr "Domäne-Name"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "Kommando zur Kommunikation mit dem Server verwenden"
 
 msgid "Use command to communicate with server"
 msgstr "Kommando zur Kommunikation mit dem Server verwenden"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Cross-gepostete Nachrichten als gelesen und mit Farbe markieren:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Cross-gepostete Nachrichten als gelesen und mit Farbe markieren:"
 

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "Durchsuchen"
 
 msgid "Browse"
 msgstr "Durchsuchen"
 

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "Wartende Nachrichten ablegen in"
 
 msgid "Put queued messages in"
 msgstr "Wartende Nachrichten ablegen in"
 

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 
 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "Kontoname wurde nicht angegeben."
 
 msgid "Account name is not entered."
 msgstr "Kontoname wurde nicht angegeben."
 

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "Der Standard Posteingangsordner existiert nicht."
 
 msgid "The default inbox folder doesn't exist."
 msgstr "Der Standard Posteingangsordner existiert nicht."
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "Keine Dateinamen für die lokale Mailbox angegeben."
 
 msgid "local mailbox filename is not entered."
 msgstr "Keine Dateinamen für die lokale Mailbox angegeben."
 

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "Kein Mailkommando angegeben."
 
 msgid "mail command is not entered."
 msgstr "Kein Mailkommando angegeben."
 

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "Empfangen"
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr "Verfassen"
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr "Vorlage"
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "Datenschutz"
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "Einstellungen eines neuen Kontos"
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Konteneinstellungen"
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "Datei mit Unterschrift auswählen"
 
 msgid "Select signature file"
 msgstr "Datei mit Unterschrift auswählen"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "Protokoll:"
 
 msgid "Protocol:"
 msgstr "Protokoll:"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (Plugin nicht geladen)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (Plugin nicht geladen)"


@@ -8837,20 +9321,20 @@ msgid "Command line"
 msgstr "Kommandozeile"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
 msgstr "Kommandozeile"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544

-#: src/prefs_filtering.c:454 src/prefs_matcher.c:679 src/prefs_template.c:270
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Ersetzen"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Ersetzen"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515

-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "Informationen ..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
 msgid "Info..."
 msgstr "Informationen ..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641

-#: src/prefs_filtering.c:761 src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764 src/prefs_filtering.c:839 src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(Neue)"
 
 msgid "(New)"
 msgstr "(Neue)"
 


@@ -8897,21 +9381,21 @@ msgstr "Aktion löschen"
 msgid "Do you really want to delete this action?"
 msgstr "Soll diese Aktion wirklich gelöscht werden?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Soll diese Aktion wirklich gelöscht werden?"
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1838
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_matcher.c:1840
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 
 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 


@@ -9035,93 +9519,91 @@ msgstr ""
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "Automatische Kontoauswahl"
 
 msgid "Automatic account selection"
 msgstr "Automatische Kontoauswahl"
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "Beim Antworten"
 
 msgid "when replying"
 msgstr "Beim Antworten"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "Beim Weiterleiten"
 
 msgid "when forwarding"
 msgstr "Beim Weiterleiten"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "Beim Wiederbearbeiten"
 
 msgid "when re-editing"
 msgstr "Beim Wiederbearbeiten"
 

-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "Weiterleiten"
-
-#: src/prefs_compose_writing.c:141 src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "Weiterleiten als Anhang"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Beim Umleiten den original 'Von'-Nachrichtenkopf beibehalten"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr "Verfassen"
 
 msgid "Editing"
 msgstr "Verfassen"
 

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "Externen Editor automatisch starten"
 
 msgid "Automatically launch the external editor"
 msgstr "Externen Editor automatisch starten"
 

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatisches Speichern in den Entwurfsordner aller"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatisches Speichern in den Entwurfsordner aller"
 

-#: src/prefs_compose_writing.c:166 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "Zeichen"
 
 msgid "characters"
 msgstr "Zeichen"
 

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 
 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "Antworten"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "Antwort standardmäßig zitieren"
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "Weiterleiten"
+
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "Weiterleiten als Anhang"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Beim Umleiten den original 'Von'-Nachrichtenkopf beibehalten"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr "Wenn Dateien im Verfassenfenster fallen gelassen werden"
 
 msgid "When dropping files into the Compose window"
 msgstr "Wenn Dateien im Verfassenfenster fallen gelassen werden"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "nachfragen"
 
 msgid "Ask"
 msgstr "nachfragen"
 

-#: src/prefs_compose_writing.c:199 src/toolbar.c:475
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476

 msgid "Insert"
 msgstr "Einfügen"
 
 msgid "Insert"
 msgstr "Einfügen"
 

-#: src/prefs_compose_writing.c:200 src/toolbar.c:477
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478

 msgid "Attach"
 msgstr "Anhang"
 
 msgid "Attach"
 msgstr "Anhang"
 

-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "Benutze Vorlage zum verfassen neuer Nachrichten"
-

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "Vorlage neue Nachricht"
-
-#: src/prefs_compose_writing.c:267 src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " Beschreibung der Symbole... "
+msgid "Quotation characters"
+msgstr "Zitatzeichen"

 
 

-#: src/prefs_compose_writing.c:387 src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311 src/prefs_spelling.c:441 src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "Verfassen"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "Diese Zeichen als Zitatzeichen behandeln: "

 
 

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "Verfassen"
 
 msgid "Writing"
 msgstr "Verfassen"
 


@@ -9133,8 +9615,8 @@ msgstr "Benutzerdefinierte Kopfzeileneinstellungen"
 msgid "From file..."
 msgstr "aus Datei..."
 
 msgid "From file..."
 msgstr "aus Datei..."
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1327 src/prefs_matcher.c:1337
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 


@@ -9202,7 +9684,7 @@ msgid "Displayed header configuration"
 msgstr "Angezeigte Kopfzeilen"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
 msgstr "Angezeigte Kopfzeilen"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435

-#: src/prefs_matcher.c:497
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "Kopfzeilenname"
 
 msgid "Header name"
 msgstr "Kopfzeilenname"
 


@@ -9218,7 +9700,7 @@ msgstr "Versteckte Kopfzeilen"
 msgid "Show all unspecified headers"
 msgstr "Alle unspezifizierten Kopfzeilen anzeigen"
 
 msgid "Show all unspecified headers"
 msgstr "Alle unspezifizierten Kopfzeilen anzeigen"
 

-#: src/prefs_display_header.c:575
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 


@@ -9269,7 +9751,7 @@ msgid "Copy"
 msgstr "Kopieren"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
 msgstr "Kopieren"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79

-#: src/summaryview.c:2448
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "Markieren"
 
 msgid "Mark"
 msgstr "Markieren"
 


@@ -9297,7 +9779,7 @@ msgstr "Als Spam markieren"
 msgid "Mark as ham"
 msgstr "Als Ham (kein Spam) markieren"
 
 msgid "Mark as ham"
 msgstr "Als Ham (kein Spam) markieren"
 

-#: src/prefs_filtering_action.c:170 src/toolbar.c:426 src/toolbar.c:524
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr "Weiterleiten"
 
 msgid "Forward"
 msgstr "Weiterleiten"
 


@@ -9306,7 +9788,7 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468

-#: src/toolbar.c:184 src/toolbar.c:1825
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr "Ausführen"
 
 msgid "Execute"
 msgstr "Ausführen"
 


@@ -9326,7 +9808,7 @@ msgstr "Benotung setzen"
 msgid "Hide"
 msgstr "Verstecken"
 
 msgid "Hide"
 msgstr "Verstecken"
 

-#: src/prefs_filtering_action.c:178 src/toolbar.c:187
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "Thread ignorieren"
 
 msgid "Ignore thread"
 msgstr "Thread ignorieren"
 


@@ -9338,7 +9820,7 @@ msgstr "Filtern beenden"
 msgid "Filtering action configuration"
 msgstr "Filteraktion-Konfiguration"
 
 msgid "Filtering action configuration"
 msgstr "Filteraktion-Konfiguration"
 

-#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:412
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr "Aktion"
 
 msgid "Action"
 msgstr "Aktion"
 


@@ -9351,11 +9833,11 @@ msgid "Recipient"
 msgstr "Empfänger"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
 msgstr "Empfänger"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88

-#: src/summaryview.c:497
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "Benotung"
 
 msgid "Score"
 msgstr "Benotung"
 

-#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:550
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577

 msgid "Book/folder"
 msgstr "Adressbuch/Ordner"
 
 msgid "Book/folder"
 msgstr "Adressbuch/Ordner"
 


@@ -9387,44 +9869,25 @@ msgstr "Zieladressbuch/ordner ist nicht gesetzt."
 msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 
 msgid "No action was defined."
 msgstr "Keine Aktion definiert."
 

-#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "Symbol für %"
 
 msgid "literal %"
 msgstr "Symbol für %"
 

-#: src/prefs_filtering_action.c:1164 src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:494
-msgid "Date"
-msgstr "Datum"
-
-#: src/prefs_filtering_action.c:1165 src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr "Nachrichten-ID"
-
-#: src/prefs_filtering_action.c:1166 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888 src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "Newsgruppen"
-
-#: src/prefs_filtering_action.c:1167 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889 src/quote_fmt.c:52
-msgid "References"
-msgstr "Referenzen"
-
-#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1890
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht geändert werden)"
 
 msgid "filename (should not be modified)"
 msgstr "Dateiname (sollte nicht geändert werden)"
 

-#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1891
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "neue Zeile"
 
 msgid "new line"
 msgstr "neue Zeile"
 

-#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1892
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "Escape-Zeichen für Zitate"
 
 msgid "escape character for quotes"
 msgstr "Escape-Zeichen für Zitate"
 

-#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1893
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "Zitatzeichen"
 
 msgid "quote character"
 msgstr "Zitatzeichen"
 


@@ -9448,52 +9911,52 @@ msgstr ""
 msgid "Current action list"
 msgstr "Aktuelle Aktionsliste"
 
 msgid "Current action list"
 msgstr "Aktuelle Aktionsliste"
 

-#: src/prefs_filtering.c:187 src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 

-#: src/prefs_filtering.c:249 src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "Alle"
 
 msgid "Filtering Account Menu|All"
 msgstr "Alle"
 

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "Bedingung"
 
 msgid "Condition"
 msgstr "Bedingung"
 

-#: src/prefs_filtering.c:403 src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr "Definiere..."
 
 msgid " Define... "
 msgstr "Definiere..."
 

-#: src/prefs_filtering.c:927 src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht zulässig."
 
 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht zulässig."
 

-#: src/prefs_filtering.c:963 src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "Aktionszeichenfolge ist nicht zulässig."
 
 msgid "Action string is not valid."
 msgstr "Aktionszeichenfolge ist nicht zulässig."
 

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 
 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 
 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "Regel löschen"
 
 msgid "Delete rule"
 msgstr "Regel löschen"
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "Soll diese Regel wirklich gelöscht werden?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Soll diese Regel wirklich gelöscht werden?"
 

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "aktiviert"
 
 msgid "Enable"
 msgstr "aktiviert"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "Regel"
 
 msgid "Rule"
 msgstr "Regel"
 


@@ -9514,8 +9977,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Unsichtbare Spalten"
 
 msgid "Hidden columns"
 msgstr "Unsichtbare Spalten"
 

-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 


@@ -9524,7 +9987,7 @@ msgstr "Angezeigte Spalten"
 msgid " Use default "
 msgstr " Standard verwenden "
 
 msgid " Use default "
 msgstr " Standard verwenden "
 

-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676

 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "


@@ -9534,7 +9997,8 @@ msgstr ""
 "Unterordner des Kontos mit Hilfe des Knopfes \"auf Unterordner anwenden\" "
 "übertragen werden.</i>"
 
 "Unterordner des Kontos mit Hilfe des Knopfes \"auf Unterordner anwenden\" "
 "übertragen werden.</i>"
 

-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -9542,73 +10006,73 @@ msgstr ""
 "Anwenden auf\n"
 "Unterordner"
 
 "Anwenden auf\n"
 "Unterordner"
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "Gesendete"
 
 msgid "Outbox"
 msgstr "Gesendete"
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr "Ordnertype"
 
 msgid "Folder type"
 msgstr "Ordnertype"
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "Regulärer Ausdruck Betreffvereinfachung"
 
 msgid "Simplify Subject RegExp"
 msgstr "Regulärer Ausdruck Betreffvereinfachung"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "Test Regulärer Ausdruck"
 
 msgid "Test RegExp"
 msgstr "Test Regulärer Ausdruck"
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr "Ordner chmod"
 
 msgid "Folder chmod"
 msgstr "Ordner chmod"
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Ordnerfarbe"
 
 msgid "Folder color"
 msgstr "Ordnerfarbe"
 

-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 
 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "Beim Start verarbeiten"
 
 msgid "Process at start-up"
 msgstr "Beim Start verarbeiten"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "Nach neuen E-Mails scannen"
 
 msgid "Scan for new mail"
 msgstr "Nach neuen E-Mails scannen"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "Für Offline-Nutzung synchronisieren"
 
 msgid "Synchronise for offline use"
 msgstr "Für Offline-Nutzung synchronisieren"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung fordern"
 
 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung fordern"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie der ausgehenden Nachrichten in diesem Ordner speichern, anstelle von "
 "'Gesendet'"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie der ausgehenden Nachrichten in diesem Ordner speichern, anstelle von "
 "'Gesendet'"
 

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "Standard An:"
 
 msgid "Default To:"
 msgstr "Standard An:"
 

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "Standard An: für Antworten"
 
 msgid "Default To: for replies"
 msgstr "Standard An: für Antworten"
 

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "Generell"
 
 msgid "General"
 msgstr "Generell"
 

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"


@@ -9629,7 +10093,7 @@ msgstr "Benutze andere Schriftart zum drucken"
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:669
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Anzeige"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Anzeige"


@@ -9638,7 +10102,7 @@ msgstr "Anzeige"
 msgid "Fonts"
 msgstr "Schriften"
 
 msgid "Fonts"
 msgstr "Schriften"
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "Einstellungen"
 
 msgid "Preferences"
 msgstr "Einstellungen"
 


@@ -9662,30 +10126,30 @@ msgstr "/Bilder inline anzeigen"
 msgid "Image Viewer"
 msgstr "Bildbetrachter"
 
 msgid "Image Viewer"
 msgstr "Bildbetrachter"
 

-#: src/prefs_logging.c:117 src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "Größe des Protokolls beschränken"
-
-#: src/prefs_logging.c:122 src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "Protokollfensterlänge"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "Begrenze das Protokollfenster auf"

 
 

-#: src/prefs_logging.c:139 src/prefs_logging.c:258
+#: src/prefs_logging.c:133 src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0, um das Protokollieren im Protokollfenster zu stoppen"
 
 msgid "0 to stop logging in the log window"
 msgstr "0, um das Protokollieren im Protokollfenster zu stoppen"
 

-#: src/prefs_logging.c:142 src/prefs_logging.c:261
+#: src/prefs_logging.c:136 src/prefs_logging.c:254

 msgid "lines"
 msgstr "Zeilen"
 
 msgid "lines"
 msgstr "Zeilen"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "Filter-/Verarbeitungprotokoll"
+
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"

 msgstr "aktiviere Protokollierung für Filter und Verarbeitunsregeln"
 
 msgstr "aktiviere Protokollierung für Filter und Verarbeitunsregeln"
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
+"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."
 msgstr ""
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""


@@ -9695,56 +10159,56 @@ msgstr ""
 "verlangsamen, dies könnte hinderlich sein wenn sehr viele Regeln auf "
 "tausende Nachrichten angewandt werden sollen."
 
 "verlangsamen, dies könnte hinderlich sein wenn sehr viele Regeln auf "
 "tausende Nachrichten angewandt werden sollen."
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."

 msgstr "protokolliere Filter und Verarbeitungsregeln wenn..."
 
 msgstr "protokolliere Filter und Verarbeitungsregeln wenn..."
 

-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgstr "Filterung bei Nachrichteneingang"
 
 msgid "filtering at incorporation"
 msgstr "Filterung bei Nachrichteneingang"
 

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgstr "manuelles Filtern"
 
 msgid "manually filtering"
 msgstr "manuelles Filtern"
 

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgstr "verarbeite Ordner"
 
 msgid "processing folders"
 msgstr "verarbeite Ordner"
 

-#: src/prefs_logging.c:190
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgstr "Vorverarbeitung Ordner"
 
 msgid "pre-processing folders"
 msgstr "Vorverarbeitung Ordner"
 

-#: src/prefs_logging.c:196
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgstr "Nachverarbeitung Ordner"
 
 msgid "post-processing folders"
 msgstr "Nachverarbeitung Ordner"
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
-msgstr "Protokollstufe"
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr "Protokollierungsstufe"

 
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "Niedrig"
 
 msgid "Low"
 msgstr "Niedrig"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "Mittel"
 
 msgid "Medium"
 msgstr "Mittel"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "Hoch"
 
 msgid "High"
 msgstr "Hoch"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not "
-"and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being "
-"processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped "
-"or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
+"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"
+"Caution: the higher the level, the greater the impact on performance."

 msgstr ""
 "Wählt die Detailstufe der angezeigten Meldungen wenn Protokollierung "
 "aktiviert ist.\n"
 msgstr ""
 "Wählt die Detailstufe der angezeigten Meldungen wenn Protokollierung "
 "aktiviert ist.\n"


@@ -9754,187 +10218,179 @@ msgstr ""
 "sehen und warum Regeln übersprungen wurden.\n"
 "Wähle die hohe Stufe um eindeutig zu sehen warum Regeln übersprungen wurden "
 "oder nicht und warum Bedingungen zugetroffen haben oder nicht.\n"
 "sehen und warum Regeln übersprungen wurden.\n"
 "Wähle die hohe Stufe um eindeutig zu sehen warum Regeln übersprungen wurden "
 "oder nicht und warum Bedingungen zugetroffen haben oder nicht.\n"

-"Achtung: je höher die Stufe gewählt wird, um so grösser wird der Einfluss "
-"auf Leistung sein."
+"Achtung: je höher die Stufe gewählt wird, um so größer wird der Einfluss auf "
+"Leistung sein."

 
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "Protokollierung"
 
 msgid "Logging"
 msgstr "Protokollierung"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "Alle Nachrichten"
 
 msgid "All messages"
 msgstr "Alle Nachrichten"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr "An oder Cc"
-
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "In Antwort auf"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "Alter größer als"
 
 msgid "Age greater than"
 msgstr "Alter größer als"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "Alter kleiner als"
 
 msgid "Age lower than"
 msgstr "Alter kleiner als"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "Kopfbereich"
 
 msgid "Headers part"
 msgstr "Kopfbereich"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "Körperbereich"
 
 msgid "Body part"
 msgstr "Körperbereich"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "Ganze Nachricht"
 
 msgid "Whole message"
 msgstr "Ganze Nachricht"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "Ungelesen-Zeichen"
 
 msgid "Unread flag"
 msgstr "Ungelesen-Zeichen"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "Neu-Zeichen"
 
 msgid "New flag"
 msgstr "Neu-Zeichen"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "Markierungszeichen"
 
 msgid "Marked flag"
 msgstr "Markierungszeichen"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "Lösch-Zeichen"
 
 msgid "Deleted flag"
 msgstr "Lösch-Zeichen"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "Antwortzeichen"
 
 msgid "Replied flag"
 msgstr "Antwortzeichen"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "Weiterleitungszeichen"
 
 msgid "Forwarded flag"
 msgstr "Weiterleitungszeichen"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "Sperrzeichen"
 
 msgid "Locked flag"
 msgstr "Sperrzeichen"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "Spamflag"
 
 msgid "Spam flag"
 msgstr "Spamflag"
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Farblabel"
 
 msgid "Color label"
 msgstr "Farblabel"
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "ignorierter Thread"
 
 msgid "Ignored thread"
 msgstr "ignorierter Thread"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "Note größer als"
 
 msgid "Score greater than"
 msgstr "Note größer als"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "Note kleiner als"
 
 msgid "Score lower than"
 msgstr "Note kleiner als"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "Note gleich"
 
 msgid "Score equal to"
 msgstr "Note gleich"
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "Test"
 
 msgid "Test"
 msgstr "Test"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "Größer als"
 
 msgid "Size greater than"
 msgstr "Größer als"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "Kleiner als"
 
 msgid "Size smaller than"
 msgstr "Kleiner als"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "Genaue Größe"
 
 msgid "Size exactly"
 msgstr "Genaue Größe"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "Teilweise herungergeladen"
 
 msgid "Partially downloaded"
 msgstr "Teilweise herungergeladen"
 

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "Im Adressbuch gefunden"
 
 msgid "Found in addressbook"
 msgstr "Im Adressbuch gefunden"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "oder"
 
 msgid "or"
 msgstr "oder"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "und"
 
 msgid "and"
 msgstr "und"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "enthält"
 
 msgid "contains"
 msgstr "enthält"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "enthält nicht"
 
 msgid "does not contain"
 msgstr "enthält nicht"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "ja"
 
 msgid "yes"
 msgstr "ja"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "nein"
 
 msgid "no"
 msgstr "nein"
 

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "Bedingungskonfiguration"
 
 msgid "Condition configuration"
 msgstr "Bedingungskonfiguration"
 

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "Übereinstimmungstyp"
 
 msgid "Match type"
 msgstr "Übereinstimmungstyp"
 

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "Kopfzeile"
 
 msgid "Address header"
 msgstr "Kopfzeile"
 

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "Aussage"
 
 msgid "Predicate"
 msgstr "Aussage"
 

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "Verwende regexp"
 
 msgid "Use regexp"
 msgstr "Verwende regexp"
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "Boolesche Op."
 
 msgid "Boolean Op"
 msgstr "Boolesche Op."
 

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "Wert ist nicht gesetzt."
 
 msgid "Value is not set."
 msgstr "Wert ist nicht gesetzt."
 

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "alle Adressen in allen Kopfzeilen"
 
 msgid "all addresses in all headers"
 msgstr "alle Adressen in allen Kopfzeilen"
 

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "irgend eine Adressen in irgend einer Kopfzeile"
 
 msgid "any address in any header"
 msgstr "irgend eine Adressen in irgend einer Kopfzeile"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "Die Adresse(n) in der Kopfzeile '%s'"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "Die Adresse(n) in der Kopfzeile '%s'"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -9947,7 +10403,7 @@ msgstr ""
 "Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss 'Alle' in "
 "der Adressbuch/Ordner Auswahl gewählt werden."
 
 "Wenn %s gegen das gesamte Adressbuch verglichen werden soll, muss 'Alle' in "
 "der Adressbuch/Ordner Auswahl gewählt werden."
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -9955,11 +10411,11 @@ msgstr ""
 "Der Eintrag wurde nicht gespeichert.\n"
 "Trotzdem schließen?"
 
 "Der Eintrag wurde nicht gespeichert.\n"
 "Trotzdem schließen?"
 

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "Treffertyp: 'Test'"
 
 msgid "Match Type: 'Test'"
 msgstr "Treffertyp: 'Test'"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 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"
 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"


@@ -9971,7 +10427,7 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr "Aktuelle Bedingungsregeln"
 
 msgid "Current condition rules"
 msgstr "Aktuelle Bedingungsregeln"
 


@@ -10127,7 +10583,7 @@ msgstr "Farbe für Signaturen wählen"
 msgid "Signatures"
 msgstr "Unterschriften"
 
 msgid "Signatures"
 msgstr "Unterschriften"
 

-#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:346
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr "Ordnerliste"
 
 msgid "Folder list"
 msgstr "Ordnerliste"
 


@@ -10302,33 +10758,9 @@ msgstr ""
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronisiere Offlineordner so bald wie möglich"
 
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchronisiere Offlineordner so bald wie möglich"
 

-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "Antwort standardmäßig zitieren"
-
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "Antwortformat"
-
-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "Zitatzeichen"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "Weiterleitungsformat"
-
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "Zitatzeichen"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "Diese Zeichen als Zitatzeichen behandeln: "
-
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "Zitate"
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "Vorlage neue Nachricht"

 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"


@@ -10362,7 +10794,7 @@ msgstr "Dialoge"
 msgid "Show receive dialog"
 msgstr "Empfangsdialog anzeigen"
 
 msgid "Show receive dialog"
 msgstr "Empfangsdialog anzeigen"
 

-#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:448
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr "Immer"
 
 msgid "Always"
 msgstr "Immer"
 


@@ -10636,180 +11068,156 @@ msgstr "Farbe für falsche Worte wählen. Wähle Schwarz zum unterstreichen"
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 
 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 
 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 
 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 
 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 
 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 
 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 
 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 
 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 
 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 
 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 
 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 
 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 
 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 
 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 
 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 
 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 

-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "Datumsformat"
 
 msgid "Date format"
 msgstr "Datumsformat"
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 
 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "Beispiel"
 
 msgid "Example"
 msgstr "Beispiel"
 

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgstr "Nachrichtenanzahl neben dem Ordnernamen anzeigen"
 
 msgid "Display message number next to folder name"
 msgstr "Nachrichtenanzahl neben dem Ordnernamen anzeigen"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "Nein"
 
 msgid "No"
 msgstr "Nein"
 

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgstr "ungelesene Nachrichten"
 
 msgid "Unread messages"
 msgstr "ungelesene Nachrichten"
 

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgstr "ungelesene und alle Nachrichten"
 
 msgid "Unread and Total messages"
 msgstr "ungelesene und alle Nachrichten"
 

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "Öffne den zuletzt geöffneten Ordner beim Starten"
+
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürzen von Newsgruppen länger als"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürzen von Newsgruppen länger als"
 

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "Zeichen"
 
 msgid "letters"
 msgstr "Zeichen"
 

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr " Nachrichtenliste"
 
 msgid "Message list"
 msgstr " Nachrichtenliste"
 

-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "Beim Öffnen eines Ordners"
-
-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "Nichts tun"
-
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "Erste ungelesene (neue oder markierte) Nachricht auswählen"
-
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "Erste ungelesene (markierte oder neue) Nachricht auswählen"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"
+msgstr "Standardauswahl wenn ein Ordner geöffnet wird"

 
 

-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "Erste neue (ungelesene oder markierte) Nachricht auswählen"
-
-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "Erste neue (markierte oder ungelesene) Nachricht auswählen"
-
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "Erste markierte (neue oder ungelesene) Nachricht auswählen"
-
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "Erste markierte (ungelesene oder neue) Nachricht auswählen"
-
-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Keine ungelesenen (oder neue) Nachrichten'-Dialog anzeigen"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Keine ungelesenen (oder neue) Nachrichten'-Dialog anzeigen"
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "'Ja' annehmen"
 
 msgid "Assume 'Yes'"
 msgstr "'Ja' annehmen"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "'Nein' annehmen"
 
 msgid "Assume 'No'"
 msgstr "'Nein' annehmen"
 

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr "Nachrichten immer öffnen, wenn sie ausgewählt wurden"
 
 msgid "Always open message when selected"
 msgstr "Nachrichten immer öffnen, wenn sie ausgewählt wurden"
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
 

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Bewegen oder Löschen von Nachrichten sofort ausführen"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Bewegen oder Löschen von Nachrichten sofort ausführen"
 

-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:460

 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'"


@@ -10817,34 +11225,36 @@ msgstr ""
 "Verschieben, Kopieren und Löschen von Nachrichten zurückhalten bis 'Extras/"
 "Ausführen' aufgerufen wird"
 
 "Verschieben, Kopieren und Löschen von Nachrichten zurückhalten bis 'Extras/"
 "Ausführen' aufgerufen wird"
 

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"

 msgstr ""
 msgstr ""

-"Nachricht nur als gelesen markieren, wenn sie in einem neuen Fenster "
-"geöffnet wurde"
+"Nachricht nur als gelesen markieren, wenn sie in\n"
+"einem neuen Fenster geöffnet oder beantwortet wurde"

 
 

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "Nachricht als gelesen markieren nach"
 
 msgid "Mark messages as read after"
 msgstr "Nachricht als gelesen markieren nach"
 

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr "Absender mittels Adressbuch darstellen"
 
 msgid "Display sender using address book"
 msgstr "Absender mittels Adressbuch darstellen"
 

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr "Hilfe Datumsformat"
 
 msgid "Date format help"
 msgstr "Hilfe Datumsformat"
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr ""
 "Nachfragen bevor alle Mails in einem Ordner als gelesen markiert werden"
 
 msgid "Confirm before marking all mails in a folder as read"
 msgstr ""
 "Nachfragen bevor alle Mails in einem Ordner als gelesen markiert werden"
 

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "Übersetze Kopfzeilennamen"
 
 msgid "Translate header names"
 msgstr "Übersetze Kopfzeilennamen"
 

-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:544

 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."


@@ -10852,11 +11262,11 @@ msgstr ""
 "Die Standardkopfzeilen (wie 'From:', 'Subject:') werden in ihre Sprache "
 "übersetzt"
 
 "Die Standardkopfzeilen (wie 'From:', 'Subject:') werden in ihre Sprache "
 "übersetzt"
 

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr "Gesamtansicht"
 
 msgid "Summaries"
 msgstr "Gesamtansicht"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2442
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr "Anhang"
 
 msgid "Attachment"
 msgstr "Anhang"
 


@@ -10877,35 +11287,67 @@ msgstr ""
 "Die Reihenfolge kann mit den Auf- und Ab-Schaltflächen oder durch Ziehen\n"
 "der Eigenschaften geändert werden."
 
 "Die Reihenfolge kann mit den Auf- und Ab-Schaltflächen oder durch Ziehen\n"
 "der Eigenschaften geändert werden."
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "Gehe zur ersten markierten Nachricht"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "Gehe zur ersten neuen Nachricht"
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "Gehe zur ersten ungelesenen Nachricht"
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "gehe zur zuletzt geöffneten Nachricht"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "Gehe zur letzten Nachricht in der Liste"
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "Nichts tun"
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "Aktion beim öffnen eines Ordners"
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "Mögliche Aktionen"
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "Der Name wird als Menüeintrag verwendet"
 
 msgid "This name is used as the Menu item"
 msgstr "Der Name wird als Menüeintrag verwendet"
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " Symbole..."
 
 msgid " Symbols... "
 msgstr " Symbole..."
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 
 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 
 msgid "Template name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "Vorlage löschen"
 
 msgid "Delete template"
 msgstr "Vorlage löschen"
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "Soll diese Vorlage wirklich gelöscht werden?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Soll diese Vorlage wirklich gelöscht werden?"
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 
 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "Vorlage"
 
 msgid "Template"
 msgstr "Vorlage"
 


@@ -11045,10 +11487,6 @@ msgstr "Autor: "
 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "Status:"
-

 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Vorschau"
 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Vorschau"


@@ -11153,11 +11591,11 @@ msgstr "Zeilenumbruch"
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr "kein Empfängerschlüssel angegeben."
 
 msgid "No recipient keys defined."
 msgstr "kein Empfängerschlüssel angegeben."
 

-#: src/procmime.c:341 src/procmime.c:343
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler BASE64-Entschlüsselung]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler BASE64-Entschlüsselung]\n"
 


@@ -11181,7 +11619,7 @@ msgstr "Die Kopfzeilen der Nachricht im Postausgang sind kaputt."
 
 #: src/procmsg.c:1600
 msgid "An error happened during SMTP session."
 
 #: src/procmsg.c:1600
 msgid "An error happened during SMTP session."

-msgstr "Während der SMTP Sitzung ist ein Fehler aufgetreten."
+msgstr "Während der SMTP-Sitzung ist ein Fehler aufgetreten."

 
 #: src/procmsg.c:1614
 msgid ""
 
 #: src/procmsg.c:1614
 msgid ""


@@ -11212,176 +11650,255 @@ msgstr "Fehler beim Schreiben der temporären Datei für Newssendung."
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht zu %s ist ein Fehler aufgetreten."
 
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht zu %s ist ein Fehler aufgetreten."
 

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">Symbole:</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgstr "individuelles Datumsformat (siehe 'man strftime')"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "individuelles Datumsformat (siehe 'man strftime')"
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgstr "E-Mail-Adresse des Absenders"
 
 msgid "email address of sender"
 msgstr "E-Mail-Adresse des Absenders"
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr "Vollständiger Name des Abesenders"
 
 msgid "full name of sender"
 msgstr "Vollständiger Name des Abesenders"
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr "Vorname des Absenders"
 
 msgid "first name of sender"
 msgstr "Vorname des Absenders"
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr "Nachname des Absenders"
 
 msgid "last name of sender"
 msgstr "Nachname des Absenders"
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr "Initialien des Absenders"
 
 msgid "initials of sender"
 msgstr "Initialien des Absenders"
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr "Nachrichtenkörper"
 
 msgid "message body"
 msgstr "Nachrichtenkörper"
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr "Zitierter Nachrichtenkörper"
 
 msgid "quoted message body"
 msgstr "Zitierter Nachrichtenkörper"
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr "Nachrichtenkörper ohne Signatur"
 
 msgid "message body without signature"
 msgstr "Nachrichtenkörper ohne Signatur"
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgstr "Zitierter Nachrichtenkörper ohne Signatur"
 
 msgid "quoted message body without signature"
 msgstr "Zitierter Nachrichtenkörper ohne Signatur"
 

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "Aktuelles Wörterbuch"
+
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr "Cursorposition"
 
 msgid "cursor position"
 msgstr "Cursorposition"
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
+#: src/quote_fmt.c:67
+msgid "account property: your name"

 msgstr "Kontoeigenschaft: ihr Name"
 
 msgstr "Kontoeigenschaft: ihr Name"
 

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"

 msgstr "Kontoeigenschaft: ihre E-Mail Adresse"
 
 msgstr "Kontoeigenschaft: ihre E-Mail Adresse"
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
+#: src/quote_fmt.c:69
+msgid "account property: account name"

 msgstr "Kontoeigenschaft: Kontoname"
 
 msgstr "Kontoeigenschaft: Kontoname"
 

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
+#: src/quote_fmt.c:70
+msgid "account property: organization"

 msgstr "Kontoeigenschaft: Organisation"
 
 msgstr "Kontoeigenschaft: Organisation"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "Kontoeigenschaft: Standard Wörterbuch"
+
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "Adressbuch <span style=\"oblique\">Vervollständigung</span>: Cc"
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "Adressbuch <span style=\"oblique\">Vervollständigung</span>: Von"
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "Adressbuch <span style=\"oblique\">Vervollständigung</span>: An"
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "Symbol für Backslash"
 
 msgid "literal backslash"
 msgstr "Symbol für Backslash"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "Symbol für Zitatzeichen"
 
 msgid "literal question mark"
 msgstr "Symbol für Zitatzeichen"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "Symbol für Ausrufezeichen"
 
 msgid "literal exclamation mark"
 msgstr "Symbol für Ausrufezeichen"
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "Symbol für Pipe"
 
 msgid "literal pipe"
 msgstr "Symbol für Pipe"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr "Symbol für öffnende geschweifte Klammer"
 
 msgid "literal opening curly brace"
 msgstr "Symbol für öffnende geschweifte Klammer"
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr "Symbol für schließende geschweifte Klammer"
 
 msgid "literal closing curly brace"
 msgstr "Symbol für schließende geschweifte Klammer"
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgstr "Tabulator"
 
 msgid "tab"
 msgstr "Tabulator"
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "Zeilenvorschub"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">Anweisungen:</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"expr einfügen, wenn x gesetzt ist\n"
-"(wobei x eins der Zeichen dfNFLIstcnri oder af, ao ist)"
+"<span style=\"oblique\">expr</span> einfügen Wenn x gesetzt ist, wobei x ein "
+"Symbol\n"
+"aus [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] ist (oder die "
+"entsprechende lange\n"
+"Schreibweise)"

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"expr einfügen, wenn x nicht gesetzt ist\n"
-"(wobei x eins der Zeichen dfNFLIstcnri oder af, ao ist)"
+"<span style=\"oblique\">expr</span> einfügen Wenn x nicht gesetzt ist,\n"
+"wobei x ein Symbol aus [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] ist\n"
+"(oder die entsprechende lange Schreibweise)"

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 "Datei einfügen:\n"
 msgstr ""
 "Datei einfügen:\n"

-"sub_expr wird als Datei zum einfügen interpretiert"
+"<span style=\"oblique\">sub_expr</span> wird als Datei zum einfügen "
+"interpretiert"

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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"
 "the output from"
 msgstr ""
 "Programmausgaben einfügen:\n"

-"sub_expr wird als Kommandozeile interpretiert von\n"
+"<span style=\"oblique\">sub_expr</span> wird als Kommandozeile interpretiert "
+"von\n"

 "die Ausgaben gelesen werden sollen."
 
 "die Ausgaben gelesen werden sollen."
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "Benutzerangaben einfügen:\n"
 "user-entered text"
 msgstr ""
 "Benutzerangaben einfügen:\n"

-"sub_expr ist eine Variable die durch den vom\n"
-"User eingegebenen Text ersetzt wird"
+"<span style=\"oblique\">sub_expr</span> ist eine Variable die durch den\n"
+"vom User eingegebenen Text ersetzt wird"

 
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "Ausdrucksbezeichnung:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">Definition der Bedigungen:</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "Text der alle oben genannten Symbole enthalten darf"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"Text der alle oben genannten Symbole und\n"
+"Anweisungen enthalten darf"

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"text that can contain any of the symbols (no\n"
+"commands) above"

 msgstr ""
 msgstr ""

-"Text der alle oben genannten Symbole enthalten darf ausser ?x{}, !x{}, |f{}, "
-"|p{} und |i{}"
+"Text der alle oben genannten Symbole (keine\n"
+"Anweisungen) enthalten darf"

 
 

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:95
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+"Vervollständigung aus der Adressbuch funktioniert nur mit\n"
+"der ersten Adresse in den Kopfzeilen. Es wird der vollständige\n"
+"Name des Kontakts ausgegeben wenn die Adresse genau auf\n"
+"einen Kontakt im Adressbuch passt"
+
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "Die folgenden Symbole können verwendet werden:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "Die folgenden Symbole und Anweisungen können verwendet werden:"

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr "Benutze Vorlage zum verfassen neuer Nachrichten"
+
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "Antwortformat"
+
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "Zitatzeichen"
+
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "Weiterleitungsformat"
+
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "Beschreibung der Symbole... "
+
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr "Antwort-Formatfehler."
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "Weiterleitungs-Formatfehler."
+
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Eingaben um '%s' zu ersetzen"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Eingaben um '%s' zu ersetzen"
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "Variable eingeben"
 
 msgid "Enter variable"
 msgstr "Variable eingeben"
 


@@ -11523,10 +12040,6 @@ msgstr "Übereinstimmung mit irgendetwas des Folgenden"
 msgid "Match all of the following"
 msgstr "Übereinstimmung mit allem des Folgenden"
 
 msgid "Match all of the following"
 msgstr "Übereinstimmung mit allem des Folgenden"
 

-#: src/summary_search.c:356
-msgid "From:"
-msgstr "Von:"
-

 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Körper:"
 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Körper:"


@@ -11539,376 +12052,384 @@ msgstr "Bedingung:"
 msgid "Find _all"
 msgstr "_Alle finden"
 
 msgid "Find _all"
 msgstr "_Alle finden"
 

-#: src/summary_search.c:658
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 

-#: src/summary_search.c:660
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/An_tworten"
 
 msgid "/_Reply"
 msgstr "/An_tworten"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/Antwort an"
 
 msgid "/Repl_y to"
 msgstr "/Antwort an"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/Antwort an/A_lle"
 
 msgid "/Repl_y to/_all"
 msgstr "/Antwort an/A_lle"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/_Antwort an/Abs_ender"
 
 msgid "/Repl_y to/_sender"
 msgstr "/_Antwort an/Abs_ender"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 

-#: src/summaryview.c:429 src/toolbar.c:247
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 

-#: src/summaryview.c:430 src/toolbar.c:248
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/_Weiterleiten als Anhang"
 
 msgid "/For_ward as attachment"
 msgstr "/_Weiterleiten als Anhang"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/Umleiten"
 
 msgid "/Redirect"
 msgstr "/Umleiten"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 
 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 
 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/In den Mülleimer verschieben"
 
 msgid "/Move to _trash"
 msgstr "/In den Mülleimer verschieben"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/_Löschen..."
 
 msgid "/_Delete..."
 msgstr "/_Löschen..."
 

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/_Markieren"
 
 msgid "/_Mark"
 msgstr "/_Markieren"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/_Markieren/_Markieren"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Markieren/_Markieren"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/_Markieren/Markierung _entfernen"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Markieren/Markierung _entfernen"
 

-#: src/summaryview.c:441 src/summaryview.c:447 src/summaryview.c:450
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 
 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Als _ungelesen markieren"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Als _ungelesen markieren"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Als gelesen markieren"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Als gelesen markieren"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/_Markieren/Alle als gelesen markieren"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Markieren/Alle als gelesen markieren"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/_Markieren/Thread ignorieren"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Markieren/Thread ignorieren"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/_Markieren/Thread unignorieren"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Markieren/Thread unignorieren"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/_Markieren/Als _Spam markieren"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/_Markieren/Als _Spam markieren"
 

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr "/_Markieren/Als _Ham (kein Spam) markieren"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/_Markieren/Als _Ham (kein Spam) markieren"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/_Markieren/Sperren"
 
 msgid "/_Mark/Lock"
 msgstr "/_Markieren/Sperren"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "/_Markieren/Entsperren"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Markieren/Entsperren"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/Einfärben"
 
 msgid "/Color la_bel"
 msgstr "/Einfärben"
 

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "/Absender dem _Adressbuch hinzufügen"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Absender dem _Adressbuch hinzufügen"
 

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/Filter_regel erstellen"
 
 msgid "/Create f_ilter rule"
 msgstr "/Filter_regel erstellen"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter_regel erstellen/_Automatisch"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter_regel erstellen/_Automatisch"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter_regel erstellen/nach Abs_ender"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter_regel erstellen/nach Abs_ender"
 

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter_regel erstellen/nach Empf_änger"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter_regel erstellen/nach Empf_änger"
 

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter_regel erstellen/nach _Betreff"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter_regel erstellen/nach _Betreff"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/Verarbeitungregel erstellen"
 
 msgid "/Create processing rule"
 msgstr "/Verarbeitungregel erstellen"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/Verarbeitungregel erstellen/_Automatisch"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Verarbeitungregel erstellen/_Automatisch"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/Verarbeitungregel erstellen/nach Abs_ender"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Verarbeitungregel erstellen/nach Abs_ender"
 

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/Verarbeitungregel erstellen/nach Empf_änger"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Verarbeitungregel erstellen/nach Empf_änger"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/Verarbeitungregel erstellen/nach _Betreff"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Verarbeitungregel erstellen/nach _Betreff"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/_Ansicht/_Quelltext anzeigen"
 
 msgid "/_View/Message _source"
 msgstr "/_Ansicht/_Quelltext anzeigen"
 

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/_Ansicht/A_lle Kopfzeilen"
 
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/A_lle Kopfzeilen"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/_Speichern als..."
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/_Drucken..."
 
 msgid "/_Print..."
 msgstr "/_Drucken..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr "Schnellsuchmenu umschalten"
 
 msgid "Toggle quick search bar"
 msgstr "Schnellsuchmenu umschalten"
 

-#: src/summaryview.c:1065
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr "Mehrfachauswahl umschalten"
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Ordner %s wird durchsucht ..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Ordner %s wird durchsucht ..."
 

-#: src/summaryview.c:1591 src/summaryview.c:1643
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesene Nachrichten"
 
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesene Nachrichten"
 

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1604 src/summaryview.c:1656 src/summaryview.c:1703
-#: src/summaryview.c:1755 src/summaryview.c:1834
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 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"
 
 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:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "Keine ungelesene Nachrichten."
 
 msgid "No unread messages."
 msgstr "Keine ungelesene Nachrichten."
 

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Zu nächstem Ordner gehen?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Zu nächstem Ordner gehen?"
 

-#: src/summaryview.c:1690 src/summaryview.c:1742
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 
 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Zu nächstem Ordner gehen?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Zu nächstem Ordner gehen?"
 

-#: src/summaryview.c:1780 src/summaryview.c:1821
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 
 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten"
 
 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten"
 

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr "Keine markierte Nachricht gefunden. Zu nächstem Ordner gehen?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Keine markierte Nachricht gefunden. Zu nächstem Ordner gehen?"
 

-#: src/summaryview.c:1859 src/summaryview.c:1884
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "Keine weiteren eingefärbten Nachrichten"
 
 msgid "No more labeled messages"
 msgstr "Keine weiteren eingefärbten Nachrichten"
 

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1869 src/summaryview.c:1894
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "Keine eingefärbte Nachrichten"
 
 msgid "No labeled messages."
 msgstr "Keine eingefärbte Nachrichten"
 

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Anfang suchen?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Anfang suchen?"
 

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "Nachrichten werden nach Betreff angezogen..."
 
 msgid "Attracting messages by subject..."
 msgstr "Nachrichten werden nach Betreff angezogen..."
 

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 

-#: src/summaryview.c:2339 src/summaryview.c:2346
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr " Eintrag gewählt"
 
 msgid " item selected"
 msgstr " Eintrag gewählt"
 

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr " Einträge gewählt"
 
 msgid " items selected"
 msgstr " Einträge gewählt"
 

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 
 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 
 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 
 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Sie sind nicht der Autor dieses Artikels.\n"
 

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgstr "Ausgewählte Nachricht wirklich löschen?"
 
 msgid "Do you really want to delete the selected message?"
 msgstr "Ausgewählte Nachricht wirklich löschen?"
 

-#: src/summaryview.c:3817
+#: src/summaryview.c:3835

 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "die Ausgewählten %d Nachrichten wirklich löschen?"
 
 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "die Ausgewählten %d Nachrichten wirklich löschen?"
 

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr "Ziel ist gleich dem aktuellen Ordner."
 
 msgid "Destination is same as current folder."
 msgstr "Ziel ist gleich dem aktuellen Ordner."
 

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr "Kopierziel ist gleich dem aktuellen Ordner."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Kopierziel ist gleich dem aktuellen Ordner."
 

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 
 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr "Anhängen oder Überschreiben der existierenden Datei?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Anhängen oder Überschreiben der existierenden Datei?"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "_Anhängen"
 
 msgid "_Append"
 msgstr "_Anhängen"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "_Überschreiben"
 
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "Threads werden erstellt..."
 
 msgid "Building threads..."
 msgstr "Threads werden erstellt..."
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "Diese Regel überspringen"
 
 msgid "Skip these rules"
 msgstr "Diese Regel überspringen"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden egal zu welchem Konto sie gehöhren"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden egal zu welchem Konto sie gehöhren"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "Die Regeln anwenden, wenn sie zum aktuellen Konto gehöhren"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Die Regeln anwenden, wenn sie zum aktuellen Konto gehöhren"
 

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "Filter"
 
 msgid "Filtering"
 msgstr "Filter"
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -11916,19 +12437,19 @@ msgstr ""
 "Einige Filterregeln ghöhren zu einem bestimmtem Konto.\n"
 "Bitte wähle was mit diesen geschehen soll:"
 
 "Einige Filterregeln ghöhren zu einem bestimmtem Konto.\n"
 "Bitte wähle was mit diesen geschehen soll:"
 

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "_Filtern"
 
 msgid "_Filter"
 msgstr "_Filtern"
 

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "Filterung läuft..."
 
 msgid "Filtering..."
 msgstr "Filterung läuft..."
 

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 
 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11937,46 +12458,46 @@ msgstr ""
 "Fehler in Regular Expression (regexp):\n"
 "%s"
 
 "Fehler in Regular Expression (regexp):\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 "Gehe zurück zur Ordner-liste (Es sind ungelesene Nachrichten vorhanden)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 "Gehe zurück zur Ordner-liste (Es sind ungelesene Nachrichten vorhanden)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "Gehe zurück zur Ordnerliste"
 
 msgid "Go back to the folder list"
 msgstr "Gehe zurück zur Ordnerliste"
 

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/_Neue Nachricht verfassen..."
 
 msgid "/Compose _new message"
 msgstr "/_Neue Nachricht verfassen..."
 

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "Zum Adressbuch hinzufügen"
 
 msgid "/Add to _address book"
 msgstr "Zum Adressbuch hinzufügen"
 

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/Adresse kopieren"
 
 msgid "/Copy this add_ress"
 msgstr "/Adresse kopieren"
 

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/Bild _öffnen"
 
 msgid "/_Open image"
 msgstr "/Bild _öffnen"
 

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/Bild _speichern..."
 
 msgid "/_Save image..."
 msgstr "/Bild _speichern..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11990,79 +12511,79 @@ msgstr ""
 "\n"
 "  Benutze "
 
 "\n"
 "  Benutze "
 

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "Protokoll Anzeigen"
 
 msgid "'View Log'"
 msgstr "Protokoll Anzeigen"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr " im Extrasmenü für mehr Informationen."
 
 msgid " in the Tools menu for more information."
 msgstr " im Extrasmenü für mehr Informationen."
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr "  Folgende Dinge können durch Rechtsklicken auf das\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Folgende Dinge können durch Rechtsklicken auf das\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  Icon mit diesem Teil der Nachricht gemacht werden:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  Icon mit diesem Teil der Nachricht gemacht werden:\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - Zum speichern "
 
 msgid "     - To save, select "
 msgstr "     - Zum speichern "
 

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 
 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Kurzwahltaste: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Kurzwahltaste: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 
 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "'Darstellen als Text'"
 
 msgid "'Display as text'"
 msgstr "'Darstellen als Text'"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " (Kurzwahltaste: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Kurzwahltaste: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "'Öffnen'"
 
 msgid "'Open'"
 msgstr "'Öffnen'"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Kurzwahltaste: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Kurzwahltaste: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 
 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr "     - oder benutze "
 
 msgid "     - Or use "
 msgstr "     - oder benutze "
 

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "'Öffne mit...'"
 
 msgid "'Open with...'"
 msgstr "'Öffne mit...'"
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Kurzwahltaste: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Kurzwahltaste: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -12073,7 +12594,7 @@ msgstr ""
 "....%s\n"
 "Rückgabewert %d\n"
 
 "....%s\n"
 "Rückgabewert %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -12092,243 +12613,243 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
 "\n"
 "Trotzdem öffnen?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "Phishingversuch (Betrugsversuch) Warnung"
 
 msgid "Phishing attempt warning"
 msgstr "Phishingversuch (Betrugsversuch) Warnung"
 

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "/_URL Öffnen"
 
 msgid "_Open URL"
 msgstr "/_URL Öffnen"
 

-#: src/toolbar.c:171 src/toolbar.c:1637
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "E-Mails von allen Konten empfangen"
 
 msgid "Receive Mail on all Accounts"
 msgstr "E-Mails von allen Konten empfangen"
 

-#: src/toolbar.c:172 src/toolbar.c:1651
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 
 msgid "Receive Mail on current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 

-#: src/toolbar.c:173 src/toolbar.c:1657
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "Wartende Nachrichten senden"
 
 msgid "Send Queued Messages"
 msgstr "Wartende Nachrichten senden"
 

-#: src/toolbar.c:174 src/toolbar.c:1682
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 

-#: src/toolbar.c:175 src/toolbar.c:1686
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr "News verfassen"
 
 msgid "Compose News"
 msgstr "News verfassen"
 

-#: src/toolbar.c:176 src/toolbar.c:1728 src/toolbar.c:1738
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "Auf Nachricht antworten"
 
 msgid "Reply to Message"
 msgstr "Auf Nachricht antworten"
 

-#: src/toolbar.c:177 src/toolbar.c:1745 src/toolbar.c:1755
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "An Absender antworten"
 
 msgid "Reply to Sender"
 msgstr "An Absender antworten"
 

-#: src/toolbar.c:178 src/toolbar.c:1762 src/toolbar.c:1772
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "An Alle antworten"
 
 msgid "Reply to All"
 msgstr "An Alle antworten"
 

-#: src/toolbar.c:179 src/toolbar.c:1779 src/toolbar.c:1789
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "An Mailingliste antworten"
 
 msgid "Reply to Mailing-list"
 msgstr "An Mailingliste antworten"
 

-#: src/toolbar.c:180 src/toolbar.c:1669
+#: src/toolbar.c:181 src/toolbar.c:1678

 msgid "Open email"
 msgstr "E-Mail öffnen"
 
 msgid "Open email"
 msgstr "E-Mail öffnen"
 

-#: src/toolbar.c:181 src/toolbar.c:1796 src/toolbar.c:1806
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 
 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 

-#: src/toolbar.c:182 src/toolbar.c:1813
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 
 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 

-#: src/toolbar.c:183 src/toolbar.c:1819
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 

-#: src/toolbar.c:185 src/toolbar.c:1831
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "Zu vorheriger ungelesener Nachricht gehen"
 
 msgid "Go to Previous Unread Message"
 msgstr "Zu vorheriger ungelesener Nachricht gehen"
 

-#: src/toolbar.c:186 src/toolbar.c:1838
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "Zur nächsten Nachricht gehen"
 
 msgid "Go to Next Unread Message"
 msgstr "Zur nächsten Nachricht gehen"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Ham"
 
 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Ham"
 

-#: src/toolbar.c:190 src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "Gehe zur Ordnerliste"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "Öffne ORdner/Gehe zur Ordnerliste"

 
 

-#: src/toolbar.c:192 src/toolbar.c:1847
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr "Nachricht senden"
 
 msgid "Send Message"
 msgstr "Nachricht senden"
 

-#: src/toolbar.c:193 src/toolbar.c:1853
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr "In Postausgang ablegen und später senden"
 
 msgid "Put into queue folder and send later"
 msgstr "In Postausgang ablegen und später senden"
 

-#: src/toolbar.c:194 src/toolbar.c:1859
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr "In Entwurfsordner speichern"
 
 msgid "Save to draft folder"
 msgstr "In Entwurfsordner speichern"
 

-#: src/toolbar.c:195 src/toolbar.c:1865
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr "Datei einfügen"
 
 msgid "Insert file"
 msgstr "Datei einfügen"
 

-#: src/toolbar.c:196 src/toolbar.c:1871
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr "Datei anhängen"
 
 msgid "Attach file"
 msgstr "Datei anhängen"
 

-#: src/toolbar.c:197 src/toolbar.c:1877
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 

-#: src/toolbar.c:198 src/toolbar.c:1883
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 
 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 

-#: src/toolbar.c:199 src/toolbar.c:1889
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen des aktuellen Absatzes umbrechen"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen des aktuellen Absatzes umbrechen"
 

-#: src/toolbar.c:200 src/toolbar.c:1895
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 
 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 

-#: src/toolbar.c:203 src/toolbar.c:1908
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 
 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Aktion Feature"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Aktion Feature"
 

-#: src/toolbar.c:206 src/toolbar.c:1931
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "Empfang abbrechen"
 
 msgid "Cancel receiving"
 msgstr "Empfang abbrechen"
 

-#: src/toolbar.c:207 src/toolbar.c:1663
+#: src/toolbar.c:208 src/toolbar.c:1672

 msgid "Close window"
 msgstr "Fenster schliessen"
 
 msgid "Close window"
 msgstr "Fenster schliessen"
 

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/Antwort mit _Zitat"
 
 msgid "/Reply with _quote"
 msgstr "/Antwort mit _Zitat"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/_Antwort ohne Zitat"
 
 msgid "/_Reply without quote"
 msgstr "/_Antwort ohne Zitat"
 

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/Antwort an a_lle mit Zitat"
 
 msgid "/Reply to all with _quote"
 msgstr "/Antwort an a_lle mit Zitat"
 

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/Antwort an _alle ohne Zitat"
 
 msgid "/_Reply to all without quote"
 msgstr "/Antwort an _alle ohne Zitat"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/Antwort an Liste mit Zitat"
 
 msgid "/Reply to list with _quote"
 msgstr "/Antwort an Liste mit Zitat"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/Antwort an Liste ohne Zitat"
 
 msgid "/_Reply to list without quote"
 msgstr "/Antwort an Liste ohne Zitat"
 

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr "/Antwort an Abs_ender mit Zitat"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Antwort an Abs_ender mit Zitat"
 

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/U_mleiten"
 
 msgid "/Redirec_t"
 msgstr "/U_mleiten"
 

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "lernen als _Spam"
 
 msgid "/Learn as _Spam"
 msgstr "lernen als _Spam"
 

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "lernen als _Ham"
 
 msgid "/Learn as _Ham"
 msgstr "lernen als _Ham"
 

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgid "Get Mail"

-msgstr "holen"
+msgstr "Abrufen"

 
 

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr "Verfassen"
 
 msgid "Toolbar|Compose"
 msgstr "Verfassen"
 

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "Öffnen"
 
 msgid "Open"
 msgstr "Öffnen"
 

-#: src/toolbar.c:421 src/toolbar.c:521
+#: src/toolbar.c:422 src/toolbar.c:522

 msgid "Reply"
 msgstr "Antwort"
 
 msgid "Reply"
 msgstr "Antwort"
 

-#: src/toolbar.c:423 src/toolbar.c:522
-msgid "All"
-msgstr "Alle"
-

 #: src/toolbar.c:424 src/toolbar.c:523
 #: src/toolbar.c:424 src/toolbar.c:523

-msgid "Sender"
-msgstr "Absender"
+msgid "All"
+msgstr "Alle Abrufen"

 
 

-#: src/toolbar.c:430 src/toolbar.c:528
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:433 src/toolbar.c:530
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr "Nächste"
 
 msgid "Next"
 msgstr "Nächste"
 

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "Später senden"
 
 msgid "Send later"
 msgstr "Später senden"
 

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "Entwürfe"
 
 msgid "Draft"
 msgstr "Entwürfe"
 

-#: src/toolbar.c:1644
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "Gehe zur Ordnerliste"
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "E-Mails vom gewählten Konten empfangen"
 
 msgid "Receive Mail on selected Account"
 msgstr "E-Mails vom gewählten Konten empfangen"
 

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "Verfassen mit gewählten Konto"
 
 msgid "Compose with selected Account"
 msgstr "Verfassen mit gewählten Konto"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "Ham (kein Spam)"
 
 msgid "Ham"
 msgstr "Ham (kein Spam)"
 

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "lerne Spam"
 
 msgid "Learn Spam"
 msgstr "lerne Spam"
 

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "lerne Ham"
 
 msgid "Learn Ham"
 msgstr "lerne Ham"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "lernen als..."
 
 msgid "Learn as..."
 msgstr "lernen als..."
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "Lernen"
 
 msgid "Learn"
 msgstr "Lernen"
 


@@ -12641,6 +13162,114 @@ msgstr ""
 "\n"
 "Zum Starten 'speichern' klicken."
 
 "\n"
 "Zum Starten 'speichern' klicken."
 

+#~ msgid "Error reading LDIF fields."
+#~ msgstr "Fehler beim Lesen der LDIF-Felder."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid ""
+#~ "This folder is already subscribed and has no unsubscribed subfolders."
+#~ msgstr ""
+#~ "Dieser Ordner ist bereits abonniert und hat keine nicht abonnierten "
+#~ "Unterordner."
+
+#~ msgid "Protocol log"
+#~ msgstr "Mitschrift des Protokolls"
+
+#~ msgid "subject"
+#~ msgstr "Betreff"
+
+#~ msgid "From: header"
+#~ msgstr "Von: Kopfzeile"
+
+#~ msgid "To: header"
+#~ msgstr "An: Kopfzeile"
+
+#~ msgid "Cc: header"
+#~ msgstr "Cc: Kopfzeile"
+
+#~ msgid "Newsgroups: header"
+#~ msgstr "Newsgroups: Kopfzeile"
+
+#~ msgid "InReplyTo: header"
+#~ msgstr "InReplyTo: Kopfzeile"
+
+#~ msgid "InReplyTo: header (references)"
+#~ msgstr "InReplyTo: Kopfzeile (Referenzen)"
+
+#~ msgid "_Basic"
+#~ msgstr "_Allgemein"
+
+#~ msgid "_Receive"
+#~ msgstr "_Empfang"
+
+#~ msgid "Co_mpose"
+#~ msgstr "_Verfassen"
+
+#~ msgid "SS_L"
+#~ msgstr "SS_L"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Alle Nachrichten vom Server holen"
+
+#~ msgid "Clip the log size"
+#~ msgstr "Größe des Protokolls beschränken"
+
+#~ msgid "Log window length"
+#~ msgstr "Protokollfensterlänge"
+
+#~ msgid "Debug level"
+#~ msgstr "Protokollstufe"
+
+#~ msgid "Quoting"
+#~ msgstr "Zitate"
+
+#~ msgid "Select first unread (or new or marked) message"
+#~ msgstr "Erste ungelesene (neue oder markierte) Nachricht auswählen"
+
+#~ msgid "Select first unread (or marked or new) message"
+#~ msgstr "Erste ungelesene (markierte oder neue) Nachricht auswählen"
+
+#~ msgid "Select first new (or unread or marked) message"
+#~ msgstr "Erste neue (ungelesene oder markierte) Nachricht auswählen"
+
+#~ msgid "Select first new (or marked or unread) message"
+#~ msgstr "Erste neue (markierte oder ungelesene) Nachricht auswählen"
+
+#~ msgid "Select first marked (or new or unread) message"
+#~ msgstr "Erste markierte (neue oder ungelesene) Nachricht auswählen"
+
+#~ msgid "Select first marked (or unread or new) message"
+#~ msgstr "Erste markierte (ungelesene oder neue) Nachricht auswählen"
+
+#~ msgid "linefeed"
+#~ msgstr "Zeilenvorschub"
+
+#~ msgid ""
+#~ "insert expr if x is set\n"
+#~ "(where x is one of the dfNFLIstcnri characters or af, ao)"
+#~ msgstr ""
+#~ "expr einfügen, wenn x gesetzt ist\n"
+#~ "(wobei x eins der Zeichen dfNFLIstcnri oder af, ao ist)"
+
+#~ msgid ""
+#~ "insert expr if x is not set\n"
+#~ "(where x is one of the dfNFLIstcnri characters or af, ao)"
+#~ msgstr ""
+#~ "expr einfügen, wenn x nicht gesetzt ist\n"
+#~ "(wobei x eins der Zeichen dfNFLIstcnri oder af, ao ist)"
+
+#~ msgid "terms definition:"
+#~ msgstr "Ausdrucksbezeichnung:"
+
+#~ msgid ""
+#~ "text that can contain any of the symbols above\n"
+#~ "but ?x{}, !x{}, |f{}, |p{} and |i{}"
+#~ msgstr ""
+#~ "Text der alle oben genannten Symbole enthalten darf ausser ?x{}, !x{}, |f"
+#~ "{}, |p{} und |i{}"
+

 #~ msgid "Log Size"
 #~ msgstr "Protokollgröße"
 
 #~ msgid "Log Size"
 #~ msgstr "Protokollgröße"
 


@@ -12656,9 +13285,6 @@ msgstr ""
 #~ msgid "_Save to Draft"
 #~ msgstr "Entwurf _speichern"
 
 #~ msgid "_Save to Draft"
 #~ msgstr "Entwurf _speichern"
 

-#~ msgid "_Discard them"
-#~ msgstr "_Verwerfen"
-

 #~ msgid "Do_n't quit"
 #~ msgstr "Nicht bee_nden"
 
 #~ msgid "Do_n't quit"
 #~ msgstr "Nicht bee_nden"
 


@@ -12749,14 +13375,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Antwort-/Weiterleitungs-Formatfehler.Vorlangenfehler im Betreff: Eintrag."
 
 #~ msgstr ""
 #~ "Antwort-/Weiterleitungs-Formatfehler.Vorlangenfehler im Betreff: Eintrag."
 

-#, fuzzy
-#~ msgid "Message reply quote format error."
-#~ msgstr "Antwort-/Weiterleitungs-Formatfehler."
-
-#, fuzzy
-#~ msgid "Message forward quote format error."
-#~ msgstr "Antwort-/Weiterleitungs-Formatfehler."
-

 #~ msgid "every"
 #~ msgstr "alle"
 
 #~ msgid "every"
 #~ msgstr "alle"
 


@@ -12859,18 +13477,6 @@ msgstr ""
 #~ msgid "Welcome to Claws Mail "
 #~ msgstr "Willkommen zu Sylpheed-Claws "
 
 #~ msgid "Welcome to Claws Mail "
 #~ msgstr "Willkommen zu Sylpheed-Claws "
 

-#, fuzzy
-#~ msgid "Sylpheed-Claws 2.6.0"
-#~ msgstr "Sylpheed-Claws Team"
-
-#, fuzzy
-#~ msgid "Sylpheed-Claws 1.9.15"
-#~ msgstr "Sylpheed-Claws Team"
-
-#, fuzzy
-#~ msgid "Sylpheed-Claws 1.0.5"
-#~ msgstr "Sylpheed-Claws Team"
-

 #~ msgid "Unsupported (%s)"
 #~ msgstr "Nicht unterstützt (%s)"
 
 #~ msgid "Unsupported (%s)"
 #~ msgstr "Nicht unterstützt (%s)"
 


@@ -12972,9 +13578,6 @@ msgstr ""
 #~ msgid "Fake URL warning"
 #~ msgstr "Warnung: Verschleierte URL"
 
 #~ msgid "Fake URL warning"
 #~ msgstr "Warnung: Verschleierte URL"
 

-#~ msgid "Receive"
-#~ msgstr "Empfangen"
-

 #~ msgid ""
 #~ "%s presented an unknown SSL certificate:\n"
 #~ "%s"
 #~ msgid ""
 #~ "%s presented an unknown SSL certificate:\n"
 #~ "%s"


@@ -13283,9 +13886,6 @@ msgstr ""
 #~ msgid "Server type:"
 #~ msgstr "Servertyp:"
 
 #~ msgid "Server type:"
 #~ msgstr "Servertyp:"
 

-#~ msgid "Username:"
-#~ msgstr "Benutzername:"
-

 #~ msgid ""
 #~ ".\n"
 #~ "\n"
 #~ msgid ""
 #~ ".\n"
 #~ "\n"


@@ -13419,9 +14019,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OK"
 
 #~ msgid "OK"
 #~ msgstr "OK"
 

-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
-

 #~ msgid "/Follow-up and reply to"
 #~ msgstr "/Follow-up und Antwort an"
 
 #~ msgid "/Follow-up and reply to"
 #~ msgstr "/Follow-up und Antwort an"
 

diff --git a/po/en_GB.po b/po/en_GB.po
index 0b00a286621a0a1dee72280729b1b15b8127b2bf..668a5c20f0cfd7a13a972a478a8c04ba7407ce84 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-01-08 07:07+0000\n"
-"PO-Revision-Date: 2007-02-26 08:47+0100\n"
+"POT-Creation-Date: 2007-07-02 08:30+0100\n"
+"PO-Revision-Date: 2007-07-02 08:47+0100\n"

 "Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul@claws-mail.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul@claws-mail.org>\n"
 "MIME-Version: 1.0\n"


@@ -12,84 +12,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 

-#: src/account.c:378
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 

-#: src/account.c:425
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr ""
 
 msgid "Can't create folder."
 msgstr ""
 

-#: src/account.c:682
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr ""
 
 msgid "Edit accounts"
 msgstr ""
 

-#: src/account.c:700
+#: src/account.c:715

 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 "included."
 msgstr ""
 
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 "included."
 msgstr ""
 

-#: src/account.c:773
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr ""
 
 msgid " _Set as default account "
 msgstr ""
 

-#: src/account.c:867
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 

-#: src/account.c:873
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 

-#: src/account.c:1012
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 

-#: src/account.c:1014
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr ""
 
 msgid "(Untitled)"
 msgstr ""
 

-#: src/account.c:1015
+#: src/account.c:1033

 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 msgstr ""
 

-#: src/account.c:1461
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr ""
 
 msgid "Accounts List Default Column Name|D"
 msgstr ""
 

-#: src/account.c:1467
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr ""
 
 msgid "Default account"
 msgstr ""
 

-#: src/account.c:1475
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr ""
 
 msgid "Accounts List Get Column Name|G"
 msgstr ""
 

-#: src/account.c:1481
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 

-#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5824 src/compose.c:6115 src/editaddress.c:1041
-#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6036 src/compose.c:6349 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
-#: src/prefs_filtering.c:1481 src/prefs_template.c:185
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 

-#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr ""
 
 msgid "Protocol"
 msgstr ""
 

-#: src/account.c:1502 src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr ""
 
 msgid "Server"
 msgstr ""
 


@@ -103,7 +103,8 @@ msgid "Could not get message part."
 msgstr ""
 
 #: src/action.c:403
 msgstr ""
 
 #: src/action.c:403

-msgid "Can't get part of multipart message"
+#, c-format
+msgid "Can't get part of multipart message: %s"

 msgstr ""
 
 #: src/action.c:517
 msgstr ""
 
 #: src/action.c:517


@@ -113,14 +114,25 @@ msgid ""
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 

-#: src/action.c:829
+#: src/action.c:615
+msgid "There is no filtering action set"
+msgstr ""
+
+#: src/action.c:617
+#, c-format
+msgid ""
+"Invalid filtering action(s):\n"
+"%s"
+msgstr ""
+
+#: src/action.c:839

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 "%s"
 msgstr ""
 

-#: src/action.c:924
+#: src/action.c:934

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -128,25 +140,25 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: src/action.c:1144 src/action.c:1294
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr ""
 
 msgid "Completed"
 msgstr ""
 

-#: src/action.c:1180
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 

-#: src/action.c:1184
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 

-#: src/action.c:1217
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr ""
 
 msgid "Action's input/output"
 msgstr ""
 

-#: src/action.c:1529
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -154,11 +166,11 @@ msgid ""
 "  %s"
 msgstr ""
 
 "  %s"
 msgstr ""
 

-#: src/action.c:1534
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr ""
 
 msgid "Action's hidden user argument"
 msgstr ""
 

-#: src/action.c:1538
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -166,503 +178,519 @@ msgid ""
 "  %s"
 msgstr ""
 
 "  %s"
 msgstr ""
 

-#: src/action.c:1543
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr ""
 
 msgid "Action's user argument"
 msgstr ""
 

-#: src/addressadd.c:174
+#: src/addr_compl.c:597 src/addressbook.c:4596
+msgid "Group"
+msgstr ""
+
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr ""
 
 msgid "Add to address book"
 msgstr ""
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
-#: src/toolbar.c:459
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
-#: src/editaddress.c:913 src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr ""
 
 msgid "Remarks"
 msgstr ""
 

-#: src/addressadd.c:240
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgstr ""
 
 msgid "Select Address Book Folder"
 msgstr ""
 

-#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895
-#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
-#: src/exporthtml.c:802 src/ldif.c:835
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr ""
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr ""
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898
+#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr ""
 
 msgid "Email Address"
 msgstr ""
 

-#: src/addressbook.c:419
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr ""
 
 msgid "/_Book"
 msgstr ""
 

-#: src/addressbook.c:420
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr ""
 
 msgid "/_Book/New _Book"
 msgstr ""
 

-#: src/addressbook.c:421
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr ""
 
 msgid "/_Book/New _Folder"
 msgstr ""
 

-#: src/addressbook.c:422
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr ""
 
 msgid "/_Book/New _vCard"
 msgstr ""
 

-#: src/addressbook.c:424
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr ""
 
 msgid "/_Book/New _JPilot"
 msgstr ""
 

-#: src/addressbook.c:427
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr ""
 
 msgid "/_Book/New LDAP _Server"
 msgstr ""
 

-#: src/addressbook.c:429 src/addressbook.c:432
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr ""
 
 msgid "/_Book/---"
 msgstr ""
 

-#: src/addressbook.c:430
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr ""
 
 msgid "/_Book/_Edit book"
 msgstr ""
 

-#: src/addressbook.c:431
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr ""
 
 msgid "/_Book/_Delete book"
 msgstr ""
 

-#: src/addressbook.c:433
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr ""
 
 msgid "/_Book/_Save"
 msgstr ""
 

-#: src/addressbook.c:434
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr ""
 
 msgid "/_Book/_Close"
 msgstr ""
 

-#: src/addressbook.c:435
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr ""
 
 msgid "/_Address"
 msgstr ""
 

-#: src/addressbook.c:436
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr ""
 
 msgid "/_Address/_Select all"
 msgstr ""
 

-#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
-#: src/addressbook.c:447
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr ""
 
 msgid "/_Address/---"
 msgstr ""
 

-#: src/addressbook.c:438
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr ""
 
 msgid "/_Address/C_ut"
 msgstr ""
 

-#: src/addressbook.c:439
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr ""
 
 msgid "/_Address/_Copy"
 msgstr ""
 

-#: src/addressbook.c:440
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr ""
 
 msgid "/_Address/_Paste"
 msgstr ""
 

-#: src/addressbook.c:442
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr ""
 
 msgid "/_Address/_Edit"
 msgstr ""
 

-#: src/addressbook.c:443
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr ""
 
 msgid "/_Address/_Delete"
 msgstr ""
 

-#: src/addressbook.c:445
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr ""
 
 msgid "/_Address/New _Address"
 msgstr ""
 

-#: src/addressbook.c:446
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr ""
 
 msgid "/_Address/New _Group"
 msgstr ""
 

-#: src/addressbook.c:448
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr ""
 
 msgid "/_Address/_Mail To"
 msgstr ""
 

-#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:800
-#: src/messageview.c:302
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814
+#: src/messageview.c:306

 msgid "/_Tools"
 msgstr ""
 
 msgid "/_Tools"
 msgstr ""
 

-#: src/addressbook.c:450
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr ""
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr ""
 

-#: src/addressbook.c:451
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr ""
 
 msgid "/_Tools/Import M_utt file..."
 msgstr ""
 

-#: src/addressbook.c:452
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr ""
 
 msgid "/_Tools/Import _Pine file..."
 msgstr ""
 

-#: src/addressbook.c:453 src/mainwindow.c:809 src/mainwindow.c:832
-#: src/mainwindow.c:834 src/mainwindow.c:843 src/mainwindow.c:846
-#: src/mainwindow.c:850 src/messageview.c:306 src/messageview.c:327
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
+#: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
+#: src/messageview.c:331 src/messageview.c:333

 msgid "/_Tools/---"
 msgstr ""
 
 msgid "/_Tools/---"
 msgstr ""
 

-#: src/addressbook.c:454
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr ""
 
 msgid "/_Tools/Export _HTML..."
 msgstr ""
 

-#: src/addressbook.c:455
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr ""
 
 msgid "/_Tools/Export LDI_F..."
 msgstr ""
 

-#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:875
-#: src/messageview.c:330
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892
+#: src/messageview.c:336

 msgid "/_Help"
 msgstr ""
 
 msgid "/_Help"
 msgstr ""
 

-#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:881
-#: src/messageview.c:331
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898
+#: src/messageview.c:337

 msgid "/_Help/_About"
 msgstr ""
 
 msgid "/_Help/_About"
 msgstr ""
 

-#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545
-#: src/mainwindow.c:519 src/messageview.c:164
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574
+#: src/mainwindow.c:530 src/messageview.c:168

 msgid "/_Edit"
 msgstr ""
 
 msgid "/_Edit"
 msgstr ""
 

-#: src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr ""
 
 msgid "/_Delete"
 msgstr ""
 

-#: src/addressbook.c:465
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr ""
 
 msgid "/New _Book"
 msgstr ""
 

-#: src/addressbook.c:466
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr ""
 
 msgid "/New _Folder"
 msgstr ""
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr ""
 
 msgid "/New _Group"
 msgstr ""
 

-#: src/addressbook.c:469 src/addressbook.c:484
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr ""
 
 msgid "/C_ut"
 msgstr ""
 

-#: src/addressbook.c:470 src/addressbook.c:485
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr ""
 
 msgid "/_Copy"
 msgstr ""
 

-#: src/addressbook.c:471 src/addressbook.c:486
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr ""
 
 msgid "/_Paste"
 msgstr ""
 

-#: src/addressbook.c:476
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr ""
 
 msgid "/_Select all"
 msgstr ""
 

-#: src/addressbook.c:481
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr ""
 
 msgid "/New _Address"
 msgstr ""
 

-#: src/addressbook.c:489
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr ""
 
 msgid "/_Mail To"
 msgstr ""
 

-#: src/addressbook.c:491
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr ""
 
 msgid "/_Browse Entry"
 msgstr ""
 

-#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683
-#: src/prefs_themes.c:715 src/prefs_themes.c:716
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120
+#: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
+#: src/prefs_themes.c:716 src/prefs_themes.c:717

 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 

-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr ""
 
 msgid "Success"
 msgstr ""
 

-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr ""
 
 msgid "Bad arguments"
 msgstr ""
 

-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr ""
 
 msgid "File not specified"
 msgstr ""
 

-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr ""
 
 msgid "Error opening file"
 msgstr ""
 

-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr ""
 
 msgid "Error reading file"
 msgstr ""
 

-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr ""
 
 msgid "End of file encountered"
 msgstr ""
 

-#: src/addressbook.c:517 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr ""
 
 msgid "Error allocating memory"
 msgstr ""
 

-#: src/addressbook.c:518 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr ""
 
 msgid "Bad file format"
 msgstr ""
 

-#: src/addressbook.c:519 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: src/addressbook.c:520 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr ""
 
 msgid "Error opening directory"
 msgstr ""
 

-#: src/addressbook.c:521 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr ""
 
 msgid "No path specified"
 msgstr ""
 

-#: src/addressbook.c:531
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr ""
 
 msgid "Error connecting to LDAP server"
 msgstr ""
 

-#: src/addressbook.c:532
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr ""
 
 msgid "Error initializing LDAP"
 msgstr ""
 

-#: src/addressbook.c:533
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr ""
 
 msgid "Error binding to LDAP server"
 msgstr ""
 

-#: src/addressbook.c:534
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr ""
 
 msgid "Error searching LDAP database"
 msgstr ""
 

-#: src/addressbook.c:535
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr ""
 
 msgid "Timeout performing LDAP operation"
 msgstr ""
 

-#: src/addressbook.c:536
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr ""
 
 msgid "Error in LDAP search criteria"
 msgstr ""
 

-#: src/addressbook.c:537
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 

-#: src/addressbook.c:538
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr ""
 
 msgid "LDAP search terminated on request"
 msgstr ""
 

-#: src/addressbook.c:539
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr ""
 
 msgid "Error starting TLS connection"
 msgstr ""
 

-#: src/addressbook.c:897
-msgid "Sources"
+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
-#: src/toolbar.c:1787
-msgid "Address book"
+#: src/addressbook.c:549
+msgid "Missing required information"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:1033
-msgid "Lookup name:"
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4446
-#: src/compose.c:5670 src/compose.c:6435 src/compose.c:9456
-#: src/summary_search.c:359
-msgid "To:"
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
-#: src/compose.c:4445 src/compose.c:9465
-msgid "Cc:"
+#: src/addressbook.c:925
+msgid "Sources"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213
-msgid "Bcc:"
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910
+msgid "Address book"
+msgstr ""
+
+#: src/addressbook.c:1061
+msgid "Lookup name:"

 msgstr ""
 
 msgstr ""
 

-#: src/addressbook.c:1363 src/addressbook.c:1409
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr ""
 
 msgid "Delete address(es)"
 msgstr ""
 

-#: src/addressbook.c:1364
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 

-#: src/addressbook.c:1403
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr ""
 
 msgid "Delete group"
 msgstr ""
 

-#: src/addressbook.c:1404
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 

-#: src/addressbook.c:1410
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr ""
 
 msgid "Really delete the address(es)?"
 msgstr ""
 

-#: src/addressbook.c:2014
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 

-#: src/addressbook.c:2025
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr ""
 
 msgid "Cannot paste into an address group."
 msgstr ""
 

-#: src/addressbook.c:2708
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 

-#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744
-#: src/prefs_filtering_action.c:152
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785
+#: src/prefs_filtering_action.c:161

 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 

-#: src/addressbook.c:2720
+#: src/addressbook.c:2761

 #, 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 ""
 
 #, 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 ""
 

-#: src/addressbook.c:2723 src/imap_gtk.c:286 src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr ""
 
 msgid "Delete folder"
 msgstr ""
 

-#: src/addressbook.c:2724
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr ""
 
 msgid "+Delete _folder only"
 msgstr ""
 

-#: src/addressbook.c:2724
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr ""
 
 msgid "Delete folder and _addresses"
 msgstr ""
 

-#: src/addressbook.c:2735
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 

-#: src/addressbook.c:2742
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 

-#: src/addressbook.c:3595
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr ""
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr ""
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr ""
 
 msgid "New user, could not save index file."
 msgstr ""
 

-#: src/addressbook.c:3599
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr ""
 
 msgid "New user, could not save address book files."
 msgstr ""
 

-#: src/addressbook.c:3609
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr ""
 
 msgid "Old address book converted successfully."
 msgstr ""
 

-#: src/addressbook.c:3614
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 

-#: src/addressbook.c:3627
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 

-#: src/addressbook.c:3633
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 

-#: src/addressbook.c:3638
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 

-#: src/addressbook.c:3645 src/addressbook.c:3651
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr ""
 
 msgid "Addressbook conversion error"
 msgstr ""
 

-#: src/addressbook.c:3689
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr ""
 
 msgid "Addressbook Error"
 msgstr ""
 

-#: src/addressbook.c:3690
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr ""
 
 msgid "Could not read address index"
 msgstr ""
 

-#: src/addressbook.c:4017
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr ""
 
 msgid "Busy searching..."
 msgstr ""
 

-#: src/addressbook.c:4088
-#, c-format
-msgid "Search '%s'"
-msgstr ""
-
-#: src/addressbook.c:4313
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr ""
 
 msgid "Interface"
 msgstr ""
 

-#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394
-#: src/exporthtml.c:1020 src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr ""
 
 msgid "Address Book"
 msgstr ""
 

-#: src/addressbook.c:4345
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr ""
 
 msgid "Person"
 msgstr ""
 

-#: src/addressbook.c:4361
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr ""
 
 msgid "EMail Address"
 msgstr ""
 

-#: src/addressbook.c:4377
-msgid "Group"
-msgstr ""
-
-#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
-#: src/prefs_account.c:2417 src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr ""
 
 msgid "Folder"
 msgstr ""
 

-#: src/addressbook.c:4409
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr ""
 
 msgid "vCard"
 msgstr ""
 

-#: src/addressbook.c:4425 src/addressbook.c:4441
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr ""
 
 msgid "JPilot"
 msgstr ""
 

-#: src/addressbook.c:4457
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr ""
 
 msgid "LDAP servers"
 msgstr ""
 

-#: src/addressbook.c:4473
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr ""
 
 msgid "LDAP Query"
 msgstr ""
 

-#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756
-#: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
-#: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
-#: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr ""
 
 msgid "Any"
 msgstr ""
 


@@ -698,7 +726,7 @@ msgid "Folder :"
 msgstr ""
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
 msgstr ""
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr ""
 
 msgid "Address Book :"
 msgstr ""
 


@@ -722,9 +750,9 @@ msgstr ""
 msgid "Address Count"
 msgstr ""
 
 msgid "Address Count"
 msgstr ""
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4797
-#: src/compose.c:9377 src/messageview.c:580 src/messageview.c:593
-#: src/plugins/pgpcore/sgpgme.c:575
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4910
+#: src/compose.c:9841 src/messageview.c:589 src/messageview.c:602
+#: src/plugins/pgpcore/sgpgme.c:579

 msgid "Warning"
 msgstr ""
 
 msgid "Warning"
 msgstr ""
 


@@ -733,7 +761,7 @@ msgid "Header Fields"
 msgstr ""
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
 msgstr ""
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr ""
 
 msgid "Finish"
 msgstr ""
 


@@ -745,56 +773,64 @@ msgstr ""
 msgid "Harvest Email Addresses - from Folder"
 msgstr ""
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr ""
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr ""
 
 msgid "Common addresses"
 msgstr ""
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr ""
 
 msgid "Personal addresses"
 msgstr ""
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr ""
 
 msgid "Common address"
 msgstr ""
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr ""
 
 msgid "Personal address"
 msgstr ""
 

-#: src/alertpanel.c:141 src/compose.c:7585
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr ""
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr ""
+
+#: src/alertpanel.c:145 src/compose.c:7902

 msgid "Notice"
 msgstr ""
 
 msgid "Notice"
 msgstr ""
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4737 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4850 src/inc.c:619
+#: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241

 msgid "Error"
 msgstr ""
 
 msgid "Error"
 msgstr ""
 

-#: src/alertpanel.c:191
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr ""
 
 msgid "_View log"
 msgstr ""
 

-#: src/alertpanel.c:338
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr ""
 
 msgid "Show this message next time"
 msgstr ""
 

-#: src/browseldap.c:219
+#: src/browseldap.c:218

 msgid "Browse Directory Entry"
 msgstr ""
 
 msgid "Browse Directory Entry"
 msgstr ""
 

-#: src/browseldap.c:239
+#: src/browseldap.c:238

 msgid "Server Name :"
 msgstr ""
 
 msgid "Server Name :"
 msgstr ""
 

-#: src/browseldap.c:249
+#: src/browseldap.c:248

 msgid "Distinguished Name (dn) :"
 msgstr ""
 
 msgid "Distinguished Name (dn) :"
 msgstr ""
 

-#: src/browseldap.c:272
+#: src/browseldap.c:271

 msgid "LDAP Name"
 msgstr ""
 
 msgid "LDAP Name"
 msgstr ""
 

-#: src/browseldap.c:274
+#: src/browseldap.c:273

 msgid "Attribute Value"
 msgstr ""
 
 msgid "Attribute Value"
 msgstr ""
 


@@ -803,7 +839,7 @@ msgstr ""
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr ""
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr ""
 

-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr ""
 
 msgid "SSL handshake failed\n"
 msgstr ""
 


@@ -824,79 +860,79 @@ msgstr ""
 msgid "Error occurred while sending command\n"
 msgstr ""
 
 msgid "Error occurred while sending command\n"
 msgstr ""
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr ""
 
 msgid "Nothing"
 msgstr ""
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr ""
 
 msgid "a viewer"
 msgstr ""
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:58

 msgid "folders"
 msgstr ""
 
 msgid "folders"
 msgstr ""
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr ""
 
 msgid "filtering"
 msgstr ""
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr ""
 
 msgid "a privacy interface"
 msgstr ""
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr ""
 
 msgid "a notifier"
 msgstr ""
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr ""
 
 msgid "an utility"
 msgstr ""
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:63

 msgid "things"
 msgstr ""
 
 msgid "things"
 msgstr ""
 

-#: src/common/plugin.c:258
+#: src/common/plugin.c:269

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 

-#: src/common/plugin.c:293
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr ""
 
 msgid "Plugin already loaded"
 msgstr ""
 

-#: src/common/plugin.c:303
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 

-#: src/common/plugin.c:330
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr ""
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr ""
 

-#: src/common/plugin.c:337
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 

-#: src/common/plugin.c:550
+#: src/common/plugin.c:599

 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 

-#: src/common/plugin.c:553
+#: src/common/plugin.c:602

 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 

-#: src/common/plugin.c:562
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 

-#: src/common/plugin.c:564
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 


@@ -912,7 +948,7 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
 msgid "error occurred on SMTP session\n"
 msgstr ""
 

-#: src/common/smtp.c:548 src/pop.c:842
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr ""
 
 msgid "error occurred on authentication\n"
 msgstr ""
 


@@ -921,7 +957,7 @@ msgstr ""
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 

-#: src/common/smtp.c:635 src/pop.c:835
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr ""
 
 msgid "couldn't start TLS session\n"
 msgstr ""
 


@@ -939,16 +975,16 @@ msgstr ""
 msgid "SSL connect failed (%s)\n"
 msgstr ""
 
 msgid "SSL connect failed (%s)\n"
 msgstr ""
 

-#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
-#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
-#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249
-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
+#: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
+#: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr ""
 
 msgid "<not in certificate>"
 msgstr ""
 

-#: src/common/ssl_certificate.c:258
+#: src/common/ssl_certificate.c:253

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -957,7 +993,7 @@ msgid ""
 "  Signature status: %s"
 msgstr ""
 
 "  Signature status: %s"
 msgstr ""
 

-#: src/common/ssl_certificate.c:385
+#: src/common/ssl_certificate.c:380

 msgid "Couldn't load X509 default paths"
 msgstr ""
 
 msgid "Couldn't load X509 default paths"
 msgstr ""
 


@@ -965,753 +1001,773 @@ msgstr ""
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 

-#: src/common/utils.c:348
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr ""
 
 #, c-format
 msgid "%dB"
 msgstr ""
 

-#: src/common/utils.c:349
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 

-#: src/common/utils.c:350
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 

-#: src/common/utils.c:351
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr ""
 
 #, c-format
 msgid "%.2fGB"
 msgstr ""
 

-#: src/common/utils.c:4799
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr ""
 

-#: src/common/utils.c:4800
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr ""
 

-#: src/common/utils.c:4801
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr ""
 

-#: src/common/utils.c:4802
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr ""
 

-#: src/common/utils.c:4803
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr ""
 

-#: src/common/utils.c:4804
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr ""
 

-#: src/common/utils.c:4805
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr ""
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr ""
 

-#: src/common/utils.c:4807
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr ""
 
 msgid "Complete month name for use by strftime|January"
 msgstr ""
 

-#: src/common/utils.c:4808
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr ""
 
 msgid "Complete month name for use by strftime|February"
 msgstr ""
 

-#: src/common/utils.c:4809
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr ""
 
 msgid "Complete month name for use by strftime|March"
 msgstr ""
 

-#: src/common/utils.c:4810
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr ""
 
 msgid "Complete month name for use by strftime|April"
 msgstr ""
 

-#: src/common/utils.c:4811
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr ""
 
 msgid "Complete month name for use by strftime|May"
 msgstr ""
 

-#: src/common/utils.c:4812
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr ""
 
 msgid "Complete month name for use by strftime|June"
 msgstr ""
 

-#: src/common/utils.c:4813
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr ""
 
 msgid "Complete month name for use by strftime|July"
 msgstr ""
 

-#: src/common/utils.c:4814
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr ""
 
 msgid "Complete month name for use by strftime|August"
 msgstr ""
 

-#: src/common/utils.c:4815
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr ""
 
 msgid "Complete month name for use by strftime|September"
 msgstr ""
 

-#: src/common/utils.c:4816
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr ""
 
 msgid "Complete month name for use by strftime|October"
 msgstr ""
 

-#: src/common/utils.c:4817
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr ""
 
 msgid "Complete month name for use by strftime|November"
 msgstr ""
 

-#: src/common/utils.c:4818
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr ""
 
 msgid "Complete month name for use by strftime|December"
 msgstr ""
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr ""
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr ""
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr ""
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr ""
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr ""
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr ""
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr ""
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr ""
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr ""
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr ""
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr ""
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr ""
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr ""
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr ""
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr ""
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr ""
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr ""
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr ""
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr ""
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr ""
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr ""
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr ""
 
 msgid "For use by strftime (morning)|AM"
 msgstr ""
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr ""
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr ""
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr ""
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr ""
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr ""
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr ""
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr ""
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr ""
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr ""
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr ""
 

-#: src/common/utils.c:4848
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr ""
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr ""
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr ""
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr ""
 

-#: src/compose.c:522
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr ""
 
 msgid "/_Add..."
 msgstr ""
 

-#: src/compose.c:523
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr ""
 
 msgid "/_Remove"
 msgstr ""
 

-#: src/compose.c:525 src/folderview.c:294
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr ""
 
 msgid "/_Properties..."
 msgstr ""
 

-#: src/compose.c:530 src/mainwindow.c:741 src/messageview.c:285
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr ""
 
 msgid "/_Message"
 msgstr ""
 

-#: src/compose.c:531
-msgid "/_Message/_Send"
+#: src/compose.c:560
+msgid "/_Message/S_end"

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:533
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr ""
 
 msgid "/_Message/Send _later"
 msgstr ""
 

-#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:751
-#: src/mainwindow.c:761 src/mainwindow.c:774 src/mainwindow.c:780
-#: src/mainwindow.c:797 src/messageview.c:288 src/messageview.c:296
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765
+#: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
+#: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300

 msgid "/_Message/---"
 msgstr ""
 
 msgid "/_Message/---"
 msgstr ""
 

-#: src/compose.c:536
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr ""
 
 msgid "/_Message/_Attach file"
 msgstr ""
 

-#: src/compose.c:537
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr ""
 
 msgid "/_Message/_Insert file"
 msgstr ""
 

-#: src/compose.c:538
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr ""
 
 msgid "/_Message/Insert si_gnature"
 msgstr ""
 

-#: src/compose.c:540
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr ""
 
 msgid "/_Message/_Save"
 msgstr ""
 

-#: src/compose.c:543
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr ""
 
 msgid "/_Message/_Close"
 msgstr ""
 

-#: src/compose.c:546
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr ""
 
 msgid "/_Edit/_Undo"
 msgstr ""
 

-#: src/compose.c:547
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr ""
 
 msgid "/_Edit/_Redo"
 msgstr ""
 

-#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645
-#: src/mainwindow.c:523 src/messageview.c:167
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674
+#: src/mainwindow.c:535 src/messageview.c:171

 msgid "/_Edit/---"
 msgstr ""
 
 msgid "/_Edit/---"
 msgstr ""
 

-#: src/compose.c:549
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr ""
 
 msgid "/_Edit/Cu_t"
 msgstr ""
 

-#: src/compose.c:550 src/mainwindow.c:520 src/messageview.c:165
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr ""
 
 msgid "/_Edit/_Copy"
 msgstr ""
 

-#: src/compose.c:551
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr ""
 
 msgid "/_Edit/_Paste"
 msgstr ""
 

-#: src/compose.c:552
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr ""
 
 msgid "/_Edit/Special paste"
 msgstr ""
 

-#: src/compose.c:553
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr ""
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr ""
 

-#: src/compose.c:555
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr ""
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr ""
 

-#: src/compose.c:557
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr ""
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr ""
 

-#: src/compose.c:559 src/mainwindow.c:521 src/messageview.c:166
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr ""
 
 msgid "/_Edit/Select _all"
 msgstr ""
 

-#: src/compose.c:560
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr ""
 
 msgid "/_Edit/A_dvanced"
 msgstr ""
 

-#: src/compose.c:561
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 

-#: src/compose.c:566
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 

-#: src/compose.c:571
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 

-#: src/compose.c:576
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 

-#: src/compose.c:581
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 

-#: src/compose.c:586
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 

-#: src/compose.c:591
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 

-#: src/compose.c:596
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 

-#: src/compose.c:601
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 

-#: src/compose.c:606
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 

-#: src/compose.c:611
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 

-#: src/compose.c:616
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 

-#: src/compose.c:621
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 

-#: src/compose.c:626
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr ""
 

-#: src/compose.c:631
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 

-#: src/compose.c:637
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr ""
 
 msgid "/_Edit/_Find"
 msgstr ""
 

-#: src/compose.c:640
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr ""
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr ""
 

-#: src/compose.c:642
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr ""
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr ""
 

-#: src/compose.c:644
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr ""
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr ""
 

-#: src/compose.c:646
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr ""
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr ""
 

-#: src/compose.c:649
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr ""
 
 msgid "/_Spelling"
 msgstr ""
 

-#: src/compose.c:650
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr ""
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr ""
 

-#: src/compose.c:652
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr ""
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr ""
 

-#: src/compose.c:654
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr ""
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr ""
 

-#: src/compose.c:656
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr ""
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr ""
 

-#: src/compose.c:658
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr ""
 
 msgid "/_Spelling/---"
 msgstr ""
 

-#: src/compose.c:659
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr ""
 
 msgid "/_Spelling/Options"
 msgstr ""
 

-#: src/compose.c:662
+#: src/compose.c:691

 msgid "/_Options"
 msgstr ""
 
 msgid "/_Options"
 msgstr ""
 

-#: src/compose.c:663
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr ""
 
 msgid "/_Options/Reply _mode"
 msgstr ""
 

-#: src/compose.c:664
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr ""
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr ""
 

-#: src/compose.c:665
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr ""
 
 msgid "/_Options/Reply _mode/_All"
 msgstr ""
 

-#: src/compose.c:666
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr ""
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr ""
 

-#: src/compose.c:667
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr ""
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr ""
 

-#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
-#: src/compose.c:684
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr ""
 
 msgid "/_Options/---"
 msgstr ""
 

-#: src/compose.c:669
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr ""
 
 msgid "/_Options/Privacy _System"
 msgstr ""
 

-#: src/compose.c:670
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr ""
 
 msgid "/_Options/Privacy _System/None"
 msgstr ""
 

-#: src/compose.c:671
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr ""
 
 msgid "/_Options/Si_gn"
 msgstr ""
 

-#: src/compose.c:672
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr ""
 
 msgid "/_Options/_Encrypt"
 msgstr ""
 

-#: src/compose.c:674
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr ""
 
 msgid "/_Options/_Priority"
 msgstr ""
 

-#: src/compose.c:675
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr ""
 
 msgid "/_Options/Priority/_Highest"
 msgstr ""
 

-#: src/compose.c:676
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr ""
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr ""
 

-#: src/compose.c:677
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr ""
 
 msgid "/_Options/Priority/_Normal"
 msgstr ""
 

-#: src/compose.c:678
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr ""
 
 msgid "/_Options/Priority/Lo_w"
 msgstr ""
 

-#: src/compose.c:679
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr ""
 
 msgid "/_Options/Priority/_Lowest"
 msgstr ""
 

-#: src/compose.c:681
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr ""
 
 msgid "/_Options/_Request Return Receipt"
 msgstr ""
 

-#: src/compose.c:683
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr ""
 
 msgid "/_Options/Remo_ve references"
 msgstr ""
 

-#: src/compose.c:690
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr ""
 
 msgid "/_Options/Character _encoding"
 msgstr ""
 

-#: src/compose.c:691
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr ""
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr ""
 

-#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
-#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
-#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
-#: src/compose.c:765
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr ""
 
 msgid "/_Options/Character _encoding/---"
 msgstr ""
 

-#: src/compose.c:695
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 

-#: src/compose.c:697
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 

-#: src/compose.c:701
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 

-#: src/compose.c:703
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 

-#: src/compose.c:705
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 

-#: src/compose.c:709
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 

-#: src/compose.c:713
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 

-#: src/compose.c:715
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 

-#: src/compose.c:719
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 

-#: src/compose.c:723
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 

-#: src/compose.c:725
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 

-#: src/compose.c:729
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 

-#: src/compose.c:731
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 

-#: src/compose.c:735
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 

-#: src/compose.c:739
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 

-#: src/compose.c:741
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 

-#: src/compose.c:743
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 

-#: src/compose.c:745
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 

-#: src/compose.c:749
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 

-#: src/compose.c:753
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 

-#: src/compose.c:755
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 

-#: src/compose.c:757
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 

-#: src/compose.c:759
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 

-#: src/compose.c:763
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 

-#: src/compose.c:767
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr ""
 

-#: src/compose.c:769
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr ""
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr ""
 

-#: src/compose.c:773
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr ""
 
 msgid "/_Tools/Show _ruler"
 msgstr ""
 

-#: src/compose.c:774 src/messageview.c:303
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr ""
 
 msgid "/_Tools/_Address book"
 msgstr ""
 

-#: src/compose.c:775
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr ""
 
 msgid "/_Tools/_Template"
 msgstr ""
 

-#: src/compose.c:776 src/mainwindow.c:833 src/messageview.c:328
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr ""
 
 msgid "/_Tools/Actio_ns"
 msgstr ""
 

-#: src/compose.c:1039 src/prefs_compose_writing.c:384
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr ""
 
 msgid "New message subject format error."
 msgstr ""
 

-#: src/compose.c:1068 src/prefs_compose_writing.c:388
-msgid "New message body format error."
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:1438 src/prefs_quote.c:281
-msgid "Message reply format error."
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:1555 src/prefs_quote.c:286
-msgid "Message forward format error."
+#: src/compose.c:1614 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:1675
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr ""
 
 msgid "Fw: multiple emails"
 msgstr ""
 

-#: src/compose.c:2050
-msgid "Message redirect format error."
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr ""
+
+#: src/compose.c:2176 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr ""
+
+#: src/compose.c:2179 src/gtk/headers.h:14
+msgid "Bcc:"

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:2119
+#: src/compose.c:2182 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr ""
 
 msgid "Reply-To:"
 msgstr ""
 

-#: src/compose.c:2122 src/compose.c:5667 src/compose.c:6437 src/compose.c:9475
+#: src/compose.c:2185 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr ""
 
 msgid "Newsgroups:"
 msgstr ""
 

-#: src/compose.c:2125
+#: src/compose.c:2188 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr ""
 
 msgid "Followup-To:"
 msgstr ""
 

-#: src/compose.c:2304
+#: src/compose.c:2192 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr ""
+
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr ""
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr ""
 

-#: src/compose.c:2308
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 

-#: src/compose.c:2539
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr ""
 
 msgid "Quote mark format error."
 msgstr ""
 

-#: src/compose.c:3133
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 

-#: src/compose.c:3137
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 

-#: src/compose.c:3164
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr ""
 
 #, c-format
 msgid "Message: %s"
 msgstr ""
 

-#: src/compose.c:3983
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr ""
 
 msgid " [Edited]"
 msgstr ""
 

-#: src/compose.c:3989
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 

-#: src/compose.c:3992
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 

-#: src/compose.c:4017 src/messageview.c:615
+#: src/compose.c:4085
+msgid "Compose message"
+msgstr ""
+
+#: src/compose.c:4112 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 

-#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
-#: src/toolbar.c:452
+#: src/compose.c:4305 src/compose.c:4336 src/compose.c:4368
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr ""
 
 msgid "Send"
 msgstr ""
 

-#: src/compose.c:4196
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 

-#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4737
+#: src/compose.c:4307 src/compose.c:4338 src/compose.c:4370 src/compose.c:4850

 msgid "+_Send"
 msgstr ""
 
 msgid "+_Send"
 msgstr ""
 

-#: src/compose.c:4227
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 

-#: src/compose.c:4244
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr ""
 
 msgid "Recipient is not specified."
 msgstr ""
 

-#: src/compose.c:4259
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 

-#: src/compose.c:4306 src/compose.c:7938
+#: src/compose.c:4416 src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 

-#: src/compose.c:4309 src/compose.c:7941
+#: src/compose.c:4419 src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 

-#: src/compose.c:4313 src/compose.c:7935
+#: src/compose.c:4425 src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1719,7 +1775,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
 "Signature failed: %s"
 msgstr ""
 

-#: src/compose.c:4316
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1727,24 +1783,24 @@ msgid ""
 "%s."
 msgstr ""
 
 "%s."
 msgstr ""
 

-#: src/compose.c:4318
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr ""
 
 msgid "Could not queue message for sending."
 msgstr ""
 

-#: src/compose.c:4333 src/compose.c:4394
+#: src/compose.c:4445 src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 

-#: src/compose.c:4388
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 

-#: src/compose.c:4734
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1752,7 +1808,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
 "Send it as %s?"
 msgstr ""
 

-#: src/compose.c:4793
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1761,131 +1817,146 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
 "Send it anyway?"
 msgstr ""
 

-#: src/compose.c:4981
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr ""
+
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr ""
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr ""
 
 msgid "No account for sending mails available!"
 msgstr ""
 

-#: src/compose.c:4991
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgstr ""
 
 msgid "No account for posting news available!"
 msgstr ""
 

-#: src/compose.c:5684
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr ""
+
+#: src/compose.c:5876

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 

-#: src/compose.c:5812
+#: src/compose.c:6024

 msgid "Mime type"
 msgstr ""
 
 msgid "Mime type"
 msgstr ""
 

-#: src/compose.c:5818 src/compose.c:6114 src/mimeview.c:212
-#: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
-#: src/summaryview.c:490
+#: src/compose.c:6030 src/compose.c:6348 src/mimeview.c:214
+#: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
+#: src/summaryview.c:501

 msgid "Size"
 msgstr ""
 
 msgid "Size"
 msgstr ""
 

-#: src/compose.c:5879
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr ""
 
 msgid "Save Message to "
 msgstr ""
 

-#: src/compose.c:5901 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:6122 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/clamav/clamav_plugin_gtk.c:146

 #: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207
 msgid "_Browse"
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207
 msgid "_Browse"
 msgstr ""
 

-#: src/compose.c:6113 src/compose.c:7345
+#: src/compose.c:6347 src/compose.c:7662

 msgid "MIME type"
 msgstr ""
 
 msgid "MIME type"
 msgstr ""
 

-#: src/compose.c:6185
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr ""
 
 msgid "Hea_der"
 msgstr ""
 

-#: src/compose.c:6189
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr ""
 
 msgid "_Attachments"
 msgstr ""
 

-#: src/compose.c:6193
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr ""
 
 msgid "Othe_rs"
 msgstr ""
 

-#: src/compose.c:6208 src/summary_search.c:366
+#: src/compose.c:6445 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr ""
 
 msgid "Subject:"
 msgstr ""
 

-#: src/compose.c:6399
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 

-#: src/compose.c:6511
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr ""
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr ""
 

-#: src/compose.c:6542
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr ""
 
 msgid "Account to use for this email"
 msgstr ""
 

-#: src/compose.c:6544
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr ""
 
 msgid "Sender address to be used"
 msgstr ""
 

-#: src/compose.c:6705
+#: src/compose.c:6967

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 

-#: src/compose.c:6867 src/prefs_template.c:549
-msgid "Template body format error."
+#: src/compose.c:7167 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:6975 src/prefs_template.c:587
+#: src/compose.c:7277 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr ""
 
 msgid "Template To format error."
 msgstr ""
 

-#: src/compose.c:6988 src/prefs_template.c:592
+#: src/compose.c:7295 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr ""
 
 msgid "Template Cc format error."
 msgstr ""
 

-#: src/compose.c:7001 src/prefs_template.c:597
+#: src/compose.c:7313 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr ""
 
 msgid "Template Bcc format error."
 msgstr ""
 

-#: src/compose.c:7015 src/prefs_template.c:602
+#: src/compose.c:7332 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr ""
 
 msgid "Template subject format error."
 msgstr ""
 

-#: src/compose.c:7239
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr ""
 
 msgid "Invalid MIME type."
 msgstr ""
 

-#: src/compose.c:7254
+#: src/compose.c:7571

 msgid "File doesn't exist or is empty."
 msgstr ""
 
 msgid "File doesn't exist or is empty."
 msgstr ""
 

-#: src/compose.c:7327
+#: src/compose.c:7644

 msgid "Properties"
 msgstr ""
 
 msgid "Properties"
 msgstr ""
 

-#: src/compose.c:7378
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr ""
 
 msgid "Encoding"
 msgstr ""
 

-#: src/compose.c:7398
+#: src/compose.c:7715

 msgid "Path"
 msgstr ""
 
 msgid "Path"
 msgstr ""
 

-#: src/compose.c:7399 src/prefs_toolbar.c:1060
+#: src/compose.c:7716 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr ""
 
 msgid "File name"
 msgstr ""
 

-#: src/compose.c:7582
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1893,19 +1964,19 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
 "process group id: %d"
 msgstr ""
 

-#: src/compose.c:7624
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 

-#: src/compose.c:7905 src/messageview.c:720
+#: src/compose.c:8222 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 

-#: src/compose.c:7930
+#: src/compose.c:8247

 msgid "Could not queue message."
 msgstr ""
 
 msgid "Could not queue message."
 msgstr ""
 

-#: src/compose.c:7932
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1913,187 +1984,206 @@ msgid ""
 "%s."
 msgstr ""
 
 "%s."
 msgstr ""
 

-#: src/compose.c:8052
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr ""
 
 msgid "Could not save draft."
 msgstr ""
 

-#: src/compose.c:8127 src/compose.c:8150
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr ""
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+
+#: src/compose.c:8393
+msgid "_Cancel exit"
+msgstr ""
+
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr ""
+
+#: src/compose.c:8527 src/compose.c:8550

 msgid "Select file"
 msgstr ""
 
 msgid "Select file"
 msgstr ""
 

-#: src/compose.c:8163
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 

-#: src/compose.c:8165
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 

-#: src/compose.c:8213
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr ""
 
 msgid "Discard message"
 msgstr ""
 

-#: src/compose.c:8214
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr ""
 
 msgid "This message has been modified. Discard it?"
 msgstr ""
 

-#: src/compose.c:8215
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr ""
 
 msgid "_Discard"
 msgstr ""
 

-#: src/compose.c:8215
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr ""
 
 msgid "_Save to Drafts"
 msgstr ""
 

-#: src/compose.c:8259
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr ""
 

-#: src/compose.c:8261
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr ""
 
 msgid "Apply template"
 msgstr ""
 

-#: src/compose.c:8262
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr ""
 
 msgid "_Replace"
 msgstr ""
 

-#: src/compose.c:8262
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr ""
 
 msgid "_Insert"
 msgstr ""
 

-#: src/compose.c:8950
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr ""
 
 msgid "Insert or attach?"
 msgstr ""
 

-#: src/compose.c:8951
+#: src/compose.c:9417

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 
 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:8953
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr ""
 
 msgid "+_Insert"
 msgstr ""
 

-#: src/compose.c:8953
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr ""
 
 msgid "_Attach"
 msgstr ""
 

-#: src/compose.c:9152
-msgid "Quote format error."
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:9371
+#: src/compose.c:9835

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
 
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
 

-#: src/crash.c:142
+#: src/crash.c:140

 #, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr ""
 
 #, c-format
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr ""
 

-#: src/crash.c:188
+#: src/crash.c:186

 msgid "Claws Mail has crashed"
 msgstr ""
 
 msgid "Claws Mail has crashed"
 msgstr ""
 

-#: src/crash.c:204
+#: src/crash.c:202

 #, c-format
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
 msgstr ""
 

-#: src/crash.c:209
+#: src/crash.c:207

 msgid "Debug log"
 msgstr ""
 
 msgid "Debug log"
 msgstr ""
 

-#: src/crash.c:253
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 

-#: src/crash.c:258
+#: src/crash.c:256

 msgid "Save..."
 msgstr ""
 
 msgid "Save..."
 msgstr ""
 

-#: src/crash.c:263
+#: src/crash.c:261

 msgid "Create bug report"
 msgstr ""
 
 msgid "Create bug report"
 msgstr ""
 

-#: src/crash.c:310
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr ""
 
 msgid "Save crash information"
 msgstr ""
 

-#: src/editaddress.c:183
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr ""
 
 msgid "Add New Person"
 msgstr ""
 

-#: src/editaddress.c:184
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr ""
 
 msgid "Edit Person Details"
 msgstr ""
 

-#: src/editaddress.c:355
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr ""
 
 msgid "An Email address must be supplied."
 msgstr ""
 

-#: src/editaddress.c:529
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr ""
 
 msgid "A Name and Value must be supplied."
 msgstr ""
 

-#: src/editaddress.c:618
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr ""
 
 msgid "Discard"
 msgstr ""
 

-#: src/editaddress.c:619
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr ""
 
 msgid "Apply"
 msgstr ""
 

-#: src/editaddress.c:649 src/editaddress.c:698
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr ""
 
 msgid "Edit Person Data"
 msgstr ""
 

-#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799
-#: src/ldif.c:819
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr ""
 
 msgid "Display Name"
 msgstr ""
 

-#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr ""
 
 msgid "Last Name"
 msgstr ""
 

-#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr ""
 
 msgid "First Name"
 msgstr ""
 

-#: src/editaddress.c:771
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr ""
 
 msgid "Nickname"
 msgstr ""
 

-#: src/editaddress.c:848 src/editaddress.c:904
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr ""
 
 msgid "Alias"
 msgstr ""
 

-#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:530
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr ""
 
 msgid "Value"
 msgstr ""
 

-#: src/editaddress.c:1161
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr ""
 
 msgid "_User Data"
 msgstr ""
 

-#: src/editaddress.c:1162
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr ""
 
 msgid "_Email Addresses"
 msgstr ""
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr ""
 
 msgid "O_ther Attributes"
 msgstr ""
 


@@ -2118,7 +2208,7 @@ msgid " Check File "
 msgstr ""
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr ""
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr ""
 
 msgid "File"
 msgstr ""
 


@@ -2134,7 +2224,7 @@ msgstr ""
 msgid "Edit Group Data"
 msgstr ""
 
 msgid "Edit Group Data"
 msgstr ""
 

-#: src/editgroup.c:323 src/exporthtml.c:635
+#: src/editgroup.c:323 src/exporthtml.c:588

 msgid "Group Name"
 msgstr ""
 
 msgid "Group Name"
 msgstr ""
 


@@ -2166,11 +2256,11 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
 msgid "Input the new name of folder:"
 msgstr ""
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:139 src/mh_gtk.c:130
+#: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130

 msgid "New folder"
 msgstr ""
 
 msgid "New folder"
 msgstr ""
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131
+#: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr ""
 
 msgid "Input the name of new folder:"
 msgstr ""
 


@@ -2238,7 +2328,7 @@ msgstr ""
 msgid "Connected successfully to server"
 msgstr ""
 
 msgid "Connected successfully to server"
 msgstr ""
 

-#: src/editldap.c:331 src/editldap.c:1032
+#: src/editldap.c:331 src/editldap.c:999

 msgid "Edit LDAP Server"
 msgstr ""
 
 msgid "Edit LDAP Server"
 msgstr ""
 


@@ -2262,22 +2352,22 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
 msgid "TLS"
 msgstr ""
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr ""
 
 #: src/editldap.c:475
 msgid ""
 "Enable secure connection to the LDAP server via TLS.If connection fails, be "
 msgid "SSL"
 msgstr ""
 
 #: 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_CACERT or "
-"TLS_CACERTDIR fields)."
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."

 msgstr ""
 
 #: src/editldap.c:480
 msgid ""
 "Enable secure connection to the LDAP server via SSL.If connection fails, be "
 msgstr ""
 
 #: src/editldap.c:480
 msgid ""
 "Enable secure connection to the LDAP server via SSL.If connection fails, be "

-"sure to check the correct configuration in ldap.conf (TLS_CACERT or "
-"TLS_CACERTDIR fields)."
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."

 msgstr ""
 
 #: src/editldap.c:494
 msgstr ""
 
 #: src/editldap.c:494


@@ -2410,7 +2500,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr ""
 
 msgid "Basic"
 msgstr ""
 


@@ -2418,11 +2508,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:490
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr ""
 
 msgid "Extended"
 msgstr ""
 

-#: src/editldap.c:1037
+#: src/editldap.c:1004

 msgid "Add New LDAP Server"
 msgstr ""
 
 msgid "Add New LDAP Server"
 msgstr ""
 


@@ -2489,7 +2579,7 @@ msgid "HTML Output File"
 msgstr ""
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 msgstr ""
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr ""
 
 msgid "B_rowse"
 msgstr ""
 


@@ -2497,17 +2587,17 @@ msgstr ""
 msgid "Stylesheet"
 msgstr ""
 
 msgid "Stylesheet"
 msgstr ""
 

-#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
-#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1004 src/prefs_account.c:667
-#: src/summaryview.c:4991
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 

-#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691
+#: src/exphtmldlg.c:458 src/prefs_other.c:112 src/prefs_other.c:453

 msgid "Default"
 msgstr ""
 
 msgid "Default"
 msgstr ""
 

-#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:146

 msgid "Full"
 msgstr ""
 
 msgid "Full"
 msgstr ""
 


@@ -2551,7 +2641,7 @@ msgstr ""
 msgid "Format User Attributes"
 msgstr ""
 
 msgid "Format User Attributes"
 msgstr ""
 

-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr ""
 
 msgid "File Name :"
 msgstr ""
 


@@ -2563,7 +2653,7 @@ msgstr ""
 msgid "Export Address Book to HTML File"
 msgstr ""
 
 msgid "Export Address Book to HTML File"
 msgstr ""
 

-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr ""
 
 msgid "File Info"
 msgstr ""
 


@@ -2707,7 +2797,7 @@ msgstr ""
 msgid "Distguished Name"
 msgstr ""
 
 msgid "Distguished Name"
 msgstr ""
 

-#: src/export.c:120 src/summaryview.c:6370
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr ""
 
 msgid "Export to mbox file"
 msgstr ""
 


@@ -2739,311 +2829,316 @@ msgstr ""
 msgid "Select exporting file"
 msgstr ""
 
 msgid "Select exporting file"
 msgstr ""
 

-#: src/exporthtml.c:805
+#: src/exporthtml.c:758

 msgid "Full Name"
 msgstr ""
 
 msgid "Full Name"
 msgstr ""
 

-#: src/exporthtml.c:809 src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr ""
 
 msgid "Attributes"
 msgstr ""
 

-#: src/exporthtml.c:1010
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr ""
 
 msgid "Claws Mail Address Book"
 msgstr ""
 

-#: src/exporthtml.c:1124 src/exportldif.c:601
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr ""
 
 msgid "Name already exists but is not a directory."
 msgstr ""
 

-#: src/exporthtml.c:1127 src/exportldif.c:604
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr ""
 
 msgid "No permissions to create directory."
 msgstr ""
 

-#: src/exporthtml.c:1130 src/exportldif.c:607
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr ""
 
 msgid "Name is too long."
 msgstr ""
 

-#: src/exporthtml.c:1133 src/exportldif.c:610
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr ""
 
 msgid "Not specified."
 msgstr ""
 

-#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr ""
 
 msgid "Inbox"
 msgstr ""
 

-#: src/folder.c:1287 src/foldersel.c:375
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr ""
 
 msgid "Sent"
 msgstr ""
 

-#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr ""
 
 msgid "Queue"
 msgstr ""
 

-#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
-#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgstr "Wastebin"
 
 msgid "Trash"
 msgstr "Wastebin"
 

-#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr ""
 
 msgid "Drafts"
 msgstr ""
 

-#: src/folder.c:1578
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 

-#: src/folder.c:2514
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr ""
 

-#: src/folder.c:2803
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 

-#: src/folder.c:2803
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 

-#: src/folder.c:3090
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 

-#: src/folder.c:3801
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr ""
 
 msgid "Processing messages..."
 msgstr ""
 

+#: src/folder.c:4020
+#, c-format
+msgid "Synchronising %s for offline use...\n"
+msgstr ""
+

 #: src/foldersel.c:228
 msgid "Select folder"
 msgstr ""
 
 #: src/foldersel.c:228
 msgid "Select folder"
 msgstr ""
 

-#: src/foldersel.c:558 src/imap_gtk.c:143 src/mh_gtk.c:132
+#: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr ""
 
 msgid "NewFolder"
 msgstr ""
 

-#: src/foldersel.c:566 src/imap_gtk.c:151 src/imap_gtk.c:157 src/mh_gtk.c:138
-#: src/mh_gtk.c:241
+#: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
+#: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 

-#: src/foldersel.c:576 src/imap_gtk.c:167 src/imap_gtk.c:221 src/mh_gtk.c:148
+#: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148

 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 

-#: src/foldersel.c:583 src/imap_gtk.c:173 src/mh_gtk.c:154
+#: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 

-#: src/folderview.c:291
+#: src/folderview.c:290

 msgid "/Mark all re_ad"
 msgstr ""
 
 msgid "/Mark all re_ad"
 msgstr ""
 

-#: src/folderview.c:293
+#: src/folderview.c:292

 msgid "/_Search folder..."
 msgstr ""
 
 msgid "/_Search folder..."
 msgstr ""
 

-#: src/folderview.c:295
+#: src/folderview.c:294

 msgid "/Process_ing..."
 msgstr ""
 
 msgid "/Process_ing..."
 msgstr ""
 

-#: src/folderview.c:300
+#: src/folderview.c:299

 msgid "/Empty _trash..."
 msgstr "/Empty was_tebin..."
 
 msgid "/Empty _trash..."
 msgstr "/Empty was_tebin..."
 

-#: src/folderview.c:305
+#: src/folderview.c:304

 msgid "/Send _queue..."
 msgstr ""
 
 msgid "/Send _queue..."
 msgstr ""
 

-#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80
+#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:80

 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 

-#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr ""
 
 msgid "Unread"
 msgstr ""
 

-#: src/folderview.c:426 src/prefs_folder_column.c:82
+#: src/folderview.c:425 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:474 src/summaryview.c:491
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "No."
 
 msgid "#"
 msgstr "No."
 

-#: src/folderview.c:719
+#: src/folderview.c:753

 msgid "Setting folder info..."
 msgstr ""
 
 msgid "Setting folder info..."
 msgstr ""
 

-#: src/folderview.c:773 src/summaryview.c:3453
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr ""
 
 msgid "Mark all as read"
 msgstr ""
 

-#: src/folderview.c:774 src/summaryview.c:3454
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 

-#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3934 src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr ""
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr ""
 

-#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3939 src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr ""
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr ""
 

-#: src/folderview.c:1091
+#: src/folderview.c:1069

 msgid "Rebuild folder tree"
 msgstr ""
 
 msgid "Rebuild folder tree"
 msgstr ""
 

-#: src/folderview.c:1092
+#: src/folderview.c:1070

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 

-#: src/folderview.c:1102
+#: src/folderview.c:1080

 msgid "Rebuilding folder tree..."
 msgstr ""
 
 msgid "Rebuilding folder tree..."
 msgstr ""
 

-#: src/folderview.c:1104
+#: src/folderview.c:1082 src/folderview.c:1122

 msgid "Scanning folder tree..."
 msgstr ""
 
 msgid "Scanning folder tree..."
 msgstr ""
 

-#: src/folderview.c:1175
+#: src/folderview.c:1207

 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 

-#: src/folderview.c:1228
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgstr ""
 
 msgid "Checking for new messages in all folders..."
 msgstr ""
 

-#: src/folderview.c:2090
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 msgstr ""
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr ""
 

-#: src/folderview.c:2129
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 msgstr ""
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr ""
 

-#: src/folderview.c:2142
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgstr ""
 
 msgid "Folder could not be opened."
 msgstr ""
 

-#: src/folderview.c:2303 src/mainwindow.c:2080
+#: src/folderview.c:2339 src/mainwindow.c:2121

 msgid "Empty trash"
 msgstr "Empty wastebin"
 
 msgid "Empty trash"
 msgstr "Empty wastebin"
 

-#: src/folderview.c:2304
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 

-#: src/folderview.c:2305 src/mainwindow.c:2082
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgstr "+_Empty wastebin"
 
 msgid "+_Empty trash"
 msgstr "+_Empty wastebin"
 

-#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196
+#: src/folderview.c:2385 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr ""
 
 msgid "Offline warning"
 msgstr ""
 

-#: src/folderview.c:2350 src/toolbar.c:2197
+#: src/folderview.c:2386 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr ""
 
 msgid "You're working offline. Override?"
 msgstr ""
 

-#: src/folderview.c:2361 src/toolbar.c:2216
+#: src/folderview.c:2397 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr ""
 
 msgid "Send queued messages"
 msgstr ""
 

-#: src/folderview.c:2362 src/toolbar.c:2217
+#: src/folderview.c:2398 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr ""
 
 msgid "Send all queued messages?"
 msgstr ""
 

-#: src/folderview.c:2363 src/messageview.c:581 src/messageview.c:598
-#: src/prefs_account.c:1039 src/toolbar.c:2218
+#: src/folderview.c:2399 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr ""
 
 msgid "_Send"
 msgstr ""
 

-#: src/folderview.c:2371 src/toolbar.c:2236
+#: src/folderview.c:2407 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 

-#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239
+#: src/folderview.c:2410 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 

-#: src/folderview.c:2441
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr ""
 

-#: src/folderview.c:2442
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr ""
 

-#: src/folderview.c:2444
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgstr ""
 
 msgid "Copy folder"
 msgstr ""
 

-#: src/folderview.c:2444
+#: src/folderview.c:2480

 msgid "Move folder"
 msgstr ""
 
 msgid "Move folder"
 msgstr ""
 

-#: src/folderview.c:2455
+#: src/folderview.c:2491

 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 

-#: src/folderview.c:2455
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 

-#: src/folderview.c:2486
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr ""
 
 msgid "Source and destination are the same."
 msgstr ""
 

-#: src/folderview.c:2489
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 

-#: src/folderview.c:2490
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgstr ""
 
 msgid "Can't move a folder to one of its children."
 msgstr ""
 

-#: src/folderview.c:2493
-msgid "Folder moving cannot be done between different mailboxes."
+#: src/folderview.c:2529
+msgid "A folder cannot be moved between different mailboxes."

 msgstr ""
 
 msgstr ""
 

-#: src/folderview.c:2496
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr ""
 
 msgid "Copy failed!"
 msgstr ""
 

-#: src/folderview.c:2496
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr ""
 
 msgid "Move failed!"
 msgstr ""
 

-#: src/folderview.c:2532
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 

-#: src/gedit-print.c:147 src/messageview.c:1525 src/summaryview.c:4124
-#: src/toolbar.c:182
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr ""
 
 msgid "Print"
 msgstr ""
 


@@ -3065,68 +3160,68 @@ msgstr ""
 msgid "Print preview"
 msgstr ""
 
 msgid "Print preview"
 msgstr ""
 

-#: src/gedit-print.c:456
+#: src/gedit-print.c:437

 msgid "Page %N of %Q"
 msgstr ""
 
 msgid "Page %N of %Q"
 msgstr ""
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr ""
 
 msgid "Newsgroup subscription"
 msgstr ""
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr ""
 
 msgid "Select newsgroups for subscription:"
 msgstr ""
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr ""
 
 msgid "Find groups:"
 msgstr ""
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr ""
 
 msgid " Search "
 msgstr ""
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr ""
 
 msgid "Newsgroup name"
 msgstr ""
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr ""
 
 msgid "Messages"
 msgstr ""
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr ""
 
 msgid "moderated"
 msgstr ""
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr ""
 
 msgid "readonly"
 msgstr ""
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr ""
 
 msgid "unknown"
 msgstr ""
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1265
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr ""
 
 msgid "Done."
 msgstr ""
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 

-#: src/gtk/about.c:79 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr ""
 
 msgid "/_Open with Web browser"
 msgstr ""
 

-#: src/gtk/about.c:80 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr ""
 
 msgid "/Copy this _link"
 msgstr ""
 


@@ -3176,7 +3271,7 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
 "Operating System: unknown"
 msgstr ""
 

-#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+#: src/gtk/about.c:240 src/prefs_themes.c:707 src/wizard.c:475

 msgid "The Claws Mail Team"
 msgstr ""
 
 msgid "The Claws Mail Team"
 msgstr ""
 


@@ -3316,140 +3411,277 @@ msgstr ""
 msgid "_Release Notes"
 msgstr ""
 
 msgid "_Release Notes"
 msgstr ""
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:313
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:329

 msgid "Orange"
 msgstr ""
 
 msgid "Orange"
 msgstr ""
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:317
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:333

 msgid "Red"
 msgstr ""
 
 msgid "Red"
 msgstr ""
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:321
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:337

 msgid "Pink"
 msgstr ""
 
 msgid "Pink"
 msgstr ""
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:325
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:341

 msgid "Sky blue"
 msgstr ""
 
 msgid "Sky blue"
 msgstr ""
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:329
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:345

 msgid "Blue"
 msgstr ""
 
 msgid "Blue"
 msgstr ""
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:333
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:349

 msgid "Green"
 msgstr ""
 
 msgid "Green"
 msgstr ""
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:337
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:353

 msgid "Brown"
 msgstr ""
 
 msgid "Brown"
 msgstr ""
 

-#: src/gtk/foldersort.c:156
-msgid "Set folder order"
+#: src/gtk/colorlabel.c:55 src/prefs_common.c:357
+msgid "Grey"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/foldersort.c:190
-msgid "Move folders up or down to change the sort order in the folder list."
+#: src/gtk/colorlabel.c:56 src/prefs_common.c:361
+msgid "Light brown"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/foldersort.c:214
-msgid "Folders"
+#: src/gtk/colorlabel.c:57 src/prefs_common.c:365
+msgid "Dark red"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:272
-msgid "Configuration"
+#: src/gtk/colorlabel.c:58 src/prefs_common.c:369
+msgid "Dark pink"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:273
-msgid "Configuration options for the print job"
+#: src/gtk/colorlabel.c:59 src/prefs_common.c:373
+msgid "Steel blue"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:280
-msgid "Source Buffer"
+#: src/gtk/colorlabel.c:60 src/prefs_common.c:377
+msgid "Gold"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:281
-msgid "GtkTextBuffer object to print"
+#: src/gtk/colorlabel.c:61 src/prefs_common.c:381
+msgid "Bright green"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:287
-msgid "Tabs Width"
+#: src/gtk/colorlabel.c:62 src/prefs_common.c:385
+msgid "Magenta"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:288
-msgid "Width in equivalent space characters of tabs"
+#: src/gtk/foldersort.c:156
+msgid "Set folder order"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:295
-msgid "Wrap Mode"
+#: src/gtk/foldersort.c:190
+msgid "Move folders up or down to change the sort order in the folder list."

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:296
-msgid "Word wrapping mode"
+#: src/gtk/foldersort.c:214 src/toolbar.c:410
+msgid "Folders"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:303
-msgid "Highlight"
+#: src/gtk/gtkaspell.c:638
+msgid "No dictionary selected."

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:304
-msgid "Whether to print the document with highlighted syntax"
+#: src/gtk/gtkaspell.c:851 src/gtk/gtkaspell.c:1852 src/gtk/gtkaspell.c:2147
+msgid "Normal Mode"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:312
-msgid "Font"
+#: src/gtk/gtkaspell.c:853 src/gtk/gtkaspell.c:1858 src/gtk/gtkaspell.c:2159
+msgid "Bad Spellers Mode"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:313
-msgid "GnomeFont name to use for the document text (deprecated)"
+#: src/gtk/gtkaspell.c:892
+msgid "Unknown suggestion mode."

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:320
-msgid "Font Description"
+#: src/gtk/gtkaspell.c:1183
+msgid "No misspelled word found."

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:321
-msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+#: src/gtk/gtkaspell.c:1531
+msgid "Replace unknown word"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:328 src/gtk/gtksourceprintjob.c:336
-msgid "Numbers Font"
+#: src/gtk/gtkaspell.c:1546
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:329
-msgid "GnomeFont name to use for the line numbers (deprecated)"
+#: src/gtk/gtkaspell.c:1591
+msgid ""
+"Holding down Control key while pressing Enter\n"
+"will learn from mistake.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:337
-msgid "Font description to use for the line numbers"
+#: src/gtk/gtkaspell.c:1846 src/gtk/gtkaspell.c:2135
+msgid "Fast Mode"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:344
-msgid "Print Line Numbers"
+#: src/gtk/gtkaspell.c:1953
+#, c-format
+msgid "\"%s\" unknown in %s"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:345
-msgid "Interval of printed line numbers (0 means no numbers)"
+#: src/gtk/gtkaspell.c:1967
+msgid "Accept in this session"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:352
-msgid "Print Header"
+#: src/gtk/gtkaspell.c:1977
+msgid "Add to personal dictionary"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:353
-msgid "Whether to print a header in each page"
+#: src/gtk/gtkaspell.c:1987
+msgid "Replace with..."

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:360
-msgid "Print Footer"
+#: src/gtk/gtkaspell.c:2000
+#, c-format
+msgid "Check with %s"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:361
-msgid "Whether to print a footer in each page"
+#: src/gtk/gtkaspell.c:2022
+msgid "(no suggestions)"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtksourceprintjob.c:368
-msgid "Header and Footer Font"
+#: src/gtk/gtkaspell.c:2033 src/gtk/gtkaspell.c:2212
+msgid "More..."
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2097
+#, c-format
+msgid "Dictionary: %s"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2110
+#, c-format
+msgid "Use alternate (%s)"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2121
+msgid "Use both dictionaries"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2175 src/prefs_spelling.c:214
+msgid "Check while typing"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2191
+msgid "Change dictionary"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2323
+#, c-format
+msgid ""
+"The spell checker could not change dictionary.\n"
+"%s"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2369
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:272
+msgid "Configuration"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:273
+msgid "Configuration options for the print job"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:280
+msgid "Source Buffer"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:281
+msgid "GtkTextBuffer object to print"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:287
+msgid "Tabs Width"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:288
+msgid "Width in equivalent space characters of tabs"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:295
+msgid "Wrap Mode"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:296
+msgid "Word wrapping mode"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:303
+msgid "Highlight"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:304
+msgid "Whether to print the document with highlighted syntax"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:312
+msgid "Font"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:313
+msgid "GnomeFont name to use for the document text (deprecated)"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:320
+msgid "Font Description"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:321
+msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:328 src/gtk/gtksourceprintjob.c:336
+msgid "Numbers Font"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:329
+msgid "GnomeFont name to use for the line numbers (deprecated)"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:337
+msgid "Font description to use for the line numbers"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:344
+msgid "Print Line Numbers"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:345
+msgid "Interval of printed line numbers (0 means no numbers)"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:352
+msgid "Print Header"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:353
+msgid "Whether to print a header in each page"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:360
+msgid "Print Footer"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:361
+msgid "Whether to print a footer in each page"
+msgstr ""
+
+#: src/gtk/gtksourceprintjob.c:368
+msgid "Header and Footer Font"

 msgstr ""
 
 #: src/gtk/gtksourceprintjob.c:369
 msgstr ""
 
 #: src/gtk/gtksourceprintjob.c:369


@@ -3464,109 +3696,401 @@ msgstr ""
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:632
-msgid "No dictionary selected."
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164
-msgid "Normal Mode"
+#: src/gtk/headers.h:8
+msgid "Date:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176
-msgid "Bad Spellers Mode"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:909
-msgid "Unknown suggestion mode."
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1200
-msgid "No misspelled word found."
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1548
-msgid "Replace unknown word"
+#: src/gtk/headers.h:10
+msgid "Sender:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1563
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1608
-msgid ""
-"Holding down Control key while pressing Enter\n"
-"will learn from mistake.\n"
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152
-msgid "Fast Mode"
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr ""
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr ""
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr ""
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr ""
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr ""
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr ""
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr ""
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr ""
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr ""
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr ""
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr ""
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr ""
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr ""
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr ""
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr ""
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr ""
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr ""
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr ""
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr ""
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr ""
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr ""
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "Organisation"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Organisation: "
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr ""
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr ""
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr ""
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1970
-#, c-format
-msgid "\"%s\" unknown in %s"
+#: src/gtk/headers.h:56
+msgid "X-Mailer"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1984
-msgid "Accept in this session"
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1994
-msgid "Add to personal dictionary"
+#: src/gtk/headers.h:57
+msgid "X-Status"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2004
-msgid "Replace with..."
+#: src/gtk/headers.h:57
+msgid "X-Status:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2017
-#, c-format
-msgid "Check with %s"
+#: src/gtk/headers.h:58
+msgid "X-Face"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2039
-msgid "(no suggestions)"
+#: src/gtk/headers.h:58
+msgid "X-Face:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229
-msgid "More..."
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2114
-#, c-format
-msgid "Dictionary: %s"
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2127
-#, c-format
-msgid "Use alternate (%s)"
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2138
-msgid "Use both dictionaries"
+#: src/gtk/headers.h:62
+msgid "In reply to:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218
-msgid "Check while typing"
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2208
-msgid "Change dictionary"
+#: src/gtk/headers.h:63
+msgid "To or Cc:"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2340
-#, c-format
-msgid ""
-"The spell checker could not change dictionary.\n"
-"%s"
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2386
-#, c-format
-msgid ""
-"The spell checker could not change the alternate dictionary.\n"
-"%s"
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"

 msgstr ""
 
 #: src/gtk/icon_legend.c:67
 msgstr ""
 
 #: src/gtk/icon_legend.c:67


@@ -3668,34 +4192,30 @@ msgstr ""
 msgid "Remember this"
 msgstr ""
 
 msgid "Remember this"
 msgstr ""
 

-#: src/gtk/logwindow.c:87
-msgid "Protocol log"
-msgstr ""
-
-#: src/gtk/logwindow.c:384
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr ""
 
 msgid "Clear _Log"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:150 src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 "Version: "
 msgstr ""
 
 msgid ""
 "\n"
 "\n"
 "Version: "
 msgstr ""
 

-#: src/gtk/pluginwindow.c:153
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr ""
 
 msgid "Error: "
 msgstr ""
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr ""
 
 msgid "Plugin is not functional."
 msgstr ""
 

-#: src/gtk/pluginwindow.c:185
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr ""
 
 msgid "Select the Plugins to load"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:200
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -3703,230 +4223,229 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:286 src/plugins/clamav/clamav_plugin_gtk.c:211
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447
+#: src/plugins/clamav/clamav_plugin_gtk.c:211

 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:514
-#: src/plugins/spamassassin/spamassassin_gtk.c:548
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563
+#: src/plugins/trayicon/trayicon_prefs.c:69

 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr ""
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr ""
 

-#: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr ""
 
 msgid "Get more..."
 msgstr ""
 

-#: src/gtk/pluginwindow.c:356
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr ""
 
 msgid "Load Plugin..."
 msgstr ""
 

-#: src/gtk/pluginwindow.c:357
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr ""
 
 msgid "Unload Plugin"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:384
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr ""
 
 msgid "Click here to load one or more plugins"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:388
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr ""
 
 msgid "Unload the selected plugin"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:455
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr ""
 
 msgid "Loaded plugins"
 msgstr ""
 

-#: src/gtk/prefswindow.c:527
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr ""
 
 msgid "Page Index"
 msgstr ""
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:769
-#: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
-#: src/prefs_filtering.c:1490
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2376
-msgid "Status"
-msgstr ""
-
-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr ""
 
 msgid "all messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr ""
 
 msgid "messages whose age is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr ""
 
 msgid "messages whose age is less than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr ""
 
 msgid "messages which contain S in the message body"
 msgstr ""
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr ""
 
 msgid "messages which contain S in the whole message"
 msgstr ""
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr ""
 
 msgid "messages carbon-copied to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr ""
 
 msgid "message is either to: or cc: to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr ""
 
 msgid "deleted messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr ""
 
 msgid "messages which contain S in the Sender field"
 msgstr ""
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr ""
 
 msgid "messages originating from user S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr ""
 
 msgid "forwarded messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr ""
 
 msgid "messages which contain header S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr ""
 
 msgid "messages which contain S in Message-ID header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr ""
 
 msgid "messages which contain S in inreplyto header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 
 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr ""
 
 msgid "locked messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr ""
 
 msgid "messages which are in newsgroup S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr ""
 
 msgid "new messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr ""
 
 msgid "old messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr ""
 
 msgid "messages which have been replied to"
 msgstr ""
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr ""
 
 msgid "read messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr ""
 
 msgid "messages which contain S in subject"
 msgstr ""
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr ""
 
 msgid "messages whose score is equal to #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr ""
 
 msgid "messages whose score is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr ""
 
 msgid "messages whose score is lower than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr ""
 
 msgid "messages whose size is equal to #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr ""
 
 msgid "messages whose size is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr ""
 
 msgid "messages whose size is smaller than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr ""
 
 msgid "messages which have been sent to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr ""
 
 msgid "marked messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr ""
 
 msgid "unread messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr ""
 
 msgid "messages which contain S in References header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr ""
 
 msgid "messages which contain S in X-Label header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr ""
 
 msgid "logical AND operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr ""
 
 msgid "logical OR operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr ""
 
 msgid "logical NOT operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr ""
 
 msgid "case sensitive search"
 msgstr ""
 

-#: src/gtk/quicksearch.c:373
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr ""
 
 msgid "all filtering expressions are allowed"
 msgstr ""
 

-#: src/gtk/quicksearch.c:381 src/summary_search.c:397
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr ""
 
 msgid "Extended Search"
 msgstr ""
 

-#: src/gtk/quicksearch.c:382
+#: src/gtk/quicksearch.c:425

 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"
 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"


@@ -3934,189 +4453,185 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
 "The following symbols can be used:"
 msgstr ""
 

-#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
-#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
-#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486
-msgid "Subject"
-msgstr ""
-
-#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
-msgid "From"
-msgstr ""
-
-#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
-#: src/summaryview.c:488
-msgid "To"
-msgstr ""
-
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr ""
 
 msgid "Recursive"
 msgstr ""
 

-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr ""
 
 msgid "Sticky"
 msgstr ""
 

-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr ""
 
 msgid "Type-ahead"
 msgstr ""
 

-#: src/gtk/quicksearch.c:548
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr ""
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr ""
 
 msgid " Clear "
 msgstr ""
 

-#: src/gtk/quicksearch.c:569 src/summary_search.c:350
+#: src/gtk/quicksearch.c:622
+msgid "Clear the current search"
+msgstr ""
+
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr ""
 
 msgid "Edit search criteria"
 msgstr ""
 

-#: src/gtk/quicksearch.c:575
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr ""
 
 msgid " Extended Symbols... "
 msgstr ""
 

-#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:651
+msgid "Information about extended symbols"
+msgstr ""
+
+#: src/gtk/quicksearch.c:722
+msgid "Info"
+msgstr ""
+
+#: src/gtk/quicksearch.c:724
+msgid "Clear"
+msgstr ""
+
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr ""
 
 msgid "correct"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr ""
 
 msgid "Owner"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr ""
 
 msgid "Signer"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
-#: src/prefs_themes.c:883
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164
+#: src/prefs_themes.c:879

 msgid "Name: "
 msgstr ""
 
 msgid "Name: "
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Organisation: "
 
 msgid "Organization: "
 msgstr "Organisation: "
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr ""
 
 msgid "Location: "
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr ""
 
 msgid "Fingerprint: "
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr ""
 
 msgid "Signature status: "
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr ""
 
 msgid "Expires on: "
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr ""
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "Do you want to accept it?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "Do you want to accept it?"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr ""
 
 #, c-format
 msgid "Signature status: %s"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr ""
 
 msgid "_View certificate"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr ""
 
 msgid "Unknown SSL Certificate"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr ""
 
 msgid "_Cancel connection"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr ""
 
 msgid "_Accept and save"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "Do you want to continue?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "Do you want to continue?"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr ""
 
 msgid "Expired SSL Certificate"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr ""
 
 msgid "_Accept"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr ""
 
 msgid "New certificate:"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr ""
 
 msgid "Known certificate:"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr ""
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr ""
 
 msgid "_View certificates"
 msgstr ""
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr ""
 
 msgid "Changed SSL Certificate"
 msgstr ""
 

-#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr ""
 
 msgid "(No From)"
 msgstr ""
 

-#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr ""
 
 msgid "(No Subject)"
 msgstr ""
 

-#: src/image_viewer.c:284
+#: src/image_viewer.c:290

 msgid "Filename:"
 msgstr ""
 
 msgid "Filename:"
 msgstr ""
 

-#: src/image_viewer.c:291
+#: src/image_viewer.c:297

 msgid "Filesize:"
 msgstr ""
 
 msgid "Filesize:"
 msgstr ""
 

-#: src/image_viewer.c:312
-msgid "Load Image"
-msgstr ""
-

 #: src/image_viewer.c:318
 #: src/image_viewer.c:318

-msgid "Content-Type:"
+msgid "Load Image"

 msgstr ""
 
 msgstr ""
 

-#: src/imap.c:632
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4124,36 +4639,36 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 

-#: src/imap.c:639
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 

-#: src/imap.c:643
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 

-#: src/imap.c:660
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 

-#: src/imap.c:665 src/imap.c:668
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 

-#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
-#: src/imap.c:3156 src/imap.c:3914
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 

-#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr ""
 
 msgid "Insecure connection"
 msgstr ""
 

-#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -4162,128 +4677,138 @@ msgid ""
 "not be secure."
 msgstr ""
 
 "not be secure."
 msgstr ""
 

-#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr ""
 
 msgid "Con_tinue connecting"
 msgstr ""
 

-#: src/imap.c:806
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr ""
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr ""
 

-#: src/imap.c:844
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 

-#: src/imap.c:847
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 

-#: src/imap.c:876 src/imap.c:2545
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr ""
 
 msgid "Can't start TLS session.\n"
 msgstr ""
 

-#: src/imap.c:913
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr ""
 

-#: src/imap.c:924 src/imap.c:927
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 

-#: src/imap.c:1100
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr ""
 
 msgid "Adding messages..."
 msgstr ""
 

-#: src/imap.c:1252 src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr ""
 
 msgid "Copying messages..."
 msgstr ""
 

-#: src/imap.c:1428
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr ""
 
 msgid "can't set deleted flags\n"
 msgstr ""
 

-#: src/imap.c:1434 src/imap.c:3665
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr ""
 
 msgid "can't expunge\n"
 msgstr ""
 

-#: src/imap.c:1878
+#: src/imap.c:1838
+#, c-format
+msgid "Looking for unsubscribed folders in %s..."
+msgstr ""
+
+#: src/imap.c:1841
+#, c-format
+msgid "Looking for subfolders of %s..."
+msgstr ""
+
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 

-#: src/imap.c:1894
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr ""
 
 msgid "can't create mailbox\n"
 msgstr ""
 

-#: src/imap.c:1975
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 

-#: src/imap.c:2006
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 

-#: src/imap.c:2070
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr ""
 
 msgid "can't delete mailbox\n"
 msgstr ""
 

-#: src/imap.c:2316
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr ""
 
 msgid "LIST failed\n"
 msgstr ""
 

-#: src/imap.c:2433
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 

-#: src/imap.c:2542
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr ""
 
 msgid "Server requires TLS to log in.\n"
 msgstr ""
 

-#: src/imap.c:2551
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 

-#: src/imap.c:2556
+#: src/imap.c:2802

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
 

-#: src/imap.c:2564
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr ""
 
 msgid "Server logins are disabled.\n"
 msgstr ""
 

-#: src/imap.c:2742
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr ""
 
 msgid "Fetching message..."
 msgstr ""
 

-#: src/imap.c:2909
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 

-#: src/imap.c:2939
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 

-#: src/imap.c:2983
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr ""
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr ""
 

-#: src/imap.c:3650
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 

-#: src/imap.c:4376
+#: src/imap.c:4738

 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 "
 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 "


@@ -4292,74 +4817,94 @@ msgid ""
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 

-#: src/imap_gtk.c:55 src/mh_gtk.c:50
+#: src/imap_gtk.c:58 src/mh_gtk.c:50

 msgid "/Create _new folder..."
 msgstr ""
 
 msgid "/Create _new folder..."
 msgstr ""
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:60 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr ""
 
 msgid "/_Rename folder..."
 msgstr ""
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:61 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr ""
 
 msgid "/M_ove folder..."
 msgstr ""
 

-#: src/imap_gtk.c:59 src/mh_gtk.c:54
+#: src/imap_gtk.c:62 src/mh_gtk.c:54

 msgid "/Cop_y folder..."
 msgstr ""
 
 msgid "/Cop_y folder..."
 msgstr ""
 

-#: src/imap_gtk.c:61 src/mh_gtk.c:56
+#: src/imap_gtk.c:64 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr ""
 
 msgid "/_Delete folder..."
 msgstr ""
 

-#: src/imap_gtk.c:63 src/news_gtk.c:55
-msgid "/Synchronise"
+#: src/imap_gtk.c:66
+msgid "/_Synchronise"

 msgstr ""
 
 msgstr ""
 

-#: src/imap_gtk.c:64 src/news_gtk.c:56
+#: src/imap_gtk.c:67 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr ""
 
 msgid "/Down_load messages"
 msgstr ""
 

-#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58
+#: src/imap_gtk.c:69
+msgid "/S_ubscriptions"
+msgstr ""
+
+#: src/imap_gtk.c:70
+msgid "/Subscriptions/Show only subscribed _folders"
+msgstr ""
+
+#: src/imap_gtk.c:72
+msgid "/Subscriptions/---"
+msgstr ""
+
+#: src/imap_gtk.c:73
+msgid "/Subscriptions/_Subscribe..."
+msgstr ""
+
+#: src/imap_gtk.c:74
+msgid "/Subscriptions/_Unsubscribe..."
+msgstr ""
+
+#: src/imap_gtk.c:77 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr ""
 
 msgid "/_Check for new messages"
 msgstr ""
 

-#: src/imap_gtk.c:67 src/mh_gtk.c:59
+#: src/imap_gtk.c:78 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr ""
 
 msgid "/C_heck for new folders"
 msgstr ""
 

-#: src/imap_gtk.c:68 src/mh_gtk.c:60
+#: src/imap_gtk.c:79 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr ""
 
 msgid "/R_ebuild folder tree"
 msgstr ""
 

-#: src/imap_gtk.c:140
+#: src/imap_gtk.c:156

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""
 
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""
 

-#: src/imap_gtk.c:198 src/mh_gtk.c:231
+#: src/imap_gtk.c:214 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 

-#: src/imap_gtk.c:200 src/mh_gtk.c:233
+#: src/imap_gtk.c:216 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr ""
 
 msgid "Rename folder"
 msgstr ""
 

-#: src/imap_gtk.c:209 src/imap_gtk.c:214
+#: src/imap_gtk.c:230

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr ""
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr ""
 

-#: src/imap_gtk.c:231 src/mh_gtk.c:258
+#: src/imap_gtk.c:247 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 

-#: src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/imap_gtk.c:299 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4368,14 +4913,72 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
 "Do you really want to delete?"
 msgstr ""
 

-#: src/imap_gtk.c:305 src/mh_gtk.c:201 src/news_gtk.c:241
+#: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:241

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 

-#: src/imap_gtk.c:365 src/news_gtk.c:302
+#: src/imap_gtk.c:445

 #, c-format
 #, c-format

-msgid "Error occurred while downloading messages in '%s'."
+msgid "Do you want to search for unsubscribed subfolders of '%s'?"
+msgstr ""
+
+#: src/imap_gtk.c:448
+msgid "Search recursively"
+msgstr ""
+
+#: src/imap_gtk.c:453 src/imap_gtk.c:498
+msgid "Subscriptions"
+msgstr ""
+
+#: src/imap_gtk.c:454
+msgid "+_Search"
+msgstr ""
+
+#: src/imap_gtk.c:463
+#, c-format
+msgid "Choose a subfolder of %s to subscribe to: "
+msgstr ""
+
+#: src/imap_gtk.c:465
+msgid "Subscribe"
+msgstr ""
+
+#: src/imap_gtk.c:467 src/imap_gtk.c:469
+msgid "All of them"
+msgstr ""
+
+#: src/imap_gtk.c:481
+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."
+msgstr ""
+
+#: src/imap_gtk.c:490
+#, c-format
+msgid "Do you want to %s the '%s' folder?"
+msgstr ""
+
+#: src/imap_gtk.c:491
+msgid "subscribe"
+msgstr ""
+
+#: src/imap_gtk.c:491
+msgid "unsubscribe"
+msgstr ""
+
+#: src/imap_gtk.c:493
+msgid "Apply to subfolders"
+msgstr ""
+
+#: src/imap_gtk.c:499
+msgid "+_Subscribe"
+msgstr ""
+
+#: src/imap_gtk.c:499
+msgid "+_Unsubscribe"

 msgstr ""
 
 #: src/import.c:120 src/import.c:215
 msgstr ""
 
 #: src/import.c:120 src/import.c:215


@@ -4408,89 +5011,81 @@ msgstr ""
 msgid "Select importing file"
 msgstr ""
 
 msgid "Select importing file"
 msgstr ""
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr ""
 
 msgid "Please specify address book name and file to import."
 msgstr ""
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr ""
 
 msgid "Select and rename LDIF field names to import."
 msgstr ""
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr ""
 
 msgid "File imported."
 msgstr ""
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr ""
 
 msgid "Please select a file."
 msgstr ""
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr ""
 
 msgid "Address book name must be supplied."
 msgstr ""
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr ""
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr ""
 
 msgid "LDIF file imported successfully."
 msgstr ""
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr ""
 
 msgid "Select LDIF File"
 msgstr ""
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr ""
 
 msgid "File Name"
 msgstr ""
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr ""
 
 msgid "The full file specification of the LDIF file to import."
 msgstr ""
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr ""
 
 msgid "Select the LDIF file to import."
 msgstr ""
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr ""
 
 msgid "R"
 msgstr ""
 

-#: src/importldif.c:726 src/summaryview.c:484
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr ""
 
 msgid "S"
 msgstr ""
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr ""
 
 msgid "LDIF Field Name"
 msgstr ""
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr ""
 
 msgid "Attribute Name"
 msgstr ""
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr ""
 
 msgid "LDIF Field"
 msgstr ""
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr ""
 
 msgid "Attribute"
 msgstr ""
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 

-#: src/importldif.c:811
-msgid "???"
-msgstr ""
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "
 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 "


@@ -4501,30 +5096,34 @@ msgid ""
 "field for import."
 msgstr ""
 
 "field for import."
 msgstr ""
 

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr ""
 
 msgid "Select for Import"
 msgstr ""
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr ""
 
 msgid "Select the LDIF field for import into the address book."
 msgstr ""
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr ""
 
 msgid " Modify "
 msgstr ""
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr ""
 
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr ""
 
 msgid "Records Imported :"
 msgstr ""
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr ""
 
 msgid "Import LDIF file into Address Book"
 msgstr ""
 

+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr ""
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr ""
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr ""


@@ -4553,1356 +5152,1457 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
 msgid "Import Pine file into Address Book"
 msgstr ""
 

-#: src/inc.c:173 src/inc.c:278 src/inc.c:304
+#: src/inc.c:176 src/inc.c:281 src/inc.c:307

 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 

-#: src/inc.c:384
+#: src/inc.c:387

 msgid "Retrieving new messages"
 msgstr ""
 
 msgid "Retrieving new messages"
 msgstr ""
 

-#: src/inc.c:443
+#: src/inc.c:446

 msgid "Standby"
 msgstr ""
 
 msgid "Standby"
 msgstr ""
 

-#: src/inc.c:572 src/inc.c:622
+#: src/inc.c:575 src/inc.c:625

 msgid "Cancelled"
 msgstr ""
 
 msgid "Cancelled"
 msgstr ""
 

-#: src/inc.c:583
+#: src/inc.c:586

 msgid "Retrieving"
 msgstr ""
 
 msgid "Retrieving"
 msgstr ""
 

-#: src/inc.c:592
+#: src/inc.c:595

 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/inc.c:598
+#: src/inc.c:601

 msgid "Done (no new messages)"
 msgstr ""
 
 msgid "Done (no new messages)"
 msgstr ""
 

-#: src/inc.c:603
+#: src/inc.c:606

 msgid "Connection failed"
 msgstr ""
 
 msgid "Connection failed"
 msgstr ""
 

-#: src/inc.c:606
+#: src/inc.c:609

 msgid "Auth failed"
 msgstr ""
 
 msgid "Auth failed"
 msgstr ""
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr ""
 
 msgid "Locked"
 msgstr ""
 

-#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr ""
 
 msgid "Timeout"
 msgstr ""
 

-#: src/inc.c:712
+#: src/inc.c:715

 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/inc.c:716
+#: src/inc.c:719

 msgid "Finished (no new messages)"
 msgstr ""
 
 msgid "Finished (no new messages)"
 msgstr ""
 

-#: src/inc.c:754
+#: src/inc.c:757

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 

-#: src/inc.c:786
+#: src/inc.c:789

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr ""
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr ""
 

-#: src/inc.c:803
+#: src/inc.c:806

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 

-#: src/inc.c:807
+#: src/inc.c:810

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 

-#: src/inc.c:887 src/send_message.c:472
+#: src/inc.c:890 src/send_message.c:472

 msgid "Authenticating..."
 msgstr ""
 
 msgid "Authenticating..."
 msgstr ""
 

-#: src/inc.c:889
+#: src/inc.c:892

 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr ""
 
 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr ""
 

-#: src/inc.c:895
+#: src/inc.c:898

 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 

-#: src/inc.c:899
+#: src/inc.c:902

 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 

-#: src/inc.c:903
+#: src/inc.c:906

 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 

-#: src/inc.c:907
+#: src/inc.c:910

 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 

-#: src/inc.c:914 src/send_message.c:490
+#: src/inc.c:917 src/send_message.c:490

 msgid "Quitting"
 msgstr ""
 
 msgid "Quitting"
 msgstr ""
 

-#: src/inc.c:939
+#: src/inc.c:942

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 

-#: src/inc.c:958
+#: src/inc.c:961

 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/inc.c:1114
+#: src/inc.c:1117

 msgid "Connection failed."
 msgstr ""
 
 msgid "Connection failed."
 msgstr ""
 

-#: src/inc.c:1118
+#: src/inc.c:1121

 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 

-#: src/inc.c:1123
+#: src/inc.c:1126

 msgid "Error occurred while processing mail."
 msgstr ""
 
 msgid "Error occurred while processing mail."
 msgstr ""
 

-#: src/inc.c:1129
+#: src/inc.c:1132

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 

-#: src/inc.c:1135
+#: src/inc.c:1138

 msgid "No disk space left."
 msgstr ""
 
 msgid "No disk space left."
 msgstr ""
 

-#: src/inc.c:1140
+#: src/inc.c:1143

 msgid "Can't write file."
 msgstr ""
 
 msgid "Can't write file."
 msgstr ""
 

-#: src/inc.c:1145
+#: src/inc.c:1148

 msgid "Socket error."
 msgstr ""
 
 msgid "Socket error."
 msgstr ""
 

-#: src/inc.c:1148
+#: src/inc.c:1151

 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 

-#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637
+#: src/inc.c:1156 src/send_message.c:400 src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr ""
 
 msgid "Connection closed by the remote host."
 msgstr ""
 

-#: src/inc.c:1156
+#: src/inc.c:1159

 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 

-#: src/inc.c:1161
+#: src/inc.c:1164

 msgid "Mailbox is locked."
 msgstr ""
 
 msgid "Mailbox is locked."
 msgstr ""
 

-#: src/inc.c:1165
+#: src/inc.c:1168

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 

-#: src/inc.c:1171 src/send_message.c:622
+#: src/inc.c:1174 src/send_message.c:622

 msgid "Authentication failed."
 msgstr ""
 
 msgid "Authentication failed."
 msgstr ""
 

-#: src/inc.c:1177 src/send_message.c:625
+#: src/inc.c:1180 src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 

-#: src/inc.c:1182 src/send_message.c:641
+#: src/inc.c:1185 src/send_message.c:641

 msgid "Session timed out."
 msgstr ""
 
 msgid "Session timed out."
 msgstr ""
 

-#: src/inc.c:1185
+#: src/inc.c:1188

 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 

-#: src/inc.c:1223
+#: src/inc.c:1226

 msgid "Incorporation cancelled\n"
 msgstr ""
 
 msgid "Incorporation cancelled\n"
 msgstr ""
 

-#: src/inc.c:1460
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 

-#: src/inc.c:1467
+#: src/inc.c:1475
+#, c-format
+msgid "%s%sYou're working offline. Override?"
+msgstr ""
+
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr ""
 
 msgid "On_ly once"
 msgstr ""
 

-#: src/ldif.c:831
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr ""
 
 msgid "Nick Name"
 msgstr ""
 

-#: src/main.c:180
+#: src/main.c:196

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 

-#: src/main.c:270
+#: src/main.c:219
+msgid "Exiting..."
+msgstr ""
+
+#: src/main.c:329

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 
 "Do you want to migrate this configuration?"
 msgstr ""
 

-#: src/main.c:274
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+
+#: src/main.c:344
+msgid "Keep old configuration"
+msgstr ""
+
+#: src/main.c:347
+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."
+msgstr ""
+
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr ""
 
 msgid "Migration of configuration"
 msgstr ""
 

-#: src/main.c:280
-msgid "Copying configuration..."
+#: src/main.c:367
+msgid "Copying configuration... This may take a while..."

 msgstr ""
 
 msgstr ""
 

-#: src/main.c:285
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr ""
 
 msgid "Migration failed!"
 msgstr ""
 

-#: src/main.c:572
+#: src/main.c:385
+msgid "Migrating configuration..."
+msgstr ""
+
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 

-#: src/main.c:578
+#: src/main.c:713

 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 "recompile Claws Mail."
 msgstr ""
 
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 "recompile Claws Mail."
 msgstr ""
 

-#: src/main.c:587
+#: src/main.c:722

 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""
 
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""
 

-#: src/main.c:810
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr ""
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr ""
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr ""
+
+#: src/main.c:1013

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr ""
 
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr ""
 

-#: src/main.c:822
+#: src/main.c:1032

 msgid ""
 msgid ""

-"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"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 "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "

-"mailbox's folder to try to fix it."
+"mailbox parent folder's context menu to try to fix it."

 msgstr ""
 
 msgstr ""
 

-#: src/main.c:828
+#: src/main.c:1038

 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."
 msgstr ""
 
 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."
 msgstr ""
 

-#: src/main.c:1074
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 

-#: src/main.c:1076
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr ""
 
 msgid "  --compose [address]    open composition window"
 msgstr ""
 

-#: src/main.c:1077
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 

-#: src/main.c:1078
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 

-#: src/main.c:1081
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr ""
 
 msgid "  --receive              receive new messages"
 msgstr ""
 

-#: src/main.c:1082
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 

-#: src/main.c:1083
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr ""
 
 msgid "  --send                 send all queued messages"
 msgstr ""
 

-#: src/main.c:1084
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 

-#: src/main.c:1085
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 

-#: src/main.c:1087
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 

-#: src/main.c:1089
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr ""
 
 msgid "  --online               switch to online mode"
 msgstr ""
 

-#: src/main.c:1090
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr ""
 
 msgid "  --offline              switch to offline mode"
 msgstr ""
 

-#: src/main.c:1091
-msgid "  --exit                 exit Claws Mail"
+#: src/main.c:1324
+msgid "  --exit --quit -q       exit Claws Mail"

 msgstr ""
 
 msgstr ""
 

-#: src/main.c:1092
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr ""
 
 msgid "  --debug                debug mode"
 msgstr ""
 

-#: src/main.c:1093
-msgid "  --help                 display this help and exit"
+#: src/main.c:1326
+msgid "  --help -h              display this help and exit"

 msgstr ""
 
 msgstr ""
 

-#: src/main.c:1094
-msgid "  --version              output version information and exit"
+#: src/main.c:1327
+msgid "  --version -v           output version information and exit"

 msgstr ""
 
 msgstr ""
 

-#: src/main.c:1095
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 

-#: src/main.c:1160
+#: src/main.c:1368
+msgid "Unknown option\n"
+msgstr ""
+
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 

-#: src/main.c:1163
+#: src/main.c:1389

 msgid "top level folder"
 msgstr ""
 
 msgid "top level folder"
 msgstr ""
 

-#: src/main.c:1227
-msgid "Really quit?"
-msgstr ""
-
-#: src/main.c:1228
-msgid "Composing message exists."
-msgstr ""
-
-#: src/main.c:1229
-msgid "_Save to Draft"
-msgstr ""
-
-#: src/main.c:1229
-msgid "_Discard them"
-msgstr ""
-
-#: src/main.c:1229
-msgid "Do_n't quit"
-msgstr ""
-
-#: src/main.c:1244
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr ""
 
 msgid "Queued messages"
 msgstr ""
 

-#: src/main.c:1245
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 

-#: src/mainwindow.c:497 src/messageview.c:158
+#: src/mainwindow.c:508 src/messageview.c:162

 msgid "/_File"
 msgstr ""
 
 msgid "/_File"
 msgstr ""
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:509

 msgid "/_File/_Add mailbox"
 msgstr ""
 
 msgid "/_File/_Add mailbox"
 msgstr ""
 

-#: src/mainwindow.c:499
+#: src/mainwindow.c:510

 msgid "/_File/_Add mailbox/MH..."
 msgstr ""
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr ""
 

-#: src/mainwindow.c:500 src/mainwindow.c:502 src/mainwindow.c:507
-#: src/mainwindow.c:509 src/mainwindow.c:512 src/mainwindow.c:515
-#: src/messageview.c:161
+#: src/mainwindow.c:511 src/mainwindow.c:513 src/mainwindow.c:518
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:526
+#: src/messageview.c:165

 msgid "/_File/---"
 msgstr ""
 
 msgid "/_File/---"
 msgstr ""
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:512

 msgid "/_File/Change folder order..."
 msgstr ""
 
 msgid "/_File/Change folder order..."
 msgstr ""
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:514

 msgid "/_File/_Import mbox file..."
 msgstr ""
 
 msgid "/_File/_Import mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:515

 msgid "/_File/_Export to mbox file..."
 msgstr ""
 
 msgid "/_File/_Export to mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:505
+#: src/mainwindow.c:516

 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr ""
 
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:519

 msgid "/_File/Empty all _Trash folders"
 msgstr "/_File/Empty all Was_tebin folders"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_File/Empty all Was_tebin folders"
 

-#: src/mainwindow.c:510 src/messageview.c:159
+#: src/mainwindow.c:521 src/messageview.c:163

 msgid "/_File/_Save as..."
 msgstr ""
 
 msgid "/_File/_Save as..."
 msgstr ""
 

-#: src/mainwindow.c:511 src/messageview.c:160
+#: src/mainwindow.c:522 src/messageview.c:164

 msgid "/_File/_Print..."
 msgstr ""
 
 msgid "/_File/_Print..."
 msgstr ""
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:524

 msgid "/_File/_Work offline"
 msgstr ""
 
 msgid "/_File/_Work offline"
 msgstr ""
 

-#: src/mainwindow.c:514
+#: src/mainwindow.c:525

 msgid "/_File/Synchronise folders"
 msgstr ""
 
 msgid "/_File/Synchronise folders"
 msgstr ""
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:528

 msgid "/_File/E_xit"
 msgstr ""
 
 msgid "/_File/E_xit"
 msgstr ""
 

-#: src/mainwindow.c:522
+#: src/mainwindow.c:533

 msgid "/_Edit/Select _thread"
 msgstr ""
 
 msgid "/_Edit/Select _thread"
 msgstr ""
 

-#: src/mainwindow.c:524 src/messageview.c:168
+#: src/mainwindow.c:534
+msgid "/_Edit/_Delete thread"
+msgstr ""
+
+#: src/mainwindow.c:536 src/messageview.c:172

 msgid "/_Edit/_Find in current message..."
 msgstr ""
 
 msgid "/_Edit/_Find in current message..."
 msgstr ""
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:538

 msgid "/_Edit/_Search folder..."
 msgstr ""
 
 msgid "/_Edit/_Search folder..."
 msgstr ""
 

-#: src/mainwindow.c:527
+#: src/mainwindow.c:539

 msgid "/_Edit/_Quick search"
 msgstr ""
 
 msgid "/_Edit/_Quick search"
 msgstr ""
 

-#: src/mainwindow.c:528 src/messageview.c:171 src/summaryview.c:472
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr ""
 
 msgid "/_View"
 msgstr ""
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:541

 msgid "/_View/Show or hi_de"
 msgstr ""
 
 msgid "/_View/Show or hi_de"
 msgstr ""
 

-#: src/mainwindow.c:530
-msgid "/_View/Show or hi_de/_Folder tree"
-msgstr ""
-
-#: src/mainwindow.c:532
+#: src/mainwindow.c:542

 msgid "/_View/Show or hi_de/_Message view"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr ""
 

-#: src/mainwindow.c:534
+#: src/mainwindow.c:544

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr ""
 

-#: src/mainwindow.c:536
+#: src/mainwindow.c:546

 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr ""
 

-#: src/mainwindow.c:538
+#: src/mainwindow.c:548

 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 

-#: src/mainwindow.c:540
+#: src/mainwindow.c:550

 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr ""
 

-#: src/mainwindow.c:542
+#: src/mainwindow.c:552

 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr ""
 

-#: src/mainwindow.c:544
+#: src/mainwindow.c:554

 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr ""
 

-#: src/mainwindow.c:546
+#: src/mainwindow.c:556

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr ""
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr ""
 

-#: src/mainwindow.c:548
+#: src/mainwindow.c:558

 msgid "/_View/Set displayed _columns"
 msgstr ""
 
 msgid "/_View/Set displayed _columns"
 msgstr ""
 

-#: src/mainwindow.c:549
+#: src/mainwindow.c:559

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr ""
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr ""
 

-#: src/mainwindow.c:550
+#: src/mainwindow.c:560

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr ""
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr ""
 

-#: src/mainwindow.c:552 src/mainwindow.c:555 src/mainwindow.c:583
-#: src/mainwindow.c:613 src/mainwindow.c:730 src/mainwindow.c:738
-#: src/messageview.c:277
+#: src/mainwindow.c:562 src/mainwindow.c:569 src/mainwindow.c:597
+#: src/mainwindow.c:627 src/mainwindow.c:744 src/mainwindow.c:752
+#: src/messageview.c:281

 msgid "/_View/---"
 msgstr ""
 
 msgid "/_View/---"
 msgstr ""
 

-#: src/mainwindow.c:553
-msgid "/_View/Separate f_older tree"
+#: src/mainwindow.c:563
+msgid "/_View/La_yout"

 msgstr ""
 
 msgstr ""
 

-#: src/mainwindow.c:554
-msgid "/_View/Separate _message view"
+#: src/mainwindow.c:564
+msgid "/_View/Layout/_Standard"

 msgstr ""
 
 msgstr ""
 

-#: src/mainwindow.c:556
+#: src/mainwindow.c:565
+msgid "/_View/Layout/_Three columns"
+msgstr ""
+
+#: src/mainwindow.c:566
+msgid "/_View/Layout/_Wide message"
+msgstr ""
+
+#: src/mainwindow.c:567
+msgid "/_View/Layout/W_ide message list"
+msgstr ""
+
+#: src/mainwindow.c:568
+msgid "/_View/Layout/S_mall screen"
+msgstr ""
+
+#: src/mainwindow.c:570

 msgid "/_View/_Sort"
 msgstr ""
 
 msgid "/_View/_Sort"
 msgstr ""
 

-#: src/mainwindow.c:557
+#: src/mainwindow.c:571

 msgid "/_View/_Sort/by _number"
 msgstr ""
 
 msgid "/_View/_Sort/by _number"
 msgstr ""
 

-#: src/mainwindow.c:558
+#: src/mainwindow.c:572

 msgid "/_View/_Sort/by S_ize"
 msgstr ""
 
 msgid "/_View/_Sort/by S_ize"
 msgstr ""
 

-#: src/mainwindow.c:559
+#: src/mainwindow.c:573

 msgid "/_View/_Sort/by _Date"
 msgstr ""
 
 msgid "/_View/_Sort/by _Date"
 msgstr ""
 

-#: src/mainwindow.c:560
+#: src/mainwindow.c:574

 msgid "/_View/_Sort/by _From"
 msgstr ""
 
 msgid "/_View/_Sort/by _From"
 msgstr ""
 

-#: src/mainwindow.c:561
+#: src/mainwindow.c:575

 msgid "/_View/_Sort/by _To"
 msgstr ""
 
 msgid "/_View/_Sort/by _To"
 msgstr ""
 

-#: src/mainwindow.c:562
+#: src/mainwindow.c:576

 msgid "/_View/_Sort/by S_ubject"
 msgstr ""
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr ""
 

-#: src/mainwindow.c:563
+#: src/mainwindow.c:577

 msgid "/_View/_Sort/by _color label"
 msgstr "/_View/_Sort/by _colour label"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_View/_Sort/by _colour label"
 

-#: src/mainwindow.c:565
+#: src/mainwindow.c:579

 msgid "/_View/_Sort/by _mark"
 msgstr ""
 
 msgid "/_View/_Sort/by _mark"
 msgstr ""
 

-#: src/mainwindow.c:566
+#: src/mainwindow.c:580

 msgid "/_View/_Sort/by _status"
 msgstr ""
 
 msgid "/_View/_Sort/by _status"
 msgstr ""
 

-#: src/mainwindow.c:567
+#: src/mainwindow.c:581

 msgid "/_View/_Sort/by a_ttachment"
 msgstr ""
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr ""
 

-#: src/mainwindow.c:569
+#: src/mainwindow.c:583

 msgid "/_View/_Sort/by score"
 msgstr ""
 
 msgid "/_View/_Sort/by score"
 msgstr ""
 

-#: src/mainwindow.c:570
+#: src/mainwindow.c:584

 msgid "/_View/_Sort/by locked"
 msgstr ""
 
 msgid "/_View/_Sort/by locked"
 msgstr ""
 

-#: src/mainwindow.c:571
+#: src/mainwindow.c:585

 msgid "/_View/_Sort/D_on't sort"
 msgstr ""
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr ""
 

-#: src/mainwindow.c:572 src/mainwindow.c:575
+#: src/mainwindow.c:586 src/mainwindow.c:589

 msgid "/_View/_Sort/---"
 msgstr ""
 
 msgid "/_View/_Sort/---"
 msgstr ""
 

-#: src/mainwindow.c:573
+#: src/mainwindow.c:587

 msgid "/_View/_Sort/Ascending"
 msgstr ""
 
 msgid "/_View/_Sort/Ascending"
 msgstr ""
 

-#: src/mainwindow.c:574
+#: src/mainwindow.c:588

 msgid "/_View/_Sort/Descending"
 msgstr ""
 
 msgid "/_View/_Sort/Descending"
 msgstr ""
 

-#: src/mainwindow.c:576
+#: src/mainwindow.c:590

 msgid "/_View/_Sort/_Attract by subject"
 msgstr ""
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr ""
 

-#: src/mainwindow.c:578
+#: src/mainwindow.c:592

 msgid "/_View/Th_read view"
 msgstr ""
 
 msgid "/_View/Th_read view"
 msgstr ""
 

-#: src/mainwindow.c:579
+#: src/mainwindow.c:593

 msgid "/_View/E_xpand all threads"
 msgstr ""
 
 msgid "/_View/E_xpand all threads"
 msgstr ""
 

-#: src/mainwindow.c:580
+#: src/mainwindow.c:594

 msgid "/_View/Co_llapse all threads"
 msgstr ""
 
 msgid "/_View/Co_llapse all threads"
 msgstr ""
 

-#: src/mainwindow.c:581
+#: src/mainwindow.c:595

 msgid "/_View/_Hide read messages"
 msgstr ""
 
 msgid "/_View/_Hide read messages"
 msgstr ""
 

-#: src/mainwindow.c:584
+#: src/mainwindow.c:598

 msgid "/_View/_Go to"
 msgstr ""
 
 msgid "/_View/_Go to"
 msgstr ""
 

-#: src/mainwindow.c:585
+#: src/mainwindow.c:599

 msgid "/_View/_Go to/_Previous message"
 msgstr ""
 
 msgid "/_View/_Go to/_Previous message"
 msgstr ""
 

-#: src/mainwindow.c:586
+#: src/mainwindow.c:600

 msgid "/_View/_Go to/_Next message"
 msgstr ""
 
 msgid "/_View/_Go to/_Next message"
 msgstr ""
 

-#: src/mainwindow.c:587 src/mainwindow.c:592 src/mainwindow.c:595
-#: src/mainwindow.c:600 src/mainwindow.c:605 src/mainwindow.c:610
+#: src/mainwindow.c:601 src/mainwindow.c:606 src/mainwindow.c:609
+#: src/mainwindow.c:614 src/mainwindow.c:619 src/mainwindow.c:624

 msgid "/_View/_Go to/---"
 msgstr ""
 
 msgid "/_View/_Go to/---"
 msgstr ""
 

-#: src/mainwindow.c:588
+#: src/mainwindow.c:602

 msgid "/_View/_Go to/P_revious unread message"
 msgstr ""
 
 msgid "/_View/_Go to/P_revious unread message"
 msgstr ""
 

-#: src/mainwindow.c:590
+#: src/mainwindow.c:604

 msgid "/_View/_Go to/N_ext unread message"
 msgstr ""
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr ""
 

-#: src/mainwindow.c:593
+#: src/mainwindow.c:607

 msgid "/_View/_Go to/Previous ne_w message"
 msgstr ""
 
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr ""
 

-#: src/mainwindow.c:594
+#: src/mainwindow.c:608

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr ""
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr ""
 

-#: src/mainwindow.c:596
+#: src/mainwindow.c:610

 msgid "/_View/_Go to/Previous _marked message"
 msgstr ""
 
 msgid "/_View/_Go to/Previous _marked message"
 msgstr ""
 

-#: src/mainwindow.c:598
+#: src/mainwindow.c:612

 msgid "/_View/_Go to/Next m_arked message"
 msgstr ""
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr ""
 

-#: src/mainwindow.c:601
+#: src/mainwindow.c:615

 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_View/_Go to/Previous _labelled message"
 
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_View/_Go to/Previous _labelled message"
 

-#: src/mainwindow.c:603
+#: src/mainwindow.c:617

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_View/_Go to/Next la_belled message"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_View/_Go to/Next la_belled message"
 

-#: src/mainwindow.c:606
+#: src/mainwindow.c:620

 msgid "/_View/_Go to/Last read message"
 msgstr ""
 
 msgid "/_View/_Go to/Last read message"
 msgstr ""
 

-#: src/mainwindow.c:608
+#: src/mainwindow.c:622

 msgid "/_View/_Go to/Parent message"
 msgstr ""
 
 msgid "/_View/_Go to/Parent message"
 msgstr ""
 

-#: src/mainwindow.c:611
+#: src/mainwindow.c:625

 msgid "/_View/_Go to/Next unread _folder"
 msgstr ""
 
 msgid "/_View/_Go to/Next unread _folder"
 msgstr ""
 

-#: src/mainwindow.c:612
+#: src/mainwindow.c:626

 msgid "/_View/_Go to/_Other folder..."
 msgstr ""
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr ""
 

-#: src/mainwindow.c:616 src/mainwindow.c:623 src/messageview.c:174
+#: src/mainwindow.c:630 src/mainwindow.c:637 src/messageview.c:178

 msgid "/_View/Character _encoding/---"
 msgstr ""
 
 msgid "/_View/Character _encoding/---"
 msgstr ""
 

-#: src/mainwindow.c:620 src/messageview.c:178
+#: src/mainwindow.c:634 src/messageview.c:182

 msgid "/_View/Character _encoding"
 msgstr ""
 
 msgid "/_View/Character _encoding"
 msgstr ""
 

-#: src/mainwindow.c:621 src/messageview.c:179
+#: src/mainwindow.c:635 src/messageview.c:183

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr ""
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr ""
 

-#: src/mainwindow.c:624 src/messageview.c:182
+#: src/mainwindow.c:638 src/messageview.c:186

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 

-#: src/mainwindow.c:626 src/messageview.c:185
+#: src/mainwindow.c:640 src/messageview.c:189

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 

-#: src/mainwindow.c:630 src/messageview.c:188
+#: src/mainwindow.c:644 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 

-#: src/mainwindow.c:632 src/messageview.c:190
+#: src/mainwindow.c:646 src/messageview.c:194

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 

-#: src/mainwindow.c:634 src/messageview.c:192
+#: src/mainwindow.c:648 src/messageview.c:196

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 

-#: src/mainwindow.c:638 src/messageview.c:195
+#: src/mainwindow.c:652 src/messageview.c:199

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 

-#: src/mainwindow.c:642 src/messageview.c:198
+#: src/mainwindow.c:656 src/messageview.c:202

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 

-#: src/mainwindow.c:644 src/messageview.c:200
+#: src/mainwindow.c:658 src/messageview.c:204

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 

-#: src/mainwindow.c:648 src/messageview.c:203
+#: src/mainwindow.c:662 src/messageview.c:207

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 

-#: src/mainwindow.c:652 src/messageview.c:206
+#: src/mainwindow.c:666 src/messageview.c:210

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 

-#: src/mainwindow.c:654 src/messageview.c:208
+#: src/mainwindow.c:668 src/messageview.c:212

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 

-#: src/mainwindow.c:658 src/messageview.c:211
+#: src/mainwindow.c:672 src/messageview.c:215

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 

-#: src/mainwindow.c:660 src/messageview.c:213
+#: src/mainwindow.c:674 src/messageview.c:217

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 

-#: src/mainwindow.c:664 src/messageview.c:216
+#: src/mainwindow.c:678 src/messageview.c:220

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 

-#: src/mainwindow.c:668 src/messageview.c:219
+#: src/mainwindow.c:682 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 

-#: src/mainwindow.c:670 src/messageview.c:221
+#: src/mainwindow.c:684 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 

-#: src/mainwindow.c:672 src/messageview.c:223
+#: src/mainwindow.c:686 src/messageview.c:227

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 

-#: src/mainwindow.c:674 src/messageview.c:225
+#: src/mainwindow.c:688 src/messageview.c:229

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 

-#: src/mainwindow.c:678 src/messageview.c:228
+#: src/mainwindow.c:692 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 

-#: src/mainwindow.c:680 src/messageview.c:230
+#: src/mainwindow.c:694 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr ""
 

-#: src/mainwindow.c:682 src/messageview.c:232
+#: src/mainwindow.c:696 src/messageview.c:236

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr ""
 

-#: src/mainwindow.c:684 src/messageview.c:234
+#: src/mainwindow.c:698 src/messageview.c:238

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr ""
 

-#: src/mainwindow.c:688 src/messageview.c:237
+#: src/mainwindow.c:702 src/messageview.c:241

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 

-#: src/mainwindow.c:690 src/messageview.c:239
+#: src/mainwindow.c:704 src/messageview.c:243

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 

-#: src/mainwindow.c:692 src/messageview.c:241
+#: src/mainwindow.c:706 src/messageview.c:245

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 

-#: src/mainwindow.c:694 src/messageview.c:243
+#: src/mainwindow.c:708 src/messageview.c:247

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 

-#: src/mainwindow.c:696 src/messageview.c:245
+#: src/mainwindow.c:710 src/messageview.c:249

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr ""
 

-#: src/mainwindow.c:700 src/messageview.c:248
+#: src/mainwindow.c:714 src/messageview.c:252

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 

-#: src/mainwindow.c:702 src/messageview.c:250
+#: src/mainwindow.c:716 src/messageview.c:254

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr ""
 

-#: src/mainwindow.c:706 src/messageview.c:253
+#: src/mainwindow.c:720 src/messageview.c:257

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr ""
 

-#: src/mainwindow.c:708 src/messageview.c:255
+#: src/mainwindow.c:722 src/messageview.c:259

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr ""
 

-#: src/mainwindow.c:715 src/mainwindow.c:721 src/messageview.c:262
-#: src/messageview.c:268
+#: src/mainwindow.c:729 src/mainwindow.c:735 src/messageview.c:266
+#: src/messageview.c:272

 msgid "/_View/Decode/---"
 msgstr ""
 
 msgid "/_View/Decode/---"
 msgstr ""
 

-#: src/mainwindow.c:718 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:269

 msgid "/_View/Decode"
 msgstr ""
 
 msgid "/_View/Decode"
 msgstr ""
 

-#: src/mainwindow.c:719 src/messageview.c:266
+#: src/mainwindow.c:733 src/messageview.c:270

 msgid "/_View/Decode/_Auto detect"
 msgstr ""
 
 msgid "/_View/Decode/_Auto detect"
 msgstr ""
 

-#: src/mainwindow.c:722 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:273

 msgid "/_View/Decode/_8bit"
 msgstr ""
 
 msgid "/_View/Decode/_8bit"
 msgstr ""
 

-#: src/mainwindow.c:723 src/messageview.c:270
+#: src/mainwindow.c:737 src/messageview.c:274

 msgid "/_View/Decode/_Quoted printable"
 msgstr ""
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr ""
 

-#: src/mainwindow.c:724 src/messageview.c:271
+#: src/mainwindow.c:738 src/messageview.c:275

 msgid "/_View/Decode/_Base64"
 msgstr ""
 
 msgid "/_View/Decode/_Base64"
 msgstr ""
 

-#: src/mainwindow.c:725 src/messageview.c:272
+#: src/mainwindow.c:739 src/messageview.c:276

 msgid "/_View/Decode/_Uuencode"
 msgstr ""
 
 msgid "/_View/Decode/_Uuencode"
 msgstr ""
 

-#: src/mainwindow.c:731 src/summaryview.c:473
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr ""
 
 msgid "/_View/Open in new _window"
 msgstr ""
 

-#: src/mainwindow.c:732 src/messageview.c:278
+#: src/mainwindow.c:746 src/messageview.c:282

 msgid "/_View/Mess_age source"
 msgstr ""
 
 msgid "/_View/Mess_age source"
 msgstr ""
 

-#: src/mainwindow.c:733
+#: src/mainwindow.c:747

 msgid "/_View/All headers"
 msgstr ""
 
 msgid "/_View/All headers"
 msgstr ""
 

-#: src/mainwindow.c:734 src/messageview.c:280
+#: src/mainwindow.c:748 src/messageview.c:284

 msgid "/_View/Quotes"
 msgstr ""
 
 msgid "/_View/Quotes"
 msgstr ""
 

-#: src/mainwindow.c:735 src/messageview.c:281
+#: src/mainwindow.c:749 src/messageview.c:285

 msgid "/_View/Quotes/_Fold all"
 msgstr ""
 
 msgid "/_View/Quotes/_Fold all"
 msgstr ""
 

-#: src/mainwindow.c:736 src/messageview.c:282
+#: src/mainwindow.c:750 src/messageview.c:286

 msgid "/_View/Quotes/Fold from level _2"
 msgstr ""
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr ""
 

-#: src/mainwindow.c:737 src/messageview.c:283
+#: src/mainwindow.c:751 src/messageview.c:287

 msgid "/_View/Quotes/Fold from level _3"
 msgstr ""
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr ""
 

-#: src/mainwindow.c:739
+#: src/mainwindow.c:753

 msgid "/_View/_Update summary"
 msgstr ""
 
 msgid "/_View/_Update summary"
 msgstr ""
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:756

 msgid "/_Message/Recei_ve"
 msgstr ""
 
 msgid "/_Message/Recei_ve"
 msgstr ""
 

-#: src/mainwindow.c:743
+#: src/mainwindow.c:757

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr ""
 

-#: src/mainwindow.c:745
+#: src/mainwindow.c:759

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr ""
 

-#: src/mainwindow.c:747
+#: src/mainwindow.c:761

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr ""
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:763

 msgid "/_Message/Recei_ve/---"
 msgstr ""
 
 msgid "/_Message/Recei_ve/---"
 msgstr ""
 

-#: src/mainwindow.c:750
+#: src/mainwindow.c:764

 msgid "/_Message/_Send queued messages"
 msgstr ""
 
 msgid "/_Message/_Send queued messages"
 msgstr ""
 

-#: src/mainwindow.c:752
+#: src/mainwindow.c:766

 msgid "/_Message/Compose a_n email message"
 msgstr ""
 
 msgid "/_Message/Compose a_n email message"
 msgstr ""
 

-#: src/mainwindow.c:753
+#: src/mainwindow.c:767

 msgid "/_Message/Compose a news message"
 msgstr ""
 
 msgid "/_Message/Compose a news message"
 msgstr ""
 

-#: src/mainwindow.c:754 src/messageview.c:289
+#: src/mainwindow.c:768 src/messageview.c:293

 msgid "/_Message/_Reply"
 msgstr ""
 
 msgid "/_Message/_Reply"
 msgstr ""
 

-#: src/mainwindow.c:755
+#: src/mainwindow.c:769

 msgid "/_Message/Repl_y to"
 msgstr ""
 
 msgid "/_Message/Repl_y to"
 msgstr ""
 

-#: src/mainwindow.c:756 src/messageview.c:290
+#: src/mainwindow.c:770 src/messageview.c:294

 msgid "/_Message/Repl_y to/_all"
 msgstr ""
 
 msgid "/_Message/Repl_y to/_all"
 msgstr ""
 

-#: src/mainwindow.c:757 src/messageview.c:292
+#: src/mainwindow.c:771 src/messageview.c:296

 msgid "/_Message/Repl_y to/_sender"
 msgstr ""
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr ""
 

-#: src/mainwindow.c:758 src/messageview.c:294
+#: src/mainwindow.c:772 src/messageview.c:298

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr ""
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr ""
 

-#: src/mainwindow.c:760
+#: src/mainwindow.c:774

 msgid "/_Message/Follow-up and reply to"
 msgstr ""
 
 msgid "/_Message/Follow-up and reply to"
 msgstr ""
 

-#: src/mainwindow.c:762 src/messageview.c:297
+#: src/mainwindow.c:776 src/messageview.c:301

 msgid "/_Message/_Forward"
 msgstr ""
 
 msgid "/_Message/_Forward"
 msgstr ""
 

-#: src/mainwindow.c:763 src/messageview.c:298
+#: src/mainwindow.c:777 src/messageview.c:302

 msgid "/_Message/For_ward as attachment"
 msgstr ""
 
 msgid "/_Message/For_ward as attachment"
 msgstr ""
 

-#: src/mainwindow.c:764
+#: src/mainwindow.c:778

 msgid "/_Message/Redirect"
 msgstr ""
 
 msgid "/_Message/Redirect"
 msgstr ""
 

-#: src/mainwindow.c:766
+#: src/mainwindow.c:780

 msgid "/_Message/Mailing-_List"
 msgstr ""
 
 msgid "/_Message/Mailing-_List"
 msgstr ""
 

-#: src/mainwindow.c:767
+#: src/mainwindow.c:781

 msgid "/_Message/Mailing-_List/Post"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Post"
 msgstr ""
 

-#: src/mainwindow.c:768
+#: src/mainwindow.c:782

 msgid "/_Message/Mailing-_List/Help"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Help"
 msgstr ""
 

-#: src/mainwindow.c:769
+#: src/mainwindow.c:783

 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr ""
 

-#: src/mainwindow.c:770
+#: src/mainwindow.c:784

 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr ""
 

-#: src/mainwindow.c:771
+#: src/mainwindow.c:785

 msgid "/_Message/Mailing-_List/View archive"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/View archive"
 msgstr ""
 

-#: src/mainwindow.c:772
+#: src/mainwindow.c:786

 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr ""
 

-#: src/mainwindow.c:775
+#: src/mainwindow.c:789

 msgid "/_Message/M_ove..."
 msgstr ""
 
 msgid "/_Message/M_ove..."
 msgstr ""
 

-#: src/mainwindow.c:776
+#: src/mainwindow.c:790

 msgid "/_Message/_Copy..."
 msgstr ""
 
 msgid "/_Message/_Copy..."
 msgstr ""
 

-#: src/mainwindow.c:777
+#: src/mainwindow.c:791

 msgid "/_Message/Move to _trash"
 msgstr "/_Message/Move to was_tebin"
 
 msgid "/_Message/Move to _trash"
 msgstr "/_Message/Move to was_tebin"
 

-#: src/mainwindow.c:778
+#: src/mainwindow.c:792

 msgid "/_Message/_Delete..."
 msgstr ""
 
 msgid "/_Message/_Delete..."
 msgstr ""
 

-#: src/mainwindow.c:779
+#: src/mainwindow.c:793

 msgid "/_Message/Cancel a news message"
 msgstr ""
 
 msgid "/_Message/Cancel a news message"
 msgstr ""
 

-#: src/mainwindow.c:781
+#: src/mainwindow.c:795

 msgid "/_Message/_Mark"
 msgstr ""
 
 msgid "/_Message/_Mark"
 msgstr ""
 

-#: src/mainwindow.c:782
+#: src/mainwindow.c:796

 msgid "/_Message/_Mark/_Mark"
 msgstr ""
 
 msgid "/_Message/_Mark/_Mark"
 msgstr ""
 

-#: src/mainwindow.c:783
+#: src/mainwindow.c:797

 msgid "/_Message/_Mark/_Unmark"
 msgstr ""
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr ""
 

-#: src/mainwindow.c:784 src/mainwindow.c:790 src/mainwindow.c:793
+#: src/mainwindow.c:798 src/mainwindow.c:804 src/mainwindow.c:807

 msgid "/_Message/_Mark/---"
 msgstr ""
 
 msgid "/_Message/_Mark/---"
 msgstr ""
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:799

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr ""
 

-#: src/mainwindow.c:786
+#: src/mainwindow.c:800

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr ""
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:801

 msgid "/_Message/_Mark/Mark all _read"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr ""
 

-#: src/mainwindow.c:788
+#: src/mainwindow.c:802

 msgid "/_Message/_Mark/Ignore thread"
 msgstr ""
 
 msgid "/_Message/_Mark/Ignore thread"
 msgstr ""
 

-#: src/mainwindow.c:789
+#: src/mainwindow.c:803

 msgid "/_Message/_Mark/Unignore thread"
 msgstr ""
 
 msgid "/_Message/_Mark/Unignore thread"
 msgstr ""
 

-#: src/mainwindow.c:791
+#: src/mainwindow.c:805

 msgid "/_Message/_Mark/Mark as _spam"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr ""
 

-#: src/mainwindow.c:792
+#: src/mainwindow.c:806

 msgid "/_Message/_Mark/Mark as _ham"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr ""
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:808

 msgid "/_Message/_Mark/Lock"
 msgstr ""
 
 msgid "/_Message/_Mark/Lock"
 msgstr ""
 

-#: src/mainwindow.c:795
+#: src/mainwindow.c:809

 msgid "/_Message/_Mark/Unlock"
 msgstr ""
 
 msgid "/_Message/_Mark/Unlock"
 msgstr ""
 

-#: src/mainwindow.c:796
+#: src/mainwindow.c:810

 msgid "/_Message/Color la_bel"
 msgstr "/_Message/Colour la_bel"
 
 msgid "/_Message/Color la_bel"
 msgstr "/_Message/Colour la_bel"
 

-#: src/mainwindow.c:798
+#: src/mainwindow.c:812

 msgid "/_Message/Re-_edit"
 msgstr ""
 
 msgid "/_Message/Re-_edit"
 msgstr ""
 

-#: src/mainwindow.c:801
+#: src/mainwindow.c:815

 msgid "/_Tools/_Address book..."
 msgstr ""
 
 msgid "/_Tools/_Address book..."
 msgstr ""
 

-#: src/mainwindow.c:802 src/messageview.c:304
+#: src/mainwindow.c:816 src/messageview.c:308

 msgid "/_Tools/Add sender to address boo_k"
 msgstr ""
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr ""
 

-#: src/mainwindow.c:804
+#: src/mainwindow.c:818

 msgid "/_Tools/_Harvest addresses"
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses"
 msgstr ""
 

-#: src/mainwindow.c:805
+#: src/mainwindow.c:819

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr ""
 

-#: src/mainwindow.c:807
+#: src/mainwindow.c:821

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr ""
 

-#: src/mainwindow.c:810
+#: src/mainwindow.c:824

 msgid "/_Tools/_Filter all messages in folder"
 msgstr ""
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr ""
 

-#: src/mainwindow.c:812
+#: src/mainwindow.c:826

 msgid "/_Tools/Filter _selected messages"
 msgstr ""
 
 msgid "/_Tools/Filter _selected messages"
 msgstr ""
 

-#: src/mainwindow.c:814 src/messageview.c:307
+#: src/mainwindow.c:828 src/messageview.c:311

 msgid "/_Tools/_Create filter rule"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule"
 msgstr ""
 

-#: src/mainwindow.c:815 src/messageview.c:309
+#: src/mainwindow.c:829 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr ""
 

-#: src/mainwindow.c:817 src/messageview.c:311
+#: src/mainwindow.c:831 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr ""
 

-#: src/mainwindow.c:819 src/messageview.c:313
+#: src/mainwindow.c:833 src/messageview.c:317

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr ""
 

-#: src/mainwindow.c:821 src/messageview.c:315
+#: src/mainwindow.c:835 src/messageview.c:319

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr ""
 

-#: src/mainwindow.c:823
+#: src/mainwindow.c:837

 msgid "/_Tools/C_reate processing rule"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule"
 msgstr ""
 

-#: src/mainwindow.c:824
+#: src/mainwindow.c:838

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr ""
 

-#: src/mainwindow.c:826
+#: src/mainwindow.c:840

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr ""
 

-#: src/mainwindow.c:828
+#: src/mainwindow.c:842

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr ""
 

-#: src/mainwindow.c:830
+#: src/mainwindow.c:844

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr ""
 

-#: src/mainwindow.c:835
+#: src/mainwindow.c:847 src/messageview.c:332
+msgid "/_Tools/List _URLs..."
+msgstr ""
+
+#: src/mainwindow.c:851

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr ""
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr ""
 

-#: src/mainwindow.c:837
+#: src/mainwindow.c:853

 msgid "/_Tools/Delete du_plicated messages"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr ""
 

-#: src/mainwindow.c:839
+#: src/mainwindow.c:855

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr ""
 

-#: src/mainwindow.c:841
+#: src/mainwindow.c:857

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr ""
 

-#: src/mainwindow.c:844
+#: src/mainwindow.c:860

 msgid "/_Tools/E_xecute"
 msgstr ""
 
 msgid "/_Tools/E_xecute"
 msgstr ""
 

-#: src/mainwindow.c:847
+#: src/mainwindow.c:863

 msgid "/_Tools/SSL cer_tificates..."
 msgstr ""
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr ""
 

-#: src/mainwindow.c:851
-msgid "/_Tools/_Log window"
+#: src/mainwindow.c:867
+msgid "/_Tools/Filtering Log"

 msgstr ""
 
 msgstr ""
 

-#: src/mainwindow.c:853
+#: src/mainwindow.c:868
+msgid "/_Tools/Network _Log"
+msgstr ""
+
+#: src/mainwindow.c:870

 msgid "/_Configuration"
 msgstr ""
 
 msgid "/_Configuration"
 msgstr ""
 

-#: src/mainwindow.c:854
+#: src/mainwindow.c:871

 msgid "/_Configuration/C_hange current account"
 msgstr ""
 
 msgid "/_Configuration/C_hange current account"
 msgstr ""
 

-#: src/mainwindow.c:856
+#: src/mainwindow.c:873

 msgid "/_Configuration/_Preferences for current account..."
 msgstr ""
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr ""
 

-#: src/mainwindow.c:858
+#: src/mainwindow.c:875

 msgid "/_Configuration/Create _new account..."
 msgstr ""
 
 msgid "/_Configuration/Create _new account..."
 msgstr ""
 

-#: src/mainwindow.c:860
+#: src/mainwindow.c:877

 msgid "/_Configuration/_Edit accounts..."
 msgstr ""
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr ""
 

-#: src/mainwindow.c:862
+#: src/mainwindow.c:879

 msgid "/_Configuration/---"
 msgstr ""
 
 msgid "/_Configuration/---"
 msgstr ""
 

-#: src/mainwindow.c:863
+#: src/mainwindow.c:880

 msgid "/_Configuration/P_references..."
 msgstr ""
 
 msgid "/_Configuration/P_references..."
 msgstr ""
 

-#: src/mainwindow.c:865
+#: src/mainwindow.c:882

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr ""
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr ""
 

-#: src/mainwindow.c:867
+#: src/mainwindow.c:884

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr ""
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr ""
 

-#: src/mainwindow.c:869
+#: src/mainwindow.c:886

 msgid "/_Configuration/_Filtering..."
 msgstr ""
 
 msgid "/_Configuration/_Filtering..."
 msgstr ""
 

-#: src/mainwindow.c:871
+#: src/mainwindow.c:888

 msgid "/_Configuration/_Templates..."
 msgstr ""
 
 msgid "/_Configuration/_Templates..."
 msgstr ""
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "/_Configuration/_Actions..."
 msgstr ""
 
 msgid "/_Configuration/_Actions..."
 msgstr ""
 

-#: src/mainwindow.c:873
+#: src/mainwindow.c:890

 msgid "/_Configuration/Plu_gins..."
 msgstr ""
 
 msgid "/_Configuration/Plu_gins..."
 msgstr ""
 

-#: src/mainwindow.c:876
+#: src/mainwindow.c:893

 msgid "/_Help/_Manual"
 msgstr ""
 
 msgid "/_Help/_Manual"
 msgstr ""
 

-#: src/mainwindow.c:877
+#: src/mainwindow.c:894

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr ""
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr ""
 

-#: src/mainwindow.c:879
+#: src/mainwindow.c:896

 msgid "/_Help/Icon _Legend"
 msgstr ""
 
 msgid "/_Help/Icon _Legend"
 msgstr ""
 

-#: src/mainwindow.c:880
+#: src/mainwindow.c:897

 msgid "/_Help/---"
 msgstr ""
 
 msgid "/_Help/---"
 msgstr ""
 

-#: src/mainwindow.c:1228
+#: src/mainwindow.c:1246

 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 

-#: src/mainwindow.c:1242
+#: src/mainwindow.c:1260

 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 

-#: src/mainwindow.c:1245
+#: src/mainwindow.c:1263

 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 

-#: src/mainwindow.c:1261
+#: src/mainwindow.c:1279

 msgid "Select account"
 msgstr ""
 
 msgid "Select account"
 msgstr ""
 

-#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
-#: src/mainwindow.c:1775 src/mainwindow.c:1818
-#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:764
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"
+msgstr ""
+
+#: src/mainwindow.c:1304
+msgid "Filtering/processing debug log"
+msgstr ""
+
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr ""
+
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr ""
+
+#: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
+#: src/mainwindow.c:1828 src/mainwindow.c:1871
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr ""
 
 msgid "Untitled"
 msgstr ""
 

-#: src/mainwindow.c:1819
+#: src/mainwindow.c:1872

 msgid "none"
 msgstr ""
 
 msgid "none"
 msgstr ""
 

-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2122

 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 

-#: src/mainwindow.c:2100
+#: src/mainwindow.c:2141

 msgid "Add mailbox"
 msgstr ""
 
 msgid "Add mailbox"
 msgstr ""
 

-#: src/mainwindow.c:2101
+#: src/mainwindow.c:2142

 msgid ""
 "Input the location of mailbox.\n"
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 
 "scanned automatically."
 msgstr ""
 

-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2148

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 

-#: src/mainwindow.c:2112 src/setup.c:51
+#: src/mainwindow.c:2153 src/setup.c:51 src/wizard.c:691

 msgid "Mailbox"
 msgstr ""
 
 msgid "Mailbox"
 msgstr ""
 

-#: src/mainwindow.c:2117 src/setup.c:54
+#: src/mainwindow.c:2158 src/setup.c:54

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 

-#: src/mainwindow.c:2437
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr ""
 
 msgid "No posting allowed"
 msgstr ""
 

-#: src/mainwindow.c:2704
-msgid "Claws Mail - Folder View"
-msgstr ""
-
-#: src/mainwindow.c:2740 src/messageview.c:449 src/messageview.c:861
-msgid "Claws Mail - Message View"
-msgstr ""
-
-#: src/mainwindow.c:3090
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr ""
 
 msgid "Mbox import has failed."
 msgstr ""
 

-#: src/mainwindow.c:3099 src/mainwindow.c:3108
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr ""
 
 msgid "Export to mbox has failed."
 msgstr ""
 

-#: src/mainwindow.c:3131 src/plugins/trayicon/trayicon.c:474
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr ""
 
 msgid "Exit"
 msgstr ""
 

-#: src/mainwindow.c:3131
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr ""
 
 msgid "Exit Claws Mail?"
 msgstr ""
 

-#: src/mainwindow.c:3282
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr ""
 
 msgid "Folder synchronisation"
 msgstr ""
 

-#: src/mainwindow.c:3283
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 

-#: src/mainwindow.c:3284
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr ""
 
 msgid "+_Synchronise"
 msgstr ""
 

-#: src/mainwindow.c:3615
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr ""
 
 msgid "Deleting duplicated messages..."
 msgstr ""
 

-#: src/mainwindow.c:3652
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/mainwindow.c:3811 src/summaryview.c:4783
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 

-#: src/mainwindow.c:3820
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 

-#: src/mainwindow.c:3829 src/summaryview.c:4794
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr ""
 
 msgid "Filtering configuration"
 msgstr ""
 

-#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
-#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr ""
+
+#: src/matcher.c:1157 src/matcher.c:1159
+msgid "header"
+msgstr ""
+
+#: src/matcher.c:1168
+msgid "header line"
+msgstr ""
+
+#: src/matcher.c:1170
+msgid "headers line"
+msgstr ""
+
+#: src/matcher.c:1172 src/matcher.c:1174
+msgid "message line"
+msgstr ""
+
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr ""
 
 msgid "Filtering Matcher Menu|All"
 msgstr ""
 

-#: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
-#: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
+#: src/matcher.c:1392 src/matcher.c:1395
+msgid "body line"
+msgstr ""
+
+#: src/matcher.c:1571
+#, c-format
+msgid "checking if message matches [ %s ]\n"
+msgstr ""
+
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660
+msgid "message matches\n"
+msgstr ""
+
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662
+msgid "message does not match\n"
+msgstr ""
+
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 


@@ -5918,27 +6618,27 @@ msgstr ""
 msgid "Importing from mbox... (%d mails imported)"
 msgstr ""
 
 msgid "Importing from mbox... (%d mails imported)"
 msgstr ""
 

-#: src/mbox.c:481
+#: src/mbox.c:529

 msgid "Overwrite mbox file"
 msgstr ""
 
 msgid "Overwrite mbox file"
 msgstr ""
 

-#: src/mbox.c:482
+#: src/mbox.c:530

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 

-#: src/mbox.c:483 src/messageview.c:1149 src/mimeview.c:1443
-#: src/textview.c:2654
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr ""
 
 msgid "Overwrite"
 msgstr ""
 

-#: src/mbox.c:492
+#: src/mbox.c:540

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 msgstr ""
 

-#: src/mbox.c:500
+#: src/mbox.c:548

 msgid "Exporting to mbox..."
 msgstr ""
 
 msgid "Exporting to mbox..."
 msgstr ""
 


@@ -5950,71 +6650,75 @@ msgstr ""
 msgid "Find text:"
 msgstr ""
 
 msgid "Find text:"
 msgstr ""
 

-#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr ""
 
 msgid "Case sensitive"
 msgstr ""
 

-#: src/message_search.c:323 src/summary_search.c:637
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr ""
 
 msgid "Search failed"
 msgstr ""
 

-#: src/message_search.c:324 src/summary_search.c:638
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr ""
 
 msgid "Search string not found."
 msgstr ""
 

-#: src/message_search.c:333
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr ""
 
 msgid "Beginning of message reached; continue from end?"
 msgstr ""
 

-#: src/message_search.c:336
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr ""
 
 msgid "End of message reached; continue from beginning?"
 msgstr ""
 

-#: src/message_search.c:339 src/summary_search.c:649
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr ""
 
 msgid "Search finished"
 msgstr ""
 

-#: src/messageview.c:162
+#: src/messageview.c:166

 msgid "/_File/_Close"
 msgstr ""
 
 msgid "/_File/_Close"
 msgstr ""
 

-#: src/messageview.c:279
+#: src/messageview.c:283

 msgid "/_View/Show all _headers"
 msgstr ""
 
 msgid "/_View/Show all _headers"
 msgstr ""
 

-#: src/messageview.c:286
+#: src/messageview.c:290

 msgid "/_Message/Compose _new message"
 msgstr ""
 
 msgid "/_Message/Compose _new message"
 msgstr ""
 

-#: src/messageview.c:300
+#: src/messageview.c:304

 msgid "/_Message/Redirec_t"
 msgstr ""
 
 msgid "/_Message/Redirec_t"
 msgstr ""
 

-#: src/messageview.c:317
+#: src/messageview.c:321

 msgid "/_Tools/Create processing rule"
 msgstr ""
 
 msgid "/_Tools/Create processing rule"
 msgstr ""
 

-#: src/messageview.c:319
+#: src/messageview.c:323

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr ""
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr ""
 

-#: src/messageview.c:321
+#: src/messageview.c:325

 msgid "/_Tools/Create processing rule/by _From"
 msgstr ""
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr ""
 

-#: src/messageview.c:323
+#: src/messageview.c:327

 msgid "/_Tools/Create processing rule/by _To"
 msgstr ""
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr ""
 

-#: src/messageview.c:325
+#: src/messageview.c:329

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr ""
 

-#: src/messageview.c:566
+#: src/messageview.c:455 src/messageview.c:864
+msgid "Claws Mail - Message View"
+msgstr ""
+
+#: src/messageview.c:575

 msgid "<No Return-Path found>"
 msgstr ""
 
 msgid "<No Return-Path found>"
 msgstr ""
 

-#: src/messageview.c:574
+#: src/messageview.c:583

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -6024,11 +6728,11 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
 "It is advised to not to send the return receipt."
 msgstr ""
 

-#: src/messageview.c:581 src/messageview.c:598
+#: src/messageview.c:590 src/messageview.c:607

 msgid "_Don't Send"
 msgstr ""
 
 msgid "_Don't Send"
 msgstr ""
 

-#: src/messageview.c:594
+#: src/messageview.c:603

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -6036,117 +6740,117 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
 "It is advised to not to send the return receipt."
 msgstr ""
 

-#: src/messageview.c:815 src/procmime.c:873
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 

-#: src/messageview.c:1144 src/mimeview.c:1582 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2642
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr ""
 
 msgid "Save as"
 msgstr ""
 

-#: src/messageview.c:1150
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr ""
 
 msgid "Overwrite existing file?"
 msgstr ""
 

-#: src/messageview.c:1158 src/summaryview.c:4085 src/summaryview.c:4088
-#: src/summaryview.c:4103
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 

-#: src/messageview.c:1239
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr ""
 
 msgid "You asked for a return receipt in this message."
 msgstr ""
 

-#: src/messageview.c:1243
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr ""
 
 msgid "This message asks for a return receipt."
 msgstr ""
 

-#: src/messageview.c:1244
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr ""
 
 msgid "Send receipt"
 msgstr ""
 

-#: src/messageview.c:1287
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 

-#: src/messageview.c:1293
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 

-#: src/messageview.c:1297 src/messageview.c:1319
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr ""
 
 msgid "Mark for download"
 msgstr ""
 

-#: src/messageview.c:1298 src/messageview.c:1310
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr ""
 
 msgid "Mark for deletion"
 msgstr ""
 

-#: src/messageview.c:1303
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 

-#: src/messageview.c:1308 src/messageview.c:1321
-#: src/prefs_filtering_action.c:154
+#: src/messageview.c:1331 src/messageview.c:1344
+#: src/prefs_filtering_action.c:163

 msgid "Unmark"
 msgstr ""
 
 msgid "Unmark"
 msgstr ""
 

-#: src/messageview.c:1314
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 

-#: src/messageview.c:1390
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr ""
 
 msgid "Return Receipt Notification"
 msgstr ""
 

-#: src/messageview.c:1391
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 "notification:"
 msgstr ""
 
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 "notification:"
 msgstr ""
 

-#: src/messageview.c:1395
-msgid "_Send Notification"
+#: src/messageview.c:1419
+msgid "_Cancel"

 msgstr ""
 
 msgstr ""
 

-#: src/messageview.c:1395
-msgid "+_Cancel"
+#: src/messageview.c:1419
+msgid "_Send Notification"

 msgstr ""
 
 msgstr ""
 

-#: src/messageview.c:1462
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 

-#: src/messageview.c:1526 src/summaryview.c:4125
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Enter the print command line:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 

-#: src/messageview.c:1532 src/summaryview.c:4131
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 "'%s'"
 msgstr ""
 
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 "'%s'"
 msgstr ""
 

-#: src/messageview.c:1807 src/messageview.c:1813 src/summaryview.c:3521
-#: src/summaryview.c:5542
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr ""
 
 msgid "An error happened while learning.\n"
 msgstr ""
 


@@ -6182,208 +6886,386 @@ msgstr ""
 msgid "_Remove"
 msgstr ""
 
 msgid "_Remove"
 msgstr ""
 

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr ""
-

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
+msgid "/_Open (l)"

 msgstr ""
 
 #: src/mimeview.c:170
 msgstr ""
 
 #: src/mimeview.c:170

-msgid "/_Display as text"
+msgid "/Open _with (o)..."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:171 src/summaryview.c:478
-msgid "/_Save as..."
+#: src/mimeview.c:171
+msgid "/_Display as text (t)"

 msgstr ""
 
 #: src/mimeview.c:172
 msgstr ""
 
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr ""
+
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr ""
 
 msgid "/Save _all..."
 msgstr ""
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr ""
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr ""
 
 msgid "MIME Type"
 msgstr ""
 

-#: src/mimeview.c:742
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr ""
 
 msgid "Check signature"
 msgstr ""
 

-#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr ""
 
 msgid "View full information"
 msgstr ""
 

-#: src/mimeview.c:762 src/mimeview.c:766
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr ""
 
 msgid "Check again"
 msgstr ""
 

-#: src/mimeview.c:775
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 

-#: src/mimeview.c:780
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 

-#: src/mimeview.c:990
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr ""
 
 msgid "Checking signature..."
 msgstr ""
 

-#: src/mimeview.c:1032
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr ""
 
 msgid "Go back to email"
 msgstr ""
 

-#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
-#: src/mimeview.c:1661
-msgid "Couldn't save the part of multipart message."
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744
+#, c-format
+msgid "Couldn't save the part of multipart message: %s"
+msgstr ""
+
+#: src/mimeview.c:1511 src/textview.c:2669
+#, c-format
+msgid "Overwrite existing file '%s'?"
+msgstr ""
+
+#: src/mimeview.c:1552
+msgid "Select destination folder"
+msgstr ""
+
+#: src/mimeview.c:1559
+#, c-format
+msgid "'%s' is not a directory."
+msgstr ""
+
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600
+msgid "Open with"
+msgstr ""
+
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601
+#, c-format
+msgid ""
+"Enter the command line to open file:\n"
+"('%s' will be replaced with file name)"
+msgstr ""
+
+#: src/news.c:255
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr ""
+
+#: src/news.c:328
+msgid "Claws Mail needs network access in order to access the News server."
+msgstr ""
+
+#: src/news.c:345
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr ""
+
+#: src/news.c:475
+msgid "can't retrieve newsgroup list\n"
+msgstr ""
+
+#: src/news.c:588
+msgid "couldn't post article.\n"
+msgstr ""
+
+#: src/news.c:614
+#, c-format
+msgid "couldn't retrieve article %d\n"
+msgstr ""
+
+#: src/news.c:663
+#, c-format
+msgid "couldn't select group: %s\n"
+msgstr ""
+
+#: src/news.c:888
+#, c-format
+msgid "couldn't set group: %s\n"
+msgstr ""
+
+#: src/news.c:897
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr ""
+
+#: src/news.c:917
+#, c-format
+msgid "error occurred while getting %s.\n"
+msgstr ""
+
+#: src/news.c:955
+#, c-format
+msgid "getting xover %d in %s...\n"
+msgstr ""
+
+#: src/news.c:962 src/news.c:1056
+msgid "couldn't get xover\n"
+msgstr ""
+
+#: src/news.c:972 src/news.c:1068
+msgid "error occurred while getting xover.\n"
+msgstr ""
+
+#: src/news.c:979 src/news.c:1082
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr ""
+
+#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
+msgid "couldn't get xhdr\n"
+msgstr ""
+
+#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
+msgid "error occurred while getting xhdr.\n"
+msgstr ""
+
+#: src/news.c:1052
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr ""
+
+#: src/news_gtk.c:52
+msgid "/_Subscribe to newsgroup..."
+msgstr ""
+
+#: src/news_gtk.c:53
+msgid "/_Unsubscribe newsgroup"
+msgstr ""
+
+#: src/news_gtk.c:55
+msgid "/Synchronise"
+msgstr ""
+
+#: src/news_gtk.c:226
+#, c-format
+msgid "Really unsubscribe newsgroup '%s'?"
+msgstr ""
+
+#: src/news_gtk.c:227
+msgid "Unsubscribe newsgroup"
+msgstr ""
+
+#: src/news_gtk.c:228
+msgid "_Unsubscribe"
+msgstr ""
+
+#: src/news_gtk.c:303 src/news_gtk.c:305
+#, c-format
+msgid "Error occurred while downloading messages in '%s'."
+msgstr ""
+
+#: src/plugins/bogofilter/bogofilter.c:77
+#: src/plugins/bogofilter/bogofilter_gtk.c:448
+msgid "Bogofilter"
+msgstr ""
+
+#: src/plugins/bogofilter/bogofilter.c:456
+msgid "Bogofilter: fetching bodies..."
+msgstr ""
+
+#: src/plugins/bogofilter/bogofilter.c:469
+msgid "Bogofilter: filtering messages..."
+msgstr ""
+
+#: src/plugins/bogofilter/bogofilter.c:563
+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."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:1440 src/textview.c:2652
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 #, c-format

-msgid "Overwrite existing file '%s'?"
+msgid ""
+"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
+"couldn't be run."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:1478
-msgid "Select destination folder"
+#: src/plugins/bogofilter/bogofilter.c:718
+msgid "Bogofilter: learning from message..."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:1485
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 #, c-format

-msgid "'%s' is not a directory."
+msgid "Learning failed; `%s` returned with status %d."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583
-msgid "Open with"
+#: src/plugins/bogofilter/bogofilter.c:748
+msgid "Bogofilter: learning from messages..."

 msgstr ""
 
 msgstr ""
 

-#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Enter the command line to open file:\n"
-"('%s' will be replaced with file name)"
+"Learning failed; `%s %s %s` returned with error:\n"
+"%s"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:255
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61
+msgid "Unknown error"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:328
-msgid "Claws Mail needs network access in order to access the News server."
+#: src/plugins/bogofilter/bogofilter.c:963
+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"
+"\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"
+"\n"
+"Options can be found in /Configuration/Preferences/Plugins/Bogofilter"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:345
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593
+msgid "Spam detection"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:475
-msgid "can't retrieve newsgroup list\n"
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594
+msgid "Spam learning"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:588
-msgid "couldn't post article.\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Process messages on receiving"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:614
-#, c-format
-msgid "couldn't retrieve article %d\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
+msgid "Maximum size"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:663
-#, c-format
-msgid "couldn't select group: %s\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334
+msgid "Messages larger than this will not be checked"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:888
-#, c-format
-msgid "couldn't set group: %s\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337
+msgid "kB"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:897
-#, c-format
-msgid "invalid article range: %d - %d\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376
+msgid "Save spam in"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:917
-#, c-format
-msgid "error occurred while getting %s.\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384
+msgid ""
+"Folder for storing identified spam. Leave empty to use the trash folder."

 msgstr ""
 msgstr ""

+"Folder for storing identified spam. Leave empty to use the wastebin folder."

 
 

-#: src/news.c:955
-#, c-format
-msgid "getting xover %d in %s...\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391
+msgid "Click this button to select a folder for storing spam"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:962 src/news.c:1056
-msgid "couldn't get xover\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:205
+msgid "When unsure, move to"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:972 src/news.c:1068
-msgid "error occurred while getting xover.\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+msgid ""
+"Folder for storing mail for which spam status is Unsure. Leave empty to use "
+"the inbox folder."

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:979 src/news.c:1082
-#, c-format
-msgid "invalid xover line: %s\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:220
+msgid "Click this button to select a folder for storing Unsure mails."

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
-msgid "couldn't get xhdr\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:223
+msgid "Insert X-Bogosity header"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
-msgid "error occurred while getting xhdr.\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:227
+msgid "Only done for messages in MH folders"

 msgstr ""
 
 msgstr ""
 

-#: src/news.c:1052
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
+msgid "Whitelist senders found in address book/folder"

 msgstr ""
 
 msgstr ""
 

-#: src/news_gtk.c:52
-msgid "/_Subscribe to newsgroup..."
+#: src/plugins/bogofilter/bogofilter_gtk.c:238
+msgid ""
+"Messages coming from your address book contacts will be received in the "
+"normal folder even if detected as spam"

 msgstr ""
 
 msgstr ""
 

-#: src/news_gtk.c:53
-msgid "/_Unsubscribe newsgroup"
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
+#: src/prefs_matcher.c:611
+msgid "Select ..."

 msgstr ""
 
 msgstr ""
 

-#: src/news_gtk.c:226
-#, c-format
-msgid "Really unsubscribe newsgroup '%s'?"
+#: src/plugins/bogofilter/bogofilter_gtk.c:260
+msgid "Click this button to select a book or folder in the address book"

 msgstr ""
 
 msgstr ""
 

-#: src/news_gtk.c:227
-msgid "Unsubscribe newsgroup"
+#: src/plugins/bogofilter/bogofilter_gtk.c:267
+msgid "Bogofilter call"

 msgstr ""
 
 msgstr ""
 

-#: src/news_gtk.c:228
-msgid "_Unsubscribe"
+#: src/plugins/bogofilter/bogofilter_gtk.c:275
+msgid "Path to bogofilter executable"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:43
-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
-msgid ""
-"Folder for storing identified spam. Leave empty to use the trash folder."
+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"

 msgstr ""
 msgstr ""

-"Folder for storing identified spam. Leave empty to use the wastebin folder."

 
 

+#: src/plugins/clamav/clamav_plugin.c:49

 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 msgstr ""
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:120
+#: src/plugins/clamav/clamav_plugin.c:140

 msgid "ClamAV: scanning message..."
 msgstr ""
 
 msgid "ClamAV: scanning message..."
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:205
+#: src/plugins/clamav/clamav_plugin.c:238

 msgid "Failed to register mail filtering hook"
 msgstr ""
 
 msgid "Failed to register mail filtering hook"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:253
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6394,7 +7276,7 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:280
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr ""
 
 msgid "Virus detection"
 msgstr ""
 


@@ -6430,13 +7312,14 @@ msgstr ""
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""

-"Folder for storing infected mail. Leave empty to use the default wastebin folder"
+"Folder for storing infected mail. Leave empty to use the default wastebin "
+"folder"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 

-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr ""
 
 msgid "Demo"
 msgstr ""
 


@@ -6444,7 +7327,7 @@ msgstr ""
 msgid "Failed to register log text hook"
 msgstr ""
 
 msgid "Failed to register log text hook"
 msgstr ""
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 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"


@@ -6480,18 +7363,18 @@ msgstr ""
 msgid "Dillo HTML Viewer"
 msgstr ""
 
 msgid "Dillo HTML Viewer"
 msgstr ""
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
 msgstr ""
 
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
 msgstr ""
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr ""
 
 msgid "text/html"
 msgstr ""
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:97
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr ""
 
 msgid "Passphrase"
 msgstr ""
 


@@ -6534,63 +7417,154 @@ msgstr ""
 msgid "Bad passphrase.\n"
 msgstr ""
 
 msgid "Bad passphrase.\n"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:95
+#: src/plugins/pgpcore/pgp_viewer.c:118
+msgid "Key import"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:119
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+msgid ""
+"\n"
+"  Key ID "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+msgid "   This key is not in your keyring.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:130
+msgid "   It should be possible to import it "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:132
+msgid ""
+"when working online,\n"
+"   or "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:133
+msgid ""
+"with the following command: \n"
+"\n"
+"     "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:140
+msgid ""
+"\n"
+"  Importing key ID "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:179
+msgid "   This key has been imported to your keyring.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:181
+msgid "   This key couldn't be imported to your keyring.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid ""
+"   You can try to import it manually with the command:\n"
+"\n"
+"     "
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:187
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:196
+msgid "   This key is in your keyring.\n"
+msgstr ""
+
+#: src/plugins/pgpcore/plugin.c:35
+msgid "PGP/Core"
+msgstr ""
+
+#: src/plugins/pgpcore/plugin.c:65
+msgid ""
+"This plugin handles PGP core operations, 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"
+"\n"
+"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
+"\n"
+"GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
+msgstr ""
+
+#: src/plugins/pgpcore/plugin.c:94
+msgid "Core operations"
+msgstr ""
+
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr ""
 
 msgid "Automatically check signatures"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:105
+#: src/plugins/pgpcore/prefs_gpg.c:109
+msgid "Use gpg-agent to manage passwords"
+msgstr ""
+
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr ""
 
 msgid "Store passphrase in memory"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:111
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr ""
 
 msgid "Expire after"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:126
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr ""
 
 msgid "minute(s)"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:141
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr ""
 
 msgid "Grab input while entering a passphrase"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:148
-msgid "Display warning on startup if GnuPG doesn't work"
+#: src/plugins/pgpcore/prefs_gpg.c:161
+msgid "Display warning on start-up if GnuPG doesn't work"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:273
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr ""
 
 msgid "Sign key"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:286
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr ""
 
 msgid "Use default GnuPG key"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:297
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr ""
 
 msgid "Select key by your email address"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:308
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr ""
 
 msgid "Specify key manually"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:318
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr ""
 
 msgid "User or key ID:"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:359
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr ""
 
 msgid "No secret key found."
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:362
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr ""
 
 msgid "Generate a new key pair"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:515
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr ""
 
 msgid "GPG"
 msgstr ""
 


@@ -6604,39 +7578,40 @@ msgstr ""
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:348
+#: src/plugins/pgpcore/select-keys.c:376

 msgid "Select Keys"
 msgstr ""
 
 msgid "Select Keys"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:375
+#: src/plugins/pgpcore/select-keys.c:403

 msgid "Key ID"
 msgstr ""
 
 msgid "Key ID"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:378
+#: src/plugins/pgpcore/select-keys.c:406

 msgid "Val"
 msgstr ""
 
 msgid "Val"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:399
+#: src/plugins/pgpcore/select-keys.c:427

 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:400 src/prefs_other.c:278
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364
+#: src/prefs_other.c:682

 msgid "Other"
 msgstr ""
 
 msgid "Other"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:401
+#: src/plugins/pgpcore/select-keys.c:429

 msgid "Don't encrypt"
 msgstr ""
 
 msgid "Don't encrypt"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:543
+#: src/plugins/pgpcore/select-keys.c:571

 msgid "Add key"
 msgstr ""
 
 msgid "Add key"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:544
+#: src/plugins/pgpcore/select-keys.c:572

 msgid "Enter another user or key ID:"
 msgstr ""
 
 msgid "Enter another user or key ID:"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:561
+#: src/plugins/pgpcore/select-keys.c:594

 #, c-format
 msgid ""
 "The key of '%s' is not fully trusted.\n"
 #, c-format
 msgid ""
 "The key of '%s' is not fully trusted.\n"


@@ -6645,379 +7620,308 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
 "Do you trust it enough to use it anyway?"
 msgstr ""
 

-#: src/plugins/pgpcore/select-keys.c:566
+#: src/plugins/pgpcore/select-keys.c:599

 msgid "Trust key"
 msgstr ""
 
 msgid "Trust key"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/plugins/pgpcore/sgpgme.c:78 src/privacy.c:211 src/privacy.c:215

 #: src/privacy.c:232 src/privacy.c:236
 msgid "No signature found"
 msgstr ""
 
 #: src/privacy.c:232 src/privacy.c:236
 msgid "No signature found"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:140

 msgid "Undefined"
 msgstr ""
 
 msgid "Undefined"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193
-#: src/prefs_send.c:170
+#: src/plugins/pgpcore/sgpgme.c:142 src/prefs_receive.c:181
+#: src/prefs_send.c:175

 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:144

 msgid "Marginal"
 msgstr ""
 
 msgid "Marginal"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/sgpgme.c:148

 msgid "Ultimate"
 msgstr ""
 
 msgid "Ultimate"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:180
+#: src/plugins/pgpcore/sgpgme.c:182

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
-#: src/plugins/pgpcore/sgpgme.c:235
+#: src/plugins/pgpcore/sgpgme.c:186 src/plugins/pgpcore/sgpgme.c:190
+#: src/plugins/pgpcore/sgpgme.c:237

 msgid "The signature has not been checked."
 msgstr ""
 
 msgid "The signature has not been checked."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196
+#: src/plugins/pgpcore/sgpgme.c:196 src/plugins/pgpcore/sgpgme.c:198

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:209
+#: src/plugins/pgpcore/sgpgme.c:211

 #, c-format
 msgid "Good signature from %s."
 msgstr ""
 
 #, c-format
 msgid "Good signature from %s."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:215
+#: src/plugins/pgpcore/sgpgme.c:217

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr ""
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:220
+#: src/plugins/pgpcore/sgpgme.c:222

 #, c-format
 msgid "Expired signature from %s."
 msgstr ""
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:223
+#: src/plugins/pgpcore/sgpgme.c:225

 #, c-format
 msgid "Expired key from %s."
 msgstr ""
 
 #, c-format
 msgid "Expired key from %s."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:228

 #, c-format
 msgid "Bad signature from %s."
 msgstr ""
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:230
+#: src/plugins/pgpcore/sgpgme.c:232

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr ""
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:274

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr ""
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:279
+#: src/plugins/pgpcore/sgpgme.c:281

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:284
+#: src/plugins/pgpcore/sgpgme.c:286

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr ""
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:289
+#: src/plugins/pgpcore/sgpgme.c:291

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:302

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr ""
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:308

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:311
+#: src/plugins/pgpcore/sgpgme.c:313

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:317
+#: src/plugins/pgpcore/sgpgme.c:319

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:359
+#: src/plugins/pgpcore/sgpgme.c:361

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:375
+#: src/plugins/pgpcore/sgpgme.c:377

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:492
+#: src/plugins/pgpcore/sgpgme.c:496

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:500
+#: src/plugins/pgpcore/sgpgme.c:504

 msgid "Secret key specification is ambiguous"
 msgstr ""
 
 msgid "Secret key specification is ambiguous"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:510
+#: src/plugins/pgpcore/sgpgme.c:514

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:546
+#: src/plugins/pgpcore/sgpgme.c:550

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:552
+#: src/plugins/pgpcore/sgpgme.c:556

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:560
+#: src/plugins/pgpcore/sgpgme.c:564

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:576
+#: src/plugins/pgpcore/sgpgme.c:580

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:615
-msgid "No PGP key found"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:616
-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"
-"Do you want to create a new key pair now?"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:686 src/plugins/pgpcore/sgpgme.c:702
-#, c-format
-msgid "Couldn't generate a new key pair: %s"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:693
-msgid ""
-"Generating your new key pair... Please move the mouse around to help "
-"generate entropy..."
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:708
-msgid "Couldn't generate a new key pair: unknown error"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:712
-#, c-format
-msgid ""
-"Your new key pair has been generated. Its fingerprint is:\n"
-"%s\n"
-"\n"
-"Do you want to export it to a keyserver?"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:716
-msgid "Key generated"
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:755
-msgid "Key exported."
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:757
-msgid "Couldn't export key."
-msgstr ""
-
-#: src/plugins/pgpcore/sgpgme.c:761
-msgid "Key export isn't implemented in Windows."
-msgstr ""
-
-#: src/plugins/pgpcore/plugin.c:35
-msgid "PGP/Core"
-msgstr ""
-
-#: src/plugins/pgpcore/plugin.c:64
-msgid ""
-"This plugin handles PGP core operations, 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"
-"\n"
-"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
-"\n"
-"GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
-msgstr ""
-
-#: src/plugins/pgpcore/plugin.c:93
-msgid "Core operations"
-msgstr ""
-
-#: src/plugins/pgpcore/pgp_viewer.c:118
-msgid "Key import"
-msgstr ""
-
-#: src/plugins/pgpcore/pgp_viewer.c:119
-msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
-msgstr ""
-
-#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
-msgid ""
-"\n"
-"  Key ID "
+#: src/plugins/pgpcore/sgpgme.c:619
+msgid "No PGP key found"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
-msgid "   This key is not in your keyring.\n"
+#: src/plugins/pgpcore/sgpgme.c:620
+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"
+"Do you want to create a new key pair now?"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:130
-msgid "   It should be possible to import it "
+#: src/plugins/pgpcore/sgpgme.c:690 src/plugins/pgpcore/sgpgme.c:706
+#, c-format
+msgid "Couldn't generate a new key pair: %s"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:132
+#: src/plugins/pgpcore/sgpgme.c:697

 msgid ""
 msgid ""

-"when working online,\n"
-"   or "
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:133
-msgid ""
-"with the following command: \n"
-"\n"
-"     "
+#: src/plugins/pgpcore/sgpgme.c:712
+msgid "Couldn't generate a new key pair: unknown error"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:140
+#: src/plugins/pgpcore/sgpgme.c:716
+#, c-format

 msgid ""
 msgid ""

+"Your new key pair has been generated. Its fingerprint is:\n"
+"%s\n"

 "\n"
 "\n"

-"  Importing key ID "
-msgstr ""
-
-#: src/plugins/pgpcore/pgp_viewer.c:179
-msgid "   This key has been imported to your keyring.\n"
+"Do you want to export it to a keyserver?"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:181
-msgid "   This key couldn't be imported to your keyring.\n"
+#: src/plugins/pgpcore/sgpgme.c:720
+msgid "Key generated"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:182
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/sgpgme.c:759
+msgid "Key exported."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:187
-msgid "   Key import isn't implemented in Windows.\n"
+#: src/plugins/pgpcore/sgpgme.c:761
+msgid "Couldn't export key."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/pgp_viewer.c:196
-msgid "   This key is in your keyring.\n"
+#: src/plugins/pgpcore/sgpgme.c:765
+msgid "Key export isn't implemented in Windows."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393
+#: src/plugins/pgpinline/pgpinline.c:249 src/plugins/pgpinline/pgpinline.c:405

 msgid "Couldn't get text data."
 msgstr ""
 
 msgid "Couldn't get text data."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:259
+#: src/plugins/pgpinline/pgpinline.c:267

 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
-#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:593
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:386
+#: src/plugins/pgpinline/pgpinline.c:398

 msgid "Couldn't parse mime part."
 msgstr ""
 
 msgid "Couldn't parse mime part."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343
+#: src/plugins/pgpinline/pgpinline.c:428 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:451 src/plugins/pgpinline/pgpinline.c:452
+msgid ""
+"\n"
+"--- Start of PGP/Inline encrypted data ---\n"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:459 src/plugins/pgpinline/pgpinline.c:460
+msgid "--- End of PGP/Inline encrypted data ---\n"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:477

 msgid "Couldn't scan decrypted file."
 msgstr ""
 
 msgid "Couldn't scan decrypted file."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:454
+#: src/plugins/pgpinline/pgpinline.c:485

 msgid "Couldn't scan decrypted file parts."
 msgstr ""
 
 msgid "Couldn't scan decrypted file parts."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:508
+#: src/plugins/pgpinline/pgpinline.c:539

 msgid "Couldn't create temporary file."
 msgstr ""
 
 msgid "Couldn't create temporary file."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:495

 #, c-format
 msgid "Data signing failed, %s"
 msgstr ""
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519
+#: src/plugins/pgpinline/pgpinline.c:596 src/plugins/pgpmime/pgpmime.c:520

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr ""
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528
+#: src/plugins/pgpinline/pgpinline.c:605 src/plugins/pgpmime/pgpmime.c:529

 msgid "Data signing failed, no results."
 msgstr ""
 
 msgid "Data signing failed, no results."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:615 src/plugins/pgpmime/pgpmime.c:540

 msgid "Data signing failed, no contents."
 msgstr ""
 
 msgid "Data signing failed, no contents."
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr ""
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr ""
 

-#: src/plugins/pgpinline/pgpinline.c:767
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr ""
 
 msgid "PGP/Inline"
 msgstr ""
 


@@ -7025,7 +7929,7 @@ msgstr ""
 msgid "PGP/inline"
 msgstr ""
 
 msgid "PGP/inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7040,24 +7944,6 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 

-#: src/plugins/pgpmime/plugin.c:33
-msgid "PGP/MIME"
-msgstr ""
-
-#: src/plugins/pgpmime/plugin.c:58
-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"
-"\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@gnu.org>"
-msgstr ""
-

 #: src/plugins/pgpmime/pgpmime.c:201
 msgid "Signature boundary not found."
 msgstr ""
 #: src/plugins/pgpmime/pgpmime.c:201
 msgid "Signature boundary not found."
 msgstr ""


@@ -7075,53 +7961,77 @@ msgstr ""
 msgid "Couldn't create temporary file: %s"
 msgstr ""
 
 msgid "Couldn't create temporary file: %s"
 msgstr ""
 

-#: src/plugins/pgpmime/pgpmime.c:723
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr ""
 
 msgid "PGP/Mime"
 msgstr ""
 

+#: src/plugins/pgpmime/plugin.c:33
+msgid "PGP/MIME"
+msgstr ""
+
+#: src/plugins/pgpmime/plugin.c:59
+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"
+"\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@gnu.org>"
+msgstr ""
+

 #: src/plugins/spamassassin/spamassassin.c:75
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:549
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr ""
 
 msgid "SpamAssassin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr ""
 
 msgid "SpamAssassin: filtering message..."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:277
+#: src/plugins/spamassassin/spamassassin.c:314

 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."
 msgstr ""
 
 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."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:336
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:479
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr ""
 
 msgid "Failed to get username"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:491
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:524
+#: src/plugins/spamassassin/spamassassin.c:562

 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 "
 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 "


@@ -7135,31 +8045,23 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:555
-msgid "Spam detection"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:556
-msgid "Spam learning"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr ""
 
 msgid "Localhost"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr ""
 
 msgid "TCP"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr ""
 
 msgid "Unix Socket"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr ""
 
 msgid "Enable SpamAssassin plugin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr ""
 
 msgid "Transport"
 msgstr ""
 


@@ -7191,103 +8093,92 @@ msgstr ""
 msgid "Path of Unix socket"
 msgstr ""
 
 msgid "Path of Unix socket"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:325
-msgid "Maximum size"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
-msgid "Messages larger than this will not be checked"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:337
-msgid "kB"
-msgstr ""
-

 #: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
-#: src/prefs_summaries.c:900
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:368
-msgid "Process messages on receiving"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:376
-msgid "Save spam in"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:384
-msgid ""
-"Folder for storing identified spam. Leave empty to use the default trash "
-"folder"
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:123
+msgid "Orientation"

 msgstr ""
 msgstr ""

-"Folder for storing identified spam. Leave empty to use the default wastebin "
-"folder"

 
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:391
-msgid "Click this button to select a folder for storing spam"
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:124
+msgid "The orientation of the tray."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:567
+#: src/plugins/trayicon/trayicon_prefs.c:70

 msgid "Trayicon"
 msgstr ""
 
 msgid "Trayicon"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:110

 msgid "/_Get Mail"
 msgstr ""
 
 msgid "/_Get Mail"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:108
+#: src/plugins/trayicon/trayicon.c:112

 msgid "/_Email"
 msgstr ""
 
 msgid "/_Email"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:109
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Email from account"
 msgstr ""
 
 msgid "/_Email from account"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:111
+#: src/plugins/trayicon/trayicon.c:115

 msgid "/Open A_ddressbook"
 msgstr ""
 
 msgid "/Open A_ddressbook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:113
+#: src/plugins/trayicon/trayicon.c:117

 msgid "/_Work Offline"
 msgstr ""
 
 msgid "/_Work Offline"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:115
+#: src/plugins/trayicon/trayicon.c:119

 msgid "/E_xit Claws Mail"
 msgstr ""
 
 msgid "/E_xit Claws Mail"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:204
+#: src/plugins/trayicon/trayicon.c:208

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:278
+#: src/plugins/trayicon/trayicon.c:321

 msgid "/Work Offline"
 msgstr ""
 
 msgid "/Work Offline"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:281
+#: src/plugins/trayicon/trayicon.c:324

 msgid "/Get Mail"
 msgstr ""
 
 msgid "/Get Mail"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:361
+#: src/plugins/trayicon/trayicon.c:404

 msgid "Failed to register folder item update hook"
 msgstr ""
 
 msgid "Failed to register folder item update hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:367
+#: src/plugins/trayicon/trayicon.c:410

 msgid "Failed to register folder update hook"
 msgstr ""
 
 msgid "Failed to register folder update hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379
+#: src/plugins/trayicon/trayicon.c:416

 msgid "Failed to register offline switch hook"
 msgstr ""
 
 msgid "Failed to register offline switch hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:415
+#: src/plugins/trayicon/trayicon.c:422
+msgid "Failed to register account list changed hook"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:428
+msgid "Failed to register close hook"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:434
+msgid "Failed to register got iconified hook"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7296,16 +8187,30 @@ msgid ""
 "letter. A tooltip shows new, unread and total number of messages."
 msgstr ""
 
 "letter. A tooltip shows new, unread and total number of messages."
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:474
-msgid "Exit this program?"
+#: src/plugins/trayicon/trayicon_prefs.c:111
+msgid "Hide at start-up"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:123
-msgid "Orientation"
+#: src/plugins/trayicon/trayicon_prefs.c:117
+msgid "Hide Claws Mail at start-up"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:124
-msgid "The orientation of the tray."
+#: src/plugins/trayicon/trayicon_prefs.c:121
+msgid "Close to tray"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon_prefs.c:127
+msgid ""
+"Hide Claws Mail using the tray icon instead of closing it\n"
+"when the window close button is clicked"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon_prefs.c:131
+msgid "Minimize to tray"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon_prefs.c:137
+msgid "Hide Claws Mail using the tray icon instead of minimizing it"

 msgstr ""
 
 #: src/pop.c:150
 msgstr ""
 
 #: src/pop.c:150


@@ -7316,503 +8221,525 @@ msgstr ""
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr ""
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr ""
 
 msgid "POP3 protocol error\n"
 msgstr ""
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 

-#: src/pop.c:778
+#: src/pop.c:822

 #, c-format
 #, c-format

-msgid "POP3: Deleting expired message %d\n"
+msgid "POP3: Deleting expired message %d [%s]\n"

 msgstr ""
 
 msgstr ""
 

-#: src/pop.c:794
+#: src/pop.c:838

 #, c-format
 #, c-format

-msgid "POP3: Skipping message %d (%d bytes)\n"
+msgid "POP3: Skipping message %d [%s] (%d bytes)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/pop.c:826
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr ""
 
 msgid "mailbox is locked\n"
 msgstr ""
 

-#: src/pop.c:829
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr ""
 
 msgid "Session timeout\n"
 msgstr ""
 

-#: src/pop.c:848
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr ""
 
 msgid "command not supported\n"
 msgstr ""
 

-#: src/pop.c:853
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr ""
 
 msgid "error occurred on POP3 session\n"
 msgstr ""
 

-#: src/pop.c:1047
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr ""
 
 msgid "TOP command unsupported\n"
 msgstr ""
 

-#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
-#: src/wizard.c:1122
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215
+#: src/wizard.c:1144

 msgid "POP3"
 msgstr ""
 
 msgid "POP3"
 msgstr ""
 

-#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr ""
 
 msgid "IMAP4"
 msgstr ""
 

-#: src/prefs_account.c:237
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr ""
 
 msgid "News (NNTP)"
 msgstr ""
 

-#: src/prefs_account.c:238 src/wizard.c:1132
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr ""
 
 msgid "Local mbox file"
 msgstr ""
 

-#: src/prefs_account.c:239
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr ""
 
 msgid "None (SMTP only)"
 msgstr ""
 

-#: src/prefs_account.c:725
-#, c-format
-msgid "Account%d"
-msgstr ""
-
-#: src/prefs_account.c:998
-msgid "Preferences for new account"
-msgstr ""
-
-#: src/prefs_account.c:1000
-#, c-format
-msgid "%s - Account preferences"
-msgstr ""
-
-#: src/prefs_account.c:1035
-msgid "_Basic"
-msgstr ""
-
-#: src/prefs_account.c:1037
-msgid "_Receive"
-msgstr ""
-
-#: src/prefs_account.c:1041
-msgid "Co_mpose"
-msgstr ""
-
-#: src/prefs_account.c:1043
-msgid "_Privacy"
-msgstr ""
-
-#: src/prefs_account.c:1046
-msgid "SS_L"
-msgstr ""
-
-#: src/prefs_account.c:1049
-msgid "A_dvanced"
-msgstr ""
-
-#: src/prefs_account.c:1107
+#: src/prefs_account.c:933

 msgid "Name of account"
 msgstr ""
 
 msgid "Name of account"
 msgstr ""
 

-#: src/prefs_account.c:1116
+#: src/prefs_account.c:942

 msgid "Set as default"
 msgstr ""
 
 msgid "Set as default"
 msgstr ""
 

-#: src/prefs_account.c:1120
+#: src/prefs_account.c:950

 msgid "Personal information"
 msgstr ""
 
 msgid "Personal information"
 msgstr ""
 

-#: src/prefs_account.c:1129
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr ""
 
 msgid "Full name"
 msgstr ""
 

-#: src/prefs_account.c:1135
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr ""
 
 msgid "Mail address"
 msgstr ""
 

-#: src/prefs_account.c:1141
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:1165
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr ""
 
 msgid "Server information"
 msgstr ""
 

-#: src/prefs_account.c:1205 src/wizard.c:1216
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgstr ""
 
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgstr ""
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr ""
 
 msgid "This server requires authentication"
 msgstr ""
 

-#: src/prefs_account.c:1241
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr ""
 
 msgid "Authenticate on connect"
 msgstr ""
 

-#: src/prefs_account.c:1286
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr ""
 
 msgid "News server"
 msgstr ""
 

-#: src/prefs_account.c:1292
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr ""
 
 msgid "Server for receiving"
 msgstr ""
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr ""
 
 msgid "Local mailbox"
 msgstr ""
 

-#: src/prefs_account.c:1305
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr ""
 
 msgid "SMTP server (send)"
 msgstr ""
 

-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 

-#: src/prefs_account.c:1322
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr ""
 
 msgid "command to send mails"
 msgstr ""
 

-#: src/prefs_account.c:1329 src/prefs_account.c:1779
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr ""
 
 msgid "User ID"
 msgstr ""
 

-#: src/prefs_account.c:1335 src/prefs_account.c:1788
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 

-#: src/prefs_account.c:1428
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr ""
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr ""
 
 msgid "Local"
 msgstr ""
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1534
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr ""
 
 msgid "Default inbox"
 msgstr ""
 

-#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
-#: src/prefs_account.c:1549
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 

-#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr ""
 
 msgid "Bro_wse"
 msgstr ""
 

-#: src/prefs_account.c:1469
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr ""
 
 msgid "Use secure authentication (APOP)"
 msgstr ""
 

-#: src/prefs_account.c:1472
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr ""
 
 msgid "Remove messages on server when received"
 msgstr ""
 

-#: src/prefs_account.c:1483
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr ""
 
 msgid "Remove after"
 msgstr ""
 

-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr ""
 
 msgid "0 days: remove immediately"
 msgstr ""
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr ""
 
 msgid "days"
 msgstr ""
 

-#: src/prefs_account.c:1503
-msgid "Download all messages on server"
-msgstr ""
-
-#: src/prefs_account.c:1509
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr ""
 
 msgid "Receive size limit"
 msgstr ""
 

-#: src/prefs_account.c:1512
+#: src/prefs_account.c:1382

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 

-#: src/prefs_account.c:1522
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr ""
 
 msgid "KB"
 msgstr ""
 

-#: src/prefs_account.c:1556 src/prefs_account.c:2179
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr ""
 
 msgid "NNTP"
 msgstr ""
 

-#: src/prefs_account.c:1568
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr ""
 
 msgid "Maximum number of articles to download"
 msgstr ""
 

-#: src/prefs_account.c:1580
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr ""
 
 msgid "unlimited if 0 is specified"
 msgstr ""
 

-#: src/prefs_account.c:1598 src/prefs_account.c:1749
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr ""
 
 msgid "Authentication method"
 msgstr ""
 

-#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr ""
 
 msgid "Automatic"
 msgstr ""
 

-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr ""
 
 msgid "IMAP server directory"
 msgstr ""
 

-#: src/prefs_account.c:1624
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr ""
 
 msgid "(usually empty)"
 msgstr ""
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1498
+msgid "Show subscribed folders only"
+msgstr ""
+
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr ""
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr ""
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr ""
 
 msgid "Filter messages on receiving"
 msgstr ""
 

-#: src/prefs_account.c:1638
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr ""
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 

-#: src/prefs_account.c:1700 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:162
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr ""
 
 msgid "Header"
 msgstr ""
 

-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr ""
 
 msgid "Generate Message-ID"
 msgstr ""
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr ""
 
 msgid "Add user-defined header"
 msgstr ""
 

-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr ""
 
 msgid "Authentication"
 msgstr ""
 

-#: src/prefs_account.c:1734
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 

-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1711

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 

-#: src/prefs_account.c:1821
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 

-#: src/prefs_account.c:1836
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr ""
 
 msgid "POP authentication timeout: "
 msgstr ""
 

-#: src/prefs_account.c:1845
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr ""
 
 msgid "minutes"
 msgstr ""
 

-#: src/prefs_account.c:1890 src/prefs_account.c:1941
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr ""
 
 msgid "Signature"
 msgstr ""
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr ""
 
 msgid "Insert signature automatically"
 msgstr ""
 

-#: src/prefs_account.c:1903
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr ""
 
 msgid "Signature separator"
 msgstr ""
 

-#: src/prefs_account.c:1928
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr ""
 
 msgid "Command output"
 msgstr ""
 

-#: src/prefs_account.c:1961
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr ""
 
 msgid "Automatically set the following addresses"
 msgstr ""
 

-#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
-#: src/quote_fmt.c:49
-msgid "Cc"
+#: src/prefs_account.c:1929
+msgid "Spell check dictionaries"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_account.c:1983 src/prefs_template.c:189
-msgid "Bcc"
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818
+#: src/prefs_spelling.c:233
+msgid "Default dictionary"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_account.c:1996
-msgid "Reply-To"
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851
+#: src/prefs_spelling.c:251
+msgid "Default alternate dictionary"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr ""
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr ""
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr ""
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr ""
 
 msgid "Default privacy system"
 msgstr ""
 

-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr ""
 
 msgid "Always sign messages"
 msgstr ""
 

-#: src/prefs_account.c:2059
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr ""
 
 msgid "Always encrypt messages"
 msgstr ""
 

-#: src/prefs_account.c:2061
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 

-#: src/prefs_account.c:2066
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 

-#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr ""
 
 msgid "Don't use SSL"
 msgstr ""
 

-#: src/prefs_account.c:2156
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr ""
 
 msgid "Use SSL for POP3 connection"
 msgstr ""
 

-#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr ""
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr ""
 

-#: src/prefs_account.c:2173
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr ""
 
 msgid "Use SSL for IMAP4 connection"
 msgstr ""
 

-#: src/prefs_account.c:2195
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr ""
 
 msgid "Use SSL for NNTP connection"
 msgstr ""
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr ""
 
 msgid "Send (SMTP)"
 msgstr ""
 

-#: src/prefs_account.c:2205
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr ""
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr ""
 

-#: src/prefs_account.c:2208
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr ""
 
 msgid "Use SSL for SMTP connection"
 msgstr ""
 

-#: src/prefs_account.c:2219
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr ""
 
 msgid "Use non-blocking SSL"
 msgstr ""
 

-#: src/prefs_account.c:2231
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr ""
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr ""
 

-#: src/prefs_account.c:2357
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr ""
 
 msgid "SMTP port"
 msgstr ""
 

-#: src/prefs_account.c:2363
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr ""
 
 msgid "POP3 port"
 msgstr ""
 

-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr ""
 
 msgid "IMAP4 port"
 msgstr ""
 

-#: src/prefs_account.c:2375
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr ""
 
 msgid "NNTP port"
 msgstr ""
 

-#: src/prefs_account.c:2380
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr ""
 
 msgid "Domain name"
 msgstr ""
 

-#: src/prefs_account.c:2390
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr ""
 
 msgid "Use command to communicate with server"
 msgstr ""
 

-#: src/prefs_account.c:2398
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 

-#: src/prefs_account.c:2445
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr ""
 
 msgid "Browse"
 msgstr ""
 

-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr ""
 
 msgid "Put sent messages in"
 msgstr ""
 

-#: src/prefs_account.c:2460
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr ""
 
 msgid "Put queued messages in"
 msgstr ""
 

-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr ""
 
 msgid "Put draft messages in"
 msgstr ""
 

-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr ""
 
 msgid "Put deleted messages in"
 msgstr ""
 

-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr ""
 
 msgid "Account name is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2511
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr ""
 
 msgid "Mail address is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2518
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr ""
 
 msgid "SMTP server is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr ""
 
 msgid "User ID is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2528
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr ""
 
 msgid "POP3 server is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2535
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr ""
 
 msgid "The default inbox folder doesn't exist."
 msgstr ""
 

-#: src/prefs_account.c:2541
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr ""
 
 msgid "IMAP4 server is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr ""
 
 msgid "NNTP server is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2552
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr ""
 
 msgid "local mailbox filename is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2558
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr ""
 
 msgid "mail command is not entered."
 msgstr ""
 

-#: src/prefs_account.c:2623
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr ""
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr ""
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr ""
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr ""
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr ""
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr ""
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr ""
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr ""
 
 msgid "Select signature file"
 msgstr ""
 

-#: src/prefs_account.c:2716
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr ""
 
 msgid "Protocol:"
 msgstr ""
 

-#: src/prefs_account.c:2869
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""


@@ -7829,21 +8756,21 @@ msgstr ""
 msgid "Command line"
 msgstr ""
 
 msgid "Command line"
 msgstr ""
 

-#: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270
-#: src/prefs_toolbar.c:788
+#: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281
+#: src/prefs_toolbar.c:791

 msgid "Replace"
 msgstr ""
 
 msgid "Replace"
 msgstr ""
 

-#: src/prefs_actions.c:291 src/prefs_filtering_action.c:464
-#: src/prefs_matcher.c:569
+#: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr ""
 
 msgid "Info..."
 msgstr ""
 

-#: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
-#: src/prefs_filtering.c:762 src/prefs_filtering.c:764
-#: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
-#: src/prefs_template.c:367
+#: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr ""
 
 msgid "(New)"
 msgstr ""
 


@@ -7887,21 +8814,21 @@ msgstr ""
 msgid "Do you really want to delete this action?"
 msgstr ""
 
 msgid "Do you really want to delete this action?"
 msgstr ""
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr ""
 
 msgid "Entry not saved"
 msgstr ""
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
-#: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr ""
 
 msgid "+_Continue editing"
 msgstr ""
 


@@ -7982,7 +8909,7 @@ msgstr ""
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 

-#: src/prefs_actions.c:834 src/prefs_themes.c:982
+#: src/prefs_actions.c:834 src/prefs_themes.c:978

 msgid "Actions"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 


@@ -7996,111 +8923,109 @@ msgstr ""
 msgid "Current actions"
 msgstr ""
 
 msgid "Current actions"
 msgstr ""
 

-#: src/prefs_common.c:210
+#: src/prefs_common.c:209

 msgid "Hello,\\n"
 msgstr ""
 
 msgid "Hello,\\n"
 msgstr ""
 

-#: src/prefs_common.c:272
+#: src/prefs_common.c:276

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 

-#: src/prefs_common.c:278
+#: src/prefs_common.c:282

 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 

-#: src/prefs_common.c:363
+#: src/prefs_common.c:411

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr ""
 
 msgid "Automatic account selection"
 msgstr ""
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr ""
 
 msgid "when replying"
 msgstr ""
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr ""
 
 msgid "when forwarding"
 msgstr ""
 

-#: src/prefs_compose_writing.c:136
-msgid "when re-editing"
-msgstr ""
-
-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr ""
-
-#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160
-msgid "Forward as attachment"
-msgstr ""
-
-#: src/prefs_compose_writing.c:149
-msgid "Keep the original 'From' header when redirecting"
+#: src/prefs_compose_writing.c:132
+msgid "when re-editing"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:151
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr ""
 
 msgid "Editing"
 msgstr ""
 

-#: src/prefs_compose_writing.c:159
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr ""
 
 msgid "Automatically launch the external editor"
 msgstr ""
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr ""
 
 msgid "Autosave message text to Drafts folder every"
 msgstr ""
 

-#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr ""
 
 msgid "characters"
 msgstr ""
 

-#: src/prefs_compose_writing.c:184
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr ""
 
 msgid "Undo level"
 msgstr ""
 

-#: src/prefs_compose_writing.c:197
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr ""
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr ""
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr ""
 
 msgid "Reply button invokes mailing list reply"
 msgstr ""
 

-#: src/prefs_compose_writing.c:200
-msgid "When dropping files into the Compose window"
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:208
-msgid "Ask"
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:209 src/toolbar.c:456
-msgid "Insert"
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:210 src/toolbar.c:457
-msgid "Attach"
+#: src/prefs_compose_writing.c:191
+msgid "When dropping files into the Compose window"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:226
-msgid "Use format when composing new messages"
+#: src/prefs_compose_writing.c:199
+msgid "Ask"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:228
-msgid "New message format"
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476
+msgid "Insert"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
-msgid " Description of symbols... "
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478
+msgid "Attach"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1172
-#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
-#: src/toolbar.c:1560
-msgid "Compose"
+#: src/prefs_compose_writing.c:218
+msgid "Quotation characters"
+msgstr ""
+
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_compose_writing.c:403
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr ""
 
 msgid "Writing"
 msgstr ""
 


@@ -8112,8 +9037,8 @@ msgstr ""
 msgid "From file..."
 msgstr ""
 
 msgid "From file..."
 msgstr ""
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1312 src/prefs_matcher.c:1322
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr ""
 
 msgid "Header name is not set."
 msgstr ""
 


@@ -8177,7 +9102,8 @@ msgstr ""
 msgid "Displayed header configuration"
 msgstr ""
 
 msgid "Displayed header configuration"
 msgstr ""
 

-#: src/prefs_display_header.c:251 src/prefs_matcher.c:491
+#: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr ""
 
 msgid "Header name"
 msgstr ""
 


@@ -8193,7 +9119,7 @@ msgstr ""
 msgid "Show all unspecified headers"
 msgstr ""
 
 msgid "Show all unspecified headers"
 msgstr ""
 

-#: src/prefs_display_header.c:575
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr ""
 
 msgid "This header is already in the list."
 msgstr ""
 


@@ -8206,190 +9132,187 @@ msgstr ""
 msgid "Web browser"
 msgstr ""
 
 msgid "Web browser"
 msgstr ""
 

-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:151

 msgid "Text editor"
 msgstr ""
 
 msgid "Text editor"
 msgstr ""
 

-#: src/prefs_ext_prog.c:173
+#: src/prefs_ext_prog.c:179

 msgid "Command for 'Display as text'"
 msgstr ""
 
 msgid "Command for 'Display as text'"
 msgstr ""
 

-#: src/prefs_ext_prog.c:185
+#: src/prefs_ext_prog.c:191

 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"
 msgstr ""
 
 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"
 msgstr ""
 

-#: src/prefs_ext_prog.c:196
+#: src/prefs_ext_prog.c:202

 msgid "Print command"
 msgstr ""
 
 msgid "Print command"
 msgstr ""
 

-#: src/prefs_ext_prog.c:252 src/prefs_image_viewer.c:128
-#: src/prefs_message.c:308
+#: src/prefs_ext_prog.c:258 src/prefs_image_viewer.c:128
+#: src/prefs_message.c:293

 msgid "Message View"
 msgstr ""
 
 msgid "Message View"
 msgstr ""
 

-#: src/prefs_ext_prog.c:253
+#: src/prefs_ext_prog.c:259

 msgid "External Programs"
 msgstr ""
 
 msgid "External Programs"
 msgstr ""
 

-#: src/prefs_filtering_action.c:150
+#: src/prefs_filtering_action.c:159

 msgid "Move"
 msgstr ""
 
 msgid "Move"
 msgstr ""
 

-#: src/prefs_filtering_action.c:151
+#: src/prefs_filtering_action.c:160

 msgid "Copy"
 msgstr ""
 
 msgid "Copy"
 msgstr ""
 

-#: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
-#: src/summaryview.c:2366
+#: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr ""
 
 msgid "Mark"
 msgstr ""
 

-#: src/prefs_filtering_action.c:155
+#: src/prefs_filtering_action.c:164

 msgid "Lock"
 msgstr ""
 
 msgid "Lock"
 msgstr ""
 

-#: src/prefs_filtering_action.c:156
+#: src/prefs_filtering_action.c:165

 msgid "Unlock"
 msgstr ""
 
 msgid "Unlock"
 msgstr ""
 

-#: src/prefs_filtering_action.c:157
+#: src/prefs_filtering_action.c:166

 msgid "Mark as read"
 msgstr ""
 
 msgid "Mark as read"
 msgstr ""
 

-#: src/prefs_filtering_action.c:158
+#: src/prefs_filtering_action.c:167

 msgid "Mark as unread"
 msgstr ""
 
 msgid "Mark as unread"
 msgstr ""
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499
+#: src/prefs_filtering_action.c:168
+msgid "Mark as spam"
+msgstr ""
+
+#: src/prefs_filtering_action.c:169
+msgid "Mark as ham"
+msgstr ""
+
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 

-#: src/prefs_filtering_action.c:161
+#: src/prefs_filtering_action.c:172

 msgid "Redirect"
 msgstr ""
 
 msgid "Redirect"
 msgstr ""
 

-#: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
-#: src/toolbar.c:178 src/toolbar.c:1711
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr ""
 
 msgid "Execute"
 msgstr ""
 

-#: src/prefs_filtering_action.c:163 src/prefs_filtering_action.c:434
+#: src/prefs_filtering_action.c:174 src/prefs_filtering_action.c:473

 msgid "Color"
 msgstr "Colour"
 
 msgid "Color"
 msgstr "Colour"
 

-#: src/prefs_filtering_action.c:164
+#: src/prefs_filtering_action.c:175

 msgid "Change score"
 msgstr ""
 
 msgid "Change score"
 msgstr ""
 

-#: src/prefs_filtering_action.c:165
+#: src/prefs_filtering_action.c:176

 msgid "Set score"
 msgstr ""
 
 msgid "Set score"
 msgstr ""
 

-#: src/prefs_filtering_action.c:166
+#: src/prefs_filtering_action.c:177

 msgid "Hide"
 msgstr ""
 
 msgid "Hide"
 msgstr ""
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:181
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr ""
 
 msgid "Ignore thread"
 msgstr ""
 

-#: src/prefs_filtering_action.c:168
+#: src/prefs_filtering_action.c:180

 msgid "Stop filter"
 msgstr ""
 
 msgid "Stop filter"
 msgstr ""
 

-#: src/prefs_filtering_action.c:317
+#: src/prefs_filtering_action.c:338

 msgid "Filtering action configuration"
 msgstr ""
 
 msgid "Filtering action configuration"
 msgstr ""
 

-#: src/prefs_filtering_action.c:342 src/prefs_filtering.c:413
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 

-#: src/prefs_filtering_action.c:419
+#: src/prefs_filtering_action.c:458

 msgid "Destination"
 msgstr ""
 
 msgid "Destination"
 msgstr ""
 

-#: src/prefs_filtering_action.c:424
+#: src/prefs_filtering_action.c:463

 msgid "Recipient"
 msgstr ""
 
 msgid "Recipient"
 msgstr ""
 

-#: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
-#: src/summaryview.c:492
+#: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
+#: src/summaryview.c:503

 msgid "Score"
 msgstr ""
 
 msgid "Score"
 msgstr ""
 

-#: src/prefs_filtering_action.c:454
-msgid "Select ..."
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577
+msgid "Book/folder"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_filtering_action.c:796
+#: src/prefs_filtering_action.c:859

 msgid "Command line not set"
 msgstr ""
 
 msgid "Command line not set"
 msgstr ""
 

-#: src/prefs_filtering_action.c:797
+#: src/prefs_filtering_action.c:860

 msgid "Destination is not set."
 msgstr ""
 
 msgid "Destination is not set."
 msgstr ""
 

-#: src/prefs_filtering_action.c:808
+#: src/prefs_filtering_action.c:871

 msgid "Recipient is not set."
 msgstr ""
 
 msgid "Recipient is not set."
 msgstr ""
 

-#: src/prefs_filtering_action.c:823
+#: src/prefs_filtering_action.c:886

 msgid "Score is not set"
 msgstr ""
 
 msgid "Score is not set"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1042
-msgid "No action was defined."
-msgstr ""
-
-#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865
-#: src/quote_fmt.c:62
-msgid "literal %"
-msgstr ""
-
-#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
-msgid "Date"
+#: src/prefs_filtering_action.c:896
+msgid "Header is not set."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1871
-#: src/quote_fmt.c:52
-msgid "Message-ID"
+#: src/prefs_filtering_action.c:903
+msgid "Target addressbook/folder is not set."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1872 src/quote_fmt.c:50
-msgid "Newsgroups"
+#: src/prefs_filtering_action.c:1122
+msgid "No action was defined."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1873 src/quote_fmt.c:51
-msgid "References"
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75
+msgid "literal %"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1874
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr ""
 
 msgid "filename (should not be modified)"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1875
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr ""
 
 msgid "new line"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1876
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr ""
 
 msgid "escape character for quotes"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1877
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr ""
 
 msgid "quote character"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1099
+#: src/prefs_filtering_action.c:1179

 msgid "Filtering Action: 'Execute'"
 msgstr ""
 
 msgid "Filtering Action: 'Execute'"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1100
+#: src/prefs_filtering_action.c:1180

 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"


@@ -8397,56 +9320,56 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
 "The following symbols can be used:"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1408
+#: src/prefs_filtering_action.c:1609

 msgid "Current action list"
 msgstr ""
 
 msgid "Current action list"
 msgstr ""
 

-#: src/prefs_filtering.c:188 src/prefs_filtering.c:339
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr ""
 
 msgid "Filtering/Processing configuration"
 msgstr ""
 

-#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
-#: src/prefs_filtering.c:872
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr ""
 
 msgid "Filtering Account Menu|All"
 msgstr ""
 

-#: src/prefs_filtering.c:391
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr ""
 
 msgid "Condition"
 msgstr ""
 

-#: src/prefs_filtering.c:404 src/prefs_filtering.c:426
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr ""
 
 msgid " Define... "
 msgstr ""
 

-#: src/prefs_filtering.c:928 src/prefs_filtering.c:1014
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr ""
 
 msgid "Condition string is not valid."
 msgstr ""
 

-#: src/prefs_filtering.c:964 src/prefs_filtering.c:1022
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr ""
 
 msgid "Action string is not valid."
 msgstr ""
 

-#: src/prefs_filtering.c:1001
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr ""
 
 msgid "Condition string is empty."
 msgstr ""
 

-#: src/prefs_filtering.c:1007
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr ""
 
 msgid "Action string is empty."
 msgstr ""
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr ""
 
 msgid "Delete rule"
 msgstr ""
 

-#: src/prefs_filtering.c:1092
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr ""
 
 msgid "Do you really want to delete this rule?"
 msgstr ""
 

-#: src/prefs_filtering.c:1469
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr ""
 
 msgid "Enable"
 msgstr ""
 

-#: src/prefs_filtering.c:1501
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr ""
 
 msgid "Rule"
 msgstr ""
 


@@ -8464,107 +9387,95 @@ msgstr ""
 msgid "Hidden columns"
 msgstr ""
 
 msgid "Hidden columns"
 msgstr ""
 

-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
-#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr ""
 
 msgid "Displayed columns"
 msgstr ""
 

-#: src/prefs_folder_column.c:316 src/prefs_msg_colors.c:517
-#: src/prefs_summary_column.c:330 src/prefs_toolbar.c:800
+#: src/prefs_folder_column.c:316 src/prefs_msg_colors.c:497
+#: src/prefs_summary_column.c:330 src/prefs_toolbar.c:803

 msgid " Use default "
 msgstr ""
 
 msgid " Use default "
 msgstr ""
 

-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:648
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676

 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 "to subfolders\".</i>"
 msgstr ""
 
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 "to subfolders\".</i>"
 msgstr ""
 

-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:660
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr ""
 
 msgid "Normal"
 msgstr ""
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr ""
 
 msgid "Outbox"
 msgstr ""
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr ""
 
 msgid "Folder type"
 msgstr ""
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr ""
 
 msgid "Simplify Subject RegExp"
 msgstr ""
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr ""
 
 msgid "Test RegExp"
 msgstr ""
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr ""
 
 msgid "Folder chmod"
 msgstr ""
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Folder colour"
 
 msgid "Folder color"
 msgstr "Folder colour"
 

-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1047
-#: src/prefs_msg_colors.c:648
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 

-#: src/prefs_folder_item.c:384
-msgid "Process at startup"
+#: src/prefs_folder_item.c:411
+msgid "Process at start-up"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr ""
 
 msgid "Scan for new mail"
 msgstr ""
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr ""
 
 msgid "Synchronise for offline use"
 msgstr ""
 

-#: src/prefs_folder_item.c:669
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr ""
 
 msgid "Request Return Receipt"
 msgstr ""
 

-#: src/prefs_folder_item.c:684
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 

-#: src/prefs_folder_item.c:697
-msgid "Default To: "
-msgstr ""
-
-#: src/prefs_folder_item.c:718
-msgid "Default To for replies: "
-msgstr ""
-
-#: src/prefs_folder_item.c:739
-msgid "Default account: "
+#: src/prefs_folder_item.c:725
+msgid "Default To:"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_folder_item.c:790
-msgid "Default dictionary: "
+#: src/prefs_folder_item.c:746
+msgid "Default To: for replies"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_folder_item.c:823
-msgid "Default alternate dictionary: "
-msgstr ""
-
-#: src/prefs_folder_item.c:1155
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr ""
 
 msgid "General"
 msgstr ""
 

-#: src/prefs_folder_item.c:1200
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr ""
 #, c-format
 msgid "Properties for folder %s"
 msgstr ""


@@ -8585,8 +9496,8 @@ msgstr ""
 msgid "Message Printing"
 msgstr ""
 
 msgid "Message Printing"
 msgstr ""
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078
-#: src/prefs_themes.c:360
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657
+#: src/prefs_themes.c:361

 msgid "Display"
 msgstr ""
 
 msgid "Display"
 msgstr ""
 


@@ -8594,7 +9505,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
 msgid "Fonts"
 msgstr ""
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 


@@ -8618,184 +9529,256 @@ msgstr ""
 msgid "Image Viewer"
 msgstr ""
 
 msgid "Image Viewer"
 msgstr ""
 

-#: src/prefs_matcher.c:158
-msgid "All messages"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_matcher.c:159
-msgid "To or Cc"
+#: src/prefs_logging.c:133 src/prefs_logging.c:251
+msgid "0 to stop logging in the log window"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_matcher.c:160
-msgid "In reply to"
+#: src/prefs_logging.c:136 src/prefs_logging.c:254
+msgid "lines"
+msgstr ""
+
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr ""
+
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr ""
+
+#: src/prefs_logging.c:156
+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."
+msgstr ""
+
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."
+msgstr ""
+
+#: src/prefs_logging.c:167
+msgid "filtering at incorporation"
+msgstr ""
+
+#: src/prefs_logging.c:173
+msgid "manually filtering"
+msgstr ""
+
+#: src/prefs_logging.c:179
+msgid "processing folders"
+msgstr ""
+
+#: src/prefs_logging.c:185
+msgid "pre-processing folders"
+msgstr ""
+
+#: src/prefs_logging.c:191
+msgid "post-processing folders"
+msgstr ""
+
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr ""
+
+#: src/prefs_logging.c:210
+msgid "Low"
+msgstr ""
+
+#: src/prefs_logging.c:211
+msgid "Medium"
+msgstr ""
+
+#: src/prefs_logging.c:212
+msgid "High"
+msgstr ""
+
+#: src/prefs_logging.c:220
+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"
+"Caution: the higher the level, the greater the impact on performance."
+msgstr ""
+
+#: src/prefs_logging.c:365
+msgid "Logging"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_matcher.c:161
+#: src/prefs_matcher.c:168
+msgid "All messages"
+msgstr ""
+
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr ""
 
 msgid "Age greater than"
 msgstr ""
 

-#: src/prefs_matcher.c:161
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr ""
 
 msgid "Age lower than"
 msgstr ""
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr ""
 
 msgid "Headers part"
 msgstr ""
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr ""
 
 msgid "Body part"
 msgstr ""
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr ""
 
 msgid "Whole message"
 msgstr ""
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr ""
 
 msgid "Unread flag"
 msgstr ""
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr ""
 
 msgid "New flag"
 msgstr ""
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr ""
 
 msgid "Marked flag"
 msgstr ""
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr ""
 
 msgid "Deleted flag"
 msgstr ""
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr ""
 
 msgid "Replied flag"
 msgstr ""
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr ""
 
 msgid "Forwarded flag"
 msgstr ""
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr ""
 
 msgid "Locked flag"
 msgstr ""
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:190
+msgid "Spam flag"
+msgstr ""
+
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Colour label"
 
 msgid "Color label"
 msgstr "Colour label"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr ""
 
 msgid "Ignored thread"
 msgstr ""
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr ""
 
 msgid "Score greater than"
 msgstr ""
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr ""
 
 msgid "Score lower than"
 msgstr ""
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr ""
 
 msgid "Score equal to"
 msgstr ""
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr ""
 
 msgid "Test"
 msgstr ""
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr ""
 
 msgid "Size greater than"
 msgstr ""
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr ""
 
 msgid "Size smaller than"
 msgstr ""
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr ""
 
 msgid "Size exactly"
 msgstr ""
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr ""
 
 msgid "Partially downloaded"
 msgstr ""
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr ""
 
 msgid "Found in addressbook"
 msgstr ""
 

-#: src/prefs_matcher.c:194
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr ""
 
 msgid "or"
 msgstr ""
 

-#: src/prefs_matcher.c:194
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 

-#: src/prefs_matcher.c:211
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr ""
 
 msgid "contains"
 msgstr ""
 

-#: src/prefs_matcher.c:211
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr ""
 
 msgid "does not contain"
 msgstr ""
 

-#: src/prefs_matcher.c:235
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

-#: src/prefs_matcher.c:235
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr ""
 
 msgid "no"
 msgstr ""
 

-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr ""
 
 msgid "Condition configuration"
 msgstr ""
 

-#: src/prefs_matcher.c:459
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr ""
 
 msgid "Match type"
 msgstr ""
 

-#: src/prefs_matcher.c:512
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr ""
 
 msgid "Address header"
 msgstr ""
 

-#: src/prefs_matcher.c:544
-msgid "Book/folder"
-msgstr ""
-
-#: src/prefs_matcher.c:578
-msgid " Select... "
-msgstr ""
-
-#: src/prefs_matcher.c:599
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr ""
 
 msgid "Predicate"
 msgstr ""
 

-#: src/prefs_matcher.c:650
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr ""
 
 msgid "Use regexp"
 msgstr ""
 

-#: src/prefs_matcher.c:688
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr ""
 
 msgid "Boolean Op"
 msgstr ""
 

-#: src/prefs_matcher.c:1294
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr ""
 
 msgid "Value is not set."
 msgstr ""
 

-#: src/prefs_matcher.c:1330
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr ""
 
 msgid "all addresses in all headers"
 msgstr ""
 

-#: src/prefs_matcher.c:1333
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr ""
 
 msgid "any address in any header"
 msgstr ""
 

-#: src/prefs_matcher.c:1335
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr ""
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr ""
 

-#: src/prefs_matcher.c:1336
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -8804,17 +9787,17 @@ msgid ""
 "'Any' from the book/folder drop-down list."
 msgstr ""
 
 "'Any' from the book/folder drop-down list."
 msgstr ""
 

-#: src/prefs_matcher.c:1823
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 

-#: src/prefs_matcher.c:1885
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr ""
 
 msgid "Match Type: 'Test'"
 msgstr ""
 

-#: src/prefs_matcher.c:1886
+#: src/prefs_matcher.c:1929

 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"
 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"


@@ -8822,7 +9805,7 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
 "The following symbols can be used:"
 msgstr ""
 

-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr ""
 
 msgid "Current condition rules"
 msgstr ""
 


@@ -8830,63 +9813,63 @@ msgstr ""
 msgid "Headers"
 msgstr ""
 
 msgid "Headers"
 msgstr ""
 

-#: src/prefs_message.c:116
+#: src/prefs_message.c:111

 msgid "Display header pane above message view"
 msgstr ""
 
 msgid "Display header pane above message view"
 msgstr ""
 

-#: src/prefs_message.c:120
+#: src/prefs_message.c:115

 msgid "Display (X-)Face in message view"
 msgstr ""
 
 msgid "Display (X-)Face in message view"
 msgstr ""
 

-#: src/prefs_message.c:123
+#: src/prefs_message.c:118

 msgid "Display Face in message view"
 msgstr ""
 
 msgid "Display Face in message view"
 msgstr ""
 

-#: src/prefs_message.c:137
+#: src/prefs_message.c:132

 msgid "Display headers in message view"
 msgstr ""
 
 msgid "Display headers in message view"
 msgstr ""
 

-#: src/prefs_message.c:149
+#: src/prefs_message.c:144

 msgid "HTML messages"
 msgstr ""
 
 msgid "HTML messages"
 msgstr ""
 

-#: src/prefs_message.c:157
+#: src/prefs_message.c:147

 msgid "Render HTML messages as text"
 msgstr ""
 
 msgid "Render HTML messages as text"
 msgstr ""
 

-#: src/prefs_message.c:160
+#: src/prefs_message.c:150

 msgid "Render HTML-only messages with plugin if possible"
 msgstr ""
 
 msgid "Render HTML-only messages with plugin if possible"
 msgstr ""
 

-#: src/prefs_message.c:170
+#: src/prefs_message.c:160

 msgid "Line space"
 msgstr ""
 
 msgid "Line space"
 msgstr ""
 

-#: src/prefs_message.c:184 src/prefs_message.c:222
+#: src/prefs_message.c:174 src/prefs_message.c:207

 msgid "pixel(s)"
 msgstr ""
 
 msgid "pixel(s)"
 msgstr ""
 

-#: src/prefs_message.c:189
+#: src/prefs_message.c:179

 msgid "Scroll"
 msgstr ""
 
 msgid "Scroll"
 msgstr ""
 

-#: src/prefs_message.c:196
+#: src/prefs_message.c:181

 msgid "Half page"
 msgstr ""
 
 msgid "Half page"
 msgstr ""
 

-#: src/prefs_message.c:202
+#: src/prefs_message.c:187

 msgid "Smooth scroll"
 msgstr ""
 
 msgid "Smooth scroll"
 msgstr ""
 

-#: src/prefs_message.c:208
+#: src/prefs_message.c:193

 msgid "Step"
 msgstr ""
 
 msgid "Step"
 msgstr ""
 

-#: src/prefs_message.c:229
+#: src/prefs_message.c:214

 msgid "Show attachment descriptions (rather than names)"
 msgstr ""
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr ""
 

-#: src/prefs_message.c:309
+#: src/prefs_message.c:294

 msgid "Text Options"
 msgstr ""
 
 msgid "Text Options"
 msgstr ""
 


@@ -8894,93 +9877,93 @@ msgstr ""
 msgid "Message view"
 msgstr ""
 
 msgid "Message view"
 msgstr ""
 

-#: src/prefs_msg_colors.c:164
+#: src/prefs_msg_colors.c:158

 msgid "Enable coloration of message text"
 msgstr "Enable colouration of message text"
 
 msgid "Enable coloration of message text"
 msgstr "Enable colouration of message text"
 

-#: src/prefs_msg_colors.c:166
+#: src/prefs_msg_colors.c:160

 msgid "Quote"
 msgstr ""
 
 msgid "Quote"
 msgstr ""
 

-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:171

 msgid "Cycle quote colors"
 msgstr "Cycle quote colours"
 
 msgid "Cycle quote colors"
 msgstr "Cycle quote colours"
 

-#: src/prefs_msg_colors.c:186
+#: src/prefs_msg_colors.c:175

 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "If there are more than 3 quote levels, the colours will be reused"
 
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "If there are more than 3 quote levels, the colours will be reused"
 

-#: src/prefs_msg_colors.c:193
+#: src/prefs_msg_colors.c:182

 msgid "1st Level"
 msgstr ""
 
 msgid "1st Level"
 msgstr ""
 

-#: src/prefs_msg_colors.c:199 src/prefs_msg_colors.c:225
-#: src/prefs_msg_colors.c:251
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:240

 msgid "Text"
 msgstr ""
 
 msgid "Text"
 msgstr ""
 

-#: src/prefs_msg_colors.c:213
-msgid "Pick color for 1st level text"
+#: src/prefs_msg_colors.c:202
+msgid "Tooltip|Pick color for 1st level text"

 msgstr "Pick colour for 1st level text"
 
 msgstr "Pick colour for 1st level text"
 

-#: src/prefs_msg_colors.c:219
+#: src/prefs_msg_colors.c:208

 msgid "2nd Level"
 msgstr ""
 
 msgid "2nd Level"
 msgstr ""
 

-#: src/prefs_msg_colors.c:239
-msgid "Pick color for 2nd level text"
+#: src/prefs_msg_colors.c:228
+msgid "Tooltip|Pick color for 2nd level text"

 msgstr "Pick colour for 2nd level text"
 
 msgstr "Pick colour for 2nd level text"
 

-#: src/prefs_msg_colors.c:245
+#: src/prefs_msg_colors.c:234

 msgid "3rd Level"
 msgstr ""
 
 msgid "3rd Level"
 msgstr ""
 

-#: src/prefs_msg_colors.c:265
-msgid "Pick color for 3rd level text"
+#: src/prefs_msg_colors.c:254
+msgid "Tooltip|Pick color for 3rd level text"

 msgstr "Pick colour for 3rd level text"
 
 msgstr "Pick colour for 3rd level text"
 

-#: src/prefs_msg_colors.c:272
+#: src/prefs_msg_colors.c:261

 msgid "Enable coloration of text background"
 msgstr "Enable colouration of text background"
 
 msgid "Enable coloration of text background"
 msgstr "Enable colouration of text background"
 

-#: src/prefs_msg_colors.c:288
-msgid "Pick color for 1st level text background"
+#: src/prefs_msg_colors.c:277
+msgid "Tooltip|Pick color for 1st level text background"

 msgstr "Pick colour for 1st level text background"
 
 msgstr "Pick colour for 1st level text background"
 

-#: src/prefs_msg_colors.c:290 src/prefs_msg_colors.c:311
-#: src/prefs_msg_colors.c:332
+#: src/prefs_msg_colors.c:279 src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:321

 msgid "Background"
 msgstr ""
 
 msgid "Background"
 msgstr ""
 

-#: src/prefs_msg_colors.c:309
-msgid "Pick color for 2nd level text background"
+#: src/prefs_msg_colors.c:298
+msgid "Tooltip|Pick color for 2nd level text background"

 msgstr "Pick colour for 2nd level text background"
 
 msgstr "Pick colour for 2nd level text background"
 

-#: src/prefs_msg_colors.c:330
-msgid "Pick color for 3rd level text background"
+#: src/prefs_msg_colors.c:319
+msgid "Tooltip|Pick color for 3rd level text background"

 msgstr "Pick colour for 3rd level text background"
 
 msgstr "Pick colour for 3rd level text background"
 

-#: src/prefs_msg_colors.c:350
-msgid "Pick color for links"
+#: src/prefs_msg_colors.c:339
+msgid "Tooltip|Pick color for links"

 msgstr "Pick colour for links"
 
 msgstr "Pick colour for links"
 

-#: src/prefs_msg_colors.c:352
+#: src/prefs_msg_colors.c:341

 msgid "URI link"
 msgstr ""
 
 msgid "URI link"
 msgstr ""
 

-#: src/prefs_msg_colors.c:369
-msgid "Pick color for signatures"
+#: src/prefs_msg_colors.c:358
+msgid "Tooltip|Pick color for signatures"

 msgstr "Pick colour for signatures"
 
 msgstr "Pick colour for signatures"
 

-#: src/prefs_msg_colors.c:371
+#: src/prefs_msg_colors.c:360

 msgid "Signatures"
 msgstr ""
 
 msgid "Signatures"
 msgstr ""
 

-#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr ""
 
 msgid "Folder list"
 msgstr ""
 

-#: src/prefs_msg_colors.c:394
+#: src/prefs_msg_colors.c:378

 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"


@@ -8988,403 +9971,404 @@ msgstr ""
 "Pick colour for Target folder. Target folder is used when the option "
 "'Execute immediately when moving or deleting messages' is turned off"
 
 "Pick colour for Target folder. Target folder is used when the option "
 "'Execute immediately when moving or deleting messages' is turned off"
 

-#: src/prefs_msg_colors.c:398
+#: src/prefs_msg_colors.c:382

 msgid "Target folder"
 msgstr ""
 
 msgid "Target folder"
 msgstr ""
 

-#: src/prefs_msg_colors.c:413
+#: src/prefs_msg_colors.c:397

 msgid "Pick color for folders containing new messages"
 msgstr "Pick colour for folders containing new messages"
 
 msgid "Pick color for folders containing new messages"
 msgstr "Pick colour for folders containing new messages"
 

-#: src/prefs_msg_colors.c:415
+#: src/prefs_msg_colors.c:399

 msgid "Folder containing new messages"
 msgstr ""
 
 msgid "Folder containing new messages"
 msgstr ""
 

-#: src/prefs_msg_colors.c:420
+#: src/prefs_msg_colors.c:405

 msgid "Color labels"
 msgstr "Colour labels"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 msgid "Color labels"
 msgstr "Colour labels"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
+#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:460

 #, c-format
 msgid "Tooltip|Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #, c-format
 msgid "Tooltip|Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:452 src/prefs_msg_colors.c:484
+#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:464

 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:592

 #, c-format
 msgid "Dialog title|Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
 #, c-format
 msgid "Dialog title|Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 

-#: src/prefs_msg_colors.c:621
-msgid "Pick color for 1st level text "
-msgstr "Pick colour for 1st level text "
+#: src/prefs_msg_colors.c:600
+msgid "Dialog title|Pick color for 1st level text"
+msgstr "Pick colour for 1st level text"

 
 

-#: src/prefs_msg_colors.c:624
-msgid "Pick color for 2nd level text "
-msgstr "Pick colour for 2nd level text "
+#: src/prefs_msg_colors.c:603
+msgid "Dialog title|Pick color for 2nd level text"
+msgstr "Pick colour for 2nd level text"

 
 

-#: src/prefs_msg_colors.c:627
-msgid "Pick color for 3rd level text "
-msgstr "Pick colour for 3rd level text "
+#: src/prefs_msg_colors.c:606
+msgid "Dialog title|Pick color for 3rd level text"
+msgstr "Pick colour for 3rd level text"

 
 

-#: src/prefs_msg_colors.c:630
-msgid "Pick color for 1st level text background "
-msgstr "Pick colour for 1st level text background "
+#: src/prefs_msg_colors.c:609
+msgid "Dialog title|Pick color for 1st level text background"
+msgstr "Pick colour for 1st level text background"

 
 

-#: src/prefs_msg_colors.c:633
-msgid "Pick color for 2nd level text background "
-msgstr "Pick colour for 2nd level text background "
+#: src/prefs_msg_colors.c:612
+msgid "Dialog title|Pick color for 2nd level text background"
+msgstr "Pick colour for 2nd level text background"

 
 

-#: src/prefs_msg_colors.c:636
-msgid "Pick color for 3rd level text background "
-msgstr "Pick colour for 3rd level text background "
+#: src/prefs_msg_colors.c:615
+msgid "Dialog title|Pick color for 3rd level text background"
+msgstr "Pick colour for 3rd level text background"

 
 

-#: src/prefs_msg_colors.c:639
-msgid "Pick color for links "
-msgstr "Pick colour for links "
+#: src/prefs_msg_colors.c:618
+msgid "Dialog title|Pick color for links"
+msgstr "Pick colour for links"

 
 

-#: src/prefs_msg_colors.c:642
-msgid "Pick color for target folder"
+#: src/prefs_msg_colors.c:621
+msgid "Dialog title|Pick color for target folder"

 msgstr "Pick colour for target folder"
 
 msgstr "Pick colour for target folder"
 

-#: src/prefs_msg_colors.c:645
-msgid "Pick color for signatures "
-msgstr "Pick colour for signatures "
+#: src/prefs_msg_colors.c:624
+msgid "Dialog title|Pick color for signatures"
+msgstr "Pick colour for signatures"
+
+#: src/prefs_msg_colors.c:627
+msgid "Dialog title|Pick color for folder"
+msgstr "Pick colour for folder"

 
 

-#: src/prefs_msg_colors.c:856
+#: src/prefs_msg_colors.c:835

 msgid "Colors"
 msgstr "Colours"
 
 msgid "Colors"
 msgstr "Colours"
 

-#: src/prefs_other.c:110
-msgid "Add address to destination when double-clicked"
-msgstr ""
-
-#: src/prefs_other.c:113
-msgid "Log Size"
+#: src/prefs_other.c:91
+msgid "Select key bindings"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:120
-msgid "Clip the log size"
+#: src/prefs_other.c:105
+msgid "Select preset:"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:125
-msgid "Log window length"
+#: src/prefs_other.c:115 src/prefs_other.c:462
+msgid "Old Sylpheed"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:142
-msgid "0 to stop logging in the log window"
+#: src/prefs_other.c:123
+msgid ""
+"You can also modify each menu shortcut by pressing\n"
+"any key(s) when focusing the mouse pointer on the item."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:145
-msgid "lines"
+#: src/prefs_other.c:517
+msgid "Add address to destination when double-clicked"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:154
+#: src/prefs_other.c:520

 msgid "On exit"
 msgstr ""
 
 msgid "On exit"
 msgstr ""
 

-#: src/prefs_other.c:162
+#: src/prefs_other.c:523

 msgid "Confirm on exit"
 msgstr ""
 
 msgid "Confirm on exit"
 msgstr ""
 

-#: src/prefs_other.c:169
+#: src/prefs_other.c:530

 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 

-#: src/prefs_other.c:171
-msgid "Ask before emptying"
-msgstr ""
-
-#: src/prefs_other.c:175
+#: src/prefs_other.c:533

 msgid "Warn if there are queued messages"
 msgstr ""
 
 msgid "Warn if there are queued messages"
 msgstr ""
 

-#: src/prefs_other.c:181
-msgid "Socket I/O timeout"
+#: src/prefs_other.c:535
+msgid "Keyboard shortcuts"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_other.c:632
-msgid "Ask before emptying trash"
-msgstr "Ask before emptying wastebin"
-
-#: src/prefs_other.c:634
-msgid "Ask about account specific filtering rules when filtering manually"
+#: src/prefs_other.c:538
+msgid "Enable customisable menu shortcuts"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
+#: src/prefs_other.c:542
+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"
+"Uncheck this option if you want to lock all existing menu shortcuts."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:94
-msgid "Reply format"
+#: src/prefs_other.c:549
+msgid " Set key bindings... "

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
+#: src/prefs_other.c:562
+msgid "Socket I/O timeout"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr ""
+#: src/prefs_other.c:584
+msgid "Ask before emptying trash"
+msgstr "Ask before emptying wastebin"

 
 

-#: src/prefs_quote.c:215
-msgid "Quotation characters"
+#: src/prefs_other.c:586
+msgid "Ask about account specific filtering rules when filtering manually"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
+#: src/prefs_other.c:589
+msgid "Synchronise offline folders as soon as possible"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_quote.c:312
-msgid "Quoting"
+#: src/prefs_quote.c:78
+msgid "New message format"

 msgstr ""
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 msgstr ""
 
 msgstr ""
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 msgstr ""
 

-#: src/prefs_receive.c:128
+#: src/prefs_receive.c:124

 msgid "Use external program for receiving mail"
 msgstr ""
 
 msgid "Use external program for receiving mail"
 msgstr ""
 

-#: src/prefs_receive.c:135
+#: src/prefs_receive.c:131

 msgid "Command"
 msgstr ""
 
 msgid "Command"
 msgstr ""
 

-#: src/prefs_receive.c:144
+#: src/prefs_receive.c:140

 msgid "Automatic checking"
 msgstr ""
 
 msgid "Automatic checking"
 msgstr ""
 

-#: src/prefs_receive.c:155
+#: src/prefs_receive.c:147

 msgid "Automatically check for new mail every"
 msgstr ""
 
 msgid "Automatically check for new mail every"
 msgstr ""
 

-#: src/prefs_receive.c:173
-msgid "Check for new mail on startup"
+#: src/prefs_receive.c:165
+msgid "Check for new mail on start-up"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_receive.c:176
+#: src/prefs_receive.c:168

 msgid "Dialogs"
 msgstr "Dialogues"
 
 msgid "Dialogs"
 msgstr "Dialogues"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:170

 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 
 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 

-#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 

-#: src/prefs_receive.c:191
+#: src/prefs_receive.c:179

 msgid "Only on manual receiving"
 msgstr ""
 
 msgid "Only on manual receiving"
 msgstr ""
 

-#: src/prefs_receive.c:205
+#: src/prefs_receive.c:193

 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 
 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 

-#: src/prefs_receive.c:208
+#: src/prefs_receive.c:196

 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 

-#: src/prefs_receive.c:210
+#: src/prefs_receive.c:198

 msgid "After receiving new mail"
 msgstr ""
 
 msgid "After receiving new mail"
 msgstr ""
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:200

 msgid "Go to inbox"
 msgstr ""
 
 msgid "Go to inbox"
 msgstr ""
 

-#: src/prefs_receive.c:218
+#: src/prefs_receive.c:202

 msgid "Update all local folders"
 msgstr ""
 
 msgid "Update all local folders"
 msgstr ""
 

-#: src/prefs_receive.c:220
+#: src/prefs_receive.c:204

 msgid "Run command"
 msgstr ""
 
 msgid "Run command"
 msgstr ""
 

-#: src/prefs_receive.c:229
+#: src/prefs_receive.c:209

 msgid "after automatic check"
 msgstr ""
 
 msgid "after automatic check"
 msgstr ""
 

-#: src/prefs_receive.c:231
+#: src/prefs_receive.c:211

 msgid "after manual check"
 msgstr ""
 
 msgid "after manual check"
 msgstr ""
 

-#: src/prefs_receive.c:239
+#: src/prefs_receive.c:219

 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 

-#: src/prefs_receive.c:365 src/prefs_send.c:337
+#: src/prefs_receive.c:345 src/prefs_send.c:347

 msgid "Mail Handling"
 msgstr ""
 
 msgid "Mail Handling"
 msgstr ""
 

-#: src/prefs_receive.c:366
+#: src/prefs_receive.c:346

 msgid "Receiving"
 msgstr ""
 
 msgid "Receiving"
 msgstr ""
 

-#: src/prefs_send.c:142
+#: src/prefs_send.c:144

 msgid "Save sent messages to Sent folder"
 msgstr ""
 
 msgid "Save sent messages to Sent folder"
 msgstr ""
 

-#: src/prefs_send.c:145
+#: src/prefs_send.c:147

 msgid "Confirm before sending queued messages"
 msgstr ""
 
 msgid "Confirm before sending queued messages"
 msgstr ""
 

-#: src/prefs_send.c:153
+#: src/prefs_send.c:150
+msgid "Never send Return Receipts"
+msgstr ""
+
+#: src/prefs_send.c:158

 msgid "Show send dialog"
 msgstr "Show send dialogue"
 
 msgid "Show send dialog"
 msgstr "Show send dialogue"
 

-#: src/prefs_send.c:174
+#: src/prefs_send.c:179

 msgid "Outgoing encoding"
 msgstr ""
 
 msgid "Outgoing encoding"
 msgstr ""
 

-#: src/prefs_send.c:187
+#: src/prefs_send.c:192

 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 

-#: src/prefs_send.c:201
+#: src/prefs_send.c:206

 msgid "Automatic (Recommended)"
 msgstr ""
 
 msgid "Automatic (Recommended)"
 msgstr ""
 

-#: src/prefs_send.c:203
+#: src/prefs_send.c:208

 msgid "7bit ascii (US-ASCII)"
 msgstr ""
 
 msgid "7bit ascii (US-ASCII)"
 msgstr ""
 

-#: src/prefs_send.c:204
+#: src/prefs_send.c:209

 msgid "Unicode (UTF-8)"
 msgstr ""
 
 msgid "Unicode (UTF-8)"
 msgstr ""
 

-#: src/prefs_send.c:206
+#: src/prefs_send.c:211

 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 

-#: src/prefs_send.c:207
+#: src/prefs_send.c:212

 msgid "Western European (ISO-8859-15)"
 msgstr ""
 
 msgid "Western European (ISO-8859-15)"
 msgstr ""
 

-#: src/prefs_send.c:209
+#: src/prefs_send.c:214

 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 

-#: src/prefs_send.c:211
+#: src/prefs_send.c:216

 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 

-#: src/prefs_send.c:212
+#: src/prefs_send.c:217

 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 

-#: src/prefs_send.c:214
+#: src/prefs_send.c:219

 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 

-#: src/prefs_send.c:216
+#: src/prefs_send.c:221

 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 

-#: src/prefs_send.c:217
+#: src/prefs_send.c:222

 msgid "Hebrew (Windows-1255)"
 msgstr ""
 
 msgid "Hebrew (Windows-1255)"
 msgstr ""
 

-#: src/prefs_send.c:219
+#: src/prefs_send.c:224

 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 

-#: src/prefs_send.c:220
+#: src/prefs_send.c:225

 msgid "Arabic (Windows-1256)"
 msgstr ""
 
 msgid "Arabic (Windows-1256)"
 msgstr ""
 

-#: src/prefs_send.c:222
+#: src/prefs_send.c:227

 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 

-#: src/prefs_send.c:224
+#: src/prefs_send.c:229

 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 

-#: src/prefs_send.c:225
+#: src/prefs_send.c:230

 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 
 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 

-#: src/prefs_send.c:226
+#: src/prefs_send.c:231

 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 
 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 

-#: src/prefs_send.c:227
+#: src/prefs_send.c:232

 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 

-#: src/prefs_send.c:229
+#: src/prefs_send.c:234

 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 

-#: src/prefs_send.c:231
+#: src/prefs_send.c:236

 msgid "Japanese (EUC-JP)"
 msgstr ""
 
 msgid "Japanese (EUC-JP)"
 msgstr ""
 

-#: src/prefs_send.c:232
+#: src/prefs_send.c:237

 msgid "Japanese (Shift_JIS)"
 msgstr ""
 
 msgid "Japanese (Shift_JIS)"
 msgstr ""
 

-#: src/prefs_send.c:235
+#: src/prefs_send.c:240

 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 
 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 

-#: src/prefs_send.c:236
+#: src/prefs_send.c:241

 msgid "Simplified Chinese (GBK)"
 msgstr ""
 
 msgid "Simplified Chinese (GBK)"
 msgstr ""
 

-#: src/prefs_send.c:237
+#: src/prefs_send.c:242

 msgid "Traditional Chinese (Big5)"
 msgstr ""
 
 msgid "Traditional Chinese (Big5)"
 msgstr ""
 

-#: src/prefs_send.c:239
+#: src/prefs_send.c:244

 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 

-#: src/prefs_send.c:240
+#: src/prefs_send.c:245

 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 

-#: src/prefs_send.c:243
+#: src/prefs_send.c:248

 msgid "Korean (EUC-KR)"
 msgstr ""
 
 msgid "Korean (EUC-KR)"
 msgstr ""
 

-#: src/prefs_send.c:245
+#: src/prefs_send.c:250

 msgid "Thai (TIS-620)"
 msgstr ""
 
 msgid "Thai (TIS-620)"
 msgstr ""
 

-#: src/prefs_send.c:246
+#: src/prefs_send.c:251

 msgid "Thai (Windows-874)"
 msgstr ""
 
 msgid "Thai (Windows-874)"
 msgstr ""
 

-#: src/prefs_send.c:251
+#: src/prefs_send.c:256

 msgid "Transfer encoding"
 msgstr ""
 
 msgid "Transfer encoding"
 msgstr ""
 

-#: src/prefs_send.c:264
+#: src/prefs_send.c:269

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 

-#: src/prefs_send.c:338 src/send_message.c:477 src/send_message.c:481
+#: src/prefs_send.c:348 src/send_message.c:477 src/send_message.c:481

 #: src/send_message.c:486
 msgid "Sending"
 msgstr ""
 #: src/send_message.c:486
 msgid "Sending"
 msgstr ""


@@ -9414,269 +10398,229 @@ msgid "Path to dictionaries"
 msgstr ""
 
 #: src/prefs_spelling.c:211
 msgstr ""
 
 #: src/prefs_spelling.c:211

-msgid "Automatic spelling"
+msgid "Automatic spell checking"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_spelling.c:223
+#: src/prefs_spelling.c:219

 msgid "Re-check message when changing dictionary"
 msgstr ""
 
 msgid "Re-check message when changing dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:227
+#: src/prefs_spelling.c:223

 msgid "Dictionary"
 msgstr ""
 
 msgid "Dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:240
-msgid "Default dictionary"
-msgstr ""
-
-#: src/prefs_spelling.c:258
-msgid "Default alternate dictionary"
-msgstr ""
-
-#: src/prefs_spelling.c:277
+#: src/prefs_spelling.c:270

 msgid "Check with both dictionaries"
 msgstr ""
 
 msgid "Check with both dictionaries"
 msgstr ""
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:276

 msgid "Default suggestion mode"
 msgstr ""
 
 msgid "Default suggestion mode"
 msgstr ""
 

-#: src/prefs_spelling.c:305
+#: src/prefs_spelling.c:298

 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 
 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 

-#: src/prefs_spelling.c:319
+#: src/prefs_spelling.c:312

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 

-#: src/prefs_spelling.c:449
+#: src/prefs_spelling.c:442

 msgid "Spell Checking"
 msgstr ""
 
 msgid "Spell Checking"
 msgstr ""
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr ""
 
 msgid "the full abbreviated weekday name"
 msgstr ""
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr ""
 
 msgid "the full weekday name"
 msgstr ""
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr ""
 
 msgid "the abbreviated month name"
 msgstr ""
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr ""
 
 msgid "the full month name"
 msgstr ""
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr ""
 
 msgid "the preferred date and time for the current locale"
 msgstr ""
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr ""
 
 msgid "the century number (year/100)"
 msgstr ""
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr ""
 
 msgid "the day of the month as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr ""
 
 msgid "the day of the year as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr ""
 
 msgid "the month as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr ""
 
 msgid "the minute as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr ""
 
 msgid "either AM or PM"
 msgstr ""
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr ""
 
 msgid "the second as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr ""
 
 msgid "the day of the week as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr ""
 
 msgid "the preferred date for the current locale"
 msgstr ""
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr ""
 
 msgid "the last two digits of a year"
 msgstr ""
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr ""
 
 msgid "the year as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr ""
 
 msgid "the time zone or name or abbreviation"
 msgstr ""
 

-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:911
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr ""
 
 msgid "Date format"
 msgstr ""
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr ""
 
 msgid "Specifier"
 msgstr ""
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr ""
 
 msgid "Example"
 msgstr ""
 

-#: src/prefs_summaries.c:329
-msgid "Select key bindings"
+#: src/prefs_summaries.c:355
+msgid "Display message number next to folder name"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:343
-msgid "Select preset:"
+#: src/prefs_summaries.c:363
+msgid "No"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:353 src/prefs_summaries.c:700
-msgid "Old Sylpheed"
+#: src/prefs_summaries.c:364
+msgid "Unread messages"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:361
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
+#: src/prefs_summaries.c:365
+msgid "Unread and Total messages"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:768
-msgid "Display unread number next to folder name"
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:775
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 

-#: src/prefs_summaries.c:789
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr ""
 
 msgid "letters"
 msgstr ""
 

-#: src/prefs_summaries.c:807
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr ""
 
 msgid "Message list"
 msgstr ""
 

-#: src/prefs_summaries.c:817
-msgid "When entering a folder"
-msgstr ""
-
-#: src/prefs_summaries.c:825
-msgid "Do nothing"
-msgstr ""
-
-#: src/prefs_summaries.c:826
-msgid "Select first unread (or new or marked) message"
-msgstr ""
-
-#: src/prefs_summaries.c:828
-msgid "Select first unread (or marked or new) message"
-msgstr ""
-
-#: src/prefs_summaries.c:830
-msgid "Select first new (or unread or marked) message"
-msgstr ""
-
-#: src/prefs_summaries.c:832
-msgid "Select first new (or marked or unread) message"
-msgstr ""
-
-#: src/prefs_summaries.c:834
-msgid "Select first marked (or new or unread) message"
-msgstr ""
-
-#: src/prefs_summaries.c:836
-msgid "Select first marked (or unread or new) message"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:847
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Show \"no unread (or new) message\" dialogue"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Show \"no unread (or new) message\" dialogue"
 

-#: src/prefs_summaries.c:856
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr ""
 
 msgid "Assume 'Yes'"
 msgstr ""
 

-#: src/prefs_summaries.c:858
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr ""
 
 msgid "Assume 'No'"
 msgstr ""
 

-#: src/prefs_summaries.c:866
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr ""
 
 msgid "Always open message when selected"
 msgstr ""
 

-#: src/prefs_summaries.c:869
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 

-#: src/prefs_summaries.c:875
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 

-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:460

 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr ""
 
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr ""
 

-#: src/prefs_summaries.c:882
-msgid "Only mark message as read when opened in a new window"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:889
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr ""
 
 msgid "Mark messages as read after"
 msgstr ""
 

-#: src/prefs_summaries.c:905
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr ""
 
 msgid "Display sender using address book"
 msgstr ""
 

-#: src/prefs_summaries.c:937
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr ""
 
 msgid "Date format help"
 msgstr ""
 

-#: src/prefs_summaries.c:955
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr ""
 
 msgid "Confirm before marking all mails in a folder as read"
 msgstr ""
 

-#: src/prefs_summaries.c:958
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr ""
 
 msgid "Translate header names"
 msgstr ""
 

-#: src/prefs_summaries.c:960
+#: src/prefs_summaries.c:544

 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
 
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
 

-#: src/prefs_summaries.c:967
-msgid " Set key bindings... "
-msgstr ""
-
-#: src/prefs_summaries.c:1079
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr ""
 
 msgid "Summaries"
 msgstr ""
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2360
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr ""
 
 msgid "Attachment"
 msgstr ""
 


@@ -9694,179 +10638,207 @@ msgid ""
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr ""
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr ""
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr ""
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr ""
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr ""
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr ""
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr ""
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr ""
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr ""
 
 msgid "This name is used as the Menu item"
 msgstr ""
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr ""
 
 msgid " Symbols... "
 msgstr ""
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr ""
 
 msgid "Template configuration"
 msgstr ""
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr ""
 
 msgid "Template name is not set."
 msgstr ""
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr ""
 
 msgid "Delete template"
 msgstr ""
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr ""
 
 msgid "Do you really want to delete this template?"
 msgstr ""
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr ""
 
 msgid "Current templates"
 msgstr ""
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr ""
 
 msgid "Template"
 msgstr ""
 

-#: src/prefs_themes.c:339 src/prefs_themes.c:705
+#: src/prefs_themes.c:340 src/prefs_themes.c:706

 msgid "Default internal theme"
 msgstr ""
 
 msgid "Default internal theme"
 msgstr ""
 

-#: src/prefs_themes.c:361
+#: src/prefs_themes.c:362

 msgid "Themes"
 msgstr ""
 
 msgid "Themes"
 msgstr ""
 

-#: src/prefs_themes.c:448
+#: src/prefs_themes.c:449

 msgid "Only root can remove system themes"
 msgstr ""
 
 msgid "Only root can remove system themes"
 msgstr ""
 

-#: src/prefs_themes.c:451
+#: src/prefs_themes.c:452

 #, c-format
 msgid "Remove system theme '%s'"
 msgstr ""
 
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr ""
 

-#: src/prefs_themes.c:454
+#: src/prefs_themes.c:455

 #, c-format
 msgid "Remove theme '%s'"
 msgstr ""
 
 #, c-format
 msgid "Remove theme '%s'"
 msgstr ""
 

-#: src/prefs_themes.c:460
+#: src/prefs_themes.c:461

 msgid "Are you sure you want to remove this theme?"
 msgstr ""
 
 msgid "Are you sure you want to remove this theme?"
 msgstr ""
 

-#: src/prefs_themes.c:470
+#: src/prefs_themes.c:471

 #, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
 msgstr ""
 
 #, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
 msgstr ""
 

-#: src/prefs_themes.c:474
+#: src/prefs_themes.c:475

 msgid "Removing theme directory failed."
 msgstr ""
 
 msgid "Removing theme directory failed."
 msgstr ""
 

-#: src/prefs_themes.c:477
+#: src/prefs_themes.c:478

 msgid "Theme removed succesfully"
 msgstr ""
 
 msgid "Theme removed succesfully"
 msgstr ""
 

-#: src/prefs_themes.c:497
+#: src/prefs_themes.c:498

 msgid "Select theme folder"
 msgstr ""
 
 msgid "Select theme folder"
 msgstr ""
 

-#: src/prefs_themes.c:512
+#: src/prefs_themes.c:513

 #, c-format
 msgid "Install theme '%s'"
 msgstr ""
 
 #, c-format
 msgid "Install theme '%s'"
 msgstr ""
 

-#: src/prefs_themes.c:515
+#: src/prefs_themes.c:516

 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
 msgstr ""
 
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
 msgstr ""
 

-#: src/prefs_themes.c:522
+#: src/prefs_themes.c:523

 msgid "Do you want to install theme for all users?"
 msgstr ""
 
 msgid "Do you want to install theme for all users?"
 msgstr ""
 

-#: src/prefs_themes.c:543
+#: src/prefs_themes.c:544

 msgid ""
 "A theme with the same name is\n"
 "already installed in this location"
 msgstr ""
 
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location"
 msgstr ""
 

-#: src/prefs_themes.c:547
+#: src/prefs_themes.c:548

 msgid "Couldn't create destination directory"
 msgstr ""
 
 msgid "Couldn't create destination directory"
 msgstr ""
 

-#: src/prefs_themes.c:560
+#: src/prefs_themes.c:561

 msgid "Theme installed succesfully"
 msgstr ""
 
 msgid "Theme installed succesfully"
 msgstr ""
 

-#: src/prefs_themes.c:567
+#: src/prefs_themes.c:568

 msgid "Failed installing theme"
 msgstr ""
 
 msgid "Failed installing theme"
 msgstr ""
 

-#: src/prefs_themes.c:570
+#: src/prefs_themes.c:571

 #, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
 msgstr ""
 
 #, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
 msgstr ""
 

-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:667

 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 

-#: src/prefs_themes.c:708
+#: src/prefs_themes.c:709

 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 

-#: src/prefs_themes.c:714
+#: src/prefs_themes.c:715

 msgid "No info file available for this theme"
 msgstr ""
 
 msgid "No info file available for this theme"
 msgstr ""
 

-#: src/prefs_themes.c:732
+#: src/prefs_themes.c:733

 msgid "Error: couldn't get theme status"
 msgstr ""
 
 msgid "Error: couldn't get theme status"
 msgstr ""
 

-#: src/prefs_themes.c:756
+#: src/prefs_themes.c:757

 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 

-#: src/prefs_themes.c:840
+#: src/prefs_themes.c:841

 msgid "Selector"
 msgstr ""
 
 msgid "Selector"
 msgstr ""
 

-#: src/prefs_themes.c:861
+#: src/prefs_themes.c:857

 msgid "Install new..."
 msgstr ""
 
 msgid "Install new..."
 msgstr ""
 

-#: src/prefs_themes.c:877
+#: src/prefs_themes.c:873

 msgid "Information"
 msgstr ""
 
 msgid "Information"
 msgstr ""
 

-#: src/prefs_themes.c:891
+#: src/prefs_themes.c:887

 msgid "Author: "
 msgstr ""
 
 msgid "Author: "
 msgstr ""
 

-#: src/prefs_themes.c:899
+#: src/prefs_themes.c:895

 msgid "URL:"
 msgstr ""
 
 msgid "URL:"
 msgstr ""
 

-#: src/prefs_themes.c:927
-msgid "Status:"
-msgstr ""
-
-#: src/prefs_themes.c:941
+#: src/prefs_themes.c:937

 msgid "Preview"
 msgstr ""
 
 msgid "Preview"
 msgstr ""
 

-#: src/prefs_themes.c:991
+#: src/prefs_themes.c:987

 msgid "Use this"
 msgstr ""
 
 msgid "Use this"
 msgstr ""
 

-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:992

 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 


@@ -9896,43 +10868,43 @@ msgstr ""
 msgid "Toolbar text"
 msgstr ""
 
 msgid "Toolbar text"
 msgstr ""
 

-#: src/prefs_toolbar.c:702
+#: src/prefs_toolbar.c:705

 msgid "Available toolbar icons"
 msgstr ""
 
 msgid "Available toolbar icons"
 msgstr ""
 

-#: src/prefs_toolbar.c:755
+#: src/prefs_toolbar.c:758

 msgid "Event executed on click"
 msgstr ""
 
 msgid "Event executed on click"
 msgstr ""
 

-#: src/prefs_toolbar.c:807
+#: src/prefs_toolbar.c:816

 msgid "Displayed toolbar items"
 msgstr ""
 
 msgid "Displayed toolbar items"
 msgstr ""
 

-#: src/prefs_toolbar.c:874 src/prefs_toolbar.c:888 src/prefs_toolbar.c:902
+#: src/prefs_toolbar.c:883 src/prefs_toolbar.c:897 src/prefs_toolbar.c:911

 msgid "Customize Toolbars"
 msgstr "Customise Toolbars"
 
 msgid "Customize Toolbars"
 msgstr "Customise Toolbars"
 

-#: src/prefs_toolbar.c:875
+#: src/prefs_toolbar.c:884

 msgid "Main Window"
 msgstr ""
 
 msgid "Main Window"
 msgstr ""
 

-#: src/prefs_toolbar.c:889
+#: src/prefs_toolbar.c:898

 msgid "Message Window"
 msgstr ""
 
 msgid "Message Window"
 msgstr ""
 

-#: src/prefs_toolbar.c:903
+#: src/prefs_toolbar.c:912

 msgid "Compose Window"
 msgstr ""
 
 msgid "Compose Window"
 msgstr ""
 

-#: src/prefs_toolbar.c:1037
+#: src/prefs_toolbar.c:1046

 msgid "Icon"
 msgstr ""
 
 msgid "Icon"
 msgstr ""
 

-#: src/prefs_toolbar.c:1070
+#: src/prefs_toolbar.c:1079

 msgid "Icon text"
 msgstr ""
 
 msgid "Icon text"
 msgstr ""
 

-#: src/prefs_toolbar.c:1079
+#: src/prefs_toolbar.c:1088

 msgid "Mapped event"
 msgstr ""
 
 msgid "Mapped event"
 msgstr ""
 


@@ -9956,221 +10928,288 @@ msgstr ""
 msgid "Wrapping"
 msgstr ""
 
 msgid "Wrapping"
 msgstr ""
 

-#: src/privacy.c:61
-msgid "Unknown error"
-msgstr ""
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr ""
 
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr ""
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr ""
 
 msgid "No recipient keys defined."
 msgstr ""
 

-#: src/procmime.c:340 src/procmime.c:342
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 

-#: src/procmsg.c:918 src/procmsg.c:921
+#: src/procmsg.c:860 src/procmsg.c:863

 msgid "Already trying to send."
 msgstr ""
 
 msgid "Already trying to send."
 msgstr ""
 

-#: src/procmsg.c:1517
+#: src/procmsg.c:1448

 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 

-#: src/procmsg.c:1615
+#: src/procmsg.c:1546

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 

-#: src/procmsg.c:1648
+#: src/procmsg.c:1579

 msgid "Queued message header is broken."
 msgstr ""
 
 msgid "Queued message header is broken."
 msgstr ""
 

-#: src/procmsg.c:1669
+#: src/procmsg.c:1600

 msgid "An error happened during SMTP session."
 msgstr ""
 
 msgid "An error happened during SMTP session."
 msgstr ""
 

-#: src/procmsg.c:1683
+#: src/procmsg.c:1614

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 

-#: src/procmsg.c:1691
+#: src/procmsg.c:1622

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 

-#: src/procmsg.c:1709
+#: src/procmsg.c:1640

 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 

-#: src/procmsg.c:1722
+#: src/procmsg.c:1653

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 

-#: src/procmsg.c:1736
+#: src/procmsg.c:1667

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 

-#: src/procmsg.c:2226
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr ""
 
 msgid "Filtering messages...\n"
 msgstr ""
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr ""
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgstr "customised date format (see 'man strftime')"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "customised date format (see 'man strftime')"
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50
+msgid "email address of sender"
+msgstr ""
+
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr ""
 
 msgid "full name of sender"
 msgstr ""
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr ""
 
 msgid "first name of sender"
 msgstr ""
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr ""
 
 msgid "last name of sender"
 msgstr ""
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr ""
 
 msgid "initials of sender"
 msgstr ""
 

-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr ""
 
 msgid "message body"
 msgstr ""
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr ""
 
 msgid "quoted message body"
 msgstr ""
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr ""
 
 msgid "message body without signature"
 msgstr ""
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgstr ""
 
 msgid "quoted message body without signature"
 msgstr ""
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr ""
+
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr ""
 
 msgid "cursor position"
 msgstr ""
 

-#: src/quote_fmt.c:58
-msgid "Account property: your name"
+#: src/quote_fmt.c:67
+msgid "account property: your name"
+msgstr ""
+
+#: src/quote_fmt.c:68
+msgid "account property: your email address"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:59
-msgid "Account property: your email address"
+#: src/quote_fmt.c:69
+msgid "account property: account name"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:60
-msgid "Account property: account name"
+#: src/quote_fmt.c:70
+msgid "account property: organization"
+msgstr "account property: organisation"
+
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:61
-msgid "Account property: organization"
-msgstr "Account property: organisation"
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr ""

 
 

-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr ""
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr ""
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr ""
 
 msgid "literal backslash"
 msgstr ""
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr ""
 
 msgid "literal question mark"
 msgstr ""
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr ""
 
 msgid "literal exclamation mark"
 msgstr ""
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr ""
 
 msgid "literal pipe"
 msgstr ""
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr ""
 
 msgid "literal opening curly brace"
 msgstr ""
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr ""
 
 msgid "literal closing curly brace"
 msgstr ""
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:82

 msgid "tab"
 msgstr ""
 
 msgid "tab"
 msgstr ""
 

-#: src/quote_fmt.c:70
-msgid "linefeed"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 
 "the output from"
 msgstr ""
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 
 "user-entered text"
 msgstr ""
 

-#: src/quote_fmt.c:78
-msgid "terms definition:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:79
-msgid "text that can contain any of the symbols above"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:94

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"text that can contain any of the symbols (no\n"
+"commands) above"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt.c:88
+#: src/quote_fmt.c:95
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr ""
 
 msgid "Description of symbols"
 msgstr ""
 

-#: src/quote_fmt.c:89
-msgid "The following symbols can be used:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr ""
+
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr ""
+
+#: src/quote_fmt.c:230
+msgid "Reply format"

 msgstr ""
 
 msgstr ""
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr ""
+
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr ""
+
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr ""
+
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr ""
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr ""
+
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr ""
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr ""
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr ""
 
 msgid "Enter variable"
 msgstr ""
 


@@ -10299,449 +11338,466 @@ msgstr ""
 msgid "Search messages"
 msgstr ""
 
 msgid "Search messages"
 msgstr ""
 

-#: src/summary_search.c:252
+#: src/summary_search.c:256

 msgid "Match any of the following"
 msgstr ""
 
 msgid "Match any of the following"
 msgstr ""
 

-#: src/summary_search.c:253
+#: src/summary_search.c:257

 msgid "Match all of the following"
 msgstr ""
 
 msgid "Match all of the following"
 msgstr ""
 

-#: src/summary_search.c:352
-msgid "From:"
-msgstr ""
-
-#: src/summary_search.c:373
+#: src/summary_search.c:377

 msgid "Body:"
 msgstr ""
 
 msgid "Body:"
 msgstr ""
 

-#: src/summary_search.c:380
+#: src/summary_search.c:384

 msgid "Condition:"
 msgstr ""
 
 msgid "Condition:"
 msgstr ""
 

-#: src/summary_search.c:410
+#: src/summary_search.c:414

 msgid "Find _all"
 msgstr ""
 
 msgid "Find _all"
 msgstr ""
 

-#: src/summary_search.c:645
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr ""
 
 msgid "Beginning of list reached; continue from end?"
 msgstr ""
 

-#: src/summary_search.c:647
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr ""
 
 msgid "End of list reached; continue from beginning?"
 msgstr ""
 

-#: src/summaryview.c:417
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr ""
 
 msgid "/_Reply"
 msgstr ""
 

-#: src/summaryview.c:418
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr ""
 
 msgid "/Repl_y to"
 msgstr ""
 

-#: src/summaryview.c:419
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr ""
 
 msgid "/Repl_y to/_all"
 msgstr ""
 

-#: src/summaryview.c:420
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr ""
 
 msgid "/Repl_y to/_sender"
 msgstr ""
 

-#: src/summaryview.c:421
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr ""
 
 msgid "/Repl_y to/mailing _list"
 msgstr ""
 

-#: src/summaryview.c:424 src/toolbar.c:239
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr ""
 
 msgid "/_Forward"
 msgstr ""
 

-#: src/summaryview.c:425 src/toolbar.c:240
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr ""
 
 msgid "/For_ward as attachment"
 msgstr ""
 

-#: src/summaryview.c:426
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr ""
 
 msgid "/Redirect"
 msgstr ""
 

-#: src/summaryview.c:428
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr ""
 
 msgid "/M_ove..."
 msgstr ""
 

-#: src/summaryview.c:429
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr ""
 
 msgid "/_Copy..."
 msgstr ""
 

-#: src/summaryview.c:430
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/Move to was_tebin"
 
 msgid "/Move to _trash"
 msgstr "/Move to was_tebin"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr ""
 
 msgid "/_Delete..."
 msgstr ""
 

-#: src/summaryview.c:433
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr ""
 
 msgid "/_Mark"
 msgstr ""
 

-#: src/summaryview.c:434
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr ""
 
 msgid "/_Mark/_Mark"
 msgstr ""
 

-#: src/summaryview.c:435
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr ""
 
 msgid "/_Mark/_Unmark"
 msgstr ""
 

-#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr ""
 
 msgid "/_Mark/---"
 msgstr ""
 

-#: src/summaryview.c:437
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr ""
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr ""
 

-#: src/summaryview.c:438
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr ""
 
 msgid "/_Mark/Mark as rea_d"
 msgstr ""
 

-#: src/summaryview.c:439
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr ""
 
 msgid "/_Mark/Mark all read"
 msgstr ""
 

-#: src/summaryview.c:440
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr ""
 
 msgid "/_Mark/Ignore thread"
 msgstr ""
 

-#: src/summaryview.c:441
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr ""
 
 msgid "/_Mark/Unignore thread"
 msgstr ""
 

-#: src/summaryview.c:443
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr ""
 
 msgid "/_Mark/Mark as _spam"
 msgstr ""
 

-#: src/summaryview.c:444
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr ""
 
 msgid "/_Mark/Mark as _ham"
 msgstr ""
 

-#: src/summaryview.c:446
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr ""
 
 msgid "/_Mark/Lock"
 msgstr ""
 

-#: src/summaryview.c:447
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr ""
 
 msgid "/_Mark/Unlock"
 msgstr ""
 

-#: src/summaryview.c:448
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "Colour la_bel"
 
 msgid "/Color la_bel"
 msgstr "Colour la_bel"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr ""
 
 msgid "/Add sender to address boo_k"
 msgstr ""
 

-#: src/summaryview.c:453
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr ""
 
 msgid "/Create f_ilter rule"
 msgstr ""
 

-#: src/summaryview.c:454
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr ""
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr ""
 

-#: src/summaryview.c:456
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr ""
 
 msgid "/Create f_ilter rule/by _From"
 msgstr ""
 

-#: src/summaryview.c:458
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr ""
 
 msgid "/Create f_ilter rule/by _To"
 msgstr ""
 

-#: src/summaryview.c:460
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr ""
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr ""
 

-#: src/summaryview.c:462
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr ""
 
 msgid "/Create processing rule"
 msgstr ""
 

-#: src/summaryview.c:463
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr ""
 
 msgid "/Create processing rule/_Automatically"
 msgstr ""
 

-#: src/summaryview.c:465
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr ""
 
 msgid "/Create processing rule/by _From"
 msgstr ""
 

-#: src/summaryview.c:467
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr ""
 
 msgid "/Create processing rule/by _To"
 msgstr ""
 

-#: src/summaryview.c:469
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr ""
 
 msgid "/Create processing rule/by _Subject"
 msgstr ""
 

-#: src/summaryview.c:475
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr ""
 
 msgid "/_View/Message _source"
 msgstr ""
 

-#: src/summaryview.c:476
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr ""
 
 msgid "/_View/All _headers"
 msgstr ""
 

-#: src/summaryview.c:479
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr ""
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr ""
 
 msgid "/_Print..."
 msgstr ""
 

-#: src/summaryview.c:585
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr ""
 
 msgid "Toggle quick search bar"
 msgstr ""
 

-#: src/summaryview.c:963
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr ""
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr ""
 
 msgid "Process mark"
 msgstr ""
 

-#: src/summaryview.c:964
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr ""
 
 msgid "Some marks are left. Process them?"
 msgstr ""
 

-#: src/summaryview.c:1021
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 

-#: src/summaryview.c:1509 src/summaryview.c:1561
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr ""
 
 msgid "No more unread messages"
 msgstr ""
 

-#: src/summaryview.c:1510
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr ""
 
 msgid "No unread message found. Search from the end?"
 msgstr ""
 

-#: src/summaryview.c:1522 src/summaryview.c:1574 src/summaryview.c:1621
-#: src/summaryview.c:1673 src/summaryview.c:1752
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 

-#: src/summaryview.c:1530
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr ""
 
 msgid "No unread messages."
 msgstr ""
 

-#: src/summaryview.c:1562
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 

-#: src/summaryview.c:1608 src/summaryview.c:1660
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr ""
 
 msgid "No more new messages"
 msgstr ""
 

-#: src/summaryview.c:1609
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr ""
 
 msgid "No new message found. Search from the end?"
 msgstr ""
 

-#: src/summaryview.c:1629
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr ""
 
 msgid "No new messages."
 msgstr ""
 

-#: src/summaryview.c:1661
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr ""
 
 msgid "No new message found. Go to next folder?"
 msgstr ""
 

-#: src/summaryview.c:1698 src/summaryview.c:1739
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr ""
 
 msgid "No more marked messages"
 msgstr ""
 

-#: src/summaryview.c:1699
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr ""
 
 msgid "No marked message found. Search from the end?"
 msgstr ""
 

-#: src/summaryview.c:1708
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr ""
 
 msgid "No marked messages."
 msgstr ""
 

-#: src/summaryview.c:1740
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 

-#: src/summaryview.c:1777 src/summaryview.c:1802
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 

-#: src/summaryview.c:1778
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 

-#: src/summaryview.c:1787 src/summaryview.c:1812
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "No labelled messages."
 
 msgid "No labeled messages."
 msgstr "No labelled messages."
 

-#: src/summaryview.c:1803
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 

-#: src/summaryview.c:2094
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr ""
 
 msgid "Attracting messages by subject..."
 msgstr ""
 

-#: src/summaryview.c:2252
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr ""
 
 #, c-format
 msgid "%d deleted"
 msgstr ""
 

-#: src/summaryview.c:2256
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 

-#: src/summaryview.c:2257 src/summaryview.c:2264
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 

-#: src/summaryview.c:2262
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 

-#: src/summaryview.c:2277
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr ""
 
 msgid " item selected"
 msgstr ""
 

-#: src/summaryview.c:2279
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr ""
 
 msgid " items selected"
 msgstr ""
 

-#: src/summaryview.c:2295
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 

-#: src/summaryview.c:2504
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr ""
 
 msgid "Sorting summary..."
 msgstr ""
 

-#: src/summaryview.c:2585
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr ""
 
 msgid "Setting summary from message data..."
 msgstr ""
 

-#: src/summaryview.c:2763
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr ""
 
 msgid "(No Date)"
 msgstr ""
 

-#: src/summaryview.c:2801
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr ""
 
 msgid "(No Recipient)"
 msgstr ""
 

-#: src/summaryview.c:3622
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr ""
 
 msgid "You're not the author of the article.\n"
 msgstr ""
 

-#: src/summaryview.c:3707
-msgid "Delete message(s)"
+#: src/summaryview.c:3832
+msgid "Do you really want to delete the selected message?"

 msgstr ""
 
 msgstr ""
 

-#: src/summaryview.c:3708
-msgid "Do you really want to delete selected message(s)?"
+#: src/summaryview.c:3835
+#, c-format
+msgid "Do you really want to delete the %d selected messages?"
+msgstr ""
+
+#: src/summaryview.c:3837
+msgid "Delete message(s)"

 msgstr ""
 
 msgstr ""
 

-#: src/summaryview.c:3861
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr ""
 
 msgid "Destination is same as current folder."
 msgstr ""
 

-#: src/summaryview.c:3952
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr ""
 
 msgid "Destination to copy is same as current folder."
 msgstr ""
 

-#: src/summaryview.c:4072
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr ""
 
 msgid "Append or Overwrite"
 msgstr ""
 

-#: src/summaryview.c:4073
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr ""
 
 msgid "Append or overwrite existing file?"
 msgstr ""
 

-#: src/summaryview.c:4074
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr ""
 
 msgid "_Append"
 msgstr ""
 

-#: src/summaryview.c:4074
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr ""
 
 msgid "_Overwrite"
 msgstr ""
 

-#: src/summaryview.c:4431
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr ""
 
 msgid "Building threads..."
 msgstr ""
 

-#: src/summaryview.c:4650
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr ""
 
 msgid "Skip these rules"
 msgstr ""
 

-#: src/summaryview.c:4653
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 

-#: src/summaryview.c:4656
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 

-#: src/summaryview.c:4685
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr ""
 
 msgid "Filtering"
 msgstr ""
 

-#: src/summaryview.c:4686
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 

-#: src/summaryview.c:4688
-msgid "+_Filter"
+#: src/summaryview.c:4832
+msgid "_Filter"

 msgstr ""
 
 msgstr ""
 

-#: src/summaryview.c:4715
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr ""
 
 msgid "Filtering..."
 msgstr ""
 

-#: src/summaryview.c:4788
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr ""
 
 msgid "Processing configuration"
 msgstr ""
 

-#: src/summaryview.c:6235
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 

-#: src/textview.c:222
+#: src/summaryview.c:6542
+msgid "Go back to the folder list (You have unread messages)"
+msgstr ""
+
+#: src/summaryview.c:6548
+msgid "Go back to the folder list"
+msgstr ""
+
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr ""
 
 msgid "/Compose _new message"
 msgstr ""
 

-#: src/textview.c:223
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr ""
 
 msgid "/Add to _address book"
 msgstr ""
 

-#: src/textview.c:224
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr ""
 
 msgid "/Copy this add_ress"
 msgstr ""
 

-#: src/textview.c:229
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr ""
 
 msgid "/_Open image"
 msgstr ""
 

-#: src/textview.c:230
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr ""
 
 msgid "/_Save image..."
 msgstr ""
 

-#: src/textview.c:639
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr ""
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr ""
 

-#: src/textview.c:642
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr ""
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr ""
 

-#: src/textview.c:812
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10750,79 +11806,79 @@ msgid ""
 "  Use "
 msgstr ""
 
 "  Use "
 msgstr ""
 

-#: src/textview.c:817
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr ""
 
 msgid "'View Log'"
 msgstr ""
 

-#: src/textview.c:818
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr ""
 
 msgid " in the Tools menu for more information."
 msgstr ""
 

-#: src/textview.c:839
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr ""
 
 msgid "  The following can be performed on this part by\n"
 msgstr ""
 

-#: src/textview.c:840
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 

-#: src/textview.c:842
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr ""
 
 msgid "     - To save, select "
 msgstr ""
 

-#: src/textview.c:843
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr ""
 
 msgid "'Save as...'"
 msgstr ""
 

-#: src/textview.c:844
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'y')\n"
 msgstr ""
 

-#: src/textview.c:845
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr ""
 
 msgid "     - To display as text, select "
 msgstr ""
 

-#: src/textview.c:846
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr ""
 
 msgid "'Display as text'"
 msgstr ""
 

-#: src/textview.c:847
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr ""
 
 msgid " (Shortcut key: 't')\n"
 msgstr ""
 

-#: src/textview.c:848
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr ""
 
 msgid "     - To open with an external program, select "
 msgstr ""
 

-#: src/textview.c:849
+#: src/textview.c:846

 msgid "'Open'"
 msgstr ""
 
 msgid "'Open'"
 msgstr ""
 

-#: src/textview.c:850
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'l')\n"
 msgstr ""
 

-#: src/textview.c:851
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 
 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 

-#: src/textview.c:852
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr ""
 
 msgid "mouse button)\n"
 msgstr ""
 

-#: src/textview.c:853
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr ""
 
 msgid "     - Or use "
 msgstr ""
 

-#: src/textview.c:854
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr ""
 
 msgid "'Open with...'"
 msgstr ""
 

-#: src/textview.c:855
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'o')\n"
 msgstr ""
 

-#: src/textview.c:944
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10830,7 +11886,7 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 
 "Exit code %d\n"
 msgstr ""
 

-#: src/textview.c:2492
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -10842,231 +11898,271 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
 "Open it anyway?"
 msgstr ""
 

-#: src/textview.c:2501
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr ""
 
 msgid "Phishing attempt warning"
 msgstr ""
 

-#: src/textview.c:2502
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr ""
 
 msgid "_Open URL"
 msgstr ""
 

-#: src/toolbar.c:166 src/toolbar.c:1535
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr ""
 
 msgid "Receive Mail on all Accounts"
 msgstr ""
 

-#: src/toolbar.c:167 src/toolbar.c:1549
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr ""
 
 msgid "Receive Mail on current Account"
 msgstr ""
 

-#: src/toolbar.c:168 src/toolbar.c:1555
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr ""
 
 msgid "Send Queued Messages"
 msgstr ""
 

-#: src/toolbar.c:169 src/toolbar.c:1568
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr ""
 
 msgid "Compose Email"
 msgstr ""
 

-#: src/toolbar.c:170 src/toolbar.c:1572
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr ""
 
 msgid "Compose News"
 msgstr ""
 

-#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr ""
 
 msgid "Reply to Message"
 msgstr ""
 

-#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr ""
 
 msgid "Reply to Sender"
 msgstr ""
 

-#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr ""
 
 msgid "Reply to All"
 msgstr ""
 

-#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr ""
 
 msgid "Reply to Mailing-list"
 msgstr ""
 

-#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692
+#: src/toolbar.c:181 src/toolbar.c:1678
+msgid "Open email"
+msgstr ""
+
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr ""
 
 msgid "Forward Message"
 msgstr ""
 

-#: src/toolbar.c:176 src/toolbar.c:1699
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgid "Trash Message"

-msgstr ""
+msgstr "Move Message to Wastebin"

 
 

-#: src/toolbar.c:177 src/toolbar.c:1705
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr ""
 
 msgid "Delete Message"
 msgstr ""
 

-#: src/toolbar.c:179 src/toolbar.c:1717
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr ""
 
 msgid "Go to Previous Unread Message"
 msgstr ""
 

-#: src/toolbar.c:180 src/toolbar.c:1724
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr ""
 
 msgid "Go to Next Unread Message"
 msgstr ""
 

-#: src/toolbar.c:183
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr ""
 
 msgid "Learn Spam or Ham"
 msgstr ""
 

-#: src/toolbar.c:185 src/toolbar.c:1733
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr ""
+
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr ""
 
 msgid "Send Message"
 msgstr ""
 

-#: src/toolbar.c:186 src/toolbar.c:1739
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr ""
 
 msgid "Put into queue folder and send later"
 msgstr ""
 

-#: src/toolbar.c:187 src/toolbar.c:1745
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr ""
 
 msgid "Save to draft folder"
 msgstr ""
 

-#: src/toolbar.c:188 src/toolbar.c:1751
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr ""
 
 msgid "Insert file"
 msgstr ""
 

-#: src/toolbar.c:189 src/toolbar.c:1757
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr ""
 
 msgid "Attach file"
 msgstr ""
 

-#: src/toolbar.c:190 src/toolbar.c:1763
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr ""
 
 msgid "Insert signature"
 msgstr ""
 

-#: src/toolbar.c:191 src/toolbar.c:1769
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr ""
 
 msgid "Edit with external editor"
 msgstr ""
 

-#: src/toolbar.c:192 src/toolbar.c:1775
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr ""
 
 msgid "Wrap long lines of current paragraph"
 msgstr ""
 

-#: src/toolbar.c:193 src/toolbar.c:1781
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr ""
 
 msgid "Wrap all long lines"
 msgstr ""
 

-#: src/toolbar.c:196 src/toolbar.c:1794
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr ""
 
 msgid "Check spelling"
 msgstr ""
 

-#: src/toolbar.c:198
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr ""
 
 msgid "Claws Mail Actions Feature"
 msgstr ""
 

-#: src/toolbar.c:199 src/toolbar.c:1817
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr ""
 
 msgid "Cancel receiving"
 msgstr ""
 

-#: src/toolbar.c:219
+#: src/toolbar.c:208 src/toolbar.c:1672
+msgid "Close window"
+msgstr ""
+
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr ""
 
 msgid "/Reply with _quote"
 msgstr ""
 

-#: src/toolbar.c:220
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr ""
 
 msgid "/_Reply without quote"
 msgstr ""
 

-#: src/toolbar.c:224
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr ""
 
 msgid "/Reply to all with _quote"
 msgstr ""
 

-#: src/toolbar.c:225
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr ""
 
 msgid "/_Reply to all without quote"
 msgstr ""
 

-#: src/toolbar.c:229
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr ""
 
 msgid "/Reply to list with _quote"
 msgstr ""
 

-#: src/toolbar.c:230
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr ""
 
 msgid "/_Reply to list without quote"
 msgstr ""
 

-#: src/toolbar.c:234
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr ""
 
 msgid "/Reply to sender with _quote"
 msgstr ""
 

-#: src/toolbar.c:235
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr ""
 
 msgid "/_Reply to sender without quote"
 msgstr ""
 

-#: src/toolbar.c:241
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr ""
 
 msgid "/Redirec_t"
 msgstr ""
 

-#: src/toolbar.c:245
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr ""
 
 msgid "/Learn as _Spam"
 msgstr ""
 

-#: src/toolbar.c:246
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr ""
 
 msgid "/Learn as _Ham"
 msgstr ""
 

-#: src/toolbar.c:399
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr ""
 
 msgid "Get Mail"
 msgstr ""
 

-#: src/toolbar.c:403
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr ""
 
 msgid "Toolbar|Compose"
 msgstr ""
 

-#: src/toolbar.c:405 src/toolbar.c:496
-msgid "Reply"
+#: src/toolbar.c:420
+msgid "Open"

 msgstr ""
 
 msgstr ""
 

-#: src/toolbar.c:406 src/toolbar.c:497
-msgid "All"
+#: src/toolbar.c:422 src/toolbar.c:522
+msgid "Reply"

 msgstr ""
 
 msgstr ""
 

-#: src/toolbar.c:407 src/toolbar.c:498
-msgid "Sender"
+#: src/toolbar.c:424 src/toolbar.c:523
+msgid "All"

 msgstr ""
 
 msgstr ""
 

-#: src/toolbar.c:412 src/toolbar.c:503
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr ""
 
 msgid "Spam"
 msgstr ""
 

-#: src/toolbar.c:415 src/toolbar.c:505
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr ""
 
 msgid "Next"
 msgstr ""
 

-#: src/toolbar.c:453
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr ""
 
 msgid "Send later"
 msgstr ""
 

-#: src/toolbar.c:454
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr ""
 
 msgid "Draft"
 msgstr ""
 

-#: src/toolbar.c:1542
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr ""
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr ""
 
 msgid "Receive Mail on selected Account"
 msgstr ""
 

-#: src/toolbar.c:1579
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr ""
 
 msgid "Compose with selected Account"
 msgstr ""
 

-#: src/toolbar.c:1585
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr ""
 
 msgid "Ham"
 msgstr ""
 

-#: src/toolbar.c:1593
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr ""
 
 msgid "Learn Spam"
 msgstr ""
 

-#: src/toolbar.c:1597
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr ""
 
 msgid "Learn Ham"
 msgstr ""
 

-#: src/toolbar.c:1607
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr ""
 
 msgid "Learn as..."
 msgstr ""
 

-#: src/wizard.c:461
+#: src/toolbar.c:1730
+msgid "Learn"
+msgstr ""
+
+#: src/uri_opener.c:84
+msgid "There are no URLs in this email."
+msgstr ""
+
+#: src/uri_opener.c:112
+msgid "Available URLs:"
+msgstr ""
+
+#: src/uri_opener.c:159
+msgid "Dialog title|Open URLs"
+msgstr ""
+
+#: src/uri_opener.c:173
+msgid "Open _All"
+msgstr ""
+
+#: src/uri_opener.c:187
+msgid "Please select the URL to open."
+msgstr ""
+
+#: src/wizard.c:469

 msgid "Welcome Mail Subject|Welcome to Claws Mail"
 msgstr ""
 
 msgid "Welcome Mail Subject|Welcome to Claws Mail"
 msgstr ""
 

-#: src/wizard.c:484
+#: src/wizard.c:492

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -11115,133 +12211,137 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/wizard.c:564
+#: src/wizard.c:573

 msgid "Please enter the mailbox name."
 msgstr ""
 
 msgid "Please enter the mailbox name."
 msgstr ""
 

-#: src/wizard.c:592
+#: src/wizard.c:601

 msgid "Please enter your name and email address."
 msgstr ""
 
 msgid "Please enter your name and email address."
 msgstr ""
 

-#: src/wizard.c:603
+#: src/wizard.c:612

 msgid "Please enter your receiving server and username."
 msgstr ""
 
 msgid "Please enter your receiving server and username."
 msgstr ""
 

-#: src/wizard.c:613
+#: src/wizard.c:622

 msgid "Please enter your username."
 msgstr ""
 
 msgid "Please enter your username."
 msgstr ""
 

-#: src/wizard.c:623
+#: src/wizard.c:632

 msgid "Please enter your SMTP server."
 msgstr ""
 
 msgid "Please enter your SMTP server."
 msgstr ""
 

-#: src/wizard.c:634
+#: src/wizard.c:643

 msgid "Please enter your SMTP username."
 msgstr ""
 
 msgid "Please enter your SMTP username."
 msgstr ""
 

-#: src/wizard.c:881
+#: src/wizard.c:899

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr ""
 

-#: src/wizard.c:886
+#: src/wizard.c:904

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr ""
 

-#: src/wizard.c:890
+#: src/wizard.c:908

 msgid "Your organization:"
 msgstr "Your organisation:"
 
 msgid "Your organization:"
 msgstr "Your organisation:"
 

-#: src/wizard.c:913
+#: src/wizard.c:931

 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 

-#: src/wizard.c:917
+#: src/wizard.c:935

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr ""
 

-#: src/wizard.c:954
+#: src/wizard.c:972

 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 

-#: src/wizard.c:958
+#: src/wizard.c:976

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr ""
 

-#: src/wizard.c:961
+#: src/wizard.c:979

 msgid "Use authentication"
 msgstr ""
 
 msgid "Use authentication"
 msgstr ""
 

-#: src/wizard.c:975
+#: src/wizard.c:993

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 

-#: src/wizard.c:988
+#: src/wizard.c:1006

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 

-#: src/wizard.c:1000
+#: src/wizard.c:1018

 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 
 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 

-#: src/wizard.c:1007 src/wizard.c:1230
+#: src/wizard.c:1025 src/wizard.c:1262

 msgid "Use SSL via STARTTLS"
 msgstr ""
 
 msgid "Use SSL via STARTTLS"
 msgstr ""
 

-#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165
+#: src/wizard.c:1056 src/wizard.c:1076 src/wizard.c:1187

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr ""
 

-#: src/wizard.c:1076
+#: src/wizard.c:1097

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr ""
 

-#: src/wizard.c:1127
+#: src/wizard.c:1149

 msgid "IMAP"
 msgstr ""
 
 msgid "IMAP"
 msgstr ""
 

-#: src/wizard.c:1152
+#: src/wizard.c:1174

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr ""
 

-#: src/wizard.c:1161
+#: src/wizard.c:1183

 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 

-#: src/wizard.c:1176
+#: src/wizard.c:1198

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr ""
 

-#: src/wizard.c:1192
+#: src/wizard.c:1214

 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 

-#: src/wizard.c:1204
+#: src/wizard.c:1226

 msgid "IMAP server directory:"
 msgstr ""
 
 msgid "IMAP server directory:"
 msgstr ""
 

-#: src/wizard.c:1223
+#: src/wizard.c:1238
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: src/wizard.c:1255

 msgid "Use SSL to connect to receiving server"
 msgstr ""
 
 msgid "Use SSL to connect to receiving server"
 msgstr ""
 

-#: src/wizard.c:1347
+#: src/wizard.c:1385

 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 

-#: src/wizard.c:1379
+#: src/wizard.c:1417

 msgid "Welcome to Claws Mail"
 msgstr ""
 
 msgid "Welcome to Claws Mail"
 msgstr ""
 

-#: src/wizard.c:1387
+#: src/wizard.c:1425

 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"


@@ -11250,31 +12350,31 @@ msgid ""
 "five minutes."
 msgstr ""
 
 "five minutes."
 msgstr ""
 

-#: src/wizard.c:1400
+#: src/wizard.c:1438

 msgid "About You"
 msgstr ""
 
 msgid "About You"
 msgstr ""
 

-#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430
+#: src/wizard.c:1440 src/wizard.c:1449 src/wizard.c:1458 src/wizard.c:1468

 msgid "Bold fields must be completed"
 msgstr ""
 
 msgid "Bold fields must be completed"
 msgstr ""
 

-#: src/wizard.c:1409
+#: src/wizard.c:1447

 msgid "Receiving mail"
 msgstr ""
 
 msgid "Receiving mail"
 msgstr ""
 

-#: src/wizard.c:1418
+#: src/wizard.c:1456

 msgid "Sending mail"
 msgstr ""
 
 msgid "Sending mail"
 msgstr ""
 

-#: src/wizard.c:1428
+#: src/wizard.c:1466

 msgid "Saving mail on disk"
 msgstr ""
 
 msgid "Saving mail on disk"
 msgstr ""
 

-#: src/wizard.c:1438
+#: src/wizard.c:1476

 msgid "Configuration finished"
 msgstr ""
 
 msgid "Configuration finished"
 msgstr ""
 

-#: src/wizard.c:1446
+#: src/wizard.c:1484

 msgid ""
 "Claws Mail is now ready.\n"
 "\n"
 msgid ""
 "Claws Mail is now ready.\n"
 "\n"

diff --git a/po/es.po b/po/es.po
index e3fe0f8a864b6467123692aad71b9057a8b3050d..407907ea04c049f1760d91a367bcb16cba84634b 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 msgstr ""
 "Project-Id-Version: claws mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-04-14 14:02+0200\n"
-"PO-Revision-Date: 2007-04-14 23:03+0200\n"
+"POT-Creation-Date: 2007-07-02 00:58+0200\n"
+"PO-Revision-Date: 2007-07-02 09:01+0200\n"

 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
 "MIME-Version: 1.0\n"


@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -23,15 +23,15 @@ msgstr ""
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 
 "Hay ventanas de composición abiertas.\n"
 "Cierre todas las ventanas de composición antes de editar las cuentas."
 

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 
 msgid "Can't create folder."
 msgstr "No se puede crear la carpeta."
 

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 

-#: src/account.c:701
+#: src/account.c:715

 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "


@@ -40,63 +40,63 @@ msgstr ""
 "Usando «Recibir correo» se recuperarán los mensajes de las cuentas en el "
 "orden dado, la marca en la columna «R» indica que cuentas se incluirán."
 
 "Usando «Recibir correo» se recuperarán los mensajes de las cuentas en el "
 "orden dado, la marca en la columna «R» indica que cuentas se incluirán."
 

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 
 msgid " _Set as default account "
 msgstr " _Establecer como primaria "
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Las cuentas con carpetas remotas no se pueden copiar."
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quiere borrar la cuenta «%s»?"
 

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(Sin título)"
 
 msgid "(Untitled)"
 msgstr "(Sin título)"
 

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "Borrar cuenta"
 
 msgid "Delete account"
 msgstr "Borrar cuenta"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "P"
 
 msgid "Accounts List Default Column Name|D"
 msgstr "P"
 

-#: src/account.c:1472 src/prefs_folder_item.c:740
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "Cuenta primaria"
 
 msgid "Default account"
 msgstr "Cuenta primaria"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera correo de las cuentas marcadas"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "«Recibir correo» recupera correo de las cuentas marcadas"
 

-#: src/account.c:1493 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5870 src/compose.c:6181 src/editaddress.c:1043
-#: src/editaddress.c:1092 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6036 src/compose.c:6349 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480 src/prefs_template.c:185
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr "Nombre"
 
 msgid "Name"
 msgstr "Nombre"
 

-#: src/account.c:1500 src/prefs_account.c:1258 src/prefs_account.c:2849
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "Protocolo"
 
 msgid "Protocol"
 msgstr "Protocolo"
 

-#: src/account.c:1507 src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Servidor"
 
 msgid "Server"
 msgstr "Servidor"
 


@@ -156,25 +156,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1153 src/action.c:1303
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr "Completado"
 
 msgid "Completed"
 msgstr "Completado"
 

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -185,11 +185,11 @@ msgstr ""
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 
 "(«%%h» será sustituido con el parámetro)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario oculto para la acción"
 

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -200,345 +200,354 @@ msgstr ""
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 
 "(«%%u» será sustituido con el parámetro)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 
 msgid "Action's user argument"
 msgstr "Parámetro de usuario para la acción"
 

-#: src/addr_compl.c:597 src/addressbook.c:4403
+#: src/addr_compl.c:597 src/addressbook.c:4596

 msgid "Group"
 msgstr "Grupo"
 
 msgid "Group"
 msgstr "Grupo"
 

-#: src/addressadd.c:174 src/prefs_filtering_action.c:179
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:479
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "Dirección"
 
 msgid "Address"
 msgstr "Dirección"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:851
-#: src/editaddress.c:915 src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Notas"
 
 msgid "Remarks"
 msgstr "Notas"
 

-#: src/addressadd.c:240 src/addressbook_foldersel.c:164
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 

-#: src/addressbook.c:133 src/editaddress.c:849 src/editaddress.c:897
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "Añadir dirección(es)"
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "No se puede añadir la dirección especificada"
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591

-#: src/exporthtml.c:755 src/ldif.c:779
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr "Dirección de correo"
 
 msgid "Email Address"
 msgstr "Dirección de correo"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/_Agenda"
 
 msgid "/_Book"
 msgstr "/_Agenda"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/_Agenda/Nueva _agenda"
 
 msgid "/_Book/New _Book"
 msgstr "/_Agenda/Nueva _agenda"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr "/_Agenda/Nueva _carpeta"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Agenda/Nueva _carpeta"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/_Agenda/Nueva _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Agenda/Nueva _vCard"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/_Agenda/Nuevo _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Agenda/Nuevo _JPilot"
 

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Agenda/Nuevo _servidor LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Agenda/Nuevo _servidor LDAP"
 

-#: src/addressbook.c:436 src/addressbook.c:439
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/_Agenda/---"
 
 msgid "/_Book/---"
 msgstr "/_Agenda/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/_Agenda/_Editar agenda"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Agenda/_Editar agenda"
 

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/_Agenda/_Borrar agenda"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Agenda/_Borrar agenda"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/_Agenda/_Guardar"
 
 msgid "/_Book/_Save"
 msgstr "/_Agenda/_Guardar"
 

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/_Agenda/_Cerrar"
 
 msgid "/_Book/_Close"
 msgstr "/_Agenda/_Cerrar"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/_Dirección"
 
 msgid "/_Address"
 msgstr "/_Dirección"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/_Dirección/_Seleccionar todo"
 
 msgid "/_Address/_Select all"
 msgstr "/_Dirección/_Seleccionar todo"
 

-#: src/addressbook.c:444 src/addressbook.c:448 src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/_Dirección/_Cortar"
 
 msgid "/_Address/C_ut"
 msgstr "/_Dirección/_Cortar"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/_Dirección/C_opiar"
 
 msgid "/_Address/_Copy"
 msgstr "/_Dirección/C_opiar"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/_Dirección/_Pegar"
 
 msgid "/_Address/_Paste"
 msgstr "/_Dirección/_Pegar"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "//_Dirección/Nuevo _grupo"
 
 msgid "/_Address/New _Group"
 msgstr "//_Dirección/Nuevo _grupo"
 

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr "/_Dirección/_Correo para"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Dirección/_Correo para"
 

-#: src/addressbook.c:456 src/compose.c:790 src/mainwindow.c:814
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814

 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Herramientas"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Herramientas/Importar fichero _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Herramientas/Importar fichero _LDIF..."
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Herramientas/Importar fichero M_utt..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Herramientas/Importar fichero M_utt..."
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Herramientas/Importar fichero _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Herramientas/Importar fichero _Pine..."
 

-#: src/addressbook.c:460 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846

 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Herramientas/Exportar _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Herramientas/Exportar _HTML..."
 

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Herramientas/Exportar LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Herramientas/Exportar LDI_F..."
 

-#: src/addressbook.c:463 src/compose.c:795 src/mainwindow.c:892
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892

 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Ayuda"
 
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Ayuda"
 

-#: src/addressbook.c:464 src/compose.c:796 src/mainwindow.c:898
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898

 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 

-#: src/addressbook.c:469 src/addressbook.c:485 src/compose.c:563
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574

 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Editar"
 
 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Editar"
 

-#: src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/_Borrar"
 
 msgid "/_Delete"
 msgstr "/_Borrar"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/Nueva _agenda"
 
 msgid "/New _Book"
 msgstr "/Nueva _agenda"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 

-#: src/addressbook.c:474 src/addressbook.c:489
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 

-#: src/addressbook.c:476 src/addressbook.c:491
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/C_ortar"
 
 msgid "/C_ut"
 msgstr "/C_ortar"
 

-#: src/addressbook.c:477 src/addressbook.c:492
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/_Copiar"
 
 msgid "/_Copy"
 msgstr "/_Copiar"
 

-#: src/addressbook.c:478 src/addressbook.c:493
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/_Pegar"
 
 msgid "/_Paste"
 msgstr "/_Pegar"
 

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "/_Seleccionar todo"
 
 msgid "/_Select all"
 msgstr "/_Seleccionar todo"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/_Correo para"
 
 msgid "/_Mail To"
 msgstr "/_Correo para"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/_Ver entrada"
 
 msgid "/_Browse Entry"
 msgstr "/_Ver entrada"
 

-#: src/addressbook.c:511 src/crash.c:451 src/crash.c:470 src/importldif.c:119
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120

 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Desconocido"
 

-#: src/addressbook.c:518 src/addressbook.c:537 src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr "Éxito"
 
 msgid "Success"
 msgstr "Éxito"
 

-#: src/addressbook.c:519 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 
 msgid "Bad arguments"
 msgstr "Argumentos incorrectos"
 

-#: src/addressbook.c:520 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr "No se especificó el fichero"
 
 msgid "File not specified"
 msgstr "No se especificó el fichero"
 

-#: src/addressbook.c:521 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 
 msgid "Error opening file"
 msgstr "Error abriendo el fichero"
 

-#: src/addressbook.c:522 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 
 msgid "Error reading file"
 msgstr "Error leyendo el fichero"
 

-#: src/addressbook.c:523 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 
 msgid "End of file encountered"
 msgstr "Encontrado final del fichero"
 

-#: src/addressbook.c:524 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 
 msgid "Error allocating memory"
 msgstr "Error reservando memoria"
 

-#: src/addressbook.c:525 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 
 msgid "Bad file format"
 msgstr "Formato de fichero erróneo"
 

-#: src/addressbook.c:526 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 

-#: src/addressbook.c:527 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 
 msgid "Error opening directory"
 msgstr "Error abriendo el directorio"
 

-#: src/addressbook.c:528 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr "No se especificó una ruta"
 
 msgid "No path specified"
 msgstr "No se especificó una ruta"
 

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Error conectando al servidor LDAP"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Error inicializando LDAP"
 

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Error enlazando con el servidor LDAP"
 

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Error buscando en la base de datos LDAP"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Fuera de tiempo en la operación LDAP"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criterio de búsqueda LDAP"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "No se encontraron entradas LDAP para el criterio de búsqueda"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 
 msgid "LDAP search terminated on request"
 msgstr "Se solicitó concluir la búsqueda LDAP"
 

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "Error iniciando la conexión TLS"
 
 msgid "Error starting TLS connection"
 msgstr "Error iniciando la conexión TLS"
 

-#: src/addressbook.c:920
+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"
+msgstr "Falta el nombre distinguido (dn)"
+
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "Falta la información necesaria"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "Ya existe un contacto con esa clave"
+
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "Se necesita autentificación (más) fuerte"
+
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "Fuentes"
 
 msgid "Sources"
 msgstr "Fuentes"
 

-#: src/addressbook.c:924 src/prefs_other.c:513 src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 msgid "Address book"
 msgstr "Agenda de direcciones"
 

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "Buscar nombre:"
 
 msgid "Lookup name:"
 msgstr "Buscar nombre:"
 

-#: src/addressbook.c:1129 src/compose.c:2131 src/compose.c:4481
-#: src/compose.c:5705 src/compose.c:6519 src/compose.c:9648 src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "Para:"
-
-#: src/addressbook.c:1133 src/compose.c:2115 src/compose.c:4217
-#: src/compose.c:4480 src/compose.c:9657 src/matcher.c:770
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1137 src/compose.c:2118 src/compose.c:4248
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: src/addressbook.c:1387 src/addressbook.c:1433
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Esta dirección es solo de lectura y no se puede borrar."
 

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "Borrar grupo"
 
 msgid "Delete group"
 msgstr "Borrar grupo"
 

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -546,29 +555,29 @@ msgstr ""
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 
 "¿Quiere borrar el(los) grupo(s)?\n"
 "Las direcciones que contienen no se perderán."
 

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 
 msgid "Cannot paste into an address group."
 msgstr "No se puede pegar dentro de un grupo de direcciones."
 

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
 

-#: src/addressbook.c:2735 src/addressbook.c:2761 src/addressbook.c:2768
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Borrar"
 
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Borrar"
 

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -577,19 +586,19 @@ msgstr ""
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contiene "
 "se moverán a la carpeta padre."
 
 "¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contiene "
 "se moverán a la carpeta padre."
 

-#: src/addressbook.c:2747 src/imap_gtk.c:302 src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+Borrar sólo _carpeta"
 
 msgid "+Delete _folder only"
 msgstr "+Borrar sólo _carpeta"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 
 msgid "Delete folder and _addresses"
 msgstr "Borrar carpeta y _direcciones"
 

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -598,7 +607,7 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene no se perderán."
 

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -607,19 +616,28 @@ msgstr ""
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 
 "¿Quiere borrar «%s»?\n"
 "Las direcciones que contiene se perderán."
 

-#: src/addressbook.c:3638
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr " Buscar «%s»"
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "Nuevos contactos"
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se puede guardar el fichero índice."
 

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
 

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -627,7 +645,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 
 "Antigua agenda de direcciones convertida,\n"
 "no se puede guardar el nuevo fichero índice."
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -635,7 +653,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
 "No se puede convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -643,7 +661,7 @@ msgstr ""
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 
 "No se puede convertir la antigua agenda,\n"
 "no se pudo guardar el fichero índice para la nueva."
 

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -651,71 +669,66 @@ msgstr ""
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 
 "No se puede convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para la nueva."
 

-#: src/addressbook.c:3688 src/addressbook.c:3694
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda de Sylpheed"
 
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda de Sylpheed"
 

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 
 msgid "Could not read address index"
 msgstr "No se puede leer el índice de direcciones"
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "Buscando..."
 
 msgid "Busy searching..."
 msgstr "Buscando..."
 

-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr " Buscar «%s»"
-
-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "Interfaz"
 
 msgid "Interface"
 msgstr "Interfaz"
 

-#: src/addressbook.c:4355 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:394 src/exporthtml.c:973 src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "Persona"
 
 msgid "Person"
 msgstr "Persona"
 

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "Dirección de correo"
 
 msgid "EMail Address"
 msgstr "Dirección de correo"
 

-#: src/addressbook.c:4419 src/exporthtml.c:875 src/folderview.c:469
-#: src/prefs_account.c:2542 src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Carpeta"
 
 msgid "Folder"
 msgstr "Carpeta"
 

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4451 src/addressbook.c:4467
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "Petición LDAP"
 
 msgid "LDAP Query"
 msgstr "Petición LDAP"
 

-#: src/addressbook.c:4822 src/addressbook_foldersel.c:389 src/matcher.c:312
-#: src/matcher.c:1097 src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67 src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527 src/prefs_matcher.c:1347 src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366 src/prefs_matcher.c:2119 src/prefs_matcher.c:2123
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "Cualquiera"
 
 msgid "Any"
 msgstr "Cualquiera"
 


@@ -754,7 +767,7 @@ msgid "Folder :"
 msgstr "Carpeta :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
 msgstr "Carpeta :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 


@@ -778,8 +791,8 @@ msgstr "Nombre cabecera"
 msgid "Address Count"
 msgstr "N.º direcciones"
 
 msgid "Address Count"
 msgstr "N.º direcciones"
 

-#: src/addrgather.c:537 src/alertpanel.c:155 src/compose.c:4832
-#: src/compose.c:9569 src/messageview.c:589 src/messageview.c:602
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4910
+#: src/compose.c:9841 src/messageview.c:589 src/messageview.c:602

 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Aviso"
 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Aviso"


@@ -789,7 +802,7 @@ msgid "Header Fields"
 msgstr "Campos cabecera"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
 msgstr "Campos cabecera"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "Finalizar"
 
 msgid "Finish"
 msgstr "Finalizar"
 


@@ -801,36 +814,45 @@ msgstr "Recopilar direcciones de correo - de los mensajes seleccionados"
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Recopilar direcciones de correo - de la carpeta"
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Recopilar direcciones de correo - de la carpeta"
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "Direcciones comunes"
 
 msgid "Common addresses"
 msgstr "Direcciones comunes"
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "Direcciones personales"
 
 msgid "Personal addresses"
 msgstr "Direcciones personales"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "Dirección común"
 
 msgid "Common address"
 msgstr "Dirección común"
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "Dirección personal"
 
 msgid "Personal address"
 msgstr "Dirección personal"
 

-#: src/alertpanel.c:142 src/compose.c:7673
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "Actualizar dirección(es)"
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr ""
+"Falló la actualización. No se escribieron los cambios en el directorio."
+
+#: src/alertpanel.c:145 src/compose.c:7902

 msgid "Notice"
 msgstr "Notificación"
 
 msgid "Notice"
 msgstr "Notificación"
 

-#: src/alertpanel.c:168 src/alertpanel.c:191 src/compose.c:4772 src/inc.c:619
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4850 src/inc.c:619

 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Error"
 
 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Error"
 

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "_Ver traza"
 
 msgid "_View log"
 msgstr "_Ver traza"
 

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 


@@ -859,7 +881,7 @@ msgstr "Valor del atributo"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "No se puede conectar al servidor NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "No se puede conectar al servidor NNTP: %s:%d\n"
 

-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:848
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "Negociación SSL fallida\n"
 
 msgid "SSL handshake failed\n"
 msgstr "Negociación SSL fallida\n"
 


@@ -880,62 +902,62 @@ msgstr "Ha habido un error enviando el mensaje\n"
 msgid "Error occurred while sending command\n"
 msgstr "Ha habido un error enviando la orden\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Ha habido un error enviando la orden\n"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr "Nada"
 
 msgid "Nothing"
 msgstr "Nada"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr "un visor"
 
 msgid "a viewer"
 msgstr "un visor"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "folders"
 msgstr "carpetas"
 
 msgid "folders"
 msgstr "carpetas"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr "filtrado"
 
 msgid "filtering"
 msgstr "filtrado"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 
 msgid "a privacy interface"
 msgstr "un interfaz de privacidad"
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr "un notificador"
 
 msgid "a notifier"
 msgstr "un notificador"
 

-#: src/common/plugin.c:61
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr "una utilidad"
 
 msgid "an utility"
 msgstr "una utilidad"
 

-#: src/common/plugin.c:62
+#: src/common/plugin.c:63

 msgid "things"
 msgstr "cosas"
 
 msgid "things"
 msgstr "cosas"
 

-#: src/common/plugin.c:260
+#: src/common/plugin.c:269

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Este módulo proporciona %s (%s), que ya está proporcionado por el módulo %s."
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 "Este módulo proporciona %s (%s), que ya está proporcionado por el módulo %s."
 

-#: src/common/plugin.c:295
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 
 msgid "Plugin already loaded"
 msgstr "El módulo ya está cargado"
 

-#: src/common/plugin.c:305
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Falló la petición de memoria para el Módulo"
 

-#: src/common/plugin.c:332
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Este módulo no está bajo licencia compatible con GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Este módulo no está bajo licencia compatible con GPL."
 

-#: src/common/plugin.c:339
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr "Este módulo es para la versión GTK1 de Claws Mail."
 
 msgid "This module is for Claws Mail GTK1."
 msgstr "Este módulo es para la versión GTK1 de Claws Mail."
 

-#: src/common/plugin.c:555
+#: src/common/plugin.c:599

 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "


@@ -944,7 +966,7 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo «%s»"
 
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo «%s»"
 

-#: src/common/plugin.c:558
+#: src/common/plugin.c:602

 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."


@@ -952,12 +974,12 @@ msgstr ""
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo."
 
 "Su versión de Claws Mail es más moderna que la versión con la que se "
 "construyó el módulo."
 

-#: src/common/plugin.c:567
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
 

-#: src/common/plugin.c:569
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
 


@@ -973,7 +995,7 @@ msgstr "respuesta SMTP incorrecta\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo un error en la sesión SMTP\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "hubo un error en la sesión SMTP\n"
 

-#: src/common/smtp.c:548 src/pop.c:881
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "hubo un error en la autentificación\n"
 
 msgid "error occurred on authentication\n"
 msgstr "hubo un error en la autentificación\n"
 


@@ -982,11 +1004,11 @@ msgstr "hubo un error en la autentificaci
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El mensaje es demasiado grande (Máximo %s)\n"
 

-#: src/common/smtp.c:635 src/pop.c:874
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "no se pudo iniciar la sesión TLS\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "no se pudo iniciar la sesión TLS\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escribir en fd%d: %s\n"


@@ -1003,9 +1025,9 @@ msgstr "Conexi
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244

-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<no en el certificado>"
 
 msgid "<not in certificate>"
 msgstr "<no en el certificado>"
 


@@ -1030,714 +1052,730 @@ msgstr "No se pudieron cargar las rutas X509 predeterminadas"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "(Asunto vacío por expr. reg.)"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%d b"
 
 #, c-format
 msgid "%dB"
 msgstr "%d b"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d Kb"
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d Kb"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d Mb"
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d Mb"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Domingo"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Domingo"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "Lunes"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Lunes"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Martes"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Martes"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Miércoles"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Miércoles"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Jueves"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Jueves"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "Viernes"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Viernes"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Sábado"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Sábado"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "Enero"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "Enero"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "Febrero"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "Febrero"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "Marzo"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "Marzo"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "Abril"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "Abril"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "Mayo"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "Mayo"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "Junio"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "Junio"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "Julio"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "Julio"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "Agosto"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "Agosto"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "Septiembre"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "Septiembre"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "Octubre"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "Octubre"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "Noviembre"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "Noviembre"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "Diciembre"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "Diciembre"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dom"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dom"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Lun"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Lun"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Mar"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Mar"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mié"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mié"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Jue"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Jue"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Vie"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Vie"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sáb"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sáb"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Ene"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Ene"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Feb"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Feb"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Abr"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Abr"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "May"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "May"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Ago"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Ago"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Oct"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Oct"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dic"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dic"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %H:%M:%S"
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %d %b %Y %H:%M:%S"
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d/%m/%y"
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d/%m/%y"
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/_Añadir..."
 
 msgid "/_Add..."
 msgstr "/_Añadir..."
 

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/_Quitar"
 
 msgid "/_Remove"
 msgstr "/_Quitar"
 

-#: src/compose.c:543 src/folderview.c:293
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 

-#: src/compose.c:548 src/mainwindow.c:755 src/messageview.c:289
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr "/_Mensaje"
 
 msgid "/_Message"
 msgstr "/_Mensaje"
 

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/_Mensaje/_Enviar"
 
 msgid "/_Message/S_end"
 msgstr "/_Mensaje/_Enviar"
 

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/_Mensaje/Enviar _después"
 
 msgid "/_Message/Send _later"
 msgstr "/_Mensaje/Enviar _después"
 

-#: src/compose.c:553 src/compose.c:557 src/compose.c:560 src/mainwindow.c:765
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765

 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/_Mensaje/_Adjuntar fichero"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Mensaje/_Adjuntar fichero"
 

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/_Mensaje/_Insertar fichero"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Mensaje/_Insertar fichero"
 

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensaje/Insertar _firma"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensaje/Insertar _firma"
 

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/_Mensaje/_Guardar"
 
 msgid "/_Message/_Save"
 msgstr "/_Mensaje/_Guardar"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/_Mensaje/_Cerrar"
 
 msgid "/_Message/_Close"
 msgstr "/_Mensaje/_Cerrar"
 

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 

-#: src/compose.c:566 src/compose.c:654 src/compose.c:657 src/compose.c:663
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674

 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 

-#: src/compose.c:568 src/mainwindow.c:531 src/messageview.c:169
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Pegar especial"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Pegar especial"
 

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Pegar especial/Como texto _citado"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Pegar especial/Como texto _citado"
 

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Pegar especial/_Recortado"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Pegar especial/_Recortado"
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Pegar especial/_Sin recortar"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Pegar especial/_Sin recortar"
 

-#: src/compose.c:577 src/mainwindow.c:532 src/messageview.c:170
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al carácter anterior"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al carácter anterior"
 

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al carácter siguiente"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al carácter siguiente"
 

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter anterior"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter anterior"
 

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter siguiente"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter siguiente"
 

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avanza_das/Borrar línea completa"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avanza_das/Borrar línea completa"
 

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/_Editar/_Buscar"
 
 msgid "/_Edit/_Find"
 msgstr "/_Editar/_Buscar"
 

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/_Ortografía"
 
 msgid "/_Spelling"
 msgstr "/_Ortografía"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografía/_Comprobar todo o la selección"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografía/_Comprobar todo o la selección"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografía/_Resaltar todas las faltas ortográficas"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografía/_Resaltar todas las faltas ortográficas"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografía/Comprobar faltas hacia _atrás"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografía/Comprobar faltas hacia _atrás"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografía/Avanzar hasta la siguiente _falta"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografía/Avanzar hasta la siguiente _falta"
 

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/_Ortografía/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Ortografía/---"
 

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/_Ortografía/Opciones"
 
 msgid "/_Spelling/Options"
 msgstr "/_Ortografía/Opciones"
 

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/_Opciones"
 
 msgid "/_Options"
 msgstr "/_Opciones"
 

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/_Opciones/_Modo de respuesta"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Opciones/_Modo de respuesta"
 

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opciones/_Modo de respuesta/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opciones/_Modo de respuesta/_Normal"
 

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opciones/_Modo de respuesta/A _todos"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opciones/_Modo de respuesta/A _todos"
 

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opciones/_Modo de respuesta/Al _remitente"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opciones/_Modo de respuesta/Al _remitente"
 

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opciones/_Modo de respuesta/A la _lista de correo"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opciones/_Modo de respuesta/A la _lista de correo"
 

-#: src/compose.c:686 src/compose.c:691 src/compose.c:698 src/compose.c:700
-#: src/compose.c:702
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/_Opciones/---"
 
 msgid "/_Options/---"
 msgstr "/_Opciones/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/_Opciones/_Sistema de privacidad"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Opciones/_Sistema de privacidad"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opciones/_Sistema de privacidad/Ninguno"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opciones/_Sistema de privacidad/Ninguno"
 

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/_Opciones/_Firmar"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Opciones/_Firmar"
 

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/_Opciones/_Cifrar"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opciones/_Cifrar"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/_Opciones/_Prioridad"
 
 msgid "/_Options/_Priority"
 msgstr "/_Opciones/_Prioridad"
 

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opciones/Prioridad/Má_xima"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opciones/Prioridad/Má_xima"
 

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opciones/Prioridad/_Alta"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opciones/Prioridad/_Alta"
 

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opciones/Prioridad/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opciones/Prioridad/_Normal"
 

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opciones/Prioridad/_Baja"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opciones/Prioridad/_Baja"
 

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opciones/Prioridad/_Mínima"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opciones/Prioridad/_Mínima"
 

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opciones/Solicitar acuse de _recibo"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opciones/Solicitar acuse de _recibo"
 

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opciones/Elimi_nar referencias"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opciones/Elimi_nar referencias"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/_Opciones/Codificación de caract_eres"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opciones/Codificación de caract_eres"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opciones/Codificación de caract_eres/_Autodetectar"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opciones/Codificación de caract_eres/_Autodetectar"
 

-#: src/compose.c:711 src/compose.c:717 src/compose.c:725 src/compose.c:729
-#: src/compose.c:735 src/compose.c:739 src/compose.c:745 src/compose.c:751
-#: src/compose.c:755 src/compose.c:765 src/compose.c:769 src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opciones/Codificación de caract_eres/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opciones/Codificación de caract_eres/---"
 

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opciones/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opciones/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opciones/Codificación de caract_eres/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opciones/Codificación de caract_eres/Unicode (_UTF-8)"
 

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 "/_Opciones/Codificación de caract_eres/Europeo Occidental (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 "/_Opciones/Codificación de caract_eres/Europeo Occidental (ISO-8859-_1)"
 

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 "/_Opciones/Codificación de caract_eres/Europeo Occidental (ISO-8859-_15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 "/_Opciones/Codificación de caract_eres/Europeo Occidental (ISO-8859-_15)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo Occidental (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo Occidental (Windows-1252)"
 

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opciones/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opciones/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opciones/Codificación de caract_eres/Báltico (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opciones/Codificación de caract_eres/Báltico (ISO-8859-13)"
 

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opciones/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opciones/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opciones/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opciones/Codificación de caract_eres/Griego (ISO-8859-_7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opciones/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opciones/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opciones/Codificación de caract_eres/Hebreo (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opciones/Codificación de caract_eres/Hebreo (Windows-1255)"
 

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opciones/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opciones/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opciones/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opciones/Codificación de caract_eres/Turco (ISO-8859-_9)"
 

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (KOI8-_R)"
 

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opciones/Codificación de caract_eres/Cirílico (KOI8-U)"
 

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opciones/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opciones/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino simplificado (_GB2312)"
 

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino simplificado (_GB2312)"
 

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino tradicional (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino tradicional (_Big5)"
 

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opciones/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opciones/Codificación de caract_eres/Coreano (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opciones/Codificación de caract_eres/Coreano (EUC-_KR)"
 

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opciones/Codificación de caract_eres/Tailandés (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opciones/Codificación de caract_eres/Tailandés (TIS-620)"
 

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opciones/Codificación de caract_eres/Tailandés (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opciones/Codificación de caract_eres/Tailandés (Windows-874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/_Herramientas/Mostrar _regleta"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Herramientas/Mostrar _regleta"
 

-#: src/compose.c:792 src/messageview.c:307
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/_Plantillas"
 
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/_Plantillas"
 

-#: src/compose.c:794 src/mainwindow.c:849 src/messageview.c:334
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 

-#: src/compose.c:1049 src/prefs_compose_writing.c:369
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 
 msgid "New message subject format error."
 msgstr "Error de formato en el asunto del mensaje nuevo."
 

-#: src/compose.c:1078 src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "Error de formato en el cuerpo del mensaje nuevo."
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "Error de formato en el cuerpo del mensaje nuevo en la línea %d."

 
 

-#: src/compose.c:1440 src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "Error de formato en el mensaje de respuesta."
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "Error de formato en el mensaje de respuesta en la línea %d."

 
 

-#: src/compose.c:1557 src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "Error de formato en el mensaje a reenviar."
+#: src/compose.c:1614 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "Error de formato en el mensaje a reenviar en la línea %d."

 
 

-#: src/compose.c:1677
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr "Fw: múltiples correos"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: múltiples correos"
 

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "Error de formato en mensaje a redirijir."
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "Error de formato en mensaje a redirijir en la línea %d."
+
+#: src/compose.c:2176 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"

 
 

-#: src/compose.c:2121
+#: src/compose.c:2179 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: src/compose.c:2182 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr "Responder a:"
 
 msgid "Reply-To:"
 msgstr "Responder a:"
 

-#: src/compose.c:2124 src/compose.c:5702 src/compose.c:6521 src/compose.c:9667
+#: src/compose.c:2185 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 

-#: src/compose.c:2127
+#: src/compose.c:2188 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr "Enviar a:"
 
 msgid "Followup-To:"
 msgstr "Enviar a:"
 

-#: src/compose.c:2306
+#: src/compose.c:2192 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "Para:"
+
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "El fichero «%s» se ha adjuntado."
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "El fichero «%s» se ha adjuntado."
 

-#: src/compose.c:2310
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
 

-#: src/compose.c:2541
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr "Error de formato en la marca de cita."
 
 msgid "Quote mark format error."
 msgstr "Error de formato en la marca de cita."
 

-#: src/compose.c:3146
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 

-#: src/compose.c:3150
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 

-#: src/compose.c:3177
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 

-#: src/compose.c:3998
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr " [Editado]"
 
 msgid " [Edited]"
 msgstr " [Editado]"
 

-#: src/compose.c:4005
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 

-#: src/compose.c:4008
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sin asunto] - Componer mensaje%s"
 

-#: src/compose.c:4010
+#: src/compose.c:4085

 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 
 msgid "Compose message"
 msgstr "Componer un mensaje nuevo"
 

-#: src/compose.c:4037 src/messageview.c:624
+#: src/compose.c:4112 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1745,36 +1783,36 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 

-#: src/compose.c:4230 src/compose.c:4261 src/compose.c:4293 src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4305 src/compose.c:4336 src/compose.c:4368
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr "Enviar"
 
 msgid "Send"
 msgstr "Enviar"
 

-#: src/compose.c:4231
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección CC por omisión. ¿Enviar de todas "
 "formas?"
 

-#: src/compose.c:4232 src/compose.c:4263 src/compose.c:4295 src/compose.c:4772
+#: src/compose.c:4307 src/compose.c:4338 src/compose.c:4370 src/compose.c:4850

 msgid "+_Send"
 msgstr "+_Enviar"
 
 msgid "+_Send"
 msgstr "+_Enviar"
 

-#: src/compose.c:4262
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección BCC por omisión. ¿Enviar de todas "
 "formas?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "El único destinatario es la dirección BCC por omisión. ¿Enviar de todas "
 "formas?"
 

-#: src/compose.c:4279
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 

-#: src/compose.c:4294
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 

-#: src/compose.c:4341 src/compose.c:8026
+#: src/compose.c:4416 src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1784,7 +1822,7 @@ msgstr ""
 "\n"
 "Falló la conversión del conjunto caracteres."
 
 "\n"
 "Falló la conversión del conjunto caracteres."
 

-#: src/compose.c:4344 src/compose.c:8029
+#: src/compose.c:4419 src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1794,7 +1832,7 @@ msgstr ""
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 
 "\n"
 "No se pudo obtener la clave de cifrado del destinatario."
 

-#: src/compose.c:4348 src/compose.c:8023
+#: src/compose.c:4425 src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1805,7 +1843,7 @@ msgstr ""
 "\n"
 "Falló la firma: %s"
 
 "\n"
 "Falló la firma: %s"
 

-#: src/compose.c:4351
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1816,11 +1854,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4353
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 
 msgid "Could not queue message for sending."
 msgstr "No se puede poner en la cola el mensaje para enviar."
 

-#: src/compose.c:4368 src/compose.c:4429
+#: src/compose.c:4445 src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1828,7 +1866,7 @@ msgstr ""
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 
 "El mensaje está en la cola pero no se pudo enviar.\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
 

-#: src/compose.c:4423
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1837,7 +1875,7 @@ msgstr ""
 "%s\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 
 "%s\n"
 "Utilize «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
 

-#: src/compose.c:4769
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1848,7 +1886,7 @@ msgstr ""
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 
 "al conjunto de caracteres %s especificado.\n"
 "¿Enviarlo como %s?"
 

-#: src/compose.c:4828
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1861,62 +1899,74 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
 "\n"
 "¿Enviarlo de todas formas?"
 

-#: src/compose.c:5016
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr "Aviso de cifrado"
+
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr "+C_ontinuar"
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 
 msgid "No account for sending mails available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
 

-#: src/compose.c:5026
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar noticias!"
 
 msgid "No account for posting news available!"
 msgstr "¡No hay ninguna cuenta disponible para enviar noticias!"
 

-#: src/compose.c:5719
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr "Añadir a la agen_da"
+
+#: src/compose.c:5876

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Usar «tab» para autocompletar con la agenda"
 

-#: src/compose.c:5858
+#: src/compose.c:6024

 msgid "Mime type"
 msgstr "Tipo MIME"
 
 msgid "Mime type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:5864 src/compose.c:6180 src/mimeview.c:212
+#: src/compose.c:6030 src/compose.c:6348 src/mimeview.c:214

 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86

-#: src/summaryview.c:495
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "Tamaño"
 
 msgid "Size"
 msgstr "Tamaño"
 

-#: src/compose.c:5934
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 
 msgid "Save Message to "
 msgstr "Guardar mensaje en "
 

-#: src/compose.c:5956 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:6122 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383 src/prefs_spelling.c:207
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Explorar"
 
 msgid "_Browse"
 msgstr "_Explorar"
 

-#: src/compose.c:6179 src/compose.c:7433
+#: src/compose.c:6347 src/compose.c:7662

 msgid "MIME type"
 msgstr "Tipo MIME"
 
 msgid "MIME type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:6253
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr "_Cabecera"
 
 msgid "Hea_der"
 msgstr "_Cabecera"
 

-#: src/compose.c:6257
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr "_Adjuntos"
 
 msgid "_Attachments"
 msgstr "_Adjuntos"
 

-#: src/compose.c:6261
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr "Ot_ros"
 
 msgid "Othe_rs"
 msgstr "Ot_ros"
 

-#: src/compose.c:6276 src/summary_search.c:370
+#: src/compose.c:6445 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr "Asunto:"
 
 msgid "Subject:"
 msgstr "Asunto:"
 

-#: src/compose.c:6483
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1925,20 +1975,20 @@ msgstr ""
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 
 "No se puede iniciar el corrector ortográfico.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 
 msgid "Account to use for this email"
 msgstr "Cuenta a usar para este correo"
 

-#: src/compose.c:6632
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 
 msgid "Sender address to be used"
 msgstr "Dirección del remitente a usar"
 

-#: src/compose.c:6793
+#: src/compose.c:6967

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1947,51 +1997,52 @@ msgstr ""
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 
 "No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
 "o cifrar este mensaje."
 

-#: src/compose.c:6955 src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "Error de formato en el cuerpo de la plantilla."
+#: src/compose.c:7167 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "Error de formato en el cuerpo de la plantilla en la línea %d."

 
 

-#: src/compose.c:7063 src/prefs_template.c:587
+#: src/compose.c:7277 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 
 msgid "Template To format error."
 msgstr "Error de formato en el Para de la plantilla."
 

-#: src/compose.c:7076 src/prefs_template.c:592
+#: src/compose.c:7295 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 
 msgid "Template Cc format error."
 msgstr "Error de formato en el Cc de la plantilla."
 

-#: src/compose.c:7089 src/prefs_template.c:597
+#: src/compose.c:7313 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 
 msgid "Template Bcc format error."
 msgstr "Error de formato en el Bcc de la plantilla."
 

-#: src/compose.c:7103 src/prefs_template.c:602
+#: src/compose.c:7332 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 
 msgid "Template subject format error."
 msgstr "Error de formato en el asunto de la plantilla."
 

-#: src/compose.c:7327
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 

-#: src/compose.c:7342
+#: src/compose.c:7571

 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 

-#: src/compose.c:7415
+#: src/compose.c:7644

 msgid "Properties"
 msgstr "Propiedades"
 
 msgid "Properties"
 msgstr "Propiedades"
 

-#: src/compose.c:7466
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr "Codificación"
 
 msgid "Encoding"
 msgstr "Codificación"
 

-#: src/compose.c:7486
+#: src/compose.c:7715

 msgid "Path"
 msgstr "Ruta"
 
 msgid "Path"
 msgstr "Ruta"
 

-#: src/compose.c:7487 src/prefs_toolbar.c:1069
+#: src/compose.c:7716 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr "Nombre de fichero"
 
 msgid "File name"
 msgstr "Nombre de fichero"
 

-#: src/compose.c:7670
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -2002,19 +2053,19 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada del proceso monitorizador\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada del proceso monitorizador\n"
 

-#: src/compose.c:7993 src/messageview.c:729
+#: src/compose.c:8222 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
 

-#: src/compose.c:8018
+#: src/compose.c:8247

 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 
 msgid "Could not queue message."
 msgstr "El mensaje no se pudo poner en la cola."
 

-#: src/compose.c:8020
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2025,20 +2076,40 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:8193
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 
 msgid "Could not save draft."
 msgstr "No se puede guardar el borrador."
 

-#: src/compose.c:8271 src/compose.c:8294
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr "No se puede guardar el borrador"
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"No se ha podido guardar el borrador.\n"
+"¿Desea cancelar la salida o descartar este correo?"
+
+#: src/compose.c:8393
+msgid "_Cancel exit"
+msgstr "_Cancelar salida"
+
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr "_Descartar correo"
+
+#: src/compose.c:8527 src/compose.c:8550

 msgid "Select file"
 msgstr "Seleccionar fichero"
 
 msgid "Select file"
 msgstr "Seleccionar fichero"
 

-#: src/compose.c:8307
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se puede leer el fichero «%s»."
 

-#: src/compose.c:8309
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2047,44 +2118,44 @@ msgstr ""
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
 "El fichero «%s» contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 

-#: src/compose.c:8362
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr "Descartar mensaje"
 
 msgid "Discard message"
 msgstr "Descartar mensaje"
 

-#: src/compose.c:8363
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr "_Descartar"
 
 msgid "_Discard"
 msgstr "_Descartar"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 
 msgid "_Save to Drafts"
 msgstr "Guardar en _Borradores"
 

-#: src/compose.c:8408
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 

-#: src/compose.c:8410
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr "_Reemplazar"
 
 msgid "_Replace"
 msgstr "_Reemplazar"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr "_Insertar"
 
 msgid "_Insert"
 msgstr "_Insertar"
 

-#: src/compose.c:9142
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 
 msgid "Insert or attach?"
 msgstr "¿Insertar o adjuntar?"
 

-#: src/compose.c:9143
+#: src/compose.c:9417

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -2092,19 +2163,20 @@ msgstr ""
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 
 "¿Quiere insertar el contenido de este/os fichero/s en el cuerpo del correo o "
 "prefiere adjuntarlo/s al mismo?"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr "+_Insertar"
 
 msgid "+_Insert"
 msgstr "+_Insertar"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr "_Adjuntar"
 
 msgid "_Attach"
 msgstr "_Adjuntar"
 

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "Error de formato en la cita."
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "Error de formato de cita en la línea %d."

 
 

-#: src/compose.c:9563
+#: src/compose.c:9835

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -2135,7 +2207,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Traza de depuración"
 
 msgid "Debug log"
 msgstr "Traza de depuración"
 

-#: src/crash.c:251 src/toolbar.c:483 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr "Cerrar"
 
 msgid "Close"
 msgstr "Cerrar"
 


@@ -2147,73 +2219,73 @@ msgstr "Guardar..."
 msgid "Create bug report"
 msgstr "Crear informe de error"
 
 msgid "Create bug report"
 msgstr "Crear informe de error"
 

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 
 msgid "Save crash information"
 msgstr "Guardar información de terminación incorrecta"
 

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "Añadir persona nueva"
 
 msgid "Add New Person"
 msgstr "Añadir persona nueva"
 

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 
 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 
 msgid "An Email address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "Descartar"
 
 msgid "Discard"
 msgstr "Descartar"
 

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "Aplicar"
 
 msgid "Apply"
 msgstr "Aplicar"
 

-#: src/editaddress.c:651 src/editaddress.c:700
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 

-#: src/editaddress.c:761 src/expldifdlg.c:508 src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 msgid "Display Name"
 msgstr "Nombre mostrado"
 

-#: src/editaddress.c:767 src/editaddress.c:771 src/ldif.c:771
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr "Apellidos"
 
 msgid "Last Name"
 msgstr "Apellidos"
 

-#: src/editaddress.c:768 src/editaddress.c:770 src/ldif.c:767
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr "Nombre"
 
 msgid "First Name"
 msgstr "Nombre"
 

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "Apodo"
 
 msgid "Nickname"
 msgstr "Apodo"
 

-#: src/editaddress.c:850 src/editaddress.c:906
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:1044 src/editaddress.c:1101 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:536
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "Valor"
 
 msgid "Value"
 msgstr "Valor"
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "Datos de _usuario"
 
 msgid "_User Data"
 msgstr "Datos de _usuario"
 

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 
 msgid "_Email Addresses"
 msgstr "_Direcciones de correo"
 

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 
 msgid "O_ther Attributes"
 msgstr "O_tros atributos"
 


@@ -2238,7 +2310,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:2004
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr "Fichero"
 
 msgid "File"
 msgstr "Fichero"
 


@@ -2383,7 +2455,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
 msgid "TLS"
 msgstr "TLS"
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 


@@ -2567,7 +2639,7 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr "Básicas"
 
 msgid "Basic"
 msgstr "Básicas"
 


@@ -2575,7 +2647,7 @@ msgstr "B
 msgid "Search"
 msgstr "Buscar"
 
 msgid "Search"
 msgstr "Buscar"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:496
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "Extendido"
 
 msgid "Extended"
 msgstr "Extendido"
 


@@ -2650,7 +2722,7 @@ msgid "HTML Output File"
 msgstr "Fichero HTML de salida"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 msgstr "Fichero HTML de salida"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "Explo_rar"
 
 msgid "B_rowse"
 msgstr "Explo_rar"
 


@@ -2659,8 +2731,8 @@ msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
 msgstr "Hoja de estilos"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661

-#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "Ninguno"
 
 msgid "None"
 msgstr "Ninguno"
 


@@ -2712,7 +2784,7 @@ msgstr "Formatear enlaces de correo electr
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 
 msgid "Format User Attributes"
 msgstr "Formatear atributos del usuario"
 

-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 


@@ -2724,7 +2796,7 @@ msgstr "Abrir con el navegador web"
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un fichero HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un fichero HTML"
 

-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr "Información de fichero"
 
 msgid "File Info"
 msgstr "Información de fichero"
 


@@ -2891,7 +2963,7 @@ msgstr "Exportar agenda a un fichero LDIF"
 msgid "Distguished Name"
 msgstr "Nombre distinguido"
 
 msgid "Distguished Name"
 msgstr "Nombre distinguido"
 

-#: src/export.c:120 src/summaryview.c:6586
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 
 msgid "Export to mbox file"
 msgstr "Exportar a fichero mbox"
 


@@ -2927,81 +2999,81 @@ msgstr "Seleccione fichero de exportaci
 msgid "Full Name"
 msgstr "Nombre completo"
 
 msgid "Full Name"
 msgstr "Nombre completo"
 

-#: src/exporthtml.c:762 src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr "Atributos"
 
 msgid "Attributes"
 msgstr "Atributos"
 

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Agenda de direcciones de Claws Mail"
 
 msgid "Claws Mail Address Book"
 msgstr "Agenda de direcciones de Claws Mail"
 

-#: src/exporthtml.c:1077 src/exportldif.c:551
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr "El nombre ya existe pero no es un directorio."
 
 msgid "Name already exists but is not a directory."
 msgstr "El nombre ya existe pero no es un directorio."
 

-#: src/exporthtml.c:1080 src/exportldif.c:554
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr "No tiene permisos para crear el directorio."
 
 msgid "No permissions to create directory."
 msgstr "No tiene permisos para crear el directorio."
 

-#: src/exporthtml.c:1083 src/exportldif.c:557
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr "El nombre es demasiado largo."
 
 msgid "Name is too long."
 msgstr "El nombre es demasiado largo."
 

-#: src/exporthtml.c:1086 src/exportldif.c:560
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr "Sin especificar."
 
 msgid "Not specified."
 msgstr "Sin especificar."
 

-#: src/folder.c:1334 src/foldersel.c:370 src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "Entrada"
 
 msgid "Inbox"
 msgstr "Entrada"
 

-#: src/folder.c:1338 src/foldersel.c:374
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr "Enviado"
 
 msgid "Sent"
 msgstr "Enviado"
 

-#: src/folder.c:1342 src/foldersel.c:378 src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "Cola"
 
 msgid "Queue"
 msgstr "Cola"
 

-#: src/folder.c:1346 src/foldersel.c:382 src/prefs_folder_item.c:243
-#: src/toolbar.c:385 src/toolbar.c:428 src/toolbar.c:526
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgstr "Papelera"
 
 msgid "Trash"
 msgstr "Papelera"
 

-#: src/folder.c:1350 src/foldersel.c:386 src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "Borradores"
 
 msgid "Drafts"
 msgstr "Borradores"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Obteniendo todos los mensajes en %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Obteniendo todos los mensajes en %s ...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s a %s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando cache para %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualizando cache para %s..."
 

-#: src/folder.c:3864
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 
 msgid "Processing messages..."
 msgstr "Procesando mensajes..."
 

-#: src/folder.c:3993
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso sin conexión...\n"


@@ -3064,7 +3136,7 @@ msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:473 src/summaryview.c:496
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "Nº"
 
 msgid "#"
 msgstr "Nº"
 


@@ -3072,20 +3144,20 @@ msgstr "N
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 

-#: src/folderview.c:816 src/summaryview.c:3555
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 
 msgid "Mark all as read"
 msgstr "Marcar todo como leído"
 

-#: src/folderview.c:817 src/summaryview.c:3556
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
 

-#: src/folderview.c:1034 src/imap.c:3420 src/mainwindow.c:3897 src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 

-#: src/folderview.c:1038 src/imap.c:3425 src/mainwindow.c:3902 src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."


@@ -3113,62 +3185,62 @@ msgstr "Explorando 
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 
 msgid "Couldn't scan folder %s\n"
 msgstr "No se puede explorar la carpeta %s\n"
 

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 

-#: src/folderview.c:2059
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Cerrando carpeta %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Cerrando carpeta %s..."
 

-#: src/folderview.c:2149
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abriendo carpeta %s ..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abriendo carpeta %s ..."
 

-#: src/folderview.c:2162
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 
 msgid "Folder could not be opened."
 msgstr "No se puede abrir la carpeta."
 

-#: src/folderview.c:2324 src/mainwindow.c:2121
+#: src/folderview.c:2339 src/mainwindow.c:2121

 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 

-#: src/folderview.c:2325
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
 msgid "Delete all messages in trash?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 

-#: src/folderview.c:2326
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 
 msgid "+_Empty trash"
 msgstr "+_Vaciar papelera"
 

-#: src/folderview.c:2370 src/inc.c:1478 src/toolbar.c:2320
+#: src/folderview.c:2385 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "Notificación conexión"
 
 msgid "Offline warning"
 msgstr "Notificación conexión"
 

-#: src/folderview.c:2371 src/toolbar.c:2321
+#: src/folderview.c:2386 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 

-#: src/folderview.c:2382 src/toolbar.c:2340
+#: src/folderview.c:2397 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 
 msgid "Send queued messages"
 msgstr "Enviar mensajes en la cola"
 

-#: src/folderview.c:2383 src/toolbar.c:2341
+#: src/folderview.c:2398 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 
 msgid "Send all queued messages?"
 msgstr "¿Enviar todos los mensajes en la cola?"
 

-#: src/folderview.c:2384 src/messageview.c:590 src/messageview.c:607
-#: src/prefs_account.c:1122 src/toolbar.c:2342
+#: src/folderview.c:2399 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "_Enviar"
 
 msgid "_Send"
 msgstr "_Enviar"
 

-#: src/folderview.c:2392 src/toolbar.c:2360
+#: src/folderview.c:2407 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 

-#: src/folderview.c:2395 src/main.c:1762 src/toolbar.c:2363
+#: src/folderview.c:2410 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3177,65 +3249,65 @@ msgstr ""
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 
 "Hubo algún error enviando los mensajes en la cola:\n"
 "%s"
 

-#: src/folderview.c:2462
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "¿Quiere realmente copiar la carpeta «%s» a «%s»?"
 

-#: src/folderview.c:2463
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "¿Quiere realmente mover la carpeta «%s» a una subcarpeta de «%s»?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "¿Quiere realmente mover la carpeta «%s» a una subcarpeta de «%s»?"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Move folder"
 msgstr "Mover carpeta"
 
 msgid "Move folder"
 msgstr "Mover carpeta"
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s a %s..."
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 

-#: src/folderview.c:2510
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 
 msgid "Can't copy a folder to one of its children."
 msgstr "No se puede copiar una carpeta a una de sus subcarpetas."
 

-#: src/folderview.c:2511
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 

-#: src/folderview.c:2514
+#: src/folderview.c:2529

 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 
 msgid "Copy failed!"
 msgstr "¡Copiar falló!"
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 

-#: src/folderview.c:2568
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuración de procesamiento para la carpeta «%s»"
 

-#: src/gedit-print.c:147 src/messageview.c:1544 src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "Imprimir"
 
 msgid "Print"
 msgstr "Imprimir"
 


@@ -3261,64 +3333,64 @@ msgstr "Previsualizar impresi
 msgid "Page %N of %Q"
 msgstr "Página %N de %Q"
 
 msgid "Page %N of %Q"
 msgstr "Página %N de %Q"
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "Suscripción a grupos de noticias"
 
 msgid "Newsgroup subscription"
 msgstr "Suscripción a grupos de noticias"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "Seleccione los grupos de noticias a suscribir:"
 
 msgid "Select newsgroups for subscription:"
 msgstr "Seleccione los grupos de noticias a suscribir:"
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "Buscar grupos:"
 
 msgid "Find groups:"
 msgstr "Buscar grupos:"
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " Buscar "
 
 msgid " Search "
 msgstr " Buscar "
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr "Nombre de grupo"
 
 msgid "Newsgroup name"
 msgstr "Nombre de grupo"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "Mensajes"
 
 msgid "Messages"
 msgstr "Mensajes"
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "Tipo"
 
 msgid "Type"
 msgstr "Tipo"
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "moderado"
 
 msgid "moderated"
 msgstr "moderado"
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "solo lectura"
 
 msgid "readonly"
 msgstr "solo lectura"
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "desconocido"
 
 msgid "unknown"
 msgstr "desconocido"
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1367
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr "Hecho."
 
 msgid "Done."
 msgstr "Hecho."
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 

-#: src/gtk/about.c:79 src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "/_Abrir con el navegador web"
 
 msgid "/_Open with Web browser"
 msgstr "/_Abrir con el navegador web"
 

-#: src/gtk/about.c:80 src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/_Copiar el enlace"
 
 msgid "/Copy this _link"
 msgstr "/_Copiar el enlace"
 


@@ -3617,7 +3689,7 @@ msgstr ""
 "Mover las carpetas arriba o abajo para cambiar la posición en la lista de "
 "carpetas."
 
 "Mover las carpetas arriba o abajo para cambiar la posición en la lista de "
 "carpetas."
 

-#: src/gtk/foldersort.c:214 src/toolbar.c:409
+#: src/gtk/foldersort.c:214 src/toolbar.c:410

 msgid "Folders"
 msgstr "Carpetas"
 
 msgid "Folders"
 msgstr "Carpetas"
 


@@ -3840,33 +3912,430 @@ msgstr "Descripci
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Tipografía a usar para las cabeceras y los pies (p.ej. «Monospace 10»)"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Tipografía a usar para las cabeceras y los pies (p.ej. «Monospace 10»)"
 

-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "Mensaje nuevo"
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "Fecha"

 
 

-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "Mensaje sin leer"
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "Fecha:"

 
 

-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "Mensaje que ha sido respondido"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"
+msgstr "Desde"

 
 

-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "Mensaje que ha sido reenviado"
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "Desde:"

 
 

-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "Mensaje que está en un hilo ignorado"
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"
+msgstr "Remitente"

 
 

-#: src/gtk/icon_legend.c:72
-msgid "Message is spam"
-msgstr "Mensaje que es correo basura"
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "Remitente:"

 
 

-#: src/gtk/icon_legend.c:74
-msgid "Message has attachment(s)"
-msgstr "Mensaje que tiene adjunto(s)"
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "Para"
+
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "Cc"
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr "Bcc"
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr "ID-Mensaje"
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr "ID-Mensaje:"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr "En-Respuesta-A"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr "En-Respuesta-A:"
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr "Referencias"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr "Referencias:"
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr "Asunto"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr "Comentarios"
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr "Comentarios:"
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr "Palabras clave:"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr "Reenvío-Fecha"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr "Reenvío-Fecha:"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr "Reenvío-Desde"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr "Reenvío-Desde:"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr "Reenvío-Remitente"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr "Reenvío-Remitente:"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr "Reenvío-Para"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr "Reenvío-Para:"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr "Reenvío-Cc"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr "Reenvío-Cc:"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr "Reenvío-Bcc"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr "Reenvío-Bcc:"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr "Reenvío-ID-Mensaje"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr "Reenvío-ID-Mensaje:"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr "Ruta-Retorno:"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr "Ruta-Retorno:"
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr "Recibido"
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr "Recibido:"
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr "Subsiguiente-Para"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr "Distribuido-A"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr "Distribuido-A:"
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr "Visto"
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr "Visto:"
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "Estado"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr "Cara"
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr "Cara:"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr "Notificación-Disposición-A"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr "Notificación-Disposición-Para:"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr "Acuse-Recibo-Para"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr "Acuse-Recibo-Para:"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr "Agente-Usuario"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr "Agente-Usuario:"
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr "Tipo-Contenido"
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr "Tipo-Contenido:"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr "Codificación-Transferencia-Contenido"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr "Codificación-Transferencia-Contenido:"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr "Versión-MIME"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr "Versión-MIME:"
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr "Precedencia"
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr "Precedencia:"
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "Organización"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Organización:"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "Lista-Correo"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "Lista-Correo:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr "Lista-Enviar"
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr "Lista-Enviar:"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr "Lista-Suscribir"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr "Lista-Suscribir:"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr "Lista-Desuscribir"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr "Lista-Desuscribir:"
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr "Lista-Ayuda"
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr "Lista-Ayuda:"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr "Lista-Archivo"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr "Lista-Archivo:"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr "Lista-Propietario"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr "Lista-Propietario:"
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr "X-Etiqueta"
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr "X-Etiqueta:"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr "X-Cartero"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr "X-Cartero:"
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr "X-Estado"
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr "X-Estado:"
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr "X-Cara"
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr "X-Cara:"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr "X-No-Archivar"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr "X-No-Archivar:"
+
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr "En respuesta a"
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr "En respuesta a:"
+
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr "Para o Cc"
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr "Para o Cc:"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr "Desde, Para o Asunto"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr "Desde, Para o Asunto:"
+
+#: src/gtk/icon_legend.c:67
+msgid "New message"
+msgstr "Mensaje nuevo"
+
+#: src/gtk/icon_legend.c:68
+msgid "Unread message"
+msgstr "Mensaje sin leer"
+
+#: src/gtk/icon_legend.c:69
+msgid "Message has been replied to"
+msgstr "Mensaje que ha sido respondido"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been forwarded"
+msgstr "Mensaje que ha sido reenviado"
+
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "Mensaje que está en un hilo ignorado"
+
+#: src/gtk/icon_legend.c:72
+msgid "Message is spam"
+msgstr "Mensaje que es correo basura"
+
+#: src/gtk/icon_legend.c:74
+msgid "Message has attachment(s)"
+msgstr "Mensaje que tiene adjunto(s)"

 
 #: src/gtk/icon_legend.c:75
 msgid "Digitally signed message"
 
 #: src/gtk/icon_legend.c:75
 msgid "Digitally signed message"


@@ -3941,11 +4410,11 @@ msgstr "Introduzca la contrase
 msgid "Remember this"
 msgstr "Recordar esto"
 
 msgid "Remember this"
 msgstr "Recordar esto"
 

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 
 msgid "Clear _Log"
 msgstr "_Limpiar traza"
 

-#: src/gtk/pluginwindow.c:151 src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3955,19 +4424,19 @@ msgstr ""
 "\n"
 "Versión: "
 
 "\n"
 "Versión: "
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "Error: "
 
 msgid "Error: "
 msgstr "Error: "
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "El módulo no está operativo."
 
 msgid "Plugin is not functional."
 msgstr "El módulo no está operativo."
 

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "Seleccionar los módulos a cargar"
 
 msgid "Select the Plugins to load"
 msgstr "Seleccionar los módulos a cargar"
 

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -3978,234 +4447,231 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287 src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Módulos"
 
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Módulos"
 

-#: src/gtk/pluginwindow.c:321 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr "Descripción"
 
 msgid "Description"
 msgstr "Descripción"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr "Hay más módulos disponibles en el sitio web de Claws Mail."
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr "Hay más módulos disponibles en el sitio web de Claws Mail."
 

-#: src/gtk/pluginwindow.c:344 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr "Obtener más..."
 
 msgid "Get more..."
 msgstr "Obtener más..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "Cargar módulo..."
 
 msgid "Load Plugin..."
 msgstr "Cargar módulo..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "Descargar módulo"
 
 msgid "Unload Plugin"
 msgstr "Descargar módulo"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "Pulse aquí para cargar uno o más módulos"
 
 msgid "Click here to load one or more plugins"
 msgstr "Pulse aquí para cargar uno o más módulos"
 

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "Descargar el módulo seleccionado"
 
 msgid "Unload the selected plugin"
 msgstr "Descargar el módulo seleccionado"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 
 msgid "Loaded plugins"
 msgstr "Módulos cargados"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "Página índice"
 
 msgid "Page Index"
 msgstr "Página índice"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:842
-#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "Cuenta"
 
 msgid "Account"
 msgstr "Cuenta"
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2458
-msgid "Status"
-msgstr "Estado"
-
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "todos los mensajes"
 
 msgid "all messages"
 msgstr "todos los mensajes"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "mensajes cuya edad es mayor que "
 
 msgid "messages whose age is greater than #"
 msgstr "mensajes cuya edad es mayor que "
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "mensajes cuya edad es menor que "
 
 msgid "messages whose age is less than #"
 msgstr "mensajes cuya edad es menor que "
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "mensajes borrados"
 
 msgid "deleted messages"
 msgstr "mensajes borrados"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "mensajes provinientes del usuario S"
 
 msgid "messages originating from user S"
 msgstr "mensajes provinientes del usuario S"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "mensajes que contienen la cabecera S"
 
 msgid "messages which contain header S"
 msgstr "mensajes que contienen la cabecera S"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "mensajes que contienen S en la cabecera Message-ID"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "mensajes que contienen S en la cabecera Message-ID"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "mensajes que están marcados con el color nº"
 
 msgid "messages which are marked with color #"
 msgstr "mensajes que están marcados con el color nº"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "mensajes bloqueados"
 
 msgid "locked messages"
 msgstr "mensajes bloqueados"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 
 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "mensajes nuevos"
 
 msgid "new messages"
 msgstr "mensajes nuevos"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "mensajes antiguos"
 
 msgid "old messages"
 msgstr "mensajes antiguos"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensajes incompletos (no descargados por completo)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensajes incompletos (no descargados por completo)"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "mensajes que han sido respondidos"
 
 msgid "messages which have been replied to"
 msgstr "mensajes que han sido respondidos"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "mensajes leídos"
 
 msgid "read messages"
 msgstr "mensajes leídos"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 
 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "mensajes con puntuación igual a "
 
 msgid "messages whose score is equal to #"
 msgstr "mensajes con puntuación igual a "
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "mensajes con puntuación mayor que "
 
 msgid "messages whose score is greater than #"
 msgstr "mensajes con puntuación mayor que "
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "mensajes con puntuación menor que "
 
 msgid "messages whose score is lower than #"
 msgstr "mensajes con puntuación menor que "
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "mensajes con tamaño igual a "
 
 msgid "messages whose size is equal to #"
 msgstr "mensajes con tamaño igual a "
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "mensajes con tamaño mayor que "
 
 msgid "messages whose size is greater than #"
 msgstr "mensajes con tamaño mayor que "
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "mensajes con tamaño menor que "
 
 msgid "messages whose size is smaller than #"
 msgstr "mensajes con tamaño menor que "
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 
 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "mensajes marcados"
 
 msgid "marked messages"
 msgstr "mensajes marcados"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "mensajes sin leer"
 
 msgid "unread messages"
 msgstr "mensajes sin leer"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 
 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensajes que devuelven 0 al pasarlos a una orden - %F es el fichero del "
 "mensaje"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensajes que devuelven 0 al pasarlos a una orden - %F es el fichero del "
 "mensaje"
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "operador Y lógico"
 
 msgid "logical AND operator"
 msgstr "operador Y lógico"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "operador O lógico"
 
 msgid "logical OR operator"
 msgstr "operador O lógico"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 
 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 
 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "se admite cualquier expresión de filtrado"
 
 msgid "all filtering expressions are allowed"
 msgstr "se admite cualquier expresión de filtrado"
 

-#: src/gtk/quicksearch.c:387 src/summary_search.c:401
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr "Búsqueda extendida"
 
 msgid "Extended Search"
 msgstr "Búsqueda extendida"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 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"
 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"


@@ -4217,115 +4683,99 @@ msgstr ""
 "\n"
 "Se pueden utilizar los siguientes símbolos:"
 
 "\n"
 "Se pueden utilizar los siguientes símbolos:"
 

-#: src/gtk/quicksearch.c:484 src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160 src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:48 src/summaryview.c:491
-msgid "Subject"
-msgstr "Asunto"
-
-#: src/gtk/quicksearch.c:488 src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:492
-msgid "From"
-msgstr "Desde"
-
-#: src/gtk/quicksearch.c:492 src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "Para"
-
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr "Recursivo"
 
 msgid "Recursive"
 msgstr "Recursivo"
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr "Pegajoso"
 
 msgid "Sticky"
 msgstr "Pegajoso"
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "Mientras teclea"
 
 msgid "Type-ahead"
 msgstr "Mientras teclea"
 

-#: src/gtk/quicksearch.c:554 src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr "Ejecutar sobre la selección"
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr " Limpiar "
 
 msgid " Clear "
 msgstr " Limpiar "
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 
 msgid "Clear the current search"
 msgstr "Limpiar la búsqueda actual"
 

-#: src/gtk/quicksearch.c:577 src/summary_search.c:354
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 
 msgid "Edit search criteria"
 msgstr "Editar el criterio de búsqueda"
 

-#: src/gtk/quicksearch.c:583 src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 
 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 
 msgid "Information about extended symbols"
 msgstr "Información sobre los símbolos extendidos"
 

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "Información"
 
 msgid "Info"
 msgstr "Información"
 

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "Limpiar"
 
 msgid "Clear"
 msgstr "Limpiar"
 

-#: src/gtk/quicksearch.c:1090 src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscando en %s...\n"
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "correcto"
 
 msgid "correct"
 msgstr "correcto"
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "Propietario"
 
 msgid "Owner"
 msgstr "Propietario"
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "Firmante"
 
 msgid "Signer"
 msgstr "Firmante"
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nombre: "
 
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nombre: "
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Organización: "
 
 msgid "Organization: "
 msgstr "Organización: "
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "Localización: "
 
 msgid "Location: "
 msgstr "Localización: "
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "Huella: "
 
 msgid "Fingerprint: "
 msgstr "Huella: "
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "Estado de la firma: "
 
 msgid "Signature status: "
 msgstr "Estado de la firma: "
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "Caduca en: "
 
 msgid "Expires on: "
 msgstr "Caduca en: "
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificado SSL para %s"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificado SSL para %s"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -4334,30 +4784,30 @@ msgstr ""
 "El certificado de %s es desconocido.\n"
 "¿Quiere aceptarlo?"
 
 "El certificado de %s es desconocido.\n"
 "¿Quiere aceptarlo?"
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "Estado de la firma: %s"
 
 #, c-format
 msgid "Signature status: %s"
 msgstr "Estado de la firma: %s"
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "_Mostrar certificado"
 
 msgid "_View certificate"
 msgstr "_Mostrar certificado"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconocido"
 
 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconocido"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "_Cancelar conexión"
 
 msgid "_Cancel connection"
 msgstr "_Cancelar conexión"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "_Aceptar y guardar"
 
 msgid "_Accept and save"
 msgstr "_Aceptar y guardar"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -4366,40 +4816,40 @@ msgstr ""
 "El certificado de %s está caducado.\n"
 "¿Quiere continuar?"
 
 "El certificado de %s está caducado.\n"
 "¿Quiere continuar?"
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "Certificados SSL caducados"
 
 msgid "Expired SSL Certificate"
 msgstr "Certificados SSL caducados"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "_Aceptar"
 
 msgid "_Accept"
 msgstr "_Aceptar"
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "Certificado nuevo:"
 
 msgid "New certificate:"
 msgstr "Certificado nuevo:"
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "Certificado conocido:"
 
 msgid "Known certificate:"
 msgstr "Certificado conocido:"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "El certificado de %s ha cambiado. ¿Quiere aceptarlo?"
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "El certificado de %s ha cambiado. ¿Quiere aceptarlo?"
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "_Mostrar certificados"
 
 msgid "_View certificates"
 msgstr "_Mostrar certificados"
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "Certificado SSL cambiado"
 
 msgid "Changed SSL Certificate"
 msgstr "Certificado SSL cambiado"
 

-#: src/headerview.c:195 src/summaryview.c:2866 src/summaryview.c:2877
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(Sin remite)"
 
 msgid "(No From)"
 msgstr "(Sin remite)"
 

-#: src/headerview.c:210 src/summaryview.c:2901 src/summaryview.c:2904
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 


@@ -4415,11 +4865,7 @@ msgstr "Tama
 msgid "Load Image"
 msgstr "Cargar imagen"
 
 msgid "Load Image"
 msgstr "Cargar imagen"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr "Content-Type:"
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4431,37 +4877,37 @@ msgstr ""
 "Las autentificaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo CRAM-MD5 de SASL está instalado."
 
 "Las autentificaciones con CRAM-MD5 sólo funcionarán si libetpan ha sido "
 "compilada con soporte SASL y el módulo CRAM-MD5 de SASL está instalado."
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: login rechazado.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Falló la conexión con %s: login rechazado.%s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: login rechazado.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Falló la conexión con %s: login rechazado.%s\n"
 

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Falló la conexión con %s"
 

-#: src/imap.c:666 src/imap.c:669
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha desconectado. Reconectando...\n"
 

-#: src/imap.c:718 src/imap.c:2447 src/imap.c:2956 src/imap.c:3041
-#: src/imap.c:3386 src/imap.c:4143
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
 

-#: src/imap.c:797 src/inc.c:773 src/news.c:295 src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 

-#: src/imap.c:798 src/inc.c:774 src/news.c:296 src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -4474,106 +4920,106 @@ msgstr ""
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 
 "\n"
 "¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
 

-#: src/imap.c:804 src/inc.c:780 src/news.c:302 src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 
 msgid "Con_tinue connecting"
 msgstr "Seguir conec_tando"
 

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando al servidor IMAP4: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando al servidor IMAP4: %s..."
 

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d"
 

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar al servidor IMAP4: %s:%d\n"
 

-#: src/imap.c:884 src/imap.c:2764
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "No se puede iniciar la sesión TLS.\n"
 

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando al servidor IMAP4 %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando al servidor IMAP4 %s...\n"
 

-#: src/imap.c:932 src/imap.c:935
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No se puede entrar al servidor IMAP %s."
 

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 
 msgid "Adding messages..."
 msgstr "Añadiendo mensajes..."
 

-#: src/imap.c:1305 src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 
 msgid "can't set deleted flags\n"
 msgstr "no se pueden establecer los flags «borrado»\n"
 

-#: src/imap.c:1487 src/imap.c:3894
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 
 msgid "can't expunge\n"
 msgstr "no puedo purgar\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscando carpetas no suscritas en %s..."
 

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscando subcarpetas de %s..."
 

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nuevo nombre de la carpeta no debe contener el separador del espacio de "
 "nombres"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nuevo nombre de la carpeta no debe contener el separador del espacio de "
 "nombres"
 

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 
 msgid "can't delete mailbox\n"
 msgstr "no se puede borrar el buzón\n"
 

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 
 msgid "LIST failed\n"
 msgstr "LIST falló\n"
 

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "El servidor necesita TLS para acceder a él.\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "No se pueden refrescar las capacidades.\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "


@@ -4582,34 +5028,34 @@ msgstr ""
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte OpenSSL.\n"
 
 "La conexión con %s falló: el servidor necesita TLS, pero Claws Mail ha sido "
 "compilado sin soporte OpenSSL.\n"
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Los accesos al servidor están deshabilitados.\n"
 

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 
 msgid "Fetching message..."
 msgstr "Recuperando mensaje..."
 

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv no puede convertir UTF-8 a UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv no puede convertir UTF-8 a UTF-7\n"
 

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no se pueden establecer los flags 'borrado': %d\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 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 "
 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 "


@@ -4742,7 +5188,7 @@ msgstr "
 msgid "Search recursively"
 msgstr "Buscar recursivamente"
 
 msgid "Search recursively"
 msgstr "Buscar recursivamente"
 

-#: src/imap_gtk.c:453 src/imap_gtk.c:496
+#: src/imap_gtk.c:453 src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "Suscripciones"
 
 msgid "Subscriptions"
 msgstr "Suscripciones"
 


@@ -4764,31 +5210,39 @@ msgid "All of them"
 msgstr "Todas ellas"
 
 #: src/imap_gtk.c:481
 msgstr "Todas ellas"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
-msgstr "Esta carpeta ya está suscrita y no tiene subcarpetas sin suscribir."
+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."
+msgstr ""
+"Esta carpeta ya está suscrita y no tiene subcarpetas sin suscribir.\n"
+"\n"
+"Si hay nuevas carpetas, creadas y suscritas desde otro cliente, utilize "
+"«Comprobar si hay carpetas nuevas» en la raíz del buzón."

 
 

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "¿Quiere %s la carpeta «%s»?"
 
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "¿Quiere %s la carpeta «%s»?"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "suscribir"
 
 msgid "subscribe"
 msgstr "suscribir"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "desuscribir"
 
 msgid "unsubscribe"
 msgstr "desuscribir"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 
 msgid "Apply to subfolders"
 msgstr "Aplicar a subcarpetas"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+_Suscribir"
 
 msgid "+_Subscribe"
 msgstr "+_Suscribir"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+_Desuscribir"
 
 msgid "+_Unsubscribe"
 msgstr "+_Desuscribir"
 


@@ -4824,39 +5278,35 @@ msgstr "No se puede encontrar carpeta de destino."
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 
 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "Seleccione y renombre los campos LDIF a importar."
 
 msgid "Select and rename LDIF field names to import."
 msgstr "Seleccione y renombre los campos LDIF a importar."
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "Fichero importado."
 
 msgid "File imported."
 msgstr "Fichero importado."
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "Error leyendo los campos LDIF."
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."


@@ -4864,51 +5314,47 @@ msgstr ""
 "Especifique el nombre para la agenda que será creada a partir de los datos "
 "del fichero LDIF."
 
 "Especifique el nombre para la agenda que será creada a partir de los datos "
 "del fichero LDIF."
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "Nombre del fichero"
 
 msgid "File Name"
 msgstr "Nombre del fichero"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificación completa del fichero LDIF a importar."
 
 msgid "The full file specification of the LDIF file to import."
 msgstr "La especificación completa del fichero LDIF a importar."
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 
 msgid "Select the LDIF file to import."
 msgstr "Seleccione el fichero LDIF a importar."
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:726 src/summaryview.c:489
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 
 msgid "LDIF Field Name"
 msgstr "Nombre de campo LDIF"
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "Atributo"
 
 msgid "Attribute"
 msgstr "Atributo"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "El campo LDIF puede renombrarse al nombre del atributo de usuario."
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "El campo LDIF puede renombrarse al nombre del atributo de usuario."
 

-#: src/importldif.c:811
-msgid "???"
-msgstr "???"
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "
 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 "


@@ -4926,30 +5372,34 @@ msgstr ""
 "debajo de la lista. Doble clic en cualquier parte de la fila y también será "
 "seleccionado el campo para importar."
 
 "debajo de la lista. Doble clic en cualquier parte de la fila y también será "
 "seleccionado el campo para importar."
 

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 
 msgid "Select for Import"
 msgstr "Seleccionar para importar"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 
 msgid "Select the LDIF field for import into the address book."
 msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " Modificar "
 
 msgid " Modify "
 msgstr " Modificar "
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr "Este botón actualizará la lista superior con los datos proporcionados."
 
 msgid "This button will update the list above with the data supplied."
 msgstr "Este botón actualizará la lista superior con los datos proporcionados."
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "Registros importados :"
 
 msgid "Records Imported :"
 msgstr "Registros importados :"
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 

+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr "Proceder"
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Error importando el fichero de MUTT."
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Error importando el fichero de MUTT."


@@ -5017,11 +5467,11 @@ msgstr "Conexi
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
 msgid "Auth failed"
 msgstr "Authorización fallida"
 

-#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2454
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr "Bloqueado"
 
 msgid "Locked"
 msgstr "Bloqueado"
 

-#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Tiempo límite"
 
 msgid "Timeout"
 msgstr "Tiempo límite"
 


@@ -5184,21 +5634,21 @@ msgstr "La conexi
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "Só_lo una vez"
 
 msgid "On_ly once"
 msgstr "Só_lo una vez"
 

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "Apodo"
 
 msgid "Nick Name"
 msgstr "Apodo"
 


@@ -5218,17 +5668,30 @@ msgstr "Saliendo..."
 #: src/main.c:329
 #, c-format
 msgid ""
 #: src/main.c:329
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Encontrada configuración para %s (o anterior).\n"
+"Encontrada configuración para %s.\n"

 "¿Desea migrar esta configuración?"
 
 "¿Desea migrar esta configuración?"
 

-#: src/main.c:337
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"Sus reglas de filtrado de Sylpheed se pueden convertir\n"
+"con un script que encontrará en %s."
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 
 msgid "Keep old configuration"
 msgstr "Conservar la configuración antigua"
 

-#: src/main.c:340
+#: src/main.c:347

 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 "
 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 "


@@ -5238,27 +5701,27 @@ msgstr ""
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 
 "pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
 "y ocupará espacio adicional en el disco."
 

-#: src/main.c:349
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 

-#: src/main.c:360
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando configuración... Esto puede tardar un rato..."
 

-#: src/main.c:369
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 
 msgid "Migration failed!"
 msgstr "¡La migración falló!"
 

-#: src/main.c:378
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 
 msgid "Migrating configuration..."
 msgstr "Migrando la configuración..."
 

-#: src/main.c:695
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 

-#: src/main.c:701
+#: src/main.c:713

 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "


@@ -5268,7 +5731,7 @@ msgstr ""
 "actualmente. Esto provocará fallos graves. Necesita actualizar GTK+ o "
 "recompilar Claws Mail."
 
 "actualmente. Esto provocará fallos graves. Necesita actualizar GTK+ o "
 "recompilar Claws Mail."
 

-#: src/main.c:710
+#: src/main.c:722

 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."


@@ -5276,7 +5739,19 @@ msgstr ""
 "Claws Mail se compiló con una librería GTK+ más antigua que la disponible "
 "actualmente. Esto provocará fallos graves. Necesita recompilar Claws Mail."
 
 "Claws Mail se compiló con una librería GTK+ más antigua que la disponible "
 "actualmente. Esto provocará fallos graves. Necesita recompilar Claws Mail."
 

-#: src/main.c:995
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (o anterior)"
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (o anterior)"
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (o anterior)"
+
+#: src/main.c:1013

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -5284,7 +5759,7 @@ msgstr ""
 "Algún módulo no se ha podido cargar. Compruebe la configuración de los "
 "módulos para más información."
 
 "Algún módulo no se ha podido cargar. Compruebe la configuración de los "
 "módulos para más información."
 

-#: src/main.c:1014
+#: src/main.c:1032

 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 "
 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 "


@@ -5294,7 +5769,7 @@ msgstr ""
 "ser debido a una cuenta IMAP que esté fallando. Utilize «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 
 "ser debido a una cuenta IMAP que esté fallando. Utilize «Reconstruir árbol "
 "de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
 

-#: src/main.c:1020
+#: src/main.c:1038

 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 "
 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 "


@@ -5304,20 +5779,20 @@ msgstr ""
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 
 "probable que esté soportado por un módulo externo desactualizado. Por favor "
 "reinstale el módulo e inténtelo de nuevo."
 

-#: src/main.c:1281
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 

-#: src/main.c:1283
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 

-#: src/main.c:1284
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      suscribirse a la URI dada si es posible"
 

-#: src/main.c:1285
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -5327,23 +5802,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 

-#: src/main.c:1288
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe los mensajes nuevos"
 

-#: src/main.c:1289
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe mensajes nuevos de todas las cuentas"
 

-#: src/main.c:1290
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 

-#: src/main.c:1291
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 

-#: src/main.c:1292
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -5351,7 +5826,7 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 

-#: src/main.c:1294
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"


@@ -5359,52 +5834,52 @@ msgstr ""
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 
 "  --select carpt[/mnsj]  va a la carpeta/mensaje especificados\n"
 "                         carpt es un identificador como «carpeta/subcarpeta»"
 

-#: src/main.c:1296
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 

-#: src/main.c:1297
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              cambiar a modo de trabajo sin conexión"
 

-#: src/main.c:1298
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       salir de Claws Mail"
 

-#: src/main.c:1299
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 

-#: src/main.c:1300
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              presenta esta ayuda y finaliza"
 

-#: src/main.c:1301
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           informa de la versión y finaliza"
 

-#: src/main.c:1302
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 

-#: src/main.c:1342
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 
 msgid "Unknown option\n"
 msgstr "Error desconocido\n"
 

-#: src/main.c:1360
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 

-#: src/main.c:1363
+#: src/main.c:1389

 msgid "top level folder"
 msgstr "carpeta superior"
 
 msgid "top level folder"
 msgstr "carpeta superior"
 

-#: src/main.c:1432
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 

-#: src/main.c:1433
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 


@@ -5486,7 +5961,7 @@ msgstr "/_Edici
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Búsqueda _rápida"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Búsqueda _rápida"
 

-#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:477
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr "/_Ver"
 
 msgid "/_View"
 msgstr "/_Ver"
 


@@ -5886,7 +6361,7 @@ msgstr "/_Ver/Decodificar/_Base64"
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Ver/Decodificar/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Ver/Decodificar/_Uuencode"
 

-#: src/mainwindow.c:745 src/summaryview.c:478
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en ventana _nueva"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en ventana _nueva"
 


@@ -6192,12 +6667,12 @@ msgid "/_Tools/SSL cer_tificates..."
 msgstr "/_Herramientas/Cer_tificados SSL..."
 
 #: src/mainwindow.c:867
 msgstr "/_Herramientas/Cer_tificados SSL..."
 
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/_Herramientas/Ventana de depuración de filtrado"
+msgid "/_Tools/Filtering Log"
+msgstr "/_Herramientas/Traza de filtrado"

 
 #: src/mainwindow.c:868
 
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/_Herramientas/_Ventana de traza"
+msgid "/_Tools/Network _Log"
+msgstr "/_Herramientas/_Traza del protocolo"

 
 #: src/mainwindow.c:870
 msgid "/_Configuration"
 
 #: src/mainwindow.c:870
 msgid "/_Configuration"


@@ -6283,25 +6758,25 @@ msgstr "Esta desconectado. Pulse en el icono para conectarse"
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 

-#: src/mainwindow.c:1300 src/prefs_logging.c:114
-msgid "Protocol log"
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"

 msgstr "Traza del protocolo"
 
 msgstr "Traza del protocolo"
 

-#: src/mainwindow.c:1304 src/prefs_logging.c:152
+#: src/mainwindow.c:1304

 msgid "Filtering/processing debug log"
 msgstr "Configuración de filtrado/traza de depuración de procesamiento"
 
 msgid "Filtering/processing debug log"
 msgstr "Configuración de filtrado/traza de depuración de procesamiento"
 

-#: src/mainwindow.c:1323 src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
-msgstr "depuración de filtrado activada\n"
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr "traza de filtrado activada\n"

 
 

-#: src/mainwindow.c:1325 src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
-msgstr "depuración de filtrado desactivada\n"
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr "traza de filtrado desactivada\n"

 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871
 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871

-#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:765
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "Sin título"
 
 msgid "Untitled"
 msgstr "Sin título"
 


@@ -6320,11 +6795,11 @@ msgstr "A
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "scanned automatically."
 msgstr ""

-"Introduzca la localización del buzón.\n"
-"Si el buzón especificado ya existe será\n"
+"Introduzca la ubicación del buzón.\n"
+"Si especifica un buzón existente será\n"

 "escaneado automáticamente."
 
 #: src/mainwindow.c:2148
 "escaneado automáticamente."
 
 #: src/mainwindow.c:2148


@@ -6346,129 +6821,108 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 
 msgid "No posting allowed"
 msgstr "No esta permitido enviar"
 

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 
 msgid "Mbox import has failed."
 msgstr "La importación de mbox ha fallado."
 

-#: src/mainwindow.c:3053 src/mainwindow.c:3062
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 
 msgid "Export to mbox has failed."
 msgstr "La exportación a mbox ha fallado."
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr "Salir"
 
 msgid "Exit"
 msgstr "Salir"
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 
 msgid "Exit Claws Mail?"
 msgstr "¿Salir de Claws Mail?"
 

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 
 msgid "Folder synchronisation"
 msgstr "Sincronización de carpeta"
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "¿Quiere sincronizar sus carpetas ahora?"
 

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
 msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
 msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
 

-#: src/mainwindow.c:3774 src/summaryview.c:4907
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 

-#: src/mainwindow.c:3792 src/summaryview.c:4918
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 

-#: src/matcher.c:750 src/matcher.c:752
-msgid "subject"
-msgstr "asunto"
-
-#: src/matcher.c:754 src/matcher.c:756
-msgid "From: header"
-msgstr "Desde: cabecera"
-
-#: src/matcher.c:758 src/matcher.c:760 src/matcher.c:766
-msgid "To: header"
-msgstr "Para: cabecera"
-
-#: src/matcher.c:762 src/matcher.c:764 src/matcher.c:767
-msgid "Cc: header"
-msgstr "Cc: cabecera"
-
-#: src/matcher.c:975 src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "Newsgroups: cabecera"
-
-#: src/matcher.c:979 src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "InReplyTo: cabecera"
-
-#: src/matcher.c:985 src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr "InReplyTo: cabecera (referencias)"
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "cabecera %s"

 
 

-#: src/matcher.c:1071 src/matcher.c:1073
+#: src/matcher.c:1157 src/matcher.c:1159

 msgid "header"
 msgstr "cabecera"
 
 msgid "header"
 msgstr "cabecera"
 

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 msgid "header line"
 msgstr "línea de cabecera"
 
 msgid "header line"
 msgstr "línea de cabecera"
 

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 msgid "headers line"
 msgstr "línea de cabeceras"
 
 msgid "headers line"
 msgstr "línea de cabeceras"
 

-#: src/matcher.c:1086 src/matcher.c:1088
+#: src/matcher.c:1172 src/matcher.c:1174

 msgid "message line"
 msgstr "línea de mensaje"
 
 msgid "message line"
 msgstr "línea de mensaje"
 

-#: src/matcher.c:1099 src/matcher.c:1232 src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344 src/prefs_matcher.c:1361 src/prefs_matcher.c:2116
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "Todos"
 
 msgid "Filtering Matcher Menu|All"
 msgstr "Todos"
 

-#: src/matcher.c:1306 src/matcher.c:1309
+#: src/matcher.c:1392 src/matcher.c:1395

 msgid "body line"
 msgstr "línea de cuerpo"
 
 msgid "body line"
 msgstr "línea de cuerpo"
 

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el  mensaje coincide [ %s ]\n"
 
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprobando si el  mensaje coincide [ %s ]\n"
 

-#: src/matcher.c:1542 src/matcher.c:1561 src/matcher.c:1574
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660

 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 
 msgid "message matches\n"
 msgstr "el mensaje coincide\n"
 

-#: src/matcher.c:1549 src/matcher.c:1567 src/matcher.c:1576
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662

 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 
 msgid "message does not match\n"
 msgstr "el mensaje no coincide\n"
 

-#: src/matcher.c:1829 src/matcher.c:1830 src/matcher.c:1831 src/matcher.c:1832
-#: src/matcher.c:1833 src/matcher.c:1834 src/matcher.c:1835 src/matcher.c:1836
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr "(ninguna)"
 
 msgid "(none)"
 msgstr "(ninguna)"
 


@@ -6494,8 +6948,8 @@ msgstr "Sobreescribir fichero mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
 

-#: src/mbox.c:531 src/messageview.c:1180 src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 msgid "Overwrite"
 msgstr "Sobreescribir"
 


@@ -6520,27 +6974,27 @@ msgstr "Buscar en el mensaje actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
 msgid "Find text:"
 msgstr "Buscar texto:"
 

-#: src/message_search.c:210 src/prefs_matcher.c:655 src/summary_search.c:396
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr "Mayús./minús."
 
 msgid "Case sensitive"
 msgstr "Mayús./minús."
 

-#: src/message_search.c:325 src/summary_search.c:661
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr "Búsqueda fallida"
 
 msgid "Search failed"
 msgstr "Búsqueda fallida"
 

-#: src/message_search.c:326 src/summary_search.c:662
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr "Cadena no encontrada."
 
 msgid "Search string not found."
 msgstr "Cadena no encontrada."
 

-#: src/message_search.c:335
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
 

-#: src/message_search.c:338
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 

-#: src/message_search.c:341 src/summary_search.c:673
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 


@@ -6619,39 +7073,39 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 
 "oficialmente dirigido a usted.\n"
 "Se recomienda no enviar el acuse de recibo."
 

-#: src/messageview.c:817 src/procmime.c:883
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "No se puede descifrar: %s"
 

-#: src/messageview.c:1175 src/mimeview.c:1606 src/summaryview.c:4187
-#: src/summaryview.c:4190 src/textview.c:2648
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr "Guardar como"
 
 msgid "Save as"
 msgstr "Guardar como"
 

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 

-#: src/messageview.c:1189 src/summaryview.c:4207 src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No se pudo guardar el fichero «%s»."
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Usted solicitó acuse de recibo en este mensaje."
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 
 msgid "This message asks for a return receipt."
 msgstr "Este mensaje solicita acuse de recibo."
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6659,7 +7113,7 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 
 "Este mensaje se ha descargado parcialmente,\n"
 "y ha sido eliminado del servidor."
 

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6668,15 +7122,15 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s."
 

-#: src/messageview.c:1308 src/messageview.c:1330
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr "Marcar para descargar"
 
 msgid "Mark for download"
 msgstr "Marcar para descargar"
 

-#: src/messageview.c:1309 src/messageview.c:1321
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 
 msgid "Mark for deletion"
 msgstr "Marcar para eliminar"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6686,12 +7140,12 @@ msgstr ""
 "es de %s y será descargado."
 
 # RML To be consistent with previous one.
 "es de %s y será descargado."
 
 # RML To be consistent with previous one.

-#: src/messageview.c:1319 src/messageview.c:1332
+#: src/messageview.c:1331 src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Desmarca"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Desmarca"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6700,11 +7154,11 @@ msgstr ""
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 
 "Este mensaje se ha descargado parcialmente;\n"
 "es de %s y será eliminado."
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6714,19 +7168,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "_Cancelar"
 
 msgid "_Cancel"
 msgstr "_Cancelar"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 
 msgid "_Send Notification"
 msgstr "_Enviar notificación"
 

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "No se puede imprimir: el mensaje no contiene texto."
 

-#: src/messageview.c:1545 src/summaryview.c:4247
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6735,7 +7189,7 @@ msgstr ""
 "Teclee la orden para imprimir:\n"
 "(«%s» será sustituido por el fichero)"
 
 "Teclee la orden para imprimir:\n"
 "(«%s» será sustituido por el fichero)"
 

-#: src/messageview.c:1551 src/summaryview.c:4253
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6744,8 +7198,8 @@ msgstr ""
 "La orden para imprimir no es válida:\n"
 "«%s»"
 
 "La orden para imprimir no es válida:\n"
 "«%s»"
 

-#: src/messageview.c:1829 src/messageview.c:1835 src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Ocurrió un error mientras se aprendía.\n"
 


@@ -6783,85 +7237,89 @@ msgstr "Eliminar buz
 msgid "_Remove"
 msgstr "Elimina_r"
 
 msgid "_Remove"
 msgstr "Elimina_r"
 

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr "/_Abrir"
-

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
-msgstr "/Abrir _con..."
+msgid "/_Open (l)"
+msgstr "/_Abrir (l)"

 
 #: src/mimeview.c:170
 
 #: src/mimeview.c:170

-msgid "/_Display as text"
-msgstr "/_Ver como texto"
+msgid "/Open _with (o)..."
+msgstr "/Abrir _con (o)..."

 
 

-#: src/mimeview.c:171 src/summaryview.c:483
-msgid "/_Save as..."
-msgstr "/_Guardar como..."
+#: src/mimeview.c:171
+msgid "/_Display as text (t)"
+msgstr "/_Ver como texto (t)"

 
 #: src/mimeview.c:172
 
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr "/_Guardar como (y)..."
+
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 
 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr "/Parte siguiente (a)"
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "Tipo MIME"
 
 msgid "MIME Type"
 msgstr "Tipo MIME"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "Verificar firma"
 
 msgid "Check signature"
 msgstr "Verificar firma"
 

-#: src/mimeview.c:764 src/mimeview.c:769 src/mimeview.c:774
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr "Ver la información completa"
 
 msgid "View full information"
 msgstr "Ver la información completa"
 

-#: src/mimeview.c:779 src/mimeview.c:783
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr "Verificar de nuevo"
 
 msgid "Check again"
 msgstr "Verificar de nuevo"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Pulse en el icono o la tecla «C» para comprobarla."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Pulse en el icono o la tecla «C» para comprobarla."
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «C» para "
 "reintentar."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «C» para "
 "reintentar."
 

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "Verificando firma..."
 
 msgid "Checking signature..."
 msgstr "Verificando firma..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "Volver al correo"
 
 msgid "Go back to email"
 msgstr "Volver al correo"
 

-#: src/mimeview.c:1388 src/mimeview.c:1472 src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
 
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
 

-#: src/mimeview.c:1461 src/textview.c:2658
+#: src/mimeview.c:1511 src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "¿Sobreescribir el fichero existente «%s»?"
 

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destino"
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "«%s» no es un directorio."
 

-#: src/mimeview.c:1734 src/mimeview.c:1742 src/textview.c:2589
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600

 msgid "Open with"
 msgstr "Abrir con"
 
 msgid "Open with"
 msgstr "Abrir con"
 

-#: src/mimeview.c:1735 src/mimeview.c:1743 src/textview.c:2590
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6975,25 +7433,25 @@ msgstr "Desuscribir grupo de noticias"
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 

-#: src/news_gtk.c:302
+#: src/news_gtk.c:303 src/news_gtk.c:305

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Hubo algún error al descargar los mensajes en «%s»."
 
 #: src/plugins/bogofilter/bogofilter.c:77
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Hubo algún error al descargar los mensajes en «%s»."
 
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 msgid "Bogofilter"
 msgstr "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperando cuerpos..."
 
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperando cuerpos..."
 

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando mensajes..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando mensajes..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 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"
 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"


@@ -7005,7 +7463,7 @@ msgstr ""
 "Utilize «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bogofilter con unos pocos cientos de mensajes de ambos tipos."
 
 "Utilize «/Marcar/Marcar como correo basura» y «/Marcar/Marcar como bueno» "
 "para entrenar a Bogofilter con unos pocos cientos de mensajes de ambos tipos."
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "


@@ -7014,21 +7472,21 @@ msgstr ""
 "El módulo Bogofilter no pudo filtrar un mensaje. La orden «%s %s %s» no se "
 "pudo ejecutar."
 
 "El módulo Bogofilter no pudo filtrar un mensaje. La orden «%s %s %s» no se "
 "pudo ejecutar."
 

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendiendo del mensaje..."
 
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendiendo del mensaje..."
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprendizaje fallido; «%s» devolvió el estado %d."
 
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprendizaje fallido; «%s» devolvió el estado %d."
 

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendiendo de los mensajes..."
 
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendiendo de los mensajes..."
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"


@@ -7037,11 +7495,11 @@ msgstr ""
 "Aprendizaje fallido; «%s %s %s» devolvió el error:\n"
 "%s"
 
 "Aprendizaje fallido; «%s %s %s» devolvió el error:\n"
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61

 msgid "Unknown error"
 msgstr "Error desconocido"
 
 msgid "Unknown error"
 msgstr "Error desconocido"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:963

 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 "
 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 "


@@ -7071,60 +7529,60 @@ msgstr ""
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 
 "Las opciones se encuentran en «/Configuración/Preferencias/Módulos/"
 "Bogofilter»"
 

-#: src/plugins/bogofilter/bogofilter.c:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam detection"
 msgstr "Detección de correo basura"
 
 msgid "Spam detection"
 msgstr "Detección de correo basura"
 

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594

 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
 
 msgid "Spam learning"
 msgstr "Aprendizaje de correo basura"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "Procesar mensajes al recibir"
 
 msgid "Process messages on receiving"
 msgstr "Procesar mensajes al recibir"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "Tamaño máximo"
 
 msgid "Maximum size"
 msgstr "Tamaño máximo"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr "No se comprobarán los mensajes mayores de este tamaño"
 
 msgid "Messages larger than this will not be checked"
 msgstr "No se comprobarán los mensajes mayores de este tamaño"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "Kb"
 
 msgid "kB"
 msgstr "Kb"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "Guardar correo basura en"
 
 msgid "Save spam in"
 msgstr "Guardar correo basura en"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Carpeta para almacenar el correo basura identificado. Déjelo vacío para usar "
 "la Papelera."
 
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Carpeta para almacenar el correo basura identificado. Déjelo vacío para usar "
 "la Papelera."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar el correo basura"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar el correo basura"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgstr "Si es dudoso, mover a"
 
 msgid "When unsure, move to"
 msgstr "Si es dudoso, mover a"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:213

 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."


@@ -7132,25 +7590,25 @@ msgstr ""
 "Carpeta para almacenar el correo cuya identificación como basura no es "
 "segura. Déjelo vacío para usar la carpeta de Entrada."
 
 "Carpeta para almacenar el correo cuya identificación como basura no es "
 "segura. Déjelo vacío para usar la carpeta de Entrada."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar los correos cuya "
 "identificación como basura no es segura."
 
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar los correos cuya "
 "identificación como basura no es segura."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgstr "Insertar la cabecera «X-Bogosity»"
 
 msgid "Insert X-Bogosity header"
 msgstr "Insertar la cabecera «X-Bogosity»"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "Sólo se realiza para mensajes en carpetas MH"
 
 msgid "Only done for messages in MH folders"
 msgstr "Sólo se realiza para mensajes en carpetas MH"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgstr "Permitir los remitentes presentes en la agenda/carpeta"
 
 msgid "Whitelist senders found in address book/folder"
 msgstr "Permitir los remitentes presentes en la agenda/carpeta"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:238

 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"


@@ -7158,26 +7616,31 @@ msgstr ""
 "Los mensajes que vengan de los contactos de su agenda de direcciones serán "
 "recibidos en la carpeta normal aunque se detecten como correo basura"
 
 "Los mensajes que vengan de los contactos de su agenda de direcciones serán "
 "recibidos en la carpeta normal aunque se detecten como correo basura"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/plugins/bogofilter/bogofilter_gtk.c:256

 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505

-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "Seleccionar ..."
 
 msgid "Select ..."
 msgstr "Seleccionar ..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Pulse este botón para seleccionar una agenda o carpeta de la agenda de "
 "direcciones"
 
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Pulse este botón para seleccionar una agenda o carpeta de la agenda de "
 "direcciones"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr "Llamada a Bogofilter"
 
 msgid "Bogofilter call"
 msgstr "Llamada a Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "Ruta al ejecutable bogofilter"
 
 msgid "Path to bogofilter executable"
 msgstr "Ruta al ejecutable bogofilter"
 

+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "Marcar correo basura como leído"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -7191,7 +7654,7 @@ msgstr "ClamAV: inspeccionando mensaje..."
 msgid "Failed to register mail filtering hook"
 msgstr "Falló el registro del enlace de filtrado de correo"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Falló el registro del enlace de filtrado de correo"
 

-#: src/plugins/clamav/clamav_plugin.c:303
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -7210,7 +7673,7 @@ msgstr ""
 "Puede encontrar las opciones en /Configuración/Preferencias/Módulos/"
 "Antivirus Clam"
 
 "Puede encontrar las opciones en /Configuración/Preferencias/Módulos/"
 "Antivirus Clam"
 

-#: src/plugins/clamav/clamav_plugin.c:330
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr "Detección de virus"
 
 msgid "Virus detection"
 msgstr "Detección de virus"
 


@@ -7255,7 +7718,7 @@ msgstr ""
 "Pulse este botón para seleccionar una carpeta donde guardar el correo "
 "infectado"
 
 "Pulse este botón para seleccionar una carpeta donde guardar el correo "
 "infectado"
 

-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr "Demostración"
 
 msgid "Demo"
 msgstr "Demostración"
 


@@ -7263,7 +7726,7 @@ msgstr "Demostraci
 msgid "Failed to register log text hook"
 msgstr "Falló el registro del enlace de traza de texto"
 
 msgid "Failed to register log text hook"
 msgstr "Falló el registro del enlace de traza de texto"
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 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"


@@ -7304,7 +7767,7 @@ msgstr "Equivalente a la opci
 msgid "Dillo HTML Viewer"
 msgstr "Visor HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Visor HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -7315,11 +7778,11 @@ msgstr ""
 "Las opciones se encuentran en /Configuración/Preferencias/Módulos/Navegador "
 "Dillo."
 
 "Las opciones se encuentran en /Configuración/Preferencias/Módulos/Navegador "
 "Dillo."
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "Frase contraseña"
 
 msgid "Passphrase"
 msgstr "Frase contraseña"
 


@@ -7458,7 +7921,7 @@ msgstr "   Esta clave est
 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -7480,71 +7943,71 @@ msgstr ""
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME es copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94

 msgid "Core operations"
 msgstr "Operaciones principales"
 
 msgid "Core operations"
 msgstr "Operaciones principales"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "Verificar firmas automáticamente"
 
 msgid "Automatically check signatures"
 msgstr "Verificar firmas automáticamente"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar gpg-agent para gestionar las contraseñas"
 
 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar gpg-agent para gestionar las contraseñas"
 

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "Almacenar la contraseña en memoria"
 
 msgid "Store passphrase in memory"
 msgstr "Almacenar la contraseña en memoria"
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "Caduca despues de"
 
 msgid "Expire after"
 msgstr "Caduca despues de"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciendolo a '0' guarda la contraseña durante toda la sesión"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Estableciendolo a '0' guarda la contraseña durante toda la sesión"
 

-#: src/plugins/pgpcore/prefs_gpg.c:142 src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr "minuto(s)"
 
 msgid "minute(s)"
 msgstr "minuto(s)"
 

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir la contraseña"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir la contraseña"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Mostrar un aviso al inicio si GnuPG no funciona"
 
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Mostrar un aviso al inicio si GnuPG no funciona"
 

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr "Clave para firmar"
 
 msgid "Sign key"
 msgstr "Clave para firmar"
 

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por omisión"
 
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por omisión"
 

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "Seleccionar clave en base a la dirección de correo"
 
 msgid "Select key by your email address"
 msgstr "Seleccionar clave en base a la dirección de correo"
 

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "No se encontró ninguna clave secreta."
 
 msgid "No secret key found."
 msgstr "No se encontró ninguna clave secreta."
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "Generar un nuevo par de claves"
 
 msgid "Generate a new key pair"
 msgstr "Generar un nuevo par de claves"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr "GPG"
 
 msgid "GPG"
 msgstr "GPG"
 


@@ -7574,7 +8037,7 @@ msgstr "Val"
 msgid "Select"
 msgstr "Seleccionar"
 
 msgid "Select"
 msgstr "Seleccionar"
 

-#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:372
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Otras"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Otras"


@@ -7845,10 +8308,10 @@ msgid "Couldn't convert text data to any sane charset."
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
 msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554

-#: src/plugins/pgpinline/pgpinline.c:676 src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:594
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "No se pudo inicializar el contexto GPG, %s"


@@ -7904,22 +8367,30 @@ msgstr "Fall
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 
 msgid "Data signing failed, no contents."
 msgstr "Falló la firma de los datos, no hay contenido."
 

-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+"Por favor, dese cuenta que los adjuntos no serán cifrados por el sistema "
+"PGP/Inline, ni tampoco las cabeceras de correo, como el Asunto."
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No se pudo añadir la clave GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:706 src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "No se puede crear el fichero temporal, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:734 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falló el cifrado, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 


@@ -7927,7 +8398,7 @@ msgstr "PGP/Inline"
 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7970,7 +8441,15 @@ msgstr "No se pueden interpretar las partes del fichero."
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "No se puede crear el fichero temporal: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Por favor, dese cuenta que las cabeceras de correo, como el Asunto, no serán "
+"cifradas por el sistema PGP/MIME."
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 


@@ -7978,7 +8457,7 @@ msgstr "PGP/Mime"
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59

 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"
 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"


@@ -8003,27 +8482,27 @@ msgstr ""
 "GPGME es copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75
 "GPGME es copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "El módulo Spamassassin no pudo conectar con spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "El módulo Spamassassin no pudo conectar con spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "El módulo Spamassassin esta deshabilitado por sus preferencias.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "El módulo Spamassassin esta deshabilitado por sus preferencias.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando mensaje..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando mensaje..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
+#: src/plugins/spamassassin/spamassassin.c:314

 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 "
 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 "


@@ -8033,7 +8512,7 @@ msgstr ""
 "error es que el demonio spamd no está disponible. Por favor, asegúrese de "
 "que spamd está ejecutándose y accesible."
 
 "error es que el demonio spamd no está disponible. Por favor, asegúrese de "
 "que spamd está ejecutándose y accesible."
 

-#: src/plugins/spamassassin/spamassassin.c:370
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."


@@ -8041,17 +8520,17 @@ msgstr ""
 "Claws Mail necesita acceso a la red para enviar este correo al programa de "
 "aprendizaje remoto."
 
 "Claws Mail necesita acceso a la red para enviar este correo al programa de "
 "aprendizaje remoto."
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "Fallo al obtener en nombre de usuario"
 
 msgid "Failed to get username"
 msgstr "Fallo al obtener en nombre de usuario"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El módulo Spamassassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El módulo Spamassassin esta cargado pero deshabilitado por sus "
 "preferencias.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:562

 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 "
 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 "


@@ -8075,55 +8554,55 @@ msgstr ""
 "\n"
 "Las opciones están en /Configuración/Preferencias/Módulos/SpamAssassin"
 
 "\n"
 "Las opciones están en /Configuración/Preferencias/Módulos/SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "Máquina local"
 
 msgid "Localhost"
 msgstr "Máquina local"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr "TCP"
 
 msgid "TCP"
 msgstr "TCP"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr "Socket Unix"
 
 msgid "Unix Socket"
 msgstr "Socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar el módulo SpamAssassin"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar el módulo SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "Transporte"
 
 msgid "Transport"
 msgstr "Transporte"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "Tipo de transporte"
 
 msgid "Type of transport"
 msgstr "Tipo de transporte"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "Usuario"
 
 msgid "User"
 msgstr "Usuario"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "Usuario a utilizar con el servidor spamd"
 
 msgid "User to use with spamd server"
 msgstr "Usuario a utilizar con el servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr "spamd"
 
 msgid "spamd"
 msgstr "spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "Nombre o dirección IP del servidor spamd"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "Nombre o dirección IP del servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "Puerto del servidor spamd"
 
 msgid "Port of spamd server"
 msgstr "Puerto del servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "Ruta al socket Unix"
 
 msgid "Path of Unix socket"
 msgstr "Ruta al socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:354

 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."


@@ -8131,8 +8610,8 @@ msgstr ""
 "Tiempo máximo permitido para la comprobación. Si la comprobación lleva más "
 "tiempo será cancelada."
 
 "Tiempo máximo permitido para la comprobación. Si la comprobación lleva más "
 "tiempo será cancelada."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355 src/prefs_other.c:575
-#: src/prefs_summaries.c:493
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "segundos"
 
 msgid "seconds"
 msgstr "segundos"
 


@@ -8144,7 +8623,7 @@ msgstr "Orientaci
 msgid "The orientation of the tray."
 msgstr "La orientación de la bandeja"
 
 msgid "The orientation of the tray."
 msgstr "La orientación de la bandeja"
 

-#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:567

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Icono en bandeja"
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Icono en bandeja"


@@ -8210,7 +8689,7 @@ msgstr "Fall
 msgid "Failed to register got iconified hook"
 msgstr "Falló el registro del enlace del estado de iconización"
 
 msgid "Failed to register got iconified hook"
 msgstr "Falló el registro del enlace del estado de iconización"
 

-#: src/plugins/trayicon/trayicon.c:484
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -8262,133 +8741,95 @@ msgstr "No se encontro en el saludo la marca de tiempo APOP necesaria\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la marca de tiempo del saludo\n"
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "Error de sintaxis en la marca de tiempo del saludo (no ASCII)\n"
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "Error del protocolo POP3\n"
 
 msgid "POP3 protocol error\n"
 msgstr "Error del protocolo POP3\n"
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL inválida: %s\n"
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL inválida: %s\n"
 

-#: src/pop.c:817
+#: src/pop.c:822

 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: Borrando mensaje expirado %d [%s]\n"
 
 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: Borrando mensaje expirado %d [%s]\n"
 

-#: src/pop.c:833
+#: src/pop.c:838

 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: Saltándose mensaje %d [%s] (%d bytes)\n"
 
 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: Saltándose mensaje %d [%s] (%d bytes)\n"
 

-#: src/pop.c:865
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 

-#: src/pop.c:868
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "Excedido el tiempo límite de la sesión\n"
 
 msgid "Session timeout\n"
 msgstr "Excedido el tiempo límite de la sesión\n"
 

-#: src/pop.c:887
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "orden no soportada\n"
 
 msgid "command not supported\n"
 msgstr "orden no soportada\n"
 

-#: src/pop.c:892
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "hubo un error en la sesión POP3\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "hubo un error en la sesión POP3\n"
 

-#: src/pop.c:1086
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 
 msgid "TOP command unsupported\n"
 msgstr "orden TOP no soportada\n"
 

-#: src/prefs_account.c:242 src/prefs_account.c:1553 src/prefs_account.c:2286
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:245 src/prefs_account.c:1668 src/prefs_account.c:2299
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 

-#: src/prefs_account.c:247 src/wizard.c:1154
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 
 msgid "Local mbox file"
 msgstr "Fichero mbox local"
 

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "Ninguno (sólo SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Ninguno (sólo SMTP)"
 

-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "Cuenta%d"
-
-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "Preferencias para una nueva cuenta"
+#: src/prefs_account.c:933
+msgid "Name of account"
+msgstr "Nombre de cuenta"

 
 

-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Preferencias de la cuenta"
+#: src/prefs_account.c:942
+msgid "Set as default"
+msgstr "Marcar como primaria"

 
 

-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "_Básicas"
+#: src/prefs_account.c:950
+msgid "Personal information"
+msgstr "Información personal"

 
 

-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "_Recibir"
+#: src/prefs_account.c:959
+msgid "Full name"
+msgstr "Nombre completo"

 
 

-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "Co_mponer"
-
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "_Privacidad"
-
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "SS_L"
-
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "Avanza_das"
-
-#: src/prefs_account.c:1190
-msgid "Name of account"
-msgstr "Nombre de cuenta"
-
-#: src/prefs_account.c:1199
-msgid "Set as default"
-msgstr "Marcar como primaria"
-
-#: src/prefs_account.c:1207
-msgid "Personal information"
-msgstr "Información personal"
-
-#: src/prefs_account.c:1216
-msgid "Full name"
-msgstr "Nombre completo"
-
-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "Dirección de correo"
 
 msgid "Mail address"
 msgstr "Dirección de correo"
 

-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "Organización"
-
-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "Información del servidor"
 
 msgid "Server information"
 msgstr "Información del servidor"
 

-#: src/prefs_account.c:1287 src/wizard.c:1248
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -8396,92 +8837,93 @@ msgstr ""
 "<span weight=\"bold\">Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP.</span>"
 
 "<span weight=\"bold\">Aviso: esta versión de Claws Mail\n"
 "se construyó sin soporte IMAP.</span>"
 

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "Autentificación al conectar"
 
 msgid "Authenticate on connect"
 msgstr "Autentificación al conectar"
 

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "Servidor de news"
 
 msgid "News server"
 msgstr "Servidor de news"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "Buzón local"
 
 msgid "Local mailbox"
 msgstr "Buzón local"
 

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 

-#: src/prefs_account.c:1420 src/prefs_account.c:1852
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr "Usuario"
 
 msgid "User ID"
 msgstr "Usuario"
 

-#: src/prefs_account.c:1426 src/prefs_account.c:1872
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr "Contraseña"
 
 msgid "Password"
 msgstr "Contraseña"
 

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "Cuenta%d"
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

-#: src/prefs_account.c:1531 src/prefs_account.c:1620
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "Buzón primario"
 
 msgid "Default inbox"
 msgstr "Buzón primario"
 

-#: src/prefs_account.c:1538 src/prefs_account.c:1546 src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
 

-#: src/prefs_account.c:1543 src/prefs_account.c:1632 src/prefs_account.c:2036
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "E_xplorar"
 
 msgid "Bro_wse"
 msgstr "E_xplorar"
 

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autentificación segura (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizar autentificación segura (APOP)"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibirlos"
 

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "Eliminar después de"
 
 msgid "Remove after"
 msgstr "Eliminar después de"
 

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "0 días: borrar inmediatamente"
 
 msgid "0 days: remove immediately"
 msgstr "0 días: borrar inmediatamente"
 

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "días"
 
 msgid "days"
 msgstr "días"
 

-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "Descargar todos los mensajes del servidor"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1382

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -8489,72 +8931,84 @@ msgstr ""
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 
 "Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
 "seleccionarlos podrá descargarlos por completo o borrarlos."
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "Kb"
 
 msgid "KB"
 msgstr "Kb"
 

-#: src/prefs_account.c:1642 src/prefs_account.c:2312
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 

-#: src/prefs_account.c:1674 src/prefs_account.c:1822
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "Método de autentificación"
 
 msgid "Authentication method"
 msgstr "Método de autentificación"
 

-#: src/prefs_account.c:1684 src/prefs_account.c:1832 src/prefs_send.c:278
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr "Automático"
 
 msgid "Automatic"
 msgstr "Automático"
 

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 
 msgid "(usually empty)"
 msgstr "(vacío habitualmente)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 
 msgid "Show subscribed folders only"
 msgstr "Mostrar sólo carpetas suscritas"
 

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr "Modo de ancho de banda óptimizado"
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr "Este modo usa menos ancho de banda, pero puede ser más lento con algunos servidores."
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "Permitir el filtrado usando módulos al recibir"
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
 

-#: src/prefs_account.c:1783 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "Cabecera"
 
 msgid "Header"
 msgstr "Cabecera"
 

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 
 msgid "Generate Message-ID"
 msgstr "Generar identificador de mensaje"
 

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "Autentificación"
 
 msgid "Authentication"
 msgstr "Autentificación"
 

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1894
+#: src/prefs_account.c:1711

 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."


@@ -8562,229 +9016,258 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 
 "Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
 "y contraseña usados para la recepción."
 

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autentificación POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autentificación POP: "
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "minutos"
 
 msgid "minutes"
 msgstr "minutos"
 

-#: src/prefs_account.c:1982 src/prefs_account.c:2028
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr "Firma"
 
 msgid "Signature"
 msgstr "Firma"
 

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "Insertar firma automáticamente"
 
 msgid "Insert signature automatically"
 msgstr "Insertar firma automáticamente"
 

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "Separador de la firma"
 
 msgid "Signature separator"
 msgstr "Separador de la firma"
 

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "Salida de la orden"
 
 msgid "Command output"
 msgstr "Salida de la orden"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 

-#: src/prefs_account.c:2057 src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1885 src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:2070 src/prefs_template.c:189
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "Diccionarios de correción ortográfica"
 
 msgid "Spell check dictionaries"
 msgstr "Diccionarios de correción ortográfica"
 

-#: src/prefs_account.c:2107 src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Diccionario por omisión"
 

-#: src/prefs_account.c:2124 src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Diccionario alternativo predeterminado"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr "Usar un formato específico para los mensajes nuevos"
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr "Usar un formato específico para citar las respuestas"
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr "Usar un formato específico para citar los reenvíos"
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 
 msgid "Default privacy system"
 msgstr "Sistema de privacidad por omisión"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 
 msgid "Always sign messages"
 msgstr "Firmar siempre los mensajes"
 

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 
 msgid "Always encrypt messages"
 msgstr "Cifrar siempre los mensajes"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrar los mensajes enviados con la clave propia además de las del "
 "destinatario"
 

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en claro los mensajes enviados cifrados"
 

-#: src/prefs_account.c:2290 src/prefs_account.c:2303 src/prefs_account.c:2315
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 

-#: src/prefs_account.c:2296 src/prefs_account.c:2309 src/prefs_account.c:2336
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactive esto si tiene problemas de conexión con SSL"
 

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "Puerto POP3"
 
 msgid "POP3 port"
 msgstr "Puerto POP3"
 

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Puerto IMAP4"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "Puerto NNTP"
 
 msgid "NNTP port"
 msgstr "Puerto NNTP"
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "Nombre de dominio"
 
 msgid "Domain name"
 msgstr "Nombre de dominio"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "Explorar"
 
 msgid "Browse"
 msgstr "Explorar"
 

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 
 msgid "The default inbox folder doesn't exist."
 msgstr "La carpeta de entrada por omisión no existe."
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 
 msgid "local mailbox filename is not entered."
 msgstr "no se especificó el nombre de fichero del buzón local."
 

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 
 msgid "mail command is not entered."
 msgstr "no se especificó el mandato de correo."
 

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "Recibir"
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr "Componer"
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr "Plantillas"
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "Privacidad"
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "Avanzadas"
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "Preferencias para una nueva cuenta"
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Preferencias de la cuenta"
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 
 msgid "Select signature file"
 msgstr "Seleccionar fichero de firma"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "Protocolo:"
 
 msgid "Protocol:"
 msgstr "Protocolo:"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (módulo no cargado)"


@@ -8802,20 +9285,20 @@ msgid "Command line"
 msgstr "Orden"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
 msgstr "Orden"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544

-#: src/prefs_filtering.c:454 src/prefs_matcher.c:679 src/prefs_template.c:270
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Reemplazar"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Reemplazar"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515

-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "Información..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
 msgid "Info..."
 msgstr "Información..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641

-#: src/prefs_filtering.c:761 src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764 src/prefs_filtering.c:839 src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(Nueva)"
 
 msgid "(New)"
 msgstr "(Nueva)"
 


@@ -8862,21 +9345,21 @@ msgstr "Borrar acci
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1838
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_matcher.c:1840
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+_Seguir editando"
 
 msgid "+_Continue editing"
 msgstr "+_Seguir editando"
 


@@ -8999,93 +9482,91 @@ msgstr ""
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "Selección automática de cuenta"
 
 msgid "Automatic account selection"
 msgstr "Selección automática de cuenta"
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "al responder"
 
 msgid "when replying"
 msgstr "al responder"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "al reenviar"
 
 msgid "when forwarding"
 msgstr "al reenviar"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "al reeditar"
 
 msgid "when re-editing"
 msgstr "al reeditar"
 

-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "Reenviando"
-
-#: src/prefs_compose_writing.c:141 src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "Reenviar como adjunto"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Mantener la cabecera «Desde» original al redirigir"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgid "Editing"

-msgstr "Editando"
+msgstr "Edición"

 
 

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "Autoguardar texto del mensaje en Borradores cada"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Autoguardar texto del mensaje en Borradores cada"
 

-#: src/prefs_compose_writing.c:166 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caracteres"
 
 msgid "characters"
 msgstr "caracteres"
 

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "Respuesta"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "Responder con citación por omisión"
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "Reenvíos"
+
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "Reenviar como adjunto"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Mantener la cabecera «Desde» del original al redirigir"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr "Al soltar ficheros en la ventana de composición"
 
 msgid "When dropping files into the Compose window"
 msgstr "Al soltar ficheros en la ventana de composición"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "Preguntar"
 
 msgid "Ask"
 msgstr "Preguntar"
 

-#: src/prefs_compose_writing.c:199 src/toolbar.c:475
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476

 msgid "Insert"
 msgstr "Insertar"
 
 msgid "Insert"
 msgstr "Insertar"
 

-#: src/prefs_compose_writing.c:200 src/toolbar.c:477
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478

 msgid "Attach"
 msgstr "Adjuntar"
 
 msgid "Attach"
 msgstr "Adjuntar"
 

-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "Usar formato al componer mensajes nuevos"
-

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "Formato del mensaje nuevo"
-
-#: src/prefs_compose_writing.c:267 src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " Descripción de símbolos... "
+msgid "Quotation characters"
+msgstr "Carácteres de citación"

 
 

-#: src/prefs_compose_writing.c:387 src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311 src/prefs_spelling.c:441 src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "Componer"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "Tratar estos carácteres como marcas de cita: "

 
 

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "Escribiendo"
 
 msgid "Writing"
 msgstr "Escribiendo"
 


@@ -9097,8 +9578,8 @@ msgstr "Configuraci
 msgid "From file..."
 msgstr "Desde fichero..."
 
 msgid "From file..."
 msgstr "Desde fichero..."
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:567
-#: src/prefs_matcher.c:1327 src/prefs_matcher.c:1337
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 


@@ -9163,7 +9644,7 @@ msgid "Displayed header configuration"
 msgstr "Configuración de cabeceras mostradas"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
 msgstr "Configuración de cabeceras mostradas"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435

-#: src/prefs_matcher.c:497
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "Cabecera"
 
 msgid "Header name"
 msgstr "Cabecera"
 


@@ -9179,7 +9660,7 @@ msgstr "Cabeceras ocultas"
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas las cabeceras"
 
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas las cabeceras"
 

-#: src/prefs_display_header.c:577
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 


@@ -9233,7 +9714,7 @@ msgstr "Copiar"
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79

-#: src/summaryview.c:2448
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "Marca"
 
 msgid "Mark"
 msgstr "Marca"
 


@@ -9261,7 +9742,7 @@ msgstr "Marcar como basura"
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 
 msgid "Mark as ham"
 msgstr "Marcar como bueno"
 

-#: src/prefs_filtering_action.c:170 src/toolbar.c:426 src/toolbar.c:524
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr "Reenviar"
 
 msgid "Forward"
 msgstr "Reenviar"
 


@@ -9270,7 +9751,7 @@ msgid "Redirect"
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468

-#: src/toolbar.c:184 src/toolbar.c:1825
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr "Ejecutar"
 
 msgid "Execute"
 msgstr "Ejecutar"
 


@@ -9290,7 +9771,7 @@ msgstr "Establecer puntos"
 msgid "Hide"
 msgstr "Ocultar"
 
 msgid "Hide"
 msgstr "Ocultar"
 

-#: src/prefs_filtering_action.c:178 src/toolbar.c:187
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 
 msgid "Ignore thread"
 msgstr "Ignorar hilo"
 


@@ -9302,7 +9783,7 @@ msgstr "Detener filtro"
 msgid "Filtering action configuration"
 msgstr "Configuración de acciones de filtrado"
 
 msgid "Filtering action configuration"
 msgstr "Configuración de acciones de filtrado"
 

-#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:412
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr "Acción"
 
 msgid "Action"
 msgstr "Acción"
 


@@ -9315,11 +9796,11 @@ msgid "Recipient"
 msgstr "Destinatario"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
 msgstr "Destinatario"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88

-#: src/summaryview.c:497
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "Puntos"
 
 msgid "Score"
 msgstr "Puntos"
 

-#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:550
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577

 msgid "Book/folder"
 msgstr "Agenda/carpeta"
 
 msgid "Book/folder"
 msgstr "Agenda/carpeta"
 


@@ -9351,44 +9832,25 @@ msgstr "No se especific
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 
 msgid "No action was defined."
 msgstr "No se definió ninguna acción."
 

-#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "carácter %"
 
 msgid "literal %"
 msgstr "carácter %"
 

-#: src/prefs_filtering_action.c:1164 src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:494
-msgid "Date"
-msgstr "Fecha"
-
-#: src/prefs_filtering_action.c:1165 src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr "ID-Mensaje"
-
-#: src/prefs_filtering_action.c:1166 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888 src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: src/prefs_filtering_action.c:1167 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889 src/quote_fmt.c:52
-msgid "References"
-msgstr "Referencias"
-
-#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1890
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 
 msgid "filename (should not be modified)"
 msgstr "nombre de fichero (no debe modificarse)"
 

-#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1891
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "nueva línea"
 
 msgid "new line"
 msgstr "nueva línea"
 

-#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1892
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 
 msgid "escape character for quotes"
 msgstr "carácter de escape para citas"
 

-#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1893
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "carácter de cita"
 
 msgid "quote character"
 msgstr "carácter de cita"
 


@@ -9412,52 +9874,52 @@ msgstr ""
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 
 msgid "Current action list"
 msgstr "Lista actual de acciones"
 

-#: src/prefs_filtering.c:187 src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "Configuración de filtrado/procesamiento"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configuración de filtrado/procesamiento"
 

-#: src/prefs_filtering.c:249 src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "Cualquiera"
 
 msgid "Filtering Account Menu|All"
 msgstr "Cualquiera"
 

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "Condición"
 
 msgid "Condition"
 msgstr "Condición"
 

-#: src/prefs_filtering.c:403 src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr " Definir... "
 
 msgid " Define... "
 msgstr " Definir... "
 

-#: src/prefs_filtering.c:927 src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 
 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 

-#: src/prefs_filtering.c:963 src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 
 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 
 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "Borrar regla"
 
 msgid "Delete rule"
 msgstr "Borrar regla"
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "Activar"
 
 msgid "Enable"
 msgstr "Activar"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "Regla"
 
 msgid "Rule"
 msgstr "Regla"
 


@@ -9477,8 +9939,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 
 msgid "Hidden columns"
 msgstr "Columnas ocultas"
 

-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Columnas visibles"
 
 msgid "Displayed columns"
 msgstr "Columnas visibles"
 


@@ -9487,7 +9949,7 @@ msgstr "Columnas visibles"
 msgid " Use default "
 msgstr " Usar configuración inicial "
 
 msgid " Use default "
 msgstr " Usar configuración inicial "
 

-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676

 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "


@@ -9497,7 +9959,8 @@ msgstr ""
 "Sin embargo puede usarlas para establecerlas en todo el árbol de carpetas "
 "del buzón usando «Aplicar a subcarpetas».</i>"
 
 "Sin embargo puede usarlas para establecerlas en todo el árbol de carpetas "
 "del buzón usando «Aplicar a subcarpetas».</i>"
 

-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -9505,71 +9968,71 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetas"
 
 "Aplicar a\n"
 "subcarpetas"
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "Salida"
 
 msgid "Outbox"
 msgstr "Salida"
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr "Tipo de carpeta"
 
 msgid "Folder type"
 msgstr "Tipo de carpeta"
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 
 msgid "Simplify Subject RegExp"
 msgstr "Expr. reg. para simplificar asunto"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "Probar expr. reg."
 
 msgid "Test RegExp"
 msgstr "Probar expr. reg."
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 
 msgid "Folder chmod"
 msgstr "Permisos de la carpeta"
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Color de la carpeta"
 
 msgid "Folder color"
 msgstr "Color de la carpeta"
 

-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Elejir color para la carpeta"
 
 msgid "Pick color for folder"
 msgstr "Elejir color para la carpeta"
 

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "Procesar al inicio"
 
 msgid "Process at start-up"
 msgstr "Procesar al inicio"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 
 msgid "Scan for new mail"
 msgstr "Examinar si hay correo nuevo"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso sin conexión"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 
 msgid "Request Return Receipt"
 msgstr "Solicitar acuse de recibo"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
 

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "Por omisión Para:"
 
 msgid "Default To:"
 msgstr "Por omisión Para:"
 

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "Respuestas por omisión Para:"
 
 msgid "Default To: for replies"
 msgstr "Respuestas por omisión Para:"
 

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "Genéricas"
 
 msgid "General"
 msgstr "Genéricas"
 

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta «%s»"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propiedades de la carpeta «%s»"


@@ -9590,7 +10053,7 @@ msgstr "Usar una tipograf
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 
 msgid "Message Printing"
 msgstr "Impresión de mensajes"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:669
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Ver"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Ver"


@@ -9599,7 +10062,7 @@ msgstr "Ver"
 msgid "Fonts"
 msgstr "Tipografías"
 
 msgid "Fonts"
 msgstr "Tipografías"
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "Preferencias"
 
 msgid "Preferences"
 msgstr "Preferencias"
 


@@ -9623,91 +10086,91 @@ msgstr "Mostrar las im
 msgid "Image Viewer"
 msgstr "Visor de imágenes"
 
 msgid "Image Viewer"
 msgstr "Visor de imágenes"
 

-#: src/prefs_logging.c:117 src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "Recortar tamaño de traza"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "Restringir la ventana de traza a"

 
 

-#: src/prefs_logging.c:122 src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "Longitud de la ventana de traza"
-
-#: src/prefs_logging.c:139 src/prefs_logging.c:258
+#: src/prefs_logging.c:133 src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0 para dejar de registrar en la ventana de traza"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 para dejar de registrar en la ventana de traza"
 

-#: src/prefs_logging.c:142 src/prefs_logging.c:261
+#: src/prefs_logging.c:136 src/prefs_logging.c:254

 msgid "lines"
 msgstr "líneas"
 
 msgid "lines"
 msgstr "líneas"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
-msgstr "Activar la depuración de reglas de filtrado/procesamiento"
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "Configuración de filtrado/traza de procesamiento"
+
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr "Activar la traza de reglas de filtrado/procesamiento"

 
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
+"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."
 msgstr ""
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""

-"Si se marca activa la depuración de las reglas de filtrado y procesamiento.\n"
-"El registro de depuración está disponible en «Herramientas/Ventana de "
-"depuración de filtrado».\n"
+"Si se marca activa la traza de las reglas de filtrado y procesamiento.\n"
+"El registro de depuración está disponible en «Herramientas/Traza de "
+"filtrado».\n"

 "Atención: habilitando esta opción ralentizará el filtrado/procesamiento, lo "
 "cual puede ser crítico al aplicar muchas reglas sobre miles de mensajes."
 
 "Atención: habilitando esta opción ralentizará el filtrado/procesamiento, lo "
 "cual puede ser crítico al aplicar muchas reglas sobre miles de mensajes."
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
-msgstr "Depuración de las reglas de filtrado/procesamiento cuando..."
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."
+msgstr "Traza las reglas de filtrado/procesamiento cuando..."

 
 

-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgstr "se filtre en la incorporación"
 
 msgid "filtering at incorporation"
 msgstr "se filtre en la incorporación"
 

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgstr "se filtre manualmente"
 
 msgid "manually filtering"
 msgstr "se filtre manualmente"
 

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgstr "se procesen las carpetas"
 
 msgid "processing folders"
 msgstr "se procesen las carpetas"
 

-#: src/prefs_logging.c:190
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgstr "se pre-procesen las carpetas"
 
 msgid "pre-processing folders"
 msgstr "se pre-procesen las carpetas"
 

-#: src/prefs_logging.c:196
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgstr "se post-procesen las carpetas"
 
 msgid "post-processing folders"
 msgstr "se post-procesen las carpetas"
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
-msgstr "Nivel de depuración"
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr "Nivel de traza"

 
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "Bajo"
 
 msgid "Low"
 msgstr "Bajo"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "Medio"
 
 msgid "Medium"
 msgstr "Medio"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "Alto"
 
 msgid "High"
 msgstr "Alto"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not "
-"and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being "
-"processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped "
-"or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
+"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"
+"Caution: the higher the level, the greater the impact on performance."

 msgstr ""
 msgstr ""

-"Seleccione el nivel de detalle mostrado al habilitar la depuracion.\n"
+"Seleccione el nivel de detalle mostrado al habilitar la traza.\n"

 "Elija el nivel bajo para ver cuando se aplican las reglas, que condiciones "
 "coinciden o no y que acciones se realizan.\n"
 "Elija nivel medio para ver mas detalles sobre el mensaje que se está "
 "Elija el nivel bajo para ver cuando se aplican las reglas, que condiciones "
 "coinciden o no y que acciones se realizan.\n"
 "Elija nivel medio para ver mas detalles sobre el mensaje que se está "


@@ -9716,184 +10179,176 @@ msgstr ""
 "aplican las reglas y por qué coinciden o no.\n"
 "Atención: cuanto mayor sea el nivel mayor será el impacto en en rendimiento."
 
 "aplican las reglas y por qué coinciden o no.\n"
 "Atención: cuanto mayor sea el nivel mayor será el impacto en en rendimiento."
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "Depuración"
 
 msgid "Logging"
 msgstr "Depuración"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "Todos los mensajes"
 
 msgid "All messages"
 msgstr "Todos los mensajes"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr "Para o Cc"
-
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "En respuesta a"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "Más antiguo que"
 
 msgid "Age greater than"
 msgstr "Más antiguo que"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "Más nuevo que"
 
 msgid "Age lower than"
 msgstr "Más nuevo que"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "Sección cabeceras"
 
 msgid "Headers part"
 msgstr "Sección cabeceras"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "Sección cuerpo"
 
 msgid "Body part"
 msgstr "Sección cuerpo"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "Mensaje completo"
 
 msgid "Whole message"
 msgstr "Mensaje completo"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "Marca de «no leído»"
 
 msgid "Unread flag"
 msgstr "Marca de «no leído»"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "Marca de «nuevo»"
 
 msgid "New flag"
 msgstr "Marca de «nuevo»"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "Marca de «marcado»"
 
 msgid "Marked flag"
 msgstr "Marca de «marcado»"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "Marca de «borrado»"
 
 msgid "Deleted flag"
 msgstr "Marca de «borrado»"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "Marca de «respondido»"
 
 msgid "Replied flag"
 msgstr "Marca de «respondido»"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "Marca de «reenviado»"
 
 msgid "Forwarded flag"
 msgstr "Marca de «reenviado»"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "Marca de «bloqueado»"
 
 msgid "Locked flag"
 msgstr "Marca de «bloqueado»"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "Marca de «correo basura»"
 
 msgid "Spam flag"
 msgstr "Marca de «correo basura»"
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Etiqueta de color"
 
 msgid "Color label"
 msgstr "Etiqueta de color"
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 
 msgid "Ignored thread"
 msgstr "Hilo ignorado"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "Puntuación mayor que"
 
 msgid "Score greater than"
 msgstr "Puntuación mayor que"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "Puntuación menor que"
 
 msgid "Score lower than"
 msgstr "Puntuación menor que"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "Puntuación igual a"
 
 msgid "Score equal to"
 msgstr "Puntuación igual a"
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "Probar"
 
 msgid "Test"
 msgstr "Probar"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "Tamaño mayor que"
 
 msgid "Size greater than"
 msgstr "Tamaño mayor que"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "Tamaño menor que"
 
 msgid "Size smaller than"
 msgstr "Tamaño menor que"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "Tamaño exacto"
 
 msgid "Size exactly"
 msgstr "Tamaño exacto"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 
 msgid "Partially downloaded"
 msgstr "Parcialmente descargado"
 

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "Se encuentra en la agenda"
 
 msgid "Found in addressbook"
 msgstr "Se encuentra en la agenda"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "o"
 
 msgid "or"
 msgstr "o"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "y"
 
 msgid "and"
 msgstr "y"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "contiene"
 
 msgid "contains"
 msgstr "contiene"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "no contiene"
 
 msgid "does not contain"
 msgstr "no contiene"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "si"
 
 msgid "yes"
 msgstr "si"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "no"
 
 msgid "no"
 msgstr "no"
 

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "Configuración de la condición"
 
 msgid "Condition configuration"
 msgstr "Configuración de la condición"
 

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "Tipo de coincidencia"
 
 msgid "Match type"
 msgstr "Tipo de coincidencia"
 

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "Cabecera de dirección"
 
 msgid "Address header"
 msgstr "Cabecera de dirección"
 

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "Predicado"
 
 msgid "Predicate"
 msgstr "Predicado"
 

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "Op. lógico"
 
 msgid "Boolean Op"
 msgstr "Op. lógico"
 

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "Valor no establecido."
 
 msgid "Value is not set."
 msgstr "Valor no establecido."
 

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "Todas las direcciones en todas las cabeceras"
 
 msgid "all addresses in all headers"
 msgstr "Todas las direcciones en todas las cabeceras"
 

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "Cualquier dirección en cualquier cabecera"
 
 msgid "any address in any header"
 msgstr "Cualquier dirección en cualquier cabecera"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "la(s) dirección(es) en la cabecera «%s»"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -9906,7 +10361,7 @@ msgstr ""
 "Si quiere que la dirección «%s» coincida con todo el libro de direcciones "
 "deberá seleccionar «Cualquiera» en la lista desplegable de Agenda/carpeta."
 
 "Si quiere que la dirección «%s» coincida con todo el libro de direcciones "
 "deberá seleccionar «Cualquiera» en la lista desplegable de Agenda/carpeta."
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -9914,11 +10369,11 @@ msgstr ""
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 
 "La entrada no fue guardada.\n"
 "¿Cerrar igualmente?"
 

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 
 msgid "Match Type: 'Test'"
 msgstr "Tipo de coincidencia: «Probar»"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 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"
 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"


@@ -9930,7 +10385,7 @@ msgstr ""
 "\n"
 "Se pueden usar los siguientes símbolos:"
 
 "\n"
 "Se pueden usar los siguientes símbolos:"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 
 msgid "Current condition rules"
 msgstr "Reglas de condición actuales"
 


@@ -10084,7 +10539,7 @@ msgstr "Elejir el color para las firmas"
 msgid "Signatures"
 msgstr "Firmas"
 
 msgid "Signatures"
 msgstr "Firmas"
 

-#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:346
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr "Lista de carpetas"
 
 msgid "Folder list"
 msgstr "Lista de carpetas"
 


@@ -10259,33 +10714,9 @@ msgstr ""
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
 

-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "Responder con citación por omisión"
-
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "Formato de réplica"
-
-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "Marca de citación"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "Formato de reenvío"
-
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "Carácteres de citación"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "Tratar estos carácteres como marcas de cita: "
-
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "Citas"
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "Formato del mensaje nuevo"

 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"


@@ -10319,7 +10750,7 @@ msgstr "Di
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 

-#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:448
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr "Siempre"
 
 msgid "Always"
 msgstr "Siempre"
 


@@ -10593,180 +11024,156 @@ msgstr "Elejir color de los fallos ortogr
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 
 msgid "Spell Checking"
 msgstr "Corrección ortográfica"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "el día la semana abreviado"
 
 msgid "the full abbreviated weekday name"
 msgstr "el día la semana abreviado"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "AM o PM"
 
 msgid "either AM or PM"
 msgstr "AM o PM"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 

-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "Formato de fecha"
 
 msgid "Date format"
 msgstr "Formato de fecha"
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "Especificador"
 
 msgid "Specifier"
 msgstr "Especificador"
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "Ejemplo"
 
 msgid "Example"
 msgstr "Ejemplo"
 

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgstr "Ver el número de mensajes junto al nombre de la carpeta"
 
 msgid "Display message number next to folder name"
 msgstr "Ver el número de mensajes junto al nombre de la carpeta"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "No"
 
 msgid "No"
 msgstr "No"
 

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 
 msgid "Unread messages"
 msgstr "Mensajes sin leer"
 

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 
 msgid "Unread and Total messages"
 msgstr "Mensajes sin leer y totales"
 

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "Abrir la última carpeta abierta al iniciar"
+
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "letras"
 
 msgid "letters"
 msgstr "letras"
 

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr "Lista de mensajes"
 
 msgid "Message list"
 msgstr "Lista de mensajes"
 

-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "Al entrar en una carpeta"
-
-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "No hacer nada"
-
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "Seleccionar el primer mensaje sin leer (o nuevo o marcado)"
-
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "Seleccionar el primer mensaje sin leer (o marcado o nuevo)"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"
+msgstr "Establecer la selección por defecto al entrar en una carpeta"

 
 

-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "Seleccionar el primer mensaje nuevo (o sin leer o marcado)"
-
-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "Seleccionar el primer mensaje nuevo (o marcado o sin leer)"
-
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "Seleccionar el primer mensaje nuevo (o nuevo o sin leer)"
-
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "Seleccionar el primer mensaje marcado (o sin leer o nuevo)"
-
-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostrar diálogo de «No hay mensajes sin leer (o nuevos)»"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostrar diálogo de «No hay mensajes sin leer (o nuevos)»"
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "Asumir «Si»"
 
 msgid "Assume 'Yes'"
 msgstr "Asumir «Si»"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "Asumir «No»"
 
 msgid "Assume 'No'"
 msgstr "Asumir «No»"
 

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr "Abrir siempre el mensaje cuando se seleccione"
 
 msgid "Always open message when selected"
 msgstr "Abrir siempre el mensaje cuando se seleccione"
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
 

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 

-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:460

 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'"


@@ -10774,31 +11181,35 @@ msgstr ""
 "Postpone los movimientos, copiados y borrados de mensajes hasta que se "
 "selecciona «Herramientas/Ejecutar»"
 
 "Postpone los movimientos, copiados y borrados de mensajes hasta que se "
 "selecciona «Herramientas/Ejecutar»"
 

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
-msgstr "Sólo marcar mensaje como leído al abrirlo en una ventana nueva"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"
+msgstr ""
+"Sólo marcar mensaje como leído al abrirlo\n"
+"en una ventana nueva o al responderlo"

 
 

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "Marcar los mensajes como leídos después de"
 
 msgid "Mark messages as read after"
 msgstr "Marcar los mensajes como leídos después de"
 

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr "Ayuda del formato de fecha"
 
 msgid "Date format help"
 msgstr "Ayuda del formato de fecha"
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
 
 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
 

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "Traducir nombres de cabeceras"
 
 msgid "Translate header names"
 msgstr "Traducir nombres de cabeceras"
 

-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:544

 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."


@@ -10806,11 +11217,11 @@ msgstr ""
 "Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
 "a su idioma."
 
 "Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
 "a su idioma."
 

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr "Resúmenes"
 
 msgid "Summaries"
 msgstr "Resúmenes"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2442
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr "Adjunto"
 
 msgid "Attachment"
 msgstr "Adjunto"
 


@@ -10830,35 +11241,67 @@ msgstr ""
 "Seleccione las columnas a mostrar en el resumen. Se puede modificar\n"
 "el orden utilizando los botones Arriba/Abajo, o arrastrando los elementos."
 
 "Seleccione las columnas a mostrar en el resumen. Se puede modificar\n"
 "el orden utilizando los botones Arriba/Abajo, o arrastrando los elementos."
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "Ir al primer correo marcado"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "Ir al primer correo nuevo"
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "Ir primer correo no leído"
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "Ir al último correo abierto"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "Ir al último correo de la lista"
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "No hacer nada"
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "Acción al abrir una carpeta"
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "Acciones posibles"
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "Este nombre se utiliza como el elemento de menú"
 
 msgid "This name is used as the Menu item"
 msgstr "Este nombre se utiliza como el elemento de menú"
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " Símbolos... "
 
 msgid " Symbols... "
 msgstr " Símbolos... "
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "Configuración de plantilla"
 
 msgid "Template configuration"
 msgstr "Configuración de plantilla"
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "No se estableció el nombre de la plantilla."
 
 msgid "Template name is not set."
 msgstr "No se estableció el nombre de la plantilla."
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "Borrar plantilla"
 
 msgid "Delete template"
 msgstr "Borrar plantilla"
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "Plantillas actuales"
 
 msgid "Current templates"
 msgstr "Plantillas actuales"
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "Plantilla"
 
 msgid "Template"
 msgstr "Plantilla"
 


@@ -10998,10 +11441,6 @@ msgstr "Autor: "
 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "Estado:"
-

 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Apariencia"
 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Apariencia"


@@ -11106,11 +11545,11 @@ msgstr "Recorte de l
 msgid "No information available"
 msgstr "No hay información disponible"
 
 msgid "No information available"
 msgstr "No hay información disponible"
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 
 msgid "No recipient keys defined."
 msgstr "No se definió ninguna clave para el destinatario."
 

-#: src/procmime.c:341 src/procmime.c:343
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificando BASE64]\n"
 


@@ -11165,176 +11604,254 @@ msgstr "Error al escribir el fichero temporal para enviar noticias."
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocurrió un error mientras se enviaba el mensaje a %s."
 
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocurrió un error mientras se enviaba el mensaje a %s."
 

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtrando mensajes...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">símbolos:</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgstr "formato de fecha propio (vea «man strftime»)"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "formato de fecha propio (vea «man strftime»)"
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgstr "dirección de correo del remitente"
 
 msgid "email address of sender"
 msgstr "dirección de correo del remitente"
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr "nombre competo del remitente"
 
 msgid "full name of sender"
 msgstr "nombre competo del remitente"
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr "nombre del remitente"
 
 msgid "first name of sender"
 msgstr "nombre del remitente"
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr "apellidos del remitente"
 
 msgid "last name of sender"
 msgstr "apellidos del remitente"
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr "iniciales del remitente"
 
 msgid "initials of sender"
 msgstr "iniciales del remitente"
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr "cuerpo del mensaje"
 
 msgid "message body"
 msgstr "cuerpo del mensaje"
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr "cuerpo del mensaje citado"
 
 msgid "quoted message body"
 msgstr "cuerpo del mensaje citado"
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr "cuerpo del mensaje sin firma"
 
 msgid "message body without signature"
 msgstr "cuerpo del mensaje sin firma"
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgstr "cuerpo del mensaje citado sin firma"
 
 msgid "quoted message body without signature"
 msgstr "cuerpo del mensaje citado sin firma"
 

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "diccionario actual"
+
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr "posición del cursor"
 
 msgid "cursor position"
 msgstr "posición del cursor"
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
-msgstr "Propiedad de la cuenta: su nombre"
+#: src/quote_fmt.c:67
+msgid "account property: your name"
+msgstr "propiedad de la cuenta: su nombre"

 
 

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
-msgstr "Propiedad de la cuenta: su dirección de correo"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"
+msgstr "propiedad de la cuenta: su dirección de correo"

 
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
-msgstr "Propiedad de la cuenta: nombre de la cuenta"
+#: src/quote_fmt.c:69
+msgid "account property: account name"
+msgstr "propiedad de la cuenta: nombre de la cuenta"

 
 

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
-msgstr "Propiedad de la cuenta: organización"
+#: src/quote_fmt.c:70
+msgid "account property: organization"
+msgstr "propiedad de la cuenta: organización"

 
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "propiedad de la cuenta: diccionario por omisión"
+
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "<span style=\"oblique\">autocompletado</span> de la agenda: Cc"
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "<span style=\"oblique\">autocompletado</span> de la agenda: Desde"
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "<span style=\"oblique\">autocompletado</span> de la agenda: Para"
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "caracter \\"
 
 msgid "literal backslash"
 msgstr "caracter \\"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "carácter de interrogación"
 
 msgid "literal question mark"
 msgstr "carácter de interrogación"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "carácter de exclamación"
 
 msgid "literal exclamation mark"
 msgstr "carácter de exclamación"
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "carácter tubería"
 
 msgid "literal pipe"
 msgstr "carácter tubería"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr "carácter llave abierta"
 
 msgid "literal opening curly brace"
 msgstr "carácter llave abierta"
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr "carácter llave cerrada"
 
 msgid "literal closing curly brace"
 msgstr "carácter llave cerrada"
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgstr "tabulador"
 
 msgid "tab"
 msgstr "tabulador"
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "salto de línea"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">órdendes:</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"insertar expr si x está habilitado\n"
-"(donde x es un carácter de entre los dfNFLIstcnri o af, ao)"
+"insertar <span style=\"oblique\">expr</span> si x está establecido, donde x\n"
+"es uno de los símbolos [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"(o su equivalente largo)"

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"insertar expr si x no está habilitado\n"
-"(donde x es un carácter de entre los dfNFLIstcnri o af, ao)"
+"insertar <span style=\"oblique\">expr</span> si x no está establecido, "
+"donde\n"
+"x es uno de los símbolos [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"(o su equivalente largo)"

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 "insert file:\n"
 msgstr ""
 "insert file:\n"

-"la sub_expr es evaluada como un fichero a insertar"
+"la <span style=\"oblique\">sub_expr</span> es evaluada como la ruta del "
+"fichero a insertar"

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 "insert program output:\n"
 "the output from"
 msgstr ""
 "insert program output:\n"

-"la sub_expr es evaluada como una línea de órdenes\n"
+"la <span style=\"oblique\">sub_expr</span> es evaluada como una línea de "
+"órdenes\n"

 "de la que obtener la salida"
 
 "de la que obtener la salida"
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "user-entered text"
 msgstr ""

-"insert user input:\n"
-"la sub_expr es una variable que se sustituirá con\n"
-"el texto introducido por el usuario"
+"insertar entrada de usuario:\n"
+"la <span style=\"oblique\">sub_expr</span> es una variable que se sustituirá\n"
+"con el texto introducido por el usuario"

 
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "definición de términos:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">definición de términos:</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "texto que puede contener cualquiera de los símbolos mencionados"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"texto que puede contener cualquiera de los \n"
+"símbolos mencionados arriba"

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"text that can contain any of the symbols (no\n"
+"commands) above"

 msgstr ""
 msgstr ""

-"texto que puede contener cualquiera de los símbolos mencionados\n"
-"excepto ?x{}, !x{}, |f{}, |p{} y |i{}"
+"texto que puede contener cualquiera de los \n"
+"símbolos (no órdenes) mencionados arriba"

 
 

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:95
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+"el autocompletado de la agenda sólo funciona con la primera\n"
+"dirección de cada cabecera, devuelve el nombre completo del\n"
+"contacto si la dirección coincide exáctamente con un contacto\n"
+"en la agenda"
+
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "Se pueden usar los siguientes símbolos:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "Se pueden usar los siguientes símbolos y órdenes:"
+
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr "Usar formato al componer mensajes nuevos"
+
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "Formato de réplica"
+
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "Marca de citación"
+
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "Formato de reenvío"
+
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "Descripción de símbolos..."
+
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr "Error de formato en la marca de cita del mensaje de respuesta."
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "Error de formato en la marca de cita del mensaje a reenviar."

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Introducir texto para sustituir «%s»"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Introducir texto para sustituir «%s»"
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "Introducir variable"
 
 msgid "Enter variable"
 msgstr "Introducir variable"
 


@@ -11477,10 +11994,6 @@ msgstr "Coincidir con alguno de los siguientes"
 msgid "Match all of the following"
 msgstr "Coincidir con todos los siguientes"
 
 msgid "Match all of the following"
 msgstr "Coincidir con todos los siguientes"
 

-#: src/summary_search.c:356
-msgid "From:"
-msgstr "Desde:"
-

 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Cuerpo:"
 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Cuerpo:"


@@ -11493,377 +12006,385 @@ msgstr "Condici
 msgid "Find _all"
 msgstr "Encontrar _todos"
 
 msgid "Find _all"
 msgstr "Encontrar _todos"
 

-#: src/summary_search.c:669
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿siguir desde el final?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Se llegó al principio de la lista, ¿siguir desde el final?"
 

-#: src/summary_search.c:671
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/_Responder"
 
 msgid "/_Reply"
 msgstr "/_Responder"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 

-#: src/summaryview.c:429 src/toolbar.c:247
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr "/Reen_viar"
 
 msgid "/_Forward"
 msgstr "/Reen_viar"
 

-#: src/summaryview.c:430 src/toolbar.c:248
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/Redirigir"
 
 msgid "/Redirect"
 msgstr "/Redirigir"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/_Mover..."
 
 msgid "/M_ove..."
 msgstr "/_Mover..."
 

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/Mover a la p_apelera"
 
 msgid "/Move to _trash"
 msgstr "/Mover a la p_apelera"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/_Borrar..."
 
 msgid "/_Delete..."
 msgstr "/_Borrar..."
 

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/_Marcar"
 
 msgid "/_Mark"
 msgstr "/_Marcar"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 

-#: src/summaryview.c:441 src/summaryview.c:447 src/summaryview.c:450
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar todos leídos"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar todos leídos"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/_Ignorar hilo"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/_Ignorar hilo"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_No ignorar hilo"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_No ignorar hilo"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/_Marcar/Marcar como correo ba_sura"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/_Marcar/Marcar como correo ba_sura"
 

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr "/_Marcar/Marcar como _bueno"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/_Marcar/Marcar como _bueno"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Bloqueado"
 
 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Bloqueado"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/Desbloqueado"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/Desbloqueado"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "/Añadir _remitente a la agenda"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Añadir _remitente a la agenda"
 

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 
 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "Crear regla de f_iltrado/_Automáticamente"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "Crear regla de f_iltrado/_Automáticamente"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "Crear regla de f_iltrado/Con el _remitente"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "Crear regla de f_iltrado/Con el _remitente"
 

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Con el _destinatario"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Con el _destinatario"
 

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Con el _asunto"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Con el _asunto"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/Crear regla de procesamiento"
 
 msgid "/Create processing rule"
 msgstr "/Crear regla de procesamiento"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/Crear regla de procesamiento/_Automáticamente"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Crear regla de procesamiento/_Automáticamente"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/Crear regla de procesamiento/Con el _remitente"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Crear regla de procesamiento/Con el _remitente"
 

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/Crear regla de procesamiento/Con el _destinatario"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Crear regla de procesamiento/Con el _destinatario"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/Crear regla de procesamiento/Con el _asunto"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Crear regla de procesamiento/Con el _asunto"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/_Ver/Fuente del men_saje"
 
 msgid "/_View/Message _source"
 msgstr "/_Ver/Fuente del men_saje"
 

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas las ca_beceras"
 
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas las ca_beceras"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/_Guardar como..."
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 
 msgid "Toggle quick search bar"
 msgstr "Conmutar barra de búsqueda rápida"
 

-#: src/summaryview.c:1065
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr "Commutar la selección múltiple"
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "Procesar marcas"
 
 msgid "Process mark"
 msgstr "Procesar marcas"
 

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Quedan algunas marcas. ¿Procesarlas?"
 

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 

-#: src/summaryview.c:1591 src/summaryview.c:1643
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1604 src/summaryview.c:1656 src/summaryview.c:1703
-#: src/summaryview.c:1755 src/summaryview.c:1834
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 

-#: src/summaryview.c:1690 src/summaryview.c:1742
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 
 msgid "No new message found. Search from the end?"
 msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 

-#: src/summaryview.c:1780 src/summaryview.c:1821
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
 

-#: src/summaryview.c:1859 src/summaryview.c:1884
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1869 src/summaryview.c:1894
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 

-#: src/summaryview.c:2339 src/summaryview.c:2346
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr " elemento seleccionado"
 
 msgid " item selected"
 msgstr " elemento seleccionado"
 

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr " elementos seleccionados"
 
 msgid " items selected"
 msgstr " elementos seleccionados"
 

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 
 msgid "(No Recipient)"
 msgstr "(Sin destinatario)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del artículo.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Usted no es el autor del artículo.\n"
 

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgstr "¿Quiere borrar realmente el mensaje seleccionado?"
 
 msgid "Do you really want to delete the selected message?"
 msgstr "¿Quiere borrar realmente el mensaje seleccionado?"
 

-#: src/summaryview.c:3817
+#: src/summaryview.c:3835

 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "¿Quiere borrar realmente los %d mensajes seleccionados?"
 
 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "¿Quiere borrar realmente los %d mensajes seleccionados?"
 

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "_Añadir"
 
 msgid "_Append"
 msgstr "_Añadir"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "S_obreescribir"
 
 msgid "_Overwrite"
 msgstr "S_obreescribir"
 

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 
 msgid "Skip these rules"
 msgstr "Saltarse estas reglas"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
 

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "Filtrando"
 
 msgid "Filtering"
 msgstr "Filtrando"
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -11871,19 +12392,19 @@ msgstr ""
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 
 "Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
 "Por favor seleccione que quiere hacer con ellas:"
 

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "_Filtrar"
 
 msgid "_Filter"
 msgstr "_Filtrar"
 

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "Filtrando..."
 
 msgid "Filtering..."
 msgstr "Filtrando..."
 

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11892,45 +12413,45 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
 "Error en la expresión regular (regexp):\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 
 msgid "Go back to the folder list"
 msgstr "Volver a la lista de carpetas"
 

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/Componer un mensaje _nuevo"
 
 msgid "/Compose _new message"
 msgstr "/Componer un mensaje _nuevo"
 

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "/Añadir a la agenda"
 
 msgid "/Add to _address book"
 msgstr "/Añadir a la agenda"
 

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/Copiar esta di_rección"
 
 msgid "/Copy this add_ress"
 msgstr "/Copiar esta di_rección"
 

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/_Abrir imagen"
 
 msgid "/_Open image"
 msgstr "/_Abrir imagen"
 

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/_Guardar imagen..."
 
 msgid "/_Save image..."
 msgstr "/_Guardar imagen..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11944,79 +12465,79 @@ msgstr ""
 "\n"
 "  Utilize "
 
 "\n"
 "  Utilize "
 

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "«Ver traza»"
 
 msgid "'View Log'"
 msgstr "«Ver traza»"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 
 msgid " in the Tools menu for more information."
 msgstr " en el menú Herramientas para más información."
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Puede efectuar las siguientes acciones en esta parte haciendo\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  clic con el botón derecho en el icono o elemento de la lista:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  clic con el botón derecho en el icono o elemento de la lista:\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 
 msgid "     - To save, select "
 msgstr "     - Para guardar, seleccione "
 

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 
 msgid "'Save as...'"
 msgstr "«Guardar como...»"
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Atajo de teclado: «y»)\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Atajo de teclado: «y»)\n"
 

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 
 msgid "     - To display as text, select "
 msgstr "     - Para mostrar como texto, seleccione "
 

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 
 msgid "'Display as text'"
 msgstr "«Mostrar como texto»"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " (Atajo de teclado: «t»)\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Atajo de teclado: «t»)\n"
 

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir con un programa externo, seleccione "
 

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "«Abrir»"
 
 msgid "'Open'"
 msgstr "«Abrir»"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Atajo de teclado: «l»)\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Atajo de teclado: «l»)\n"
 

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente doble clic, o clic con el botón "
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 
 msgid "mouse button)\n"
 msgstr "central del ratón)\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr "     - O utilize"
 
 msgid "     - Or use "
 msgstr "     - O utilize"
 

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 
 msgid "'Open with...'"
 msgstr "«Abrir con...»"
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Atajo de teclado: «o»)\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Atajo de teclado: «o»)\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -12027,7 +12548,7 @@ msgstr ""
 "    %s\n"
 "Código de salida %d\n"
 
 "    %s\n"
 "Código de salida %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -12046,243 +12567,243 @@ msgstr ""
 "\n"
 "¿Abrirla de todas formas?"
 
 "\n"
 "¿Abrirla de todas formas?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 
 msgid "Phishing attempt warning"
 msgstr "Aviso de intento de «phishing»"
 

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "_Abrir URL"
 
 msgid "_Open URL"
 msgstr "_Abrir URL"
 

-#: src/toolbar.c:171 src/toolbar.c:1637
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "Recibir correo de todas las cuentas"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Recibir correo de todas las cuentas"
 

-#: src/toolbar.c:172 src/toolbar.c:1651
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "Recibir correo de la cuenta actual"
 
 msgid "Receive Mail on current Account"
 msgstr "Recibir correo de la cuenta actual"
 

-#: src/toolbar.c:173 src/toolbar.c:1657
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "Enviar mensajes en la cola"
 
 msgid "Send Queued Messages"
 msgstr "Enviar mensajes en la cola"
 

-#: src/toolbar.c:174 src/toolbar.c:1682
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "Componer correo"
 
 msgid "Compose Email"
 msgstr "Componer correo"
 

-#: src/toolbar.c:175 src/toolbar.c:1686
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr "Componer noticia"
 
 msgid "Compose News"
 msgstr "Componer noticia"
 

-#: src/toolbar.c:176 src/toolbar.c:1728 src/toolbar.c:1738
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 
 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 

-#: src/toolbar.c:177 src/toolbar.c:1745 src/toolbar.c:1755
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 

-#: src/toolbar.c:178 src/toolbar.c:1762 src/toolbar.c:1772
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "Responder a todos"
 
 msgid "Reply to All"
 msgstr "Responder a todos"
 

-#: src/toolbar.c:179 src/toolbar.c:1779 src/toolbar.c:1789
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 
 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 

-#: src/toolbar.c:180 src/toolbar.c:1669
+#: src/toolbar.c:181 src/toolbar.c:1678

 msgid "Open email"
 msgstr "Abrir correo"
 
 msgid "Open email"
 msgstr "Abrir correo"
 

-#: src/toolbar.c:181 src/toolbar.c:1796 src/toolbar.c:1806
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 

-#: src/toolbar.c:182 src/toolbar.c:1813
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgstr "Mensaje a la papelera"
 
 msgid "Trash Message"
 msgstr "Mensaje a la papelera"
 

-#: src/toolbar.c:183 src/toolbar.c:1819
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "Borrar mensaje"
 
 msgid "Delete Message"
 msgstr "Borrar mensaje"
 

-#: src/toolbar.c:185 src/toolbar.c:1831
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "Ir al mensaje anterior no leído"
 
 msgid "Go to Previous Unread Message"
 msgstr "Ir al mensaje anterior no leído"
 

-#: src/toolbar.c:186 src/toolbar.c:1838
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "Ir al mensaje siguiente no leído"
 
 msgid "Go to Next Unread Message"
 msgstr "Ir al mensaje siguiente no leído"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "Aprender correo basura o bueno"
 
 msgid "Learn Spam or Ham"
 msgstr "Aprender correo basura o bueno"
 

-#: src/toolbar.c:190 src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "Ir a la lista de carpetas"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "Abrir carpeta/Ir a la lista de carpetas"

 
 

-#: src/toolbar.c:192 src/toolbar.c:1847
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr "Enviar mensaje"
 
 msgid "Send Message"
 msgstr "Enviar mensaje"
 

-#: src/toolbar.c:193 src/toolbar.c:1853
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 

-#: src/toolbar.c:194 src/toolbar.c:1859
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 

-#: src/toolbar.c:195 src/toolbar.c:1865
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr "Insertar fichero"
 
 msgid "Insert file"
 msgstr "Insertar fichero"
 

-#: src/toolbar.c:196 src/toolbar.c:1871
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 

-#: src/toolbar.c:197 src/toolbar.c:1877
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "Insertar firma"
 
 msgid "Insert signature"
 msgstr "Insertar firma"
 

-#: src/toolbar.c:198 src/toolbar.c:1883
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 

-#: src/toolbar.c:199 src/toolbar.c:1889
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "Cortar líneas largas del párrafo actual"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Cortar líneas largas del párrafo actual"
 

-#: src/toolbar.c:200 src/toolbar.c:1895
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 

-#: src/toolbar.c:203 src/toolbar.c:1908
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "Verificar ortografía"
 
 msgid "Check spelling"
 msgstr "Verificar ortografía"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Acciones de Claws Mail"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Acciones de Claws Mail"
 

-#: src/toolbar.c:206 src/toolbar.c:1931
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "Cancelar recepción"
 
 msgid "Cancel receiving"
 msgstr "Cancelar recepción"
 

-#: src/toolbar.c:207 src/toolbar.c:1663
+#: src/toolbar.c:208 src/toolbar.c:1672

 msgid "Close window"
 msgstr "Cerrar ventana"
 
 msgid "Close window"
 msgstr "Cerrar ventana"
 

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/Responder con _cita"
 
 msgid "/Reply with _quote"
 msgstr "/Responder con _cita"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/_Responder sin cita"
 
 msgid "/_Reply without quote"
 msgstr "/_Responder sin cita"
 

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos con cita"
 
 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos con cita"
 

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sin cita"
 
 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sin cita"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/Responder a la _lista con citación"
 
 msgid "/Reply to list with _quote"
 msgstr "/Responder a la _lista con citación"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/Responder a la l_ista sin citación"
 
 msgid "/_Reply to list without quote"
 msgstr "/Responder a la l_ista sin citación"
 

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr "/Responder al remitente con _citación"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Responder al remitente con _citación"
 

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/_Responder al remitente sin citación"
 
 msgid "/_Reply to sender without quote"
 msgstr "/_Responder al remitente sin citación"
 

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/Redirigi_r"
 
 msgid "/Redirec_t"
 msgstr "/Redirigi_r"
 

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "/Aprender como correo basura"
 
 msgid "/Learn as _Spam"
 msgstr "/Aprender como correo basura"
 

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "/Aprender como bueno"
 
 msgid "/Learn as _Ham"
 msgstr "/Aprender como bueno"
 

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr "Recibir correo"
 
 msgid "Get Mail"
 msgstr "Recibir correo"
 

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr "Componer"
 
 msgid "Toolbar|Compose"
 msgstr "Componer"
 

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "Abrir"
 
 msgid "Open"
 msgstr "Abrir"
 

-#: src/toolbar.c:421 src/toolbar.c:521
+#: src/toolbar.c:422 src/toolbar.c:522

 msgid "Reply"
 msgstr "Responder"
 
 msgid "Reply"
 msgstr "Responder"
 

-#: src/toolbar.c:423 src/toolbar.c:522
+#: src/toolbar.c:424 src/toolbar.c:523

 msgid "All"
 msgstr "Todo"
 
 msgid "All"
 msgstr "Todo"
 

-#: src/toolbar.c:424 src/toolbar.c:523
-msgid "Sender"
-msgstr "Remitente"
-
-#: src/toolbar.c:430 src/toolbar.c:528
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr "Basura"
 
 msgid "Spam"
 msgstr "Basura"
 

-#: src/toolbar.c:433 src/toolbar.c:530
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr "Siguiente"
 
 msgid "Next"
 msgstr "Siguiente"
 

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "Enviar después"
 
 msgid "Send later"
 msgstr "Enviar después"
 

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "Borrador"
 
 msgid "Draft"
 msgstr "Borrador"
 

-#: src/toolbar.c:1644
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "Ir a la lista de carpetas"
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "Recibir correo de la cuenta seleccionada"
 
 msgid "Receive Mail on selected Account"
 msgstr "Recibir correo de la cuenta seleccionada"
 

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "Componer correo con la cuenta seleccionada"
 
 msgid "Compose with selected Account"
 msgstr "Componer correo con la cuenta seleccionada"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "Bueno"
 
 msgid "Ham"
 msgstr "Bueno"
 

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "Aprender correo basura"
 
 msgid "Learn Spam"
 msgstr "Aprender correo basura"
 

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "Aprender correo bueno"
 
 msgid "Learn Ham"
 msgstr "Aprender correo bueno"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "Aprender como..."
 
 msgid "Learn as..."
 msgstr "Aprender como..."
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "Aprender"
 
 msgid "Learn"
 msgstr "Aprender"
 


@@ -12592,8 +13113,3 @@ msgstr ""
 "\n"
 "Pulse «Guardar» para comenzar."
 
 "\n"
 "Pulse «Guardar» para comenzar."
 

-#~ msgid "Log Size"
-#~ msgstr "Tamaño de traza"
-
-#~ msgid "Automatic spelling"
-#~ msgstr "Ortografía automática"

diff --git a/po/fr.po b/po/fr.po
index c76ec605217de2ad6f6c1595e903f4c34a0e4184..29a6828047ab446bb6eccc85f67eb32531fbb0c4 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,6 +14,22 @@
 #  Format des msgstr : le " final doit être au max. le 79ième car.
 #  Caractères spéciaux (pr copier/coller) : «»
 #
 #  Format des msgstr : le " final doit être au max. le 79ième car.
 #  Caractères spéciaux (pr copier/coller) : «»
 #

+# 2007-07-01 [fab]     2.9.2cvs76
+# > Maemo contextual strings :   "Maemo|string"
+# > meilleure traduc ?  Run on select -> Sélection validante
+# > parent folder / root folder / top level folder -> uniformiser
+# . Citation lors d'une réponse -> Modèle de formatage lors d'une réponse
+# . Citation lors d'un transfert -> Modèle de formatage lors d'un transfert
+# > Open last opened folder at startup ; startup -> start-up
+# > Action on folder opening : Action -> Actions
+# > Go to ... : Aller à -> Sélectionner
+#
+# 2007-06-27 [fab]     2.9.2cvs73
+# > Compose / Add to address _book  ->  ajouter "..." à la fin
+# > factorize :
+#      src/prefs_logging.c / "Filtering/processing log"
+#      src/mainwindow.c / "Filtering/processing debug log"
+#

 # 2007-03-29 [fab]     2.8.1cvs62
 # > "_Cancel" (src/messageview.c:1405) -> GTK_STOCK_CANCEL
 #
 # 2007-03-29 [fab]     2.8.1cvs62
 # > "_Cancel" (src/messageview.c:1405) -> GTK_STOCK_CANCEL
 #


@@ -579,10 +595,10 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Claws-Mail-2.8.1cvs100\n"
+"Project-Id-Version: Claws-Mail-2.9.2cvs76\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-16 07:00+0200\n"
-"PO-Revision-Date: 2007-04-16 07:20+0200\n"
+"POT-Creation-Date: 2007-07-01 08:42+0200\n"
+"PO-Revision-Date: 2007-07-01 23:36+0200\n"

 "Last-Translator: Fabien Vantard <fzzzzz@gmail.com>\n"
 "Language-Team: <sylpheed-claws-translators@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Fabien Vantard <fzzzzz@gmail.com>\n"
 "Language-Team: <sylpheed-claws-translators@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"


@@ -590,7 +606,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -598,15 +614,15 @@ msgstr ""
 "Des fenêtres de composition de message sont ouvertes.\n"
 "Veuillez toutes les fermer avant de pouvoir configurer les comptes."
 
 "Des fenêtres de composition de message sont ouvertes.\n"
 "Veuillez toutes les fermer avant de pouvoir configurer les comptes."
 

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 
 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 

-#: src/account.c:701
+#: src/account.c:715

 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "


@@ -616,64 +632,64 @@ msgstr ""
 "comptes suivants, les cases à cocher de la colonne 'R' indiquant lesquels "
 "sont concernés par cette relève."
 
 "comptes suivants, les cases à cocher de la colonne 'R' indiquant lesquels "
 "sont concernés par cette relève."
 

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 
 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "Supprimer le compte"
 
 msgid "Delete account"
 msgstr "Supprimer le compte"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "D"
 
 msgid "Accounts List Default Column Name|D"
 msgstr "D"
 

-#: src/account.c:1472 src/prefs_folder_item.c:740
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "Compte par défaut"
 
 msgid "Default account"
 msgstr "Compte par défaut"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
 

-#: src/account.c:1493 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5870 src/compose.c:6181 src/editaddress.c:1043
-#: src/editaddress.c:1092 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6036 src/compose.c:6349 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480 src/prefs_template.c:185
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr "Nom"
 
 msgid "Name"
 msgstr "Nom"
 

-#: src/account.c:1500 src/prefs_account.c:1258 src/prefs_account.c:2849
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "Protocole"
 
 msgid "Protocol"
 msgstr "Protocole"
 

-#: src/account.c:1507 src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Serveur"
 
 msgid "Server"
 msgstr "Serveur"
 


@@ -734,25 +750,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1153 src/action.c:1303
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr "Terminé"
 
 msgid "Completed"
 msgstr "Terminé"
 

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 
 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -763,11 +779,11 @@ msgstr ""
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 
 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -778,348 +794,357 @@ msgstr ""
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 

-#: src/addr_compl.c:597 src/addressbook.c:4403
+#: src/addr_compl.c:597 src/addressbook.c:4596

 msgid "Group"
 msgstr "Groupe"
 
 msgid "Group"
 msgstr "Groupe"
 

-#: src/addressadd.c:174 src/prefs_filtering_action.c:179
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr "Ajout au carnet d'adresses"
 
 msgid "Add to address book"
 msgstr "Ajout au carnet d'adresses"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:479
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "Adresse"
 
 msgid "Address"
 msgstr "Adresse"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:851
-#: src/editaddress.c:915 src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Remarques"
 
 msgid "Remarks"
 msgstr "Remarques"
 

-#: src/addressadd.c:240 src/addressbook_foldersel.c:164
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgstr "Veuillez sélectionner un dossier"
 
 msgid "Select Address Book Folder"
 msgstr "Veuillez sélectionner un dossier"
 

-#: src/addressbook.c:133 src/editaddress.c:849 src/editaddress.c:897
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "Ajout d'adresse(s)"
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "Impossible d'ajouter l'adresse spécifiée."
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591

-#: src/exporthtml.c:755 src/ldif.c:779
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr "Adresse email"
 
 msgid "Email Address"
 msgstr "Adresse email"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/_Carnet"
 
 msgid "/_Book"
 msgstr "/_Carnet"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/Carnet/Nouveau _carnet d'adresses"
 
 msgid "/_Book/New _Book"
 msgstr "/Carnet/Nouveau _carnet d'adresses"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr "/Carnet/Nouveau _dossier"
 
 msgid "/_Book/New _Folder"
 msgstr "/Carnet/Nouveau _dossier"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/Carnet/Nouveau carnet _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/Carnet/Nouveau carnet _vCard"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/Carnet/Nouveau carnet _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/Carnet/Nouveau carnet _JPilot"
 

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/Carnet/Nouveau serveur _LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/Carnet/Nouveau serveur _LDAP"
 

-#: src/addressbook.c:436 src/addressbook.c:439
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/Carnet/---"
 
 msgid "/_Book/---"
 msgstr "/Carnet/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/Carnet/_Editer"
 
 msgid "/_Book/_Edit book"
 msgstr "/Carnet/_Editer"
 

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/Carnet/Supp_rimer le carnet"
 
 msgid "/_Book/_Delete book"
 msgstr "/Carnet/Supp_rimer le carnet"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/Carnet/Enregi_strer"
 
 msgid "/_Book/_Save"
 msgstr "/Carnet/Enregi_strer"
 

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/Carnet/_Fermer"
 
 msgid "/_Book/_Close"
 msgstr "/Carnet/_Fermer"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/A_dresse"
 
 msgid "/_Address"
 msgstr "/A_dresse"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/Adresse/_Sélectionner tout"
 
 msgid "/_Address/_Select all"
 msgstr "/Adresse/_Sélectionner tout"
 

-#: src/addressbook.c:444 src/addressbook.c:448 src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/Adresse/---"
 
 msgid "/_Address/---"
 msgstr "/Adresse/---"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/Adresse/Co_uper"
 
 msgid "/_Address/C_ut"
 msgstr "/Adresse/Co_uper"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/Adresse/_Copier"
 
 msgid "/_Address/_Copy"
 msgstr "/Adresse/_Copier"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/Adresse/Co_ller"
 
 msgid "/_Address/_Paste"
 msgstr "/Adresse/Co_ller"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/Adresse/Édit_er"
 
 msgid "/_Address/_Edit"
 msgstr "/Adresse/Édit_er"
 

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/Adresse/_Supprimer"
 
 msgid "/_Address/_Delete"
 msgstr "/Adresse/_Supprimer"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr "/Adresse/Nouvelle _adresse"
 
 msgid "/_Address/New _Address"
 msgstr "/Adresse/Nouvelle _adresse"
 

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "/Adresse/Nouveau _groupe"
 
 msgid "/_Address/New _Group"
 msgstr "/Adresse/Nouveau _groupe"
 

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr "/Adresse/Co_mposer"
 
 msgid "/_Address/_Mail To"
 msgstr "/Adresse/Co_mposer"
 

-#: src/addressbook.c:456 src/compose.c:790 src/mainwindow.c:814
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814

 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/Ou_tils"
 
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/Ou_tils"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/Outils/Importer un carnet d'adresses _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/Outils/Importer un carnet d'adresses _LDIF..."
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/Outils/Importer un carnet d'adresses _Mutt..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/Outils/Importer un carnet d'adresses _Mutt..."
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/Outils/Importer un carnet d'adresses _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/Outils/Importer un carnet d'adresses _Pine..."
 

-#: src/addressbook.c:460 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846

 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/Ou_tils/---"
 
 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/Ou_tils/---"
 

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/Outils/Exporter le carnet d'adresses en _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/Outils/Exporter le carnet d'adresses en _HTML..."
 

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/Outils/Exporter le carnet d'adresses en LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/Outils/Exporter le carnet d'adresses en LDI_F..."
 

-#: src/addressbook.c:463 src/compose.c:795 src/mainwindow.c:892
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892

 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Aide"
 
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Aide"
 

-#: src/addressbook.c:464 src/compose.c:796 src/mainwindow.c:898
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898

 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/Aide/_A propos"
 
 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/Aide/_A propos"
 

-#: src/addressbook.c:469 src/addressbook.c:485 src/compose.c:563
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574

 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Edition"
 
 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Edition"
 

-#: src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/_Supprimer"
 
 msgid "/_Delete"
 msgstr "/_Supprimer"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/Nouveau c_arnet"
 
 msgid "/New _Book"
 msgstr "/Nouveau c_arnet"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 

-#: src/addressbook.c:474 src/addressbook.c:489
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 

-#: src/addressbook.c:476 src/addressbook.c:491
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/Co_uper"
 
 msgid "/C_ut"
 msgstr "/Co_uper"
 

-#: src/addressbook.c:477 src/addressbook.c:492
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/_Copier"
 
 msgid "/_Copy"
 msgstr "/_Copier"
 

-#: src/addressbook.c:478 src/addressbook.c:493
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/Co_ller"
 
 msgid "/_Paste"
 msgstr "/Co_ller"
 

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "/_Sélectionner tout"
 
 msgid "/_Select all"
 msgstr "/_Sélectionner tout"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/Co_mposer"
 
 msgid "/_Mail To"
 msgstr "/Co_mposer"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/_Parcourir l'entrée"
 
 msgid "/_Browse Entry"
 msgstr "/_Parcourir l'entrée"
 

-#: src/addressbook.c:511 src/crash.c:451 src/crash.c:470 src/importldif.c:119
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120

 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Inconnu"
 
 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "Inconnu"
 

-#: src/addressbook.c:518 src/addressbook.c:537 src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr "Succès"
 
 msgid "Success"
 msgstr "Succès"
 

-#: src/addressbook.c:519 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr "Arguments incorrects"
 
 msgid "Bad arguments"
 msgstr "Arguments incorrects"
 

-#: src/addressbook.c:520 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr "Fichier non spécifié."
 
 msgid "File not specified"
 msgstr "Fichier non spécifié."
 

-#: src/addressbook.c:521 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr "Erreur lors de l'ouverture du fichier"
 
 msgid "Error opening file"
 msgstr "Erreur lors de l'ouverture du fichier"
 

-#: src/addressbook.c:522 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr "Erreur lors de la lecture du fichier"
 
 msgid "Error reading file"
 msgstr "Erreur lors de la lecture du fichier"
 

-#: src/addressbook.c:523 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr "Fin de fichier inattendue"
 
 msgid "End of file encountered"
 msgstr "Fin de fichier inattendue"
 

-#: src/addressbook.c:524 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "Erreur d'allocation de mémoire"
 
 msgid "Error allocating memory"
 msgstr "Erreur d'allocation de mémoire"
 

-#: src/addressbook.c:525 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr "Erreur dans le format du fichier"
 
 msgid "Bad file format"
 msgstr "Erreur dans le format du fichier"
 

-#: src/addressbook.c:526 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 
 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 

-#: src/addressbook.c:527 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr "Erreur lors de l'ouverture du dossier"
 
 msgid "Error opening directory"
 msgstr "Erreur lors de l'ouverture du dossier"
 

-#: src/addressbook.c:528 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr "Chemin non spécifié."
 
 msgid "No path specified"
 msgstr "Chemin non spécifié."
 

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "Erreur lors de la connexion au serveur LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Erreur lors de la connexion au serveur LDAP"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "Erreur d'initialisation LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Erreur d'initialisation LDAP"
 

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "Erreur lors de la liaison avec le serveur LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Erreur lors de la liaison avec le serveur LDAP"
 

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "Erreur lors de la recherche de la base de données LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Erreur lors de la recherche de la base de données LDAP"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "Délai excédé lors d'une opération LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Délai excédé lors d'une opération LDAP"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "Erreur dans le critère de recherche LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Erreur dans le critère de recherche LDAP"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr ""
 "Aucune entrée LDAP correspondante au critère de recherche n'a été trouvée"
 
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 "Aucune entrée LDAP correspondante au critère de recherche n'a été trouvée"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "Recherche LDAP interrompue conformément à la demande"
 
 msgid "LDAP search terminated on request"
 msgstr "Recherche LDAP interrompue conformément à la demande"
 

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "Erreur lors de l'établissement de la connexion TLS"
 
 msgid "Error starting TLS connection"
 msgstr "Erreur lors de l'établissement de la connexion TLS"
 

-#: src/addressbook.c:920
+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"
+msgstr "Le Nom Distingué (dn) est manquant"
+
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "Information requise manquante"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "Un autre contact existe avec cette clé"
+
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "Forte authentification obligatoire"
+
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "Sources"
 
 msgid "Sources"
 msgstr "Sources"
 

-#: src/addressbook.c:924 src/prefs_other.c:513 src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 msgid "Address book"
 msgstr "Carnet d'adresses"
 

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "Nom complet :"
 
 msgid "Lookup name:"
 msgstr "Nom complet :"
 

-#: src/addressbook.c:1129 src/compose.c:2131 src/compose.c:4481
-#: src/compose.c:5705 src/compose.c:6519 src/compose.c:9648 src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "À:"
-
-#: src/addressbook.c:1133 src/compose.c:2115 src/compose.c:4217
-#: src/compose.c:4480 src/compose.c:9657 src/matcher.c:770
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1137 src/compose.c:2118 src/compose.c:4248
-msgid "Bcc:"
-msgstr "Cci:"
-
-#: src/addressbook.c:1387 src/addressbook.c:1433
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule \n"
 "et ne peuvent pas être supprimées."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule \n"
 "et ne peuvent pas être supprimées."
 

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 
 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -1127,34 +1152,34 @@ msgstr ""
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront CONSERVEES."
 
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront CONSERVEES."
 

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr ""
 "Voulez-vous supprimer la(les) adresse(s) ou groupe(s) sélectionnée(s) ?"
 
 msgid "Really delete the address(es)?"
 msgstr ""
 "Voulez-vous supprimer la(les) adresse(s) ou groupe(s) sélectionnée(s) ?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Impossible de coller. Le carnet d'adresse de destination est en lecture "
 "seule."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Impossible de coller. Le carnet d'adresse de destination est en lecture "
 "seule."
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 
 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s "
 "» ?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s "
 "» ?"
 

-#: src/addressbook.c:2735 src/addressbook.c:2761 src/addressbook.c:2768
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Supprimer"
 
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Supprimer"
 

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -1164,19 +1189,19 @@ msgstr ""
 "uniquement ce dossier, les adresses qu'il contient seront déplacées dans le "
 "dossier parent."
 
 "uniquement ce dossier, les adresses qu'il contient seront déplacées dans le "
 "dossier parent."
 

-#: src/addressbook.c:2747 src/imap_gtk.c:302 src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+_Dossier uniquement"
 
 msgid "+Delete _folder only"
 msgstr "+_Dossier uniquement"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 
 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -1185,7 +1210,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront CONSERVEES."
 
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront CONSERVEES."
 

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -1194,20 +1219,29 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 

-#: src/addressbook.c:3638
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr "Recherche « %s »"
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "Nouveaux contacts"
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible de sauvegarder le fichier index."
 
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible de sauvegarder le fichier index."
 

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -1215,7 +1249,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -1223,7 +1257,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -1231,7 +1265,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses :\n"
 "impossible d'enregistrer le nouveau fichier index."
 
 "Échec lors de la conversion du carnet d'adresses :\n"
 "impossible d'enregistrer le nouveau fichier index."
 

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -1239,71 +1273,66 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 

-#: src/addressbook.c:3688 src/addressbook.c:3694
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "Recherche..."
 
 msgid "Busy searching..."
 msgstr "Recherche..."
 

-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr "Recherche « %s »"
-
-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "Interface"
 
 msgid "Interface"
 msgstr "Interface"
 

-#: src/addressbook.c:4355 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:394 src/exporthtml.c:973 src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "Contact"
 
 msgid "Person"
 msgstr "Contact"
 

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "Adresse email"
 
 msgid "EMail Address"
 msgstr "Adresse email"
 

-#: src/addressbook.c:4419 src/exporthtml.c:875 src/folderview.c:469
-#: src/prefs_account.c:2542 src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Dossier"
 
 msgid "Folder"
 msgstr "Dossier"
 

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4451 src/addressbook.c:4467
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 
 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "Requête LDAP"
 
 msgid "LDAP Query"
 msgstr "Requête LDAP"
 

-#: src/addressbook.c:4822 src/addressbook_foldersel.c:389 src/matcher.c:312
-#: src/matcher.c:1097 src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67 src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527 src/prefs_matcher.c:1347 src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366 src/prefs_matcher.c:2119 src/prefs_matcher.c:2123
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "Quelconque"
 
 msgid "Any"
 msgstr "Quelconque"
 


@@ -1342,7 +1371,7 @@ msgid "Folder :"
 msgstr "Dossier :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
 msgstr "Dossier :"
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr "Carnet d'adresses :"
 
 msgid "Address Book :"
 msgstr "Carnet d'adresses :"
 


@@ -1366,8 +1395,8 @@ msgstr "En-t
 msgid "Address Count"
 msgstr "Nombre d'adresses"
 
 msgid "Address Count"
 msgstr "Nombre d'adresses"
 

-#: src/addrgather.c:537 src/alertpanel.c:155 src/compose.c:4832
-#: src/compose.c:9569 src/messageview.c:589 src/messageview.c:602
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4910
+#: src/compose.c:9841 src/messageview.c:589 src/messageview.c:602

 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Alerte"
 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Alerte"


@@ -1377,7 +1406,7 @@ msgid "Header Fields"
 msgstr "En-têtes"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
 msgstr "En-têtes"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "Finir"
 
 msgid "Finish"
 msgstr "Finir"
 


@@ -1389,36 +1418,46 @@ msgstr "R
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Récupération d'adresses email d'un dossier"
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Récupération d'adresses email d'un dossier"
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "Adresses courantes"
 
 msgid "Common addresses"
 msgstr "Adresses courantes"
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "Adresses personnelles"
 
 msgid "Personal addresses"
 msgstr "Adresses personnelles"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "Adresse courante"
 
 msgid "Common address"
 msgstr "Adresse courante"
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "Adresse personnelle"
 
 msgid "Personal address"
 msgstr "Adresse personnelle"
 

-#: src/alertpanel.c:142 src/compose.c:7673
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "Mise à jour d'adresses"
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr ""
+"La mise à jour a échoué. Les modifications ne seront pas appliquées au "
+"répertoire."
+
+#: src/alertpanel.c:145 src/compose.c:7902

 msgid "Notice"
 msgstr "Information"
 
 msgid "Notice"
 msgstr "Information"
 

-#: src/alertpanel.c:168 src/alertpanel.c:191 src/compose.c:4772 src/inc.c:619
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4850 src/inc.c:619

 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Erreur"
 
 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "Erreur"
 

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "_Afficher les traces"
 
 msgid "_View log"
 msgstr "_Afficher les traces"
 

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "Afficher ce message la prochaine fois"
 
 msgid "Show this message next time"
 msgstr "Afficher ce message la prochaine fois"
 


@@ -1447,7 +1486,7 @@ msgstr "Valeur de l'attribut"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur NNTP : %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur NNTP : %s:%d\n"
 

-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:848
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "Échec de la négociation SSL\n"
 
 msgid "SSL handshake failed\n"
 msgstr "Échec de la négociation SSL\n"
 


@@ -1468,61 +1507,61 @@ msgstr "Erreur lors de l'envoi.\n"
 msgid "Error occurred while sending command\n"
 msgstr "Une erreur est survenue pendant l'émission d'une commande.\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Une erreur est survenue pendant l'émission d'une commande.\n"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr "« Rien »"
 
 msgid "Nothing"
 msgstr "« Rien »"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr "un visualiseur"
 
 msgid "a viewer"
 msgstr "un visualiseur"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "folders"
 msgstr "des dossiers"
 
 msgid "folders"
 msgstr "des dossiers"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr "un outil de filtrage"
 
 msgid "filtering"
 msgstr "un outil de filtrage"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr "une interface de confidentialité"
 
 msgid "a privacy interface"
 msgstr "une interface de confidentialité"
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr "un notificateur"
 
 msgid "a notifier"
 msgstr "un notificateur"
 

-#: src/common/plugin.c:61
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr "un utilitaire"
 
 msgid "an utility"
 msgstr "un utilitaire"
 

-#: src/common/plugin.c:62
+#: src/common/plugin.c:63

 msgid "things"
 msgstr "des choses"
 
 msgid "things"
 msgstr "des choses"
 

-#: src/common/plugin.c:260
+#: src/common/plugin.c:269

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Ce module fournit %s (%s), qui est déjà fourni par le module %s."
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Ce module fournit %s (%s), qui est déjà fourni par le module %s."
 

-#: src/common/plugin.c:295
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr "Module déjà chargé."
 
 msgid "Plugin already loaded"
 msgstr "Module déjà chargé."
 

-#: src/common/plugin.c:305
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr "Échec lors de l'allocation de la mémoire pour le module."
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Échec lors de l'allocation de la mémoire pour le module."
 

-#: src/common/plugin.c:332
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Ce module n'est pas distribué sous une licence compatible GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Ce module n'est pas distribué sous une licence compatible GPL."
 

-#: src/common/plugin.c:339
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr "Ce module est pour Claws Mail GTK1."
 
 msgid "This module is for Claws Mail GTK1."
 msgstr "Ce module est pour Claws Mail GTK1."
 

-#: src/common/plugin.c:555
+#: src/common/plugin.c:599

 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "


@@ -1531,7 +1570,7 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module '%s' a été compilé."
 
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module '%s' a été compilé."
 

-#: src/common/plugin.c:558
+#: src/common/plugin.c:602

 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."


@@ -1539,14 +1578,14 @@ msgstr ""
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module a été compilé."
 
 "La version de Claws Mail actuellement utilisée est plus récente que celle "
 "pour laquelle le module a été compilé."
 

-#: src/common/plugin.c:567
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module '%s'."
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 "module '%s'."
 

-#: src/common/plugin.c:569
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 "La version de Claws Mail actuellement utilisée est trop ancienne pour le "


@@ -1564,7 +1603,7 @@ msgstr "R
 msgid "error occurred on SMTP session\n"
 msgstr "Erreur pendant la session SMTP\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "Erreur pendant la session SMTP\n"
 

-#: src/common/smtp.c:548 src/pop.c:881
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "Erreur lors de l'autorisation\n"
 
 msgid "error occurred on authentication\n"
 msgstr "Erreur lors de l'autorisation\n"
 


@@ -1573,11 +1612,11 @@ msgstr "Erreur lors de l'autorisation\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Ce message est trop volumineux (la taille maximale étant de %s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Ce message est trop volumineux (la taille maximale étant de %s)\n"
 

-#: src/common/smtp.c:635 src/pop.c:874
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "Impossible d'initier une session TLS\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "Impossible d'initier une session TLS\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "écriture sur fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "écriture sur fd%d: %s\n"


@@ -1594,9 +1633,9 @@ msgstr "
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244

-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<non spécifié dans le certificat>"
 
 msgid "<not in certificate>"
 msgstr "<non spécifié dans le certificat>"
 


@@ -1621,714 +1660,732 @@ msgstr "
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprimé par RegExp)"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "(Sujet supprimé par RegExp)"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%do"
 
 #, c-format
 msgid "%dB"
 msgstr "%do"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dko"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMo"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGo"
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Dimanche"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Dimanche"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "Lundi"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Lundi"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Mardi"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Mardi"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Mercredi"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Mercredi"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Jeudi"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Jeudi"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "Vendredi"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Vendredi"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Samedi"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Samedi"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "Janvier"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "Janvier"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "Février"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "Février"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "Mars"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "Mars"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "Avril"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "Avril"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "Mai"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "Mai"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "Juin"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "Juin"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "Juillet"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "Juillet"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "Août"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "Août"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "Septembre"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "Septembre"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "Octobre"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "Octobre"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "Novembre"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "Novembre"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "Décembre"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "Décembre"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dim"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dim"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Lun"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Lun"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Mar"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Mar"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mer"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Mer"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Jeu"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Jeu"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Ven"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Ven"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sam"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sam"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Fév"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Fév"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Avr"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Avr"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jui"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jui"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aoû"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aoû"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Sep"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Oct"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Oct"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Déc"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Déc"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d/%m/%y"
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%d/%m/%y"
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/_Enlever"
 
 msgid "/_Remove"
 msgstr "/_Enlever"
 

-#: src/compose.c:543 src/folderview.c:293
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 

-#: src/compose.c:548 src/mainwindow.c:755 src/messageview.c:289
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr "/_Message"
 
 msgid "/_Message"
 msgstr "/_Message"
 

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/Message/_Envoyer"
 
 msgid "/_Message/S_end"
 msgstr "/Message/_Envoyer"
 

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/Message/Envoyer plus _tard"
 
 msgid "/_Message/Send _later"
 msgstr "/Message/Envoyer plus _tard"
 

-#: src/compose.c:553 src/compose.c:557 src/compose.c:560 src/mainwindow.c:765
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765

 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/Message/---"
 
 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/Message/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/Message/_Joindre un fichier"
 
 msgid "/_Message/_Attach file"
 msgstr "/Message/_Joindre un fichier"
 

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/Message/_Insérer un fichier"
 
 msgid "/_Message/_Insert file"
 msgstr "/Message/_Insérer un fichier"
 

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/Message/Insérer la si_gnature"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/Message/Insérer la si_gnature"
 

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/Message/Enregi_strer"
 
 msgid "/_Message/_Save"
 msgstr "/Message/Enregi_strer"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/Message/_Fermer"
 
 msgid "/_Message/_Close"
 msgstr "/Message/_Fermer"
 

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/Edition/_Annuler"
 
 msgid "/_Edit/_Undo"
 msgstr "/Edition/_Annuler"
 

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/Edition/_Refaire"
 
 msgid "/_Edit/_Redo"
 msgstr "/Edition/_Refaire"
 

-#: src/compose.c:566 src/compose.c:654 src/compose.c:657 src/compose.c:663
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674

 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/Edition/---"
 
 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/Edition/---"
 

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/Edition/Co_uper"
 
 msgid "/_Edit/Cu_t"
 msgstr "/Edition/Co_uper"
 

-#: src/compose.c:568 src/mainwindow.c:531 src/messageview.c:169
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr "/Edition/_Copier"
 
 msgid "/_Edit/_Copy"
 msgstr "/Edition/_Copier"
 

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/Edition/Co_ller"
 
 msgid "/_Edit/_Paste"
 msgstr "/Edition/Co_ller"
 

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/Edition/Coller c_omme"
 
 msgid "/_Edit/Special paste"
 msgstr "/Edition/Coller c_omme"
 

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/Edition/Coller c_omme/_Citation"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/Edition/Coller c_omme/_Citation"
 

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/Edition/Coller c_omme/Texte _justifié"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/Edition/Coller c_omme/Texte _justifié"
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/Edition/Coller c_omme/Texte _non justifié"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/Edition/Coller c_omme/Texte _non justifié"
 

-#: src/compose.c:577 src/mainwindow.c:532 src/messageview.c:170
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr "/Edition/_Sélectionner tout"
 
 msgid "/_Edit/Select _all"
 msgstr "/Edition/_Sélectionner tout"
 

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/Edition/A_vancé"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/Edition/A_vancé"
 

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Edition/Avancé/Reculer d'un _caractère"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Edition/Avancé/Reculer d'un _caractère"
 

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Edition/Avancé/Avancer d'un c_aractère"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Edition/Avancé/Avancer d'un c_aractère"
 

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Edition/Avancé/Reculer d'un _mot"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Edition/Avancé/Reculer d'un _mot"
 

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Edition/Avancé/Avancer d'un m_ot"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Edition/Avancé/Avancer d'un m_ot"
 

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Edition/Avancé/Aller en _début de ligne"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Edition/Avancé/Aller en _début de ligne"
 

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Edition/Avancé/Aller en _fin de ligne"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Edition/Avancé/Aller en _fin de ligne"
 

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Edition/Avancé/Aller à la _ligne précédente"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Edition/Avancé/Aller à la _ligne précédente"
 

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Edition/Avancé/Aller à la l_igne suivante"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Edition/Avancé/Aller à la l_igne suivante"
 

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Edition/Avancé/Supprimer le caractère _précédent"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Edition/Avancé/Supprimer le caractère _précédent"
 

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Edition/Avancé/Supprimer le caractère _suivant"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Edition/Avancé/Supprimer le caractère _suivant"
 

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Edition/Avancé/Supprimer le mot p_récédent"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Edition/Avancé/Supprimer le mot p_récédent"
 

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Edition/Avancé/Supprimer le mot s_uivant"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Edition/Avancé/Supprimer le mot s_uivant"
 

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Edition/Avancé/_Effacer la ligne"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Edition/Avancé/_Effacer la ligne"
 

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/Edition/Avancé/Supprimer la li_gne"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/Edition/Avancé/Supprimer la li_gne"
 

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Edition/Avancé/Supprimer _jusqu'à la fin de la ligne"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Edition/Avancé/Supprimer _jusqu'à la fin de la ligne"
 

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/Edition/Chercher dans le _message..."
 
 msgid "/_Edit/_Find"
 msgstr "/Edition/Chercher dans le _message..."
 

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Edition/Justifier le _paragraphe actuel"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Edition/Justifier le _paragraphe actuel"
 

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Edition/_Justifier tout le message"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Edition/_Justifier tout le message"
 

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Edition/Justification automati_que"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Edition/Justification automati_que"
 

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/Edition/Éditer avec un éditeur e_xterne"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/Edition/Éditer avec un éditeur e_xterne"
 

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/O_rthographe"
 
 msgid "/_Spelling"
 msgstr "/O_rthographe"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orthographe/_Vérifier la sélection ou tout le texte"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orthographe/_Vérifier la sélection ou tout le texte"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orthographe/Montrer les mots _inconnus"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orthographe/Montrer les mots _inconnus"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orthographe/Vérifier les mots _précédents"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orthographe/Vérifier les mots _précédents"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orthographe/Vérifier les mots _suivants et avancer"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orthographe/Vérifier les mots _suivants et avancer"
 

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/Orthographe/---"
 
 msgid "/_Spelling/---"
 msgstr "/Orthographe/---"
 

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/Orthographe/_Options"
 
 msgid "/_Spelling/Options"
 msgstr "/Orthographe/_Options"
 

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/_Options"
 
 msgid "/_Options"
 msgstr "/_Options"
 

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/Options/_Mode de réponse"
 
 msgid "/_Options/Reply _mode"
 msgstr "/Options/_Mode de réponse"
 

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/Options/Mode de réponse/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/Options/Mode de réponse/_Normal"
 

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/Options/Mode de réponse/à _tous"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/Options/Mode de réponse/à _tous"
 

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/Options/Mode de réponse/à l'_expéditeur"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/Options/Mode de réponse/à l'_expéditeur"
 

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/Options/Mode de réponse/à la _liste"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/Options/Mode de réponse/à la _liste"
 

-#: src/compose.c:686 src/compose.c:691 src/compose.c:698 src/compose.c:700
-#: src/compose.c:702
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/Options/---"
 
 msgid "/_Options/---"
 msgstr "/Options/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/Options/S_ystème de confidentialité"
 
 msgid "/_Options/Privacy _System"
 msgstr "/Options/S_ystème de confidentialité"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/Options/Système de confidentialité/Aucun"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/Options/Système de confidentialité/Aucun"
 

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/Options/_Signer"
 
 msgid "/_Options/Si_gn"
 msgstr "/Options/_Signer"
 

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/Options/_Chiffrer"
 
 msgid "/_Options/_Encrypt"
 msgstr "/Options/_Chiffrer"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/Options/_Priorité"
 
 msgid "/_Options/_Priority"
 msgstr "/Options/_Priorité"
 

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/Options/Priorité/La plus _haute"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/Options/Priorité/La plus _haute"
 

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/Options/Priorité/H_aute"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/Options/Priorité/H_aute"
 

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/Options/Priorité/_Normale"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/Options/Priorité/_Normale"
 

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/Options/Priorité/Ba_sse"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/Options/Priorité/Ba_sse"
 

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/Options/Priorité/La plus _basse"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/Options/Priorité/La plus _basse"
 

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/Options/Demander un _accusé de réception"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/Options/Demander un _accusé de réception"
 

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/Options/Supprimer les _références"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/Options/Supprimer les _références"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/Options/_Jeux de caractères"
 
 msgid "/_Options/Character _encoding"
 msgstr "/Options/_Jeux de caractères"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/Options/Jeux de caractères/Détection automati_que"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/Options/Jeux de caractères/Détection automati_que"
 

-#: src/compose.c:711 src/compose.c:717 src/compose.c:725 src/compose.c:729
-#: src/compose.c:735 src/compose.c:739 src/compose.c:745 src/compose.c:751
-#: src/compose.c:755 src/compose.c:765 src/compose.c:769 src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/Options/Jeux de caractères/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/Options/Jeux de caractères/---"
 

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Options/Jeux de caractères/_Ascii 7 bits (US-ASCII)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Options/Jeux de caractères/_Ascii 7 bits (US-ASCII)"
 

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Options/Jeux de caractères/_Unicode (UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Options/Jeux de caractères/_Unicode (UTF-8)"
 

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (ISO-8859-_1)"
 

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (Eur_o) (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (Eur_o) (ISO-8859-15)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (Window_s-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/Options/Jeux de caractères/Europe de l'Ouest (Window_s-1252)"
 

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Options/Jeux de caractères/Europe Centrale (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Options/Jeux de caractères/Europe Centrale (ISO-8859-_2)"
 

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Options/Jeux de caractères/Ba_ltique (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Options/Jeux de caractères/Ba_ltique (ISO-8859-13)"
 

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Options/Jeux de caractères/Europe du Nord (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Options/Jeux de caractères/Europe du Nord (ISO-8859-_4)"
 

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Options/Jeux de caractères/Grec (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Options/Jeux de caractères/Grec (ISO-8859-_7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Options/Jeux de caractères/Hébreu (ISO-8859-8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Options/Jeux de caractères/Hébreu (ISO-8859-8)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Options/Jeux de caractères/Hébreu (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Options/Jeux de caractères/Hébreu (Windows-1255)"
 

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Options/Jeux de caractères/Arabe (ISO-8859-6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Options/Jeux de caractères/Arabe (ISO-8859-6)"
 

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Options/Jeux de caractères/Arabe (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Options/Jeux de caractères/Arabe (Windows-1256)"
 

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Options/Jeux de caractères/Turc (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Options/Jeux de caractères/Turc (ISO-8859-_9)"
 

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Options/Jeux de caractères/Cyrillique (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Options/Jeux de caractères/Cyrillique (ISO-8859-_5)"
 

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Options/Jeux de caractères/Cyrillique (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Options/Jeux de caractères/Cyrillique (KOI8-_R)"
 

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Options/Jeux de caractères/C_yrillique (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Options/Jeux de caractères/C_yrillique (KOI8-U)"
 

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Options/Jeux de caractères/Cyrillique (_Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Options/Jeux de caractères/Cyrillique (_Windows-1251)"
 

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Options/Jeux de caractères/Japonais (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Options/Jeux de caractères/Japonais (ISO-2022-_JP)"
 

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Options/Jeux de caractères/Chinois simplifié (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Options/Jeux de caractères/Chinois simplifié (_GB2312)"
 

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Options/Jeux de caractères/Chinois sim_plifié (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Options/Jeux de caractères/Chinois sim_plifié (GBK)"
 

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Options/Jeux de caractères/Chinois traditionnel (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Options/Jeux de caractères/Chinois traditionnel (_Big5)"
 

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Options/Jeux de caractères/Chinois traditionnel (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Options/Jeux de caractères/Chinois traditionnel (EUC-_TW)"
 

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Options/Jeux de caractères/Coréen (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Options/Jeux de caractères/Coréen (EUC-_KR)"
 

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/Options/Jeux de caractères/T_haïlandais (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/Options/Jeux de caractères/T_haïlandais (TIS-620)"
 

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/Options/Jeux de caractères/Thaïlan_dais(Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/Options/Jeux de caractères/Thaïlan_dais(Windows-874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/Outils/Afficher la _règle"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/Outils/Afficher la _règle"
 

-#: src/compose.c:792 src/messageview.c:307
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr "/Outils/_Carnet d'adresses"
 
 msgid "/_Tools/_Address book"
 msgstr "/Outils/_Carnet d'adresses"
 

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/Outils/_Modèles"
 
 msgid "/_Tools/_Template"
 msgstr "/Outils/_Modèles"
 

-#: src/compose.c:794 src/mainwindow.c:849 src/messageview.c:334
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr "/Outils/_Actions"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/Outils/_Actions"
 

-#: src/compose.c:1049 src/prefs_compose_writing.c:369
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "Erreur de formatage du modèle de sujet des nouveaux messages."
 
 msgid "New message subject format error."
 msgstr "Erreur de formatage du modèle de sujet des nouveaux messages."
 

-#: src/compose.c:1078 src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "Erreur de formatage du modèle de corps des nouveaux messages."
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr ""
+"Erreur de formatage du modèle de corps des nouveaux messages à la ligne %d."

 
 

-#: src/compose.c:1440 src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "Erreur de formatage de la citation lors d'une réponse."
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "Erreur de formatage de la citation lors d'une réponse à la ligne %d."

 
 

-#: src/compose.c:1557 src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "Erreur de formatage de la citation lors d'un transfert."
+#: src/compose.c:1614 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "Erreur de formatage de la citation lors d'un transfert à la ligne %d."

 
 

-#: src/compose.c:1677
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr "Fw: emails multiples"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: emails multiples"
 

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "Erreur de formatage de la citation lors d'une redirection."
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr ""
+"Erreur de formatage de la citation lors d'une redirection à la ligne %d."
+
+#: src/compose.c:2176 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/compose.c:2179 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Cci:"

 
 

-#: src/compose.c:2121
+#: src/compose.c:2182 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr "Répondre à:"
 
 msgid "Reply-To:"
 msgstr "Répondre à:"
 

-#: src/compose.c:2124 src/compose.c:5702 src/compose.c:6521 src/compose.c:9667
+#: src/compose.c:2185 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "Groupe de discussion:"
 
 msgid "Newsgroups:"
 msgstr "Groupe de discussion:"
 

-#: src/compose.c:2127
+#: src/compose.c:2188 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr "Donnant suite à:"
 
 msgid "Followup-To:"
 msgstr "Donnant suite à:"
 

-#: src/compose.c:2306
+#: src/compose.c:2192 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "À:"
+
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "Le fichier '%s' a été joint au message."
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "Le fichier '%s' a été joint au message."
 

-#: src/compose.c:2310
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible de joindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible de joindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 

-#: src/compose.c:2541
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr "Erreur du format de citation de messages."
 
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation de messages."
 

-#: src/compose.c:3146
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 

-#: src/compose.c:3150
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 

-#: src/compose.c:3177
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 

-#: src/compose.c:3998
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr " [modifié]"
 
 msgid " [Edited]"
 msgstr " [modifié]"
 

-#: src/compose.c:4005
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 

-#: src/compose.c:4008
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[Pas de sujet] - Composition d'un message%s"
 

-#: src/compose.c:4010
+#: src/compose.c:4085

 msgid "Compose message"
 msgstr "Composition d'un message"
 
 msgid "Compose message"
 msgstr "Composition d'un message"
 

-#: src/compose.c:4037 src/messageview.c:624
+#: src/compose.c:4112 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -2336,36 +2393,36 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 

-#: src/compose.c:4230 src/compose.c:4261 src/compose.c:4293 src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4305 src/compose.c:4336 src/compose.c:4368
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr "Envoyer"
 
 msgid "Send"
 msgstr "Envoyer"
 

-#: src/compose.c:4231
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse « Cc: » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 

-#: src/compose.c:4232 src/compose.c:4263 src/compose.c:4295 src/compose.c:4772
+#: src/compose.c:4307 src/compose.c:4338 src/compose.c:4370 src/compose.c:4850

 msgid "+_Send"
 msgstr "+_Envoyer"
 
 msgid "+_Send"
 msgstr "+_Envoyer"
 

-#: src/compose.c:4262
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse « Cci: » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "Le seul destinataire est l'adresse « Cci: » par défaut. Voulez-vous quand "
 "même envoyer le message ?"
 

-#: src/compose.c:4279
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 

-#: src/compose.c:4294
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Voulez-vous quand même envoyer le message ?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Voulez-vous quand même envoyer le message ?"
 

-#: src/compose.c:4341 src/compose.c:8026
+#: src/compose.c:4416 src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -2375,7 +2432,7 @@ msgstr ""
 "\n"
 "La conversion de jeu de caractères a échoué."
 
 "\n"
 "La conversion de jeu de caractères a échoué."
 

-#: src/compose.c:4344 src/compose.c:8029
+#: src/compose.c:4419 src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -2385,7 +2442,7 @@ msgstr ""
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 
 "\n"
 "La clé de chiffrement du destinataire n'est pas disponible."
 

-#: src/compose.c:4348 src/compose.c:8023
+#: src/compose.c:4425 src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -2396,7 +2453,7 @@ msgstr ""
 "\n"
 "Sa signature a échoué : %s"
 
 "\n"
 "Sa signature a échoué : %s"
 

-#: src/compose.c:4351
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -2407,11 +2464,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4353
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
 msgid "Could not queue message for sending."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 

-#: src/compose.c:4368 src/compose.c:4429
+#: src/compose.c:4445 src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -2419,7 +2476,7 @@ msgstr ""
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 

-#: src/compose.c:4423
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -2428,7 +2485,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 

-#: src/compose.c:4769
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -2439,7 +2496,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 

-#: src/compose.c:4828
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -2453,65 +2510,77 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 

-#: src/compose.c:5016
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr "Avertissement pour le chiffrement"
+
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr "+_Poursuivre"
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 

-#: src/compose.c:5026
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgstr ""
 "Il n'existe pas de compte pour l'envoi d'articles de groupes de discussion."
 
 msgid "No account for posting news available!"
 msgstr ""
 "Il n'existe pas de compte pour l'envoi d'articles de groupes de discussion."
 

-#: src/compose.c:5719
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr "Ajouter au carnet d'_adresses"
+
+#: src/compose.c:5876

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour procéder à la complétion depuis le carnet "
 "d'adresse"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Veuillez saisir <tab> pour procéder à la complétion depuis le carnet "
 "d'adresse"
 

-#: src/compose.c:5858
+#: src/compose.c:6024

 msgid "Mime type"
 msgstr "Type Mime"
 
 msgid "Mime type"
 msgstr "Type Mime"
 

-#: src/compose.c:5864 src/compose.c:6180 src/mimeview.c:212
+#: src/compose.c:6030 src/compose.c:6348 src/mimeview.c:214

 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86

-#: src/summaryview.c:495
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "Taille"
 
 msgid "Size"
 msgstr "Taille"
 

-#: src/compose.c:5934
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr "Sauvegarder le message dans "
 
 msgid "Save Message to "
 msgstr "Sauvegarder le message dans "
 

-#: src/compose.c:5956 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:6122 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383 src/prefs_spelling.c:207
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Parcourir"
 
 msgid "_Browse"
 msgstr "_Parcourir"
 

-#: src/compose.c:6179 src/compose.c:7433
+#: src/compose.c:6347 src/compose.c:7662

 msgid "MIME type"
 msgstr "Type MIME"
 
 msgid "MIME type"
 msgstr "Type MIME"
 

-#: src/compose.c:6253
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr "E_n-tête"
 
 msgid "Hea_der"
 msgstr "E_n-tête"
 

-#: src/compose.c:6257
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 

-#: src/compose.c:6261
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr "A_utres"
 
 msgid "Othe_rs"
 msgstr "A_utres"
 

-#: src/compose.c:6276 src/summary_search.c:370
+#: src/compose.c:6445 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr "Sujet :"
 
 msgid "Subject:"
 msgstr "Sujet :"
 

-#: src/compose.c:6483
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -2520,20 +2589,20 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 

-#: src/compose.c:6632
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 

-#: src/compose.c:6793
+#: src/compose.c:6967

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -2542,51 +2611,52 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 

-#: src/compose.c:6955 src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "Erreur de formatage dans le corps du modèle."
+#: src/compose.c:7167 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "Erreur de formatage dans le corps du modèle à la ligne %d."

 
 

-#: src/compose.c:7063 src/prefs_template.c:587
+#: src/compose.c:7277 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-tête « À: » du modèle."
 
 msgid "Template To format error."
 msgstr "Erreur de formatage dans l'en-tête « À: » du modèle."
 

-#: src/compose.c:7076 src/prefs_template.c:592
+#: src/compose.c:7295 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cc: » du modèle."
 
 msgid "Template Cc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cc: » du modèle."
 

-#: src/compose.c:7089 src/prefs_template.c:597
+#: src/compose.c:7313 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cci: » du modèle."
 
 msgid "Template Bcc format error."
 msgstr "Erreur de formatage dans l'en-tête « Cci: » du modèle."
 

-#: src/compose.c:7103 src/prefs_template.c:602
+#: src/compose.c:7332 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du modèle."
 
 msgid "Template subject format error."
 msgstr "Erreur de formatage dans le sujet du modèle."
 

-#: src/compose.c:7327
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 

-#: src/compose.c:7342
+#: src/compose.c:7571

 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 

-#: src/compose.c:7415
+#: src/compose.c:7644

 msgid "Properties"
 msgstr "Propriétés"
 
 msgid "Properties"
 msgstr "Propriétés"
 

-#: src/compose.c:7466
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr "Encodage"
 
 msgid "Encoding"
 msgstr "Encodage"
 

-#: src/compose.c:7486
+#: src/compose.c:7715

 msgid "Path"
 msgstr "Chemin d'accès"
 
 msgid "Path"
 msgstr "Chemin d'accès"
 

-#: src/compose.c:7487 src/prefs_toolbar.c:1069
+#: src/compose.c:7716 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr "Nom du fichier"
 
 msgid "File name"
 msgstr "Nom du fichier"
 

-#: src/compose.c:7670
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -2597,19 +2667,19 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: input from monitoring process\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: input from monitoring process\n"
 

-#: src/compose.c:7993 src/messageview.c:729
+#: src/compose.c:8222 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
 

-#: src/compose.c:8018
+#: src/compose.c:8247

 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 
 msgid "Could not queue message."
 msgstr "Impossible de mettre le message en file d'attente d'envoi."
 

-#: src/compose.c:8020
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2620,20 +2690,41 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:8193
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 

-#: src/compose.c:8271 src/compose.c:8294
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr "Enregistrement impossible du brouillon"
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"Il est impossible d'enregistrer le brouillon.\n"
+"Souhaitez-vous annuler la fermeture de l'application ou simplement "
+"interrompre l'édition de ce message ?"
+
+#: src/compose.c:8393
+msgid "_Cancel exit"
+msgstr "A_nnuler"
+
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr "_Interrompre"
+
+#: src/compose.c:8527 src/compose.c:8550

 msgid "Select file"
 msgstr "Veuillez sélectionner un fichier"
 
 msgid "Select file"
 msgstr "Veuillez sélectionner un fichier"
 

-#: src/compose.c:8307
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 

-#: src/compose.c:8309
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2642,46 +2733,46 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 

-#: src/compose.c:8362
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 

-#: src/compose.c:8363
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr ""
 "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
 "composition ?"
 
 msgid "This message has been modified. Discard it?"
 msgstr ""
 "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
 "composition ?"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr "_Interrompre"
 
 msgid "_Discard"
 msgstr "_Interrompre"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 

-#: src/compose.c:8408
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 

-#: src/compose.c:8410
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr "_Remplacer"
 
 msgid "_Replace"
 msgstr "_Remplacer"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr "_Insérer"
 
 msgid "_Insert"
 msgstr "_Insérer"
 

-#: src/compose.c:9142
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr "Insérer ou joindre ?"
 
 msgid "Insert or attach?"
 msgstr "Insérer ou joindre ?"
 

-#: src/compose.c:9143
+#: src/compose.c:9417

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -2689,19 +2780,20 @@ msgstr ""
 "Voulez-vous insérer le contenu du(des) fichier(s)s directement dans le corps "
 "du message ou le(s) joindre en tant que pièce jointe ?"
 
 "Voulez-vous insérer le contenu du(des) fichier(s)s directement dans le corps "
 "du message ou le(s) joindre en tant que pièce jointe ?"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr "+_Insérer"
 
 msgid "+_Insert"
 msgstr "+_Insérer"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr "_Joindre"
 
 msgid "_Attach"
 msgstr "_Joindre"
 

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "Erreur de formatage de la citation."
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "Erreur de formatage de la citation à la ligne %d."

 
 

-#: src/compose.c:9563
+#: src/compose.c:9835

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -2733,7 +2825,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Traces de débogage"
 
 msgid "Debug log"
 msgstr "Traces de débogage"
 

-#: src/crash.c:251 src/toolbar.c:483 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr "Fermer"
 
 msgid "Close"
 msgstr "Fermer"
 


@@ -2745,73 +2837,73 @@ msgstr "Enregistrer sous..."
 msgid "Create bug report"
 msgstr "Création d'un rapport de bug"
 
 msgid "Create bug report"
 msgstr "Création d'un rapport de bug"
 

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "Enregistrer les données de l'interruption inattendue"
 
 msgid "Save crash information"
 msgstr "Enregistrer les données de l'interruption inattendue"
 

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "Ajout d'un contact"
 
 msgid "Add New Person"
 msgstr "Ajout d'un contact"
 

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'un contact"
 
 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'un contact"
 

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "L'adresse email est requise."
 
 msgid "An Email address must be supplied."
 msgstr "L'adresse email est requise."
 

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur sont requis."
 
 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur sont requis."
 

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "Annuler"
 
 msgid "Discard"
 msgstr "Annuler"
 

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "Appliquer"
 
 msgid "Apply"
 msgstr "Appliquer"
 

-#: src/editaddress.c:651 src/editaddress.c:700
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'un contact"
 
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'un contact"
 

-#: src/editaddress.c:761 src/expldifdlg.c:508 src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "Nom affiché"
 
 msgid "Display Name"
 msgstr "Nom affiché"
 

-#: src/editaddress.c:767 src/editaddress.c:771 src/ldif.c:771
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr "Nom"
 
 msgid "Last Name"
 msgstr "Nom"
 

-#: src/editaddress.c:768 src/editaddress.c:770 src/ldif.c:767
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr "Prénom"
 
 msgid "First Name"
 msgstr "Prénom"
 

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "Surnom"
 
 msgid "Nickname"
 msgstr "Surnom"
 

-#: src/editaddress.c:850 src/editaddress.c:906
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:1044 src/editaddress.c:1101 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:536
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "Valeur"
 
 msgid "Value"
 msgstr "Valeur"
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "Nom d'_utilisateur"
 
 msgid "_User Data"
 msgstr "Nom d'_utilisateur"
 

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "_Adresses Email"
 
 msgid "_Email Addresses"
 msgstr "_Adresses Email"
 

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "Données _supplémentaires"
 
 msgid "O_ther Attributes"
 msgstr "Données _supplémentaires"
 


@@ -2836,7 +2928,7 @@ msgid " Check File "
 msgstr " Verifier le fichier "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Verifier le fichier "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:2004
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr "Fichier"
 
 msgid "File"
 msgstr "Fichier"
 


@@ -2982,7 +3074,7 @@ msgstr ""
 msgid "TLS"
 msgstr "TLS"
 
 msgid "TLS"
 msgstr "TLS"
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 


@@ -3162,7 +3254,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 
 "The maximum number of entries that should be returned in the search result."
 msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr "Général"
 
 msgid "Basic"
 msgstr "Général"
 


@@ -3170,7 +3262,7 @@ msgstr "G
 msgid "Search"
 msgstr "Chercher"
 
 msgid "Search"
 msgstr "Chercher"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:496
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "Avancé"
 
 msgid "Extended"
 msgstr "Avancé"
 


@@ -3245,7 +3337,7 @@ msgid "HTML Output File"
 msgstr "Fichier HTML destinataire"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 msgstr "Fichier HTML destinataire"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "Pa_rcourir"
 
 msgid "B_rowse"
 msgstr "Pa_rcourir"
 


@@ -3254,8 +3346,8 @@ msgid "Stylesheet"
 msgstr "Feuille de style"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
 msgstr "Feuille de style"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661

-#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "Aucun"
 
 msgid "None"
 msgstr "Aucun"
 


@@ -3307,7 +3399,7 @@ msgstr "Adresses hyperliens (mailto:)"
 msgid "Format User Attributes"
 msgstr "Inclure les données supplémentaires"
 
 msgid "Format User Attributes"
 msgstr "Inclure les données supplémentaires"
 

-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr "Chemin du fichier :"
 
 msgid "File Name :"
 msgstr "Chemin du fichier :"
 


@@ -3319,7 +3411,7 @@ msgstr "Ouvrir avec le navigateur web"
 msgid "Export Address Book to HTML File"
 msgstr "Exporter le carnet d'adresses vers un ficher HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exporter le carnet d'adresses vers un ficher HTML"
 

-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr "Informations fichier"
 
 msgid "File Info"
 msgstr "Informations fichier"
 


@@ -3485,7 +3577,7 @@ msgstr "Exporter le carnet d'adresses vers un ficher LDIF"
 msgid "Distguished Name"
 msgstr "Nom Distingué (DN)"
 
 msgid "Distguished Name"
 msgstr "Nom Distingué (DN)"
 

-#: src/export.c:120 src/summaryview.c:6586
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr "Exporter la sélection en fichier mbox"
 
 msgid "Export to mbox file"
 msgstr "Exporter la sélection en fichier mbox"
 


@@ -3522,81 +3614,81 @@ msgstr "S
 msgid "Full Name"
 msgstr "Nom complet"
 
 msgid "Full Name"
 msgstr "Nom complet"
 

-#: src/exporthtml.c:762 src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr "Attributs"
 
 msgid "Attributes"
 msgstr "Attributs"
 

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Carnet d'adresses de Claws Mail"
 
 msgid "Claws Mail Address Book"
 msgstr "Carnet d'adresses de Claws Mail"
 

-#: src/exporthtml.c:1077 src/exportldif.c:551
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr "Le nom existe déjà mais ce n'est pas un dossier."
 
 msgid "Name already exists but is not a directory."
 msgstr "Le nom existe déjà mais ce n'est pas un dossier."
 

-#: src/exporthtml.c:1080 src/exportldif.c:554
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr "Pas de permissions pour créer le dossier."
 
 msgid "No permissions to create directory."
 msgstr "Pas de permissions pour créer le dossier."
 

-#: src/exporthtml.c:1083 src/exportldif.c:557
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr "Le nom est trop long."
 
 msgid "Name is too long."
 msgstr "Le nom est trop long."
 

-#: src/exporthtml.c:1086 src/exportldif.c:560
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr "Non spécifié."
 
 msgid "Not specified."
 msgstr "Non spécifié."
 

-#: src/folder.c:1334 src/foldersel.c:370 src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "Réception"
 
 msgid "Inbox"
 msgstr "Réception"
 

-#: src/folder.c:1338 src/foldersel.c:374
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr "Envoyés"
 
 msgid "Sent"
 msgstr "Envoyés"
 

-#: src/folder.c:1342 src/foldersel.c:378 src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "File d'attente"
 
 msgid "Queue"
 msgstr "File d'attente"
 

-#: src/folder.c:1346 src/foldersel.c:382 src/prefs_folder_item.c:243
-#: src/toolbar.c:385 src/toolbar.c:428 src/toolbar.c:526
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgstr "Corbeille"
 
 msgid "Trash"
 msgstr "Corbeille"
 

-#: src/folder.c:1350 src/foldersel.c:386 src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "Brouillons"
 
 msgid "Drafts"
 msgstr "Brouillons"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)...\n"
 

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Récupération de tous les messages dans %s...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Récupération de tous les messages dans %s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s...\n"
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s...\n"
 

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s..."
 

-#: src/folder.c:3864
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "Traitement des messages..."
 
 msgid "Processing messages..."
 msgstr "Traitement des messages..."
 

-#: src/folder.c:3993
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne\n"


@@ -3658,7 +3750,7 @@ msgstr "Non lu"
 msgid "Total"
 msgstr "Total"
 
 msgid "Total"
 msgstr "Total"
 

-#: src/folderview.c:473 src/summaryview.c:496
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 


@@ -3666,21 +3758,21 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 

-#: src/folderview.c:816 src/summaryview.c:3555
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 
 msgid "Mark all as read"
 msgstr "Marquer tous les messages comme lus"
 

-#: src/folderview.c:817 src/summaryview.c:3556
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
 

-#: src/folderview.c:1034 src/imap.c:3420 src/mainwindow.c:3897 src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s..."
 

-#: src/folderview.c:1038 src/imap.c:3425 src/mainwindow.c:3902 src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s..."
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s..."


@@ -3709,64 +3801,64 @@ msgstr "Analyse de l'arborescence..."
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgstr "Examen de tous les dossiers pour nouveaux messages..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Examen de tous les dossiers pour nouveaux messages..."
 

-#: src/folderview.c:2059
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fermeture du dossier %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fermeture du dossier %s..."
 

-#: src/folderview.c:2149
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ouverture du dossier %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ouverture du dossier %s..."
 

-#: src/folderview.c:2162
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 

-#: src/folderview.c:2324 src/mainwindow.c:2121
+#: src/folderview.c:2339 src/mainwindow.c:2121

 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 

-#: src/folderview.c:2325
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 

-#: src/folderview.c:2326
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgstr "+_Vider"
 
 msgid "+_Empty trash"
 msgstr "+_Vider"
 

-#: src/folderview.c:2370 src/inc.c:1478 src/toolbar.c:2320
+#: src/folderview.c:2385 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 

-#: src/folderview.c:2371 src/toolbar.c:2321
+#: src/folderview.c:2386 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
 msgid "You're working offline. Override?"
 msgstr ""
 "Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 

-#: src/folderview.c:2382 src/toolbar.c:2340
+#: src/folderview.c:2397 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 
 msgid "Send queued messages"
 msgstr "Envoyer les messages en file d'attente"
 

-#: src/folderview.c:2383 src/toolbar.c:2341
+#: src/folderview.c:2398 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 
 msgid "Send all queued messages?"
 msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 

-#: src/folderview.c:2384 src/messageview.c:590 src/messageview.c:607
-#: src/prefs_account.c:1122 src/toolbar.c:2342
+#: src/folderview.c:2399 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "_Envoyer"
 
 msgid "_Send"
 msgstr "_Envoyer"
 

-#: src/folderview.c:2392 src/toolbar.c:2360
+#: src/folderview.c:2407 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
 

-#: src/folderview.c:2395 src/main.c:1762 src/toolbar.c:2363
+#: src/folderview.c:2410 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3775,68 +3867,68 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 
 "Une erreur est survenue pendant l'envoi de messages en attente :\n"
 "%s"
 

-#: src/folderview.c:2462
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Voulez-vous vraiment copier le dossier '%s' dans '%s' ?"
 

-#: src/folderview.c:2463
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Voulez-vous vraiment faire du dossier '%s' un sous-dossier de '%s' ?"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgstr "Copie du dossier"
 
 msgid "Copy folder"
 msgstr "Copie du dossier"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Move folder"
 msgstr "Déplacement du dossier"
 
 msgid "Move folder"
 msgstr "Déplacement du dossier"
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s..."
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s..."
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Déplacement de %s vers %s..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 
 msgid "Source and destination are the same."
 msgstr "Source et destination identiques."
 

-#: src/folderview.c:2510
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de copier un dossier vers un de ses SOUS-DOSSIERS."
 

-#: src/folderview.c:2511
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de déplacer un dossier vers un de ses SOUS-DOSSIERS."
 
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Il n'est pas possible de déplacer un dossier vers un de ses SOUS-DOSSIERS."
 

-#: src/folderview.c:2514
+#: src/folderview.c:2529

 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 "Un dossier ne peut être déplacé à travers différentes boîtes aux lettres."
 
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 "Un dossier ne peut être déplacé à travers différentes boîtes aux lettres."
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr "La copie a échoué."
 
 msgid "Copy failed!"
 msgstr "La copie a échoué."
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 
 msgid "Move failed!"
 msgstr "Le déplacement a échoué."
 

-#: src/folderview.c:2568
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 

-#: src/gedit-print.c:147 src/messageview.c:1544 src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "Impression"
 
 msgid "Print"
 msgstr "Impression"
 


@@ -3862,64 +3954,64 @@ msgstr "Aper
 msgid "Page %N of %Q"
 msgstr "Page %N sur %Q"
 
 msgid "Page %N of %Q"
 msgstr "Page %N sur %Q"
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "Inscription aux groupes de discussion"
 
 msgid "Newsgroup subscription"
 msgstr "Inscription aux groupes de discussion"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "Veuillez sélectionner les groupes de discussion souhaités :"
 
 msgid "Select newsgroups for subscription:"
 msgstr "Veuillez sélectionner les groupes de discussion souhaités :"
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "Rechercher :"
 
 msgid "Find groups:"
 msgstr "Rechercher :"
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " Chercher "
 
 msgid " Search "
 msgstr " Chercher "
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr "Nom des groupes de discussion"
 
 msgid "Newsgroup name"
 msgstr "Nom des groupes de discussion"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "Messages"
 
 msgid "Messages"
 msgstr "Messages"
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "Type"
 
 msgid "Type"
 msgstr "Type"
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "modéré"
 
 msgid "moderated"
 msgstr "modéré"
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "lecture uniquement"
 
 msgid "readonly"
 msgstr "lecture uniquement"
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "inconnu"
 
 msgid "unknown"
 msgstr "inconnu"
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1367
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr "Terminé."
 
 msgid "Done."
 msgstr "Terminé."
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 

-#: src/gtk/about.c:79 src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "/_Ouvrir avec le navigateur web"
 
 msgid "/_Open with Web browser"
 msgstr "/_Ouvrir avec le navigateur web"
 

-#: src/gtk/about.c:80 src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/Copier l'adresse du _lien"
 
 msgid "/Copy this _link"
 msgstr "/Copier l'adresse du _lien"
 


@@ -4227,7 +4319,7 @@ msgstr ""
 "Veuillez faire monter ou descendre les boîtes aux lettres pour changer "
 "l'ordre de tri dans la liste des dossiers."
 
 "Veuillez faire monter ou descendre les boîtes aux lettres pour changer "
 "l'ordre de tri dans la liste des dossiers."
 

-#: src/gtk/foldersort.c:214 src/toolbar.c:409
+#: src/gtk/foldersort.c:214 src/toolbar.c:410

 msgid "Folders"
 msgstr "Dossiers"
 
 msgid "Folders"
 msgstr "Dossiers"
 


@@ -4456,25 +4548,422 @@ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 "Police à utiliser pour l'en-tête et le pied de page (ex : \"Monospace 10\")"
 
 msgstr ""
 "Police à utiliser pour l'en-tête et le pied de page (ex : \"Monospace 10\")"
 

-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "Nouveaux messages"
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "Date"

 
 

-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "Messages non lus"
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "Date :"

 
 

-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "Messages pour lesquels une réponse a été envoyée"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"
+msgstr "De"

 
 

-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "Messages transférés"
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "De :"

 
 

-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "Messages appartenant à un fil de discussion ignoré"
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"
+msgstr "À l'expéditeur"
+
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "À l'expéditeur :"
+
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "Répondre à"
+
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "À"
+
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "Cc"
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr "Cci"
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr "Identifiant du message"
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr "Identifiant du message:"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr "En réponse à"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr "En réponse à:"
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr "Références"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr "Références:"
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr "Sujet"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr "Commentaires"
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr "Commentaires:"
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr "Mots clés"
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr "Mots clés :"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr "Date de renvoi"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr "Date de renvoi :"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr "Expéditeur de renvoi"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr "Expéditeur de renvoi :"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr "Resent-Sender"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr "Resent-Sender :"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr "Resent-To"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr "Resent-To :"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr "Resent-Cc"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr "Resent-Cc :"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr "Resent-Bcc"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr "Resent-Bcc :"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr "Resent-Message-ID"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr "Resent-Message-ID :"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr "Return-Path"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr "Return-Path :"
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr "Reçu"
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr "Reçu :"
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "Groupe de discussion"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr "Donnant suite à:"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr "Delivered-To"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr "Delivered-To :"
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr "Consulté"
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr "Consulté :"
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "État"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "Status :"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr "Face"
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr "Face :"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr "Disposition-Notification-To"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr "Disposition-Notification-To :"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr "Return-Receipt-To"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr "Return-Receipt-To :"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr "Client de messagerie"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr "Client de messagerie :"
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr "Type de contenu"
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr "Type de contenu :"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr "Encodage de contenu"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr "Encodage de contenu :"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr "Version MIME"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr "Version MIME :"
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr "Precedence"
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr "Precedence :"
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "Société"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Société :"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "Liste de diffusion"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "Liste de diffusion :"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr "Liste de diffusion - Envoi"
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr "Liste de diffusion - Envoi :"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr "Liste de diffusion - Abonnement"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr "Liste de diffusion - Abonnement :"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr "Liste de diffusion - Désabonnement"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr "Liste de diffusion - Désabonnement :"
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr "Liste de diffusion - Aide"
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr "Liste de diffusion - Aide :"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr "Liste de diffusion - Archive"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr "Liste de diffusion - Archive :"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr "Liste de diffusion - Propriétaire"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr "Liste de diffusion - Propriétaire :"
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr "X-Label"
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr "X-Label :"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr "X-Mailer"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr "X-Mailer :"
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr "X-État"
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr "X-État :"
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr "X-Face"
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr "X-Face :"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr "X-No-Archive"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr "X-No-Archive:"
+
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr "En réponse à"
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr "En réponse à:"
+
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr "À ou Cc"
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr "À ou Cc :"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr "De, À ou Sujet"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr "De, À ou Sujet :"
+
+#: src/gtk/icon_legend.c:67
+msgid "New message"
+msgstr "Nouveaux messages"
+
+#: src/gtk/icon_legend.c:68
+msgid "Unread message"
+msgstr "Messages non lus"
+
+#: src/gtk/icon_legend.c:69
+msgid "Message has been replied to"
+msgstr "Messages pour lesquels une réponse a été envoyée"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been forwarded"
+msgstr "Messages transférés"
+
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "Messages appartenant à un fil de discussion ignoré"

 
 #: src/gtk/icon_legend.c:72
 msgid "Message is spam"
 
 #: src/gtk/icon_legend.c:72
 msgid "Message is spam"


@@ -4557,11 +5046,11 @@ msgstr "Saisie du mot de passe"
 msgid "Remember this"
 msgstr "S'en souvenir"
 
 msgid "Remember this"
 msgstr "S'en souvenir"
 

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "_Effacer les traces"
 
 msgid "Clear _Log"
 msgstr "_Effacer les traces"
 

-#: src/gtk/pluginwindow.c:151 src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4571,19 +5060,19 @@ msgstr ""
 "\n"
 "Version : "
 
 "\n"
 "Version : "
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "Erreur : "
 
 msgid "Error: "
 msgstr "Erreur : "
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "Le module n'est pas fonctionnel."
 
 msgid "Plugin is not functional."
 msgstr "Le module n'est pas fonctionnel."
 

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "Sélection des modules à charger"
 
 msgid "Select the Plugins to load"
 msgstr "Sélection des modules à charger"
 

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -4594,235 +5083,232 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287 src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Modules"
 
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Modules"
 

-#: src/gtk/pluginwindow.c:321 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr "Description"
 
 msgid "Description"
 msgstr "Description"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr ""
 "Plus de modules sont disponibles depuis le site internet de Claws Mail."
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr ""
 "Plus de modules sont disponibles depuis le site internet de Claws Mail."
 

-#: src/gtk/pluginwindow.c:344 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr "Autres..."
 
 msgid "Get more..."
 msgstr "Autres..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "Charger..."
 
 msgid "Load Plugin..."
 msgstr "Charger..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "Enlever"
 
 msgid "Unload Plugin"
 msgstr "Enlever"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "Cliquez ici pour charger un ou plusieurs modules"
 
 msgid "Click here to load one or more plugins"
 msgstr "Cliquez ici pour charger un ou plusieurs modules"
 

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "Enlever le module sélectionné"
 
 msgid "Unload the selected plugin"
 msgstr "Enlever le module sélectionné"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "Modules chargés"
 
 msgid "Loaded plugins"
 msgstr "Modules chargés"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "Préférences"
 
 msgid "Page Index"
 msgstr "Préférences"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:842
-#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "Compte"
 
 msgid "Account"
 msgstr "Compte"
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2458
-msgid "Status"
-msgstr "État"
-
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "tous les messages"
 
 msgid "all messages"
 msgstr "tous les messages"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "messages agés de plus de # jours"
 
 msgid "messages whose age is greater than #"
 msgstr "messages agés de plus de # jours"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "messages agés de moins de # jours"
 
 msgid "messages whose age is less than #"
 msgstr "messages agés de moins de # jours"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "messages contenant S dans leur corps"
 
 msgid "messages which contain S in the message body"
 msgstr "messages contenant S dans leur corps"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "message contenant S"
 
 msgid "messages which contain S in the whole message"
 msgstr "message contenant S"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-tête « Cc: »"
 
 msgid "messages carbon-copied to S"
 msgstr "messages contenant S dans l'en-tête « Cc: »"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "messages contenant S dans les en-têtes « À: » ou « Cc: »"
 
 msgid "message is either to: or cc: to S"
 msgstr "messages contenant S dans les en-têtes « À: » ou « Cc: »"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "messages supprimés"
 
 msgid "deleted messages"
 msgstr "messages supprimés"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "messages contenant S dans l'en-tête d'expéditeur (en-tête « Sender: »)"
 
 msgid "messages which contain S in the Sender field"
 msgstr "messages contenant S dans l'en-tête d'expéditeur (en-tête « Sender: »)"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "vrai si l'éxecution de « S » réussi"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "vrai si l'éxecution de « S » réussi"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "messages venant de l'expéditeur S"
 
 msgid "messages originating from user S"
 msgstr "messages venant de l'expéditeur S"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "messages transférés"
 
 msgid "forwarded messages"
 msgstr "messages transférés"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "messages contenant l'en-tête S"
 
 msgid "messages which contain header S"
 msgstr "messages contenant l'en-tête S"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "messages contenant S dans l'en-tête « Message-Id: »"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "messages contenant S dans l'en-tête « Message-Id: »"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr "messages contenant S dans l'en-tête « In-Reply-To: »"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "messages contenant S dans l'en-tête « In-Reply-To: »"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "messages marqués de la couleur n°#"
 
 msgid "messages which are marked with color #"
 msgstr "messages marqués de la couleur n°#"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "messages bloqués"
 
 msgid "locked messages"
 msgstr "messages bloqués"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "messages appartenant au groupe de discussion S"
 
 msgid "messages which are in newsgroup S"
 msgstr "messages appartenant au groupe de discussion S"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "nouveaux messages"
 
 msgid "new messages"
 msgstr "nouveaux messages"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "messages anciens"
 
 msgid "old messages"
 msgstr "messages anciens"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messages incomplets (partiellement téléchargés)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messages incomplets (partiellement téléchargés)"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "messages pour lesquels une réponse a été envoyée"
 
 msgid "messages which have been replied to"
 msgstr "messages pour lesquels une réponse a été envoyée"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "messages lus"
 
 msgid "read messages"
 msgstr "messages lus"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "messages contenant S dans le sujet"
 
 msgid "messages which contain S in subject"
 msgstr "messages contenant S dans le sujet"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "messages dont le score est égal à #"
 
 msgid "messages whose score is equal to #"
 msgstr "messages dont le score est égal à #"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "messages dont le score est plus grand que #"
 
 msgid "messages whose score is greater than #"
 msgstr "messages dont le score est plus grand que #"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "messages dont le score est plus petit que #"
 
 msgid "messages whose score is lower than #"
 msgstr "messages dont le score est plus petit que #"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "messages dont la taille est égale à #"
 
 msgid "messages whose size is equal to #"
 msgstr "messages dont la taille est égale à #"
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "messages dont la taille est plus grande que #"
 
 msgid "messages whose size is greater than #"
 msgstr "messages dont la taille est plus grande que #"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "messages dont la taille est plus petite que #"
 
 msgid "messages whose size is smaller than #"
 msgstr "messages dont la taille est plus petite que #"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "messages qui ont été envoyés à S"
 
 msgid "messages which have been sent to S"
 msgstr "messages qui ont été envoyés à S"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "messages marqués"
 
 msgid "marked messages"
 msgstr "messages marqués"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "messages non lus"
 
 msgid "unread messages"
 msgstr "messages non lus"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "messages contenant S dans l'en-tête « References: »"
 
 msgid "messages which contain S in References header"
 msgstr "messages contenant S dans l'en-tête « References: »"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messages qui, passés à la commande « cmd », lui font faire\n"
 "retourner 0 (%F étant le fichier correspondant au message)."
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messages qui, passés à la commande « cmd », lui font faire\n"
 "retourner 0 (%F étant le fichier correspondant au message)."
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "messages contenant S dans l'en-tête « X-Label: »"
 
 msgid "messages which contain S in X-Label header"
 msgstr "messages contenant S dans l'en-tête « X-Label: »"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "opérateur logique ET"
 
 msgid "logical AND operator"
 msgstr "opérateur logique ET"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "opérateur logique OU"
 
 msgid "logical OR operator"
 msgstr "opérateur logique OU"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "opérateur logique NON"
 
 msgid "logical NOT operator"
 msgstr "opérateur logique NON"
 

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "distinguer MAJ./min."
 
 msgid "case sensitive search"
 msgstr "distinguer MAJ./min."
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "L'ensemble des conditions de filtrage est utilisable."
 
 msgid "all filtering expressions are allowed"
 msgstr "L'ensemble des conditions de filtrage est utilisable."
 

-#: src/gtk/quicksearch.c:387 src/summary_search.c:401
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr "Recherche avancée"
 
 msgid "Extended Search"
 msgstr "Recherche avancée"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 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"
 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"


@@ -4835,115 +5321,99 @@ msgstr ""
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 

-#: src/gtk/quicksearch.c:484 src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160 src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:48 src/summaryview.c:491
-msgid "Subject"
-msgstr "Sujet"
-
-#: src/gtk/quicksearch.c:488 src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:492
-msgid "From"
-msgstr "De"
-
-#: src/gtk/quicksearch.c:492 src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "À"
-
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr "Récursif"
 
 msgid "Recursive"
 msgstr "Récursif"
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr "Permanent"
 
 msgid "Sticky"
 msgstr "Permanent"
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "Dynamique"
 
 msgid "Type-ahead"
 msgstr "Dynamique"
 

-#: src/gtk/quicksearch.c:554 src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr "Sélection validante"
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr "Effacer"
 
 msgid " Clear "
 msgstr "Effacer"
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 
 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 

-#: src/gtk/quicksearch.c:577 src/summary_search.c:354
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr "Édition des critères de recherche"
 
 msgid "Edit search criteria"
 msgstr "Édition des critères de recherche"
 

-#: src/gtk/quicksearch.c:583 src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr "Syntaxe Avancée..."
 
 msgid " Extended Symbols... "
 msgstr "Syntaxe Avancée..."
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avancée"
 
 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avancée"
 

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "Description"
 
 msgid "Info"
 msgstr "Description"
 

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "Effacer"
 
 msgid "Clear"
 msgstr "Effacer"
 

-#: src/gtk/quicksearch.c:1090 src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Recherche en cours dans le dossier %s... \n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Recherche en cours dans le dossier %s... \n"
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "correct"
 
 msgid "correct"
 msgstr "correct"
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "Propriétaire"
 
 msgid "Owner"
 msgstr "Propriétaire"
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "Signé par"
 
 msgid "Signer"
 msgstr "Signé par"
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nom : "
 
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nom : "
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Société : "
 
 msgid "Organization: "
 msgstr "Société : "
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "Lieu : "
 
 msgid "Location: "
 msgstr "Lieu : "
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "Empreinte : "
 
 msgid "Fingerprint: "
 msgstr "Empreinte : "
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "État des signatures : "
 
 msgid "Signature status: "
 msgstr "État des signatures : "
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "Expire le : "
 
 msgid "Expires on: "
 msgstr "Expire le : "
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificat SSL pour %s"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificat SSL pour %s"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -4952,30 +5422,30 @@ msgstr ""
 "Le certificat pour %s est inconnu.\n"
 "Voulez-vous l'accepter ?"
 
 "Le certificat pour %s est inconnu.\n"
 "Voulez-vous l'accepter ?"
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "État de la signature : %s"
 
 #, c-format
 msgid "Signature status: %s"
 msgstr "État de la signature : %s"
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "_Voir le certificat"
 
 msgid "_View certificate"
 msgstr "_Voir le certificat"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "Certificat SSL inconnu"
 
 msgid "Unknown SSL Certificate"
 msgstr "Certificat SSL inconnu"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "_Interrompre la connexion"
 
 msgid "_Cancel connection"
 msgstr "_Interrompre la connexion"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "_Accepter et sauvegarder"
 
 msgid "_Accept and save"
 msgstr "_Accepter et sauvegarder"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -4984,40 +5454,40 @@ msgstr ""
 "Le certificat pour %s a expiré.\n"
 "Voulez-vous continuer ?"
 
 "Le certificat pour %s a expiré.\n"
 "Voulez-vous continuer ?"
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "Certificat SSL expiré"
 
 msgid "Expired SSL Certificate"
 msgstr "Certificat SSL expiré"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "_Accepter"
 
 msgid "_Accept"
 msgstr "_Accepter"
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "Nouveau certificat :"
 
 msgid "New certificate:"
 msgstr "Nouveau certificat :"
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "Certificat connu :"
 
 msgid "Known certificate:"
 msgstr "Certificat connu :"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "Le certificat pour %s a été changé. Voulez-vous l'accepter ?"
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "Le certificat pour %s a été changé. Voulez-vous l'accepter ?"
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "_Voir les certificats"
 
 msgid "_View certificates"
 msgstr "_Voir les certificats"
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "Certificat SSL changé"
 
 msgid "Changed SSL Certificate"
 msgstr "Certificat SSL changé"
 

-#: src/headerview.c:195 src/summaryview.c:2866 src/summaryview.c:2877
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 

-#: src/headerview.c:210 src/summaryview.c:2901 src/summaryview.c:2904
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 


@@ -5033,11 +5503,7 @@ msgstr "Taille du fichier :"
 msgid "Load Image"
 msgstr "Charger l'image"
 
 msgid "Load Image"
 msgstr "Charger l'image"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr "Type de contenu :"
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -5050,36 +5516,36 @@ msgstr ""
 "a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
 "installé."
 
 "a été compilée avec le support SASL et si le module CRAM-MD5 SASL est "
 "installé."
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s\n"
 

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexion vers %s a échoué."
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexion vers %s a échoué."
 

-#: src/imap.c:666 src/imap.c:669
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été coupée. Reconnexion...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été coupée. Reconnexion...\n"
 

-#: src/imap.c:718 src/imap.c:2447 src/imap.c:2956 src/imap.c:3041
-#: src/imap.c:3386 src/imap.c:4143
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
 

-#: src/imap.c:797 src/inc.c:773 src/news.c:295 src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 

-#: src/imap.c:798 src/inc.c:774 src/news.c:296 src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -5093,105 +5559,105 @@ msgstr ""
 "Comme la communication ne peut pas être sécurisée, voulez-vous quand même "
 "poursuivre la connexion à ce serveur ?"
 
 "Comme la communication ne peut pas être sécurisée, voulez-vous quand même "
 "poursuivre la connexion à ce serveur ?"
 

-#: src/imap.c:804 src/inc.c:780 src/news.c:302 src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connexion au serveur IMAP : %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connexion au serveur IMAP : %s..."
 

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossible de se connecter au serveur IMAP4 %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossible de se connecter au serveur IMAP4 %s:%d"
 

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 %s:%d\n"
 

-#: src/imap.c:884 src/imap.c:2764
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connexion au serveur IMAP %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connexion au serveur IMAP %s...\n"
 

-#: src/imap.c:932 src/imap.c:935
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Authentification impossible au serveur IMAP %s."
 

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "Ajout des messages en cours..."
 
 msgid "Adding messages..."
 msgstr "Ajout des messages en cours..."
 

-#: src/imap.c:1305 src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copie des messages en cours..."
 
 msgid "Copying messages..."
 msgstr "Copie des messages en cours..."
 

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 

-#: src/imap.c:1487 src/imap.c:3894
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s..."
 
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s..."
 

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s..."
 
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s..."
 

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Le nouveau nom de dossier ne doit pas contenir le séparateur de chemin."
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Le nouveau nom de dossier ne doit pas contenir le séparateur de chemin."
 

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
 

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Le serveur nécessite TLS pour s'y connecter.\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "


@@ -5200,34 +5666,34 @@ msgstr ""
 "La connection vers %s a échoué : le serveur nécessite TLS, mais Claws Mail a "
 "été compilé sans le support OpenSSL.\n"
 
 "La connection vers %s a échoué : le serveur nécessite TLS, mais Claws Mail a "
 "été compilé sans le support OpenSSL.\n"
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Les connections au serveur sont désactivées.\n"
 

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "Lecture du message en cours..."
 
 msgid "Fetching message..."
 msgstr "Lecture du message en cours..."
 

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut pas convertir UTF-7 en %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut pas convertir UTF-7 en %s\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut pas convertir %s en UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut pas convertir %s en UTF-7\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv ne peut pas convertir UTF-8 en UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv ne peut pas convertir UTF-8 en UTF-7\n"
 

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 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 "
 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 "


@@ -5364,7 +5830,7 @@ msgstr ""
 msgid "Search recursively"
 msgstr "Rechercher récursivement"
 
 msgid "Search recursively"
 msgstr "Rechercher récursivement"
 

-#: src/imap_gtk.c:453 src/imap_gtk.c:496
+#: src/imap_gtk.c:453 src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "Inscriptions"
 
 msgid "Subscriptions"
 msgstr "Inscriptions"
 


@@ -5386,33 +5852,41 @@ msgid "All of them"
 msgstr "Tous"
 
 #: src/imap_gtk.c:481
 msgstr "Tous"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
+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."

 msgstr ""
 "Vous êtes déjà inscrit à ce dossier et il ne contient aucun sous-dossier "
 "auquel vous n'êtes pas inscrit."
 msgstr ""
 "Vous êtes déjà inscrit à ce dossier et il ne contient aucun sous-dossier "
 "auquel vous n'êtes pas inscrit."

+"S'il y a des nouveaux dossiers, créés et auquels vous vous êtes déjà "
+"inscrit depuis un autre client, vous pouvez utiliser \"Examiner pour de "
+"nouveaux dossiers\" depuis le menu contextuel du dossier racine de chaque "
+"boîte aux lettres."

 
 

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Voulez-vous vous %s dossier « %s » ?"
 
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Voulez-vous vous %s dossier « %s » ?"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "inscrire au"
 
 msgid "subscribe"
 msgstr "inscrire au"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "désinscrire du"
 
 msgid "unsubscribe"
 msgstr "désinscrire du"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+S'_inscrire"
 
 msgid "+_Subscribe"
 msgstr "+S'_inscrire"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+Se _désinscrire"
 
 msgid "+_Unsubscribe"
 msgstr "+Se _désinscrire"
 


@@ -5449,41 +5923,37 @@ msgstr "Impossible de trouver le dossier de destination."
 msgid "Select importing file"
 msgstr "Sélection du fichier à importer"
 
 msgid "Select importing file"
 msgstr "Sélection du fichier à importer"
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr ""
 "Veuillez spécifier le nom du carnet d'adresses et le chemin du fichier à "
 "importer."
 
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Veuillez spécifier le nom du carnet d'adresses et le chemin du fichier à "
 "importer."
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "Veuillez sélectionner et renommer le champ LDIF à importer."
 
 msgid "Select and rename LDIF field names to import."
 msgstr "Veuillez sélectionner et renommer le champ LDIF à importer."
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "Fichier importé."
 
 msgid "File imported."
 msgstr "Fichier importé."
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr "Veuillez sélectionner un fichier."
 
 msgid "Please select a file."
 msgstr "Veuillez sélectionner un fichier."
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "Le nom du carnet d'adresses doit être indiqué."
 
 msgid "Address book name must be supplied."
 msgstr "Le nom du carnet d'adresses doit être indiqué."
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "Erreur lors de la lecture des champs LDIF."
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "Fichier LDIF importé avec succès."
 
 msgid "LDIF file imported successfully."
 msgstr "Fichier LDIF importé avec succès."
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "Sélection d'un fichier LDIF"
 
 msgid "Select LDIF File"
 msgstr "Sélection d'un fichier LDIF"
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."


@@ -5491,51 +5961,47 @@ msgstr ""
 "Veuillez spécifier le nom du carnet d'adresses qui sera créé à partir du "
 "fichier LDIF."
 
 "Veuillez spécifier le nom du carnet d'adresses qui sera créé à partir du "
 "fichier LDIF."
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "Chemin du fichier"
 
 msgid "File Name"
 msgstr "Chemin du fichier"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "Spécification complète du fichier LDIF à importer."
 
 msgid "The full file specification of the LDIF file to import."
 msgstr "Spécification complète du fichier LDIF à importer."
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "Veuillez sélectionner le fichier LDIF à importer."
 
 msgid "Select the LDIF file to import."
 msgstr "Veuillez sélectionner le fichier LDIF à importer."
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:726 src/summaryview.c:489
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "Champ LDIF"
 
 msgid "LDIF Field Name"
 msgstr "Champ LDIF"
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "Nom de l'attribut"
 
 msgid "Attribute Name"
 msgstr "Nom de l'attribut"
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "Champ LDIF"
 
 msgid "LDIF Field"
 msgstr "Champ LDIF"
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "Attribut"
 
 msgid "Attribute"
 msgstr "Attribut"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Le champ LDIF peut être renommé en Attribute Utilisateur (UA)"
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Le champ LDIF peut être renommé en Attribute Utilisateur (UA)"
 

-#: src/importldif.c:811
-msgid "???"
-msgstr "???"
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "
 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 "


@@ -5554,32 +6020,36 @@ msgstr ""
 "double-clique également en dehors de cette colonne permet de sélectionner le "
 "champ pour l'import."
 
 "double-clique également en dehors de cette colonne permet de sélectionner le "
 "champ pour l'import."
 

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "Sélectionner pour l'import"
 
 msgid "Select for Import"
 msgstr "Sélectionner pour l'import"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "Sélectionner le champ LDIF pour l'importer dans le carnet d'adresse."
 
 msgid "Select the LDIF field for import into the address book."
 msgstr "Sélectionner le champ LDIF pour l'importer dans le carnet d'adresse."
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " Modifier "
 
 msgid " Modify "
 msgstr " Modifier "
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr ""
 "Ce bouton permet de mettre à jour la liste ci-dessus avec les données "
 "idoines."
 
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 "Ce bouton permet de mettre à jour la liste ci-dessus avec les données "
 "idoines."
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "Fiches importées :"
 
 msgid "Records Imported :"
 msgstr "Fiches importées :"
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "Importation d'un fichier LDIF"
 
 msgid "Import LDIF file into Address Book"
 msgstr "Importation d'un fichier LDIF"
 

+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr "Poursuivre"
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Erreur lors de l'importation d'un fichier Mutt."
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Erreur lors de l'importation d'un fichier Mutt."


@@ -5647,11 +6117,11 @@ msgstr "La connexion a 
 msgid "Auth failed"
 msgstr "Authorisation échouée"
 
 msgid "Auth failed"
 msgstr "Authorisation échouée"
 

-#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2454
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr "Bloqués"
 
 msgid "Locked"
 msgstr "Bloqués"
 

-#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 


@@ -5814,25 +6284,25 @@ msgstr "La connexion vers %s:%d a 
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement pour %d minutes ?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement pour %d minutes ?"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 "%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
 "l'avertissement ?"
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 
 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "Surnom"
 
 msgid "Nick Name"
 msgstr "Surnom"
 


@@ -5852,17 +6322,30 @@ msgstr "Fermeture..."
 #: src/main.c:329
 #, c-format
 msgid ""
 #: src/main.c:329
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Une configuration pour %s (ou précédente) a été trouvée.\n"
+"Une configuration pour %s a été trouvée.\n"

 "Voulez-vous faire migrer cette configuration ?"
 
 "Voulez-vous faire migrer cette configuration ?"
 

-#: src/main.c:337
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"Vos règles de filtrage pour Sylpheed peuvent être converties\n"
+"par un script disponible ici : %s."
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "Conserver l'ancienne configuration"
 
 msgid "Keep old configuration"
 msgstr "Conserver l'ancienne configuration"
 

-#: src/main.c:340
+#: src/main.c:347

 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 "
 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 "


@@ -5873,27 +6356,27 @@ msgstr ""
 "IMAP ou provenant de serveurs de discussions, et occupera un espace "
 "supplémentaire sur votre disque."
 
 "IMAP ou provenant de serveurs de discussions, et occupera un espace "
 "supplémentaire sur votre disque."
 

-#: src/main.c:349
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 

-#: src/main.c:360
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "Copie de la configuration... Cela peut prendre du temps..."
 
 msgid "Copying configuration... This may take a while..."
 msgstr "Copie de la configuration... Cela peut prendre du temps..."
 

-#: src/main.c:369
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "La migration a échoué !"
 
 msgid "Migration failed!"
 msgstr "La migration a échoué !"
 

-#: src/main.c:378
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "Migration de la configuration..."
 
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration..."
 

-#: src/main.c:695
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 

-#: src/main.c:701
+#: src/main.c:713

 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "


@@ -5904,16 +6387,29 @@ msgstr ""
 "interruption inattendue. Il est donc nécessaire de mettre à jour GTK+ ou de "
 "recompiler Claws Mail."
 
 "interruption inattendue. Il est donc nécessaire de mettre à jour GTK+ ou de "
 "recompiler Claws Mail."
 

-#: src/main.c:710
+#: src/main.c:722

 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""

-"Claws Mail a été compilé avec une version de la bibliothèque GTK+ plus "
-"ancienne que celle qui est actuellement disponible. Cela amènera à une "
-"interruption inattendue. Il est donc nécessaire de recompiler Claws Mail."
+"Claws Mail a été compilé avec une version de la bibliothèque GTK+ "
+"antérieure à celle actuellement disponible. Cela amènera à une "
+"interruption inattendue. Il est donc absolument nécessaire de recompiler "
+"Claws Mail."

 
 

-#: src/main.c:995
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (ou antérieur)"
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (ou antérieur)"
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (ou antérieur)"
+
+#: src/main.c:1013

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -5921,7 +6417,7 @@ msgstr ""
 "Un ou plusieurs modules n'ont pas pu être chargés. Veuillez vous référer à "
 "la configuration des modules pour de plus amples informations."
 
 "Un ou plusieurs modules n'ont pas pu être chargés. Veuillez vous référer à "
 "la configuration des modules pour de plus amples informations."
 

-#: src/main.c:1014
+#: src/main.c:1032

 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 "
 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 "


@@ -5933,7 +6429,7 @@ msgstr ""
 "contextuel du dossier principal de la boîte aux lettres pour tenter de le "
 "résoudre."
 
 "contextuel du dossier principal de la boîte aux lettres pour tenter de le "
 "résoudre."
 

-#: src/main.c:1020
+#: src/main.c:1038

 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 "
 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 "


@@ -5943,16 +6439,16 @@ msgstr ""
 "est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
 "le module et essayer à nouveau."
 
 "est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
 "le module et essayer à nouveau."
 

-#: src/main.c:1281
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 

-#: src/main.c:1283
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 

-#: src/main.c:1284
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"


@@ -5960,7 +6456,7 @@ msgstr ""
 "                          de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                          rendez-vous et calendriers en ligne)"
 
 "                          de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                          rendez-vous et calendriers en ligne)"
 

-#: src/main.c:1285
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -5970,27 +6466,27 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                          fichiers spécifiés attachés"
 
 "                         ouvrir une fenêtre de composition avec les\n"
 "                          fichiers spécifiés attachés"
 

-#: src/main.c:1288
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              récupérer les nouveaux messages (du compte courant)"
 
 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              récupérer les nouveaux messages (du compte courant)"
 

-#: src/main.c:1289
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 

-#: src/main.c:1290
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 

-#: src/main.c:1291
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dossier]...  afficher le nombre de messages\n"
 "                          (nouveaux, non lus, total)"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 "  --status [dossier]...  afficher le nombre de messages\n"
 "                          (nouveaux, non lus, total)"
 

-#: src/main.c:1292
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -5998,7 +6494,7 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher le nombre de messages de chaque dossier"
 
 "  --status-full [dossier]...\n"
 "                         afficher le nombre de messages de chaque dossier"
 

-#: src/main.c:1294
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"


@@ -6009,55 +6505,55 @@ msgstr ""
 "voici\n"
 "                          un exemple de syntaxe : 'dossier/sous_dossier'."
 
 "voici\n"
 "                          un exemple de syntaxe : 'dossier/sous_dossier'."
 

-#: src/main.c:1296
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 

-#: src/main.c:1297
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 

-#: src/main.c:1298
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 

-#: src/main.c:1299
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 

-#: src/main.c:1300
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 

-#: src/main.c:1301
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 

-#: src/main.c:1302
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 

-#: src/main.c:1342
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: « claws-mail --help ».\n"
 
 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: « claws-mail --help ».\n"
 

-#: src/main.c:1360
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s)..."
 

-#: src/main.c:1363
+#: src/main.c:1389

 msgid "top level folder"
 msgstr "dossier racine"
 
 msgid "top level folder"
 msgstr "dossier racine"
 

-#: src/main.c:1432
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 

-#: src/main.c:1433
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "


@@ -6141,7 +6637,7 @@ msgstr "/Edition/Chercher dans le _dossier..."
 msgid "/_Edit/_Quick search"
 msgstr "/Edition/_Recherche rapide"
 
 msgid "/_Edit/_Quick search"
 msgstr "/Edition/_Recherche rapide"
 

-#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:477
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr "/_Vue"
 
 msgid "/_View"
 msgstr "/_Vue"
 


@@ -6541,7 +7037,7 @@ msgstr "/Vue/D
 msgid "/_View/Decode/_Uuencode"
 msgstr "/Vue/Décodage/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/Vue/Décodage/_Uuencode"
 

-#: src/mainwindow.c:745 src/summaryview.c:478
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/Vue/Ouvrir dans une _nouvelle fenêtre"
 
 msgid "/_View/Open in new _window"
 msgstr "/Vue/Ouvrir dans une _nouvelle fenêtre"
 


@@ -6846,12 +7342,12 @@ msgid "/_Tools/SSL cer_tificates..."
 msgstr "/Outils/C_ertificats SSL..."
 
 #: src/mainwindow.c:867
 msgstr "/Outils/C_ertificats SSL..."
 
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/Outils/Déboguage du filtra_ge"
+msgid "/_Tools/Filtering Log"
+msgstr "/Outils/Traces de filtra_ge"

 
 #: src/mainwindow.c:868
 
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/Outils/Fenêtre de _traces"
+msgid "/_Tools/Network _Log"
+msgstr "/Outils/_Traces réseaux"

 
 #: src/mainwindow.c:870
 msgid "/_Configuration"
 
 #: src/mainwindow.c:870
 msgid "/_Configuration"


@@ -6940,25 +7436,25 @@ msgstr ""
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
 msgid "Select account"
 msgstr "Sélectionner un compte"
 

-#: src/mainwindow.c:1300 src/prefs_logging.c:114
-msgid "Protocol log"
-msgstr "Traces des protocoles utilisés"
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"
+msgstr "Traces réseaux"

 
 

-#: src/mainwindow.c:1304 src/prefs_logging.c:152
+#: src/mainwindow.c:1304

 msgid "Filtering/processing debug log"
 msgid "Filtering/processing debug log"

-msgstr "Traces pour le déboguage du filtrage/traitement"
+msgstr "Traces de déboguage du filtrage/traitement"

 
 

-#: src/mainwindow.c:1323 src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
-msgstr "Le déboguage du filtrage est activé.\n"
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr "Le traçage du filtrage est activé.\n"

 
 

-#: src/mainwindow.c:1325 src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
-msgstr "Le déboguage du filtrage est désactivé.\n"
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr "Le traçage du filtrage est désactivé.\n"

 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871
 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871

-#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:765
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "Sans titre"
 
 msgid "Untitled"
 msgstr "Sans titre"
 


@@ -6978,11 +7474,11 @@ msgstr "Nouvelle bo
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "Veuillez saisir le chemin vers la boîte aux lettres :\n"
 "scanned automatically."
 msgstr ""
 "Veuillez saisir le chemin vers la boîte aux lettres :\n"

-"(Si elle existe, elle sera analysée automatiquement.)"
+"(Si elle existe déjà, elle sera automatiquement analysée.)"

 
 #: src/mainwindow.c:2148
 #, c-format
 
 #: src/mainwindow.c:2148
 #, c-format


@@ -7003,129 +7499,108 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 

-#: src/mainwindow.c:3053 src/mainwindow.c:3062
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr "Quitter"
 
 msgid "Exit"
 msgstr "Quitter"
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 
 msgid "Exit Claws Mail?"
 msgstr "Voulez-vous vraiment quitter Claws Mail ?"
 

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+S_ynchroniser"
 
 msgid "+_Synchronise"
 msgstr "+S_ynchroniser"
 

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d message en double supprimé dans %d dossier.\n"
 msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d message en double supprimé dans %d dossier.\n"
 msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
 

-#: src/mainwindow.c:3774 src/summaryview.c:4907
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 

-#: src/mainwindow.c:3792 src/summaryview.c:4918
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 

-#: src/matcher.c:750 src/matcher.c:752
-msgid "subject"
-msgstr "sujet"
-
-#: src/matcher.c:754 src/matcher.c:756
-msgid "From: header"
-msgstr "En-tête De:"
-
-#: src/matcher.c:758 src/matcher.c:760 src/matcher.c:766
-msgid "To: header"
-msgstr "En-tête À:"
-
-#: src/matcher.c:762 src/matcher.c:764 src/matcher.c:767
-msgid "Cc: header"
-msgstr "En-tête Cc:"
-
-#: src/matcher.c:975 src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "En-tête Groupe de discussion:"
-
-#: src/matcher.c:979 src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "En-tête En répondant à:"
-
-#: src/matcher.c:985 src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr "En-tête En répondant à: (References)"
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "En-tête %s"

 
 

-#: src/matcher.c:1071 src/matcher.c:1073
+#: src/matcher.c:1157 src/matcher.c:1159

 msgid "header"
 msgstr "En-tête"
 
 msgid "header"
 msgstr "En-tête"
 

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 msgid "header line"
 msgstr "Ligne d'en-tête"
 
 msgid "header line"
 msgstr "Ligne d'en-tête"
 

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 msgid "headers line"
 msgstr "Ligne d'en-têtes"
 
 msgid "headers line"
 msgstr "Ligne d'en-têtes"
 

-#: src/matcher.c:1086 src/matcher.c:1088
+#: src/matcher.c:1172 src/matcher.c:1174

 msgid "message line"
 msgstr "Ligne du message"
 
 msgid "message line"
 msgstr "Ligne du message"
 

-#: src/matcher.c:1099 src/matcher.c:1232 src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344 src/prefs_matcher.c:1361 src/prefs_matcher.c:2116
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "Tous"
 
 msgid "Filtering Matcher Menu|All"
 msgstr "Tous"
 

-#: src/matcher.c:1306 src/matcher.c:1309
+#: src/matcher.c:1392 src/matcher.c:1395

 msgid "body line"
 msgstr "Ligne du corps"
 
 msgid "body line"
 msgstr "Ligne du corps"
 

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Teste si le message valide la condition [ %s ]\n"
 
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "Teste si le message valide la condition [ %s ]\n"
 

-#: src/matcher.c:1542 src/matcher.c:1561 src/matcher.c:1574
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660

 msgid "message matches\n"
 msgstr "Le message correspond.\n"
 
 msgid "message matches\n"
 msgstr "Le message correspond.\n"
 

-#: src/matcher.c:1549 src/matcher.c:1567 src/matcher.c:1576
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662

 msgid "message does not match\n"
 msgstr "Le message ne correspond pas.\n"
 
 msgid "message does not match\n"
 msgstr "Le message ne correspond pas.\n"
 

-#: src/matcher.c:1829 src/matcher.c:1830 src/matcher.c:1831 src/matcher.c:1832
-#: src/matcher.c:1833 src/matcher.c:1834 src/matcher.c:1835 src/matcher.c:1836
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr "(aucun)"
 
 msgid "(none)"
 msgstr "(aucun)"
 


@@ -7151,8 +7626,8 @@ msgstr "
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
 

-#: src/mbox.c:531 src/messageview.c:1180 src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "Écraser"
 
 msgid "Overwrite"
 msgstr "Écraser"
 


@@ -7177,15 +7652,15 @@ msgstr "Chercher dans le message"
 msgid "Find text:"
 msgstr "Chercher :"
 
 msgid "Find text:"
 msgstr "Chercher :"
 

-#: src/message_search.c:210 src/prefs_matcher.c:655 src/summary_search.c:396
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr "Distinguer MAJ./min."
 
 msgid "Case sensitive"
 msgstr "Distinguer MAJ./min."
 

-#: src/message_search.c:326 src/summary_search.c:667
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr "Recherche échouée"
 
 msgid "Search failed"
 msgstr "Recherche échouée"
 

-#: src/message_search.c:327 src/summary_search.c:668
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr "Texte recherché introuvable."
 
 msgid "Search string not found."
 msgstr "Texte recherché introuvable."
 


@@ -7197,7 +7672,7 @@ msgstr "D
 msgid "End of message reached; continue from beginning?"
 msgstr "Fin de message atteint, reprendre depuis le début ?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Fin de message atteint, reprendre depuis le début ?"
 

-#: src/message_search.c:342 src/summary_search.c:679
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr "Recherche terminée"
 
 msgid "Search finished"
 msgstr "Recherche terminée"
 


@@ -7276,39 +7751,39 @@ msgstr ""
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 
 "destinataire officiel.\n"
 "Il est conseillé de ne pas envoyer cet accusé de réception."
 

-#: src/messageview.c:817 src/procmime.c:883
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Déchiffrement impossible : %s"
 

-#: src/messageview.c:1175 src/mimeview.c:1606 src/summaryview.c:4187
-#: src/summaryview.c:4190 src/textview.c:2648
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr "Enregistrer sous"
 
 msgid "Save as"
 msgstr "Enregistrer sous"
 

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 

-#: src/messageview.c:1189 src/summaryview.c:4207 src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible de sauvegarder le fichier « %s »."
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible de sauvegarder le fichier « %s »."
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demandé un accusé de réception pour ce message."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Vous avez demandé un accusé de réception pour ce message."
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
 msgid "This message asks for a return receipt."
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "Envoyer"
 
 msgid "Send receipt"
 msgstr "Envoyer"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -7316,7 +7791,7 @@ msgstr ""
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 
 "Ce message a été partiellement récupéré,\n"
 "et a été supprimé du serveur."
 

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -7325,16 +7800,16 @@ msgstr "Ce message a 
 
 # NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
 # la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
 
 # NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
 # la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips

-#: src/messageview.c:1308 src/messageview.c:1330
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr "Télécharger"
 
 # NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
 msgid "Mark for download"
 msgstr "Télécharger"
 
 # NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"

-#: src/messageview.c:1309 src/messageview.c:1321
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "Supprimer"
 
 msgid "Mark for deletion"
 msgstr "Supprimer"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -7343,12 +7818,12 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être téléchargé ultérieurement."
 
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être téléchargé ultérieurement."
 

-#: src/messageview.c:1319 src/messageview.c:1332
+#: src/messageview.c:1331 src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Démarquer"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Démarquer"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -7357,11 +7832,11 @@ msgstr ""
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 
 "Ce message a été partiellement récupéré ;\n"
 "il fait %s au total et est marqué pour être supprimé ultérieurement."
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -7371,19 +7846,19 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "A_nnuler"
 
 msgid "_Cancel"
 msgstr "A_nnuler"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "_Envoyer"
 
 msgid "_Send Notification"
 msgstr "_Envoyer"
 

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossible d'imprimer : le message ne contient pas de texte."
 

-#: src/messageview.c:1545 src/summaryview.c:4247
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -7392,7 +7867,7 @@ msgstr ""
 "Veuillez saisir la ligne de commande d'impression :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 
 "Veuillez saisir la ligne de commande d'impression :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 

-#: src/messageview.c:1551 src/summaryview.c:4253
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -7401,8 +7876,8 @@ msgstr ""
 "La ligne de commande d'impression est invalide :\n"
 "'%s'"
 
 "La ligne de commande d'impression est invalide :\n"
 "'%s'"
 

-#: src/messageview.c:1829 src/messageview.c:1835 src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 


@@ -7441,87 +7916,91 @@ msgstr "Enl
 msgid "_Remove"
 msgstr "Enleve_r"
 
 msgid "_Remove"
 msgstr "Enleve_r"
 

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr "/_Ouvrir"
-

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
-msgstr "/Ouvrir _avec..."
+msgid "/_Open (l)"
+msgstr "/_Ouvrir (l)"

 
 #: src/mimeview.c:170
 
 #: src/mimeview.c:170

-msgid "/_Display as text"
-msgstr "/Afficher comme du _texte"
+msgid "/Open _with (o)..."
+msgstr "/Ouvrir _avec (o)..."

 
 

-#: src/mimeview.c:171 src/summaryview.c:483
-msgid "/_Save as..."
-msgstr "/Enregi_strer sous..."
+#: src/mimeview.c:171
+msgid "/_Display as text (t)"
+msgstr "/Afficher comme du _texte (t)"

 
 #: src/mimeview.c:172
 
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr "/Enregi_strer sous (y)..."
+
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/_Enregistrer tout sous..."
 
 msgid "/Save _all..."
 msgstr "/_Enregistrer tout sous..."
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr "/_Partie suivante (a)"
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "Type MIME"
 
 msgid "MIME Type"
 msgstr "Type MIME"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "Vérifier la signature"
 
 msgid "Check signature"
 msgstr "Vérifier la signature"
 

-#: src/mimeview.c:764 src/mimeview.c:769 src/mimeview.c:774
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 
 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 

-#: src/mimeview.c:779 src/mimeview.c:783
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr "Vérifier à nouveau"
 
 msgid "Check again"
 msgstr "Vérifier à nouveau"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Veuillez cliquer sur l'icône ou presser la touche 'C' pour la vérifier."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Veuillez cliquer sur l'icône ou presser la touche 'C' pour la vérifier."
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Veuillez "
 "cliquer sur l'icône ou presser la touche 'C' pour essayer à nouveau."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Veuillez "
 "cliquer sur l'icône ou presser la touche 'C' pour essayer à nouveau."
 

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours..."
 
 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "Revenir à l'email"
 
 msgid "Go back to email"
 msgstr "Revenir à l'email"
 

-#: src/mimeview.c:1388 src/mimeview.c:1472 src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
 
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
 

-#: src/mimeview.c:1461 src/textview.c:2658
+#: src/mimeview.c:1511 src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 
 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 

-#: src/mimeview.c:1734 src/mimeview.c:1742 src/textview.c:2589
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600

 msgid "Open with"
 msgstr "Ouvrir avec"
 
 msgid "Open with"
 msgstr "Ouvrir avec"
 

-#: src/mimeview.c:1735 src/mimeview.c:1743 src/textview.c:2590
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -7635,25 +8114,25 @@ msgstr "Suppression du groupe de discussion"
 msgid "_Unsubscribe"
 msgstr "Supp_rimer le groupe"
 
 msgid "_Unsubscribe"
 msgstr "Supp_rimer le groupe"
 

-#: src/news_gtk.c:302
+#: src/news_gtk.c:303 src/news_gtk.c:305

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Une erreur est survenue en téléchargeant les messages dans '%s'."
 
 #: src/plugins/bogofilter/bogofilter.c:77
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Une erreur est survenue en téléchargeant les messages dans '%s'."
 
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 msgid "Bogofilter"
 msgstr "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter : recupération du corps des messages..."
 
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter : recupération du corps des messages..."
 

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter : filtrage des messages..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter : filtrage des messages..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 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"
 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"


@@ -7667,7 +8146,7 @@ msgstr ""
 "comme légitime » avec quelques centaines de pourriels et courriers légitimes "
 "pour que Bogofilter puisse faire son apprentissage."
 
 "comme légitime » avec quelques centaines de pourriels et courriers légitimes "
 "pour que Bogofilter puisse faire son apprentissage."
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "


@@ -7676,23 +8155,23 @@ msgstr ""
 "Le module Bogofilter n'a pas pu filtrer un message. La commande `%s %s %s` "
 "n'a pas pû être lancée."
 
 "Le module Bogofilter n'a pas pu filtrer un message. La commande `%s %s %s` "
 "n'a pas pû être lancée."
 

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter : apprentissage sur un message..."
 
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter : apprentissage sur un message..."
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
 "Bogofilter : échec de l'apprentissage :\n"
 "La commande `%s` a retourné le code %d."
 
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
 "Bogofilter : échec de l'apprentissage :\n"
 "La commande `%s` a retourné le code %d."
 

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter : apprentissage sur des messages..."
 
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter : apprentissage sur des messages..."
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"


@@ -7702,11 +8181,11 @@ msgstr ""
 "La commande `%s %s %s` a retourné l'erreur suivante :\n"
 "%s"
 
 "La commande `%s %s %s` a retourné l'erreur suivante :\n"
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61

 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:963

 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 "
 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 "


@@ -7747,59 +8226,59 @@ msgstr ""
 "carnet d'adresses ou seulement un carnet ou dossier précis,\n"
 "  - et enfin spécifier le chemin de l'exécutable bogofilter."
 
 "carnet d'adresses ou seulement un carnet ou dossier précis,\n"
 "  - et enfin spécifier le chemin de l'exécutable bogofilter."
 

-#: src/plugins/bogofilter/bogofilter.c:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 
 msgid "Spam detection"
 msgstr "Analyse anti-SPAMs"
 

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594

 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
 
 msgid "Spam learning"
 msgstr "Apprentissage de SPAMs"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "Analyse des messages à la réception"
 
 msgid "Process messages on receiving"
 msgstr "Analyse des messages à la réception"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "Taille maximale de message"
 
 msgid "Maximum size"
 msgstr "Taille maximale de message"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr "Les messages d'un volume supérieur ne seront pas analysés."
 
 msgid "Messages larger than this will not be checked"
 msgstr "Les messages d'un volume supérieur ne seront pas analysés."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "ko"
 
 msgid "kB"
 msgstr "ko"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "Placer le pourriel dans"
 
 msgid "Save spam in"
 msgstr "Placer le pourriel dans"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Dossier de stockage du pourriel. Veuillez laisser le champ vide pour "
 "utiliser la corbeille."
 
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Dossier de stockage du pourriel. Veuillez laisser le champ vide pour "
 "utiliser la corbeille."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgstr "Sélectionner un dossier de stockage pour le pourriel"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Sélectionner un dossier de stockage pour le pourriel"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgstr "En cas de doute du statut de pourriel, déplacer vers"
 
 msgid "When unsure, move to"
 msgstr "En cas de doute du statut de pourriel, déplacer vers"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:213

 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."


@@ -7807,25 +8286,25 @@ msgstr ""
 "Dossier de stockage des messages dont le statut de pourriel est INCERTAIN. "
 "Veuillez laisser le champ vide pour utiliser la boîte de réception."
 
 "Dossier de stockage des messages dont le statut de pourriel est INCERTAIN. "
 "Veuillez laisser le champ vide pour utiliser la boîte de réception."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Utilisez ce bouton pour sélectionner un dossier de stockage des messages "
 "dont le statut de pourriel est INCERTAIN."
 
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 "Utilisez ce bouton pour sélectionner un dossier de stockage des messages "
 "dont le statut de pourriel est INCERTAIN."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgstr "Insérer l'en-tête X-Bogosity"
 
 msgid "Insert X-Bogosity header"
 msgstr "Insérer l'en-tête X-Bogosity"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "Concerne uniquement les messages de dossiers MH"
 
 msgid "Only done for messages in MH folders"
 msgstr "Concerne uniquement les messages de dossiers MH"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgstr "Liste blanche si Exp. présent dans le carnet"
 
 msgid "Whitelist senders found in address book/folder"
 msgstr "Liste blanche si Exp. présent dans le carnet"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:238

 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"


@@ -7833,26 +8312,31 @@ msgstr ""
 "Les messages provenant de contacts présents dans votre carnet d'adresses "
 "seront reçus dans un dossier normal même s'ils sont détectés comme pourriels."
 
 "Les messages provenant de contacts présents dans votre carnet d'adresses "
 "seront reçus dans un dossier normal même s'ils sont détectés comme pourriels."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/plugins/bogofilter/bogofilter_gtk.c:256

 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505

-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "Parcourir..."
 
 msgid "Select ..."
 msgstr "Parcourir..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Veuillez utiliser ce bouton pour sélectionner un carnet ou dossier de votre "
 "carnet d'adresse."
 
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 "Veuillez utiliser ce bouton pour sélectionner un carnet ou dossier de votre "
 "carnet d'adresse."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr "Programme Bogofilter"
 
 msgid "Bogofilter call"
 msgstr "Programme Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "Chemin vers l'exécutable bogofilter"
 
 msgid "Path to bogofilter executable"
 msgstr "Chemin vers l'exécutable bogofilter"
 

+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "Marquer le pourriel comme lu"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -7866,7 +8350,7 @@ msgstr "ClamAV : analyse du message..."
 msgid "Failed to register mail filtering hook"
 msgstr "Échec lors de la déclaration du hook de filtrage des messages"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Échec lors de la déclaration du hook de filtrage des messages"
 

-#: src/plugins/clamav/clamav_plugin.c:303
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -7892,7 +8376,7 @@ msgstr ""
 "sont par défaut),\n"
 "  - sélectionner le dossier qui rassemblera les messages infectés."
 
 "sont par défaut),\n"
 "  - sélectionner le dossier qui rassemblera les messages infectés."
 

-#: src/plugins/clamav/clamav_plugin.c:330
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr "Analyse antivirus"
 
 msgid "Virus detection"
 msgstr "Analyse antivirus"
 


@@ -7935,7 +8419,7 @@ msgstr ""
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "Sélectionner un dossier de stockage pour les messages infectés"
 
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "Sélectionner un dossier de stockage pour les messages infectés"
 

-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr "Demonstration"
 
 msgid "Demo"
 msgstr "Demonstration"
 


@@ -7943,7 +8427,7 @@ msgstr "Demonstration"
 msgid "Failed to register log text hook"
 msgstr "Échec lors de la déclaration du hook de traçage texte"
 
 msgid "Failed to register log text hook"
 msgstr "Échec lors de la déclaration du hook de traçage texte"
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 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"


@@ -7986,7 +8470,7 @@ msgstr "
 msgid "Dillo HTML Viewer"
 msgstr "Visualiseur de HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Visualiseur de HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -7998,11 +8482,11 @@ msgstr ""
 "La page de configuration est accessible par le menu « Configuration/"
 "Préférences... » dans le noeud « Modules/Visualiseur HTML Dillo »."
 
 "La page de configuration est accessible par le menu « Configuration/"
 "Préférences... » dans le noeud « Modules/Visualiseur HTML Dillo »."
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "Phrase secrète"
 
 msgid "Passphrase"
 msgstr "Phrase secrète"
 


@@ -8141,7 +8625,7 @@ msgstr "   Cette cl
 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -8164,71 +8648,71 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn@gnu.org>."
 
 "\n"
 "GPGME est copyright 2001 par Werner Koch <dd9jn@gnu.org>."
 

-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94

 msgid "Core operations"
 msgstr "Opérations de bases"
 
 msgid "Core operations"
 msgstr "Opérations de bases"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "Utiliser gpg-agent pour gérer les mots de passe"
 
 msgid "Use gpg-agent to manage passwords"
 msgstr "Utiliser gpg-agent pour gérer les mots de passe"
 

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "Mémoriser temporairement la phrase secrète"
 
 msgid "Store passphrase in memory"
 msgstr "Mémoriser temporairement la phrase secrète"
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "Expirer après"
 
 msgid "Expire after"
 msgstr "Expirer après"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Mettre 0 pour la mémoriser pendant toute la session"
 

-#: src/plugins/pgpcore/prefs_gpg.c:142 src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr "minute(s)"
 
 msgid "minute(s)"
 msgstr "minute(s)"
 

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Avertir au démarrage si GnuPG ne fonctionne pas"
 
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Avertir au démarrage si GnuPG ne fonctionne pas"
 

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr "Signer la clé"
 
 msgid "Sign key"
 msgstr "Signer la clé"
 

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé GnuPG par défaut"
 
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé GnuPG par défaut"
 

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "Choisir la clé en fonction de l'adresse email"
 
 msgid "Select key by your email address"
 msgstr "Choisir la clé en fonction de l'adresse email"
 

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "Spécifier la clé manuellement"
 
 msgid "Specify key manually"
 msgstr "Spécifier la clé manuellement"
 

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "Identifiant d'utilisateur ou de clé :"
 
 msgid "User or key ID:"
 msgstr "Identifiant d'utilisateur ou de clé :"
 

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "Pas de clé privée trouvée."
 
 msgid "No secret key found."
 msgstr "Pas de clé privée trouvée."
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "Générer une nouvelle paire de clés"
 
 msgid "Generate a new key pair"
 msgstr "Générer une nouvelle paire de clés"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr "GPG"
 
 msgid "GPG"
 msgstr "GPG"
 


@@ -8258,7 +8742,7 @@ msgstr "Validit
 msgid "Select"
 msgstr "Sélectionner"
 
 msgid "Select"
 msgstr "Sélectionner"
 

-#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:372
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Autres"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Autres"


@@ -8529,10 +9013,10 @@ msgid "Couldn't convert text data to any sane charset."
 msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
 msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté."
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554

-#: src/plugins/pgpinline/pgpinline.c:676 src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:594
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Impossible d'initialiser le contexte GPG, %s"


@@ -8589,22 +9073,31 @@ msgstr "La signature des donn
 msgid "Data signing failed, no contents."
 msgstr "La signature des données a échoué. Il n'y a pas de contenu."
 
 msgid "Data signing failed, no contents."
 msgstr "La signature des données a échoué. Il n'y a pas de contenu."
 

-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+"Veuillez prendre en compte que les pièces jointes ne sont pas chiffrées par "
+"le système PGP/Inline, ni les en-têtes de message, comme par exemple "
+"l'entête Sujet."
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossible d'ajouter la clé GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossible d'ajouter la clé GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:706 src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossible de créer un fichier temporaire, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossible de créer un fichier temporaire, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:734 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Le chiffrement a échoué, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Le chiffrement a échoué, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 


@@ -8612,7 +9105,7 @@ msgstr "PGP/Inline"
 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -8657,7 +9150,15 @@ msgstr "Impossible d'analyser les parties du fichier d
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossible de créer un fichier temporaire : %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossible de créer un fichier temporaire : %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Veuillez prendre en compte que les en-têtes de message, comme par exemple "
+"l'en-tête Sujet, ne sont pas chiffrés par le système PGP/Mime."
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 


@@ -8665,7 +9166,7 @@ msgstr "PGP/Mime"
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59

 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"
 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"


@@ -8692,27 +9193,27 @@ msgstr ""
 "GPGME est copyright 2001 par Werner Koch <dd9jn@gnu.org>."
 
 #: src/plugins/spamassassin/spamassassin.c:75
 "GPGME est copyright 2001 par Werner Koch <dd9jn@gnu.org>."
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Le module SpamAssassin ne peut se connecter au serveur spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Le module SpamAssassin ne peut se connecter au serveur spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Le filtrage avec le module SpamAssassin a échoué.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Le filtrage avec le module SpamAssassin a échoué.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Le module SpamAssassin est désactivé par ses propres préférences.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Le module SpamAssassin est désactivé par ses propres préférences.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin : analyse du(des) message(s)..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin : analyse du(des) message(s)..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
+#: src/plugins/spamassassin/spamassassin.c:314

 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 "
 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 "


@@ -8722,7 +9223,7 @@ msgstr ""
 "cette erreur est sans doute l'inaccessibilité du démon spamd. Veuillez "
 "vérifier qu'il fonctionne bien et est accessible."
 
 "cette erreur est sans doute l'inaccessibilité du démon spamd. Veuillez "
 "vérifier qu'il fonctionne bien et est accessible."
 

-#: src/plugins/spamassassin/spamassassin.c:370
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."


@@ -8730,17 +9231,17 @@ msgstr ""
 "Claws Mail nécessite un accès réseau pour atteindre l'opérateur "
 "d'apprentissage de SpamAssassin et lui fournir ce(s) courriel(s)."
 
 "Claws Mail nécessite un accès réseau pour atteindre l'opérateur "
 "d'apprentissage de SpamAssassin et lui fournir ce(s) courriel(s)."
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "Échec lors de la récupération du nom d'utilisateur"
 
 msgid "Failed to get username"
 msgstr "Échec lors de la récupération du nom d'utilisateur"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "Le module SpamAssassin est bien chargé mais désactivé par ses propres "
 "préférences.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "Le module SpamAssassin est bien chargé mais désactivé par ses propres "
 "préférences.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:562

 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 "
 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 "


@@ -8772,55 +9273,55 @@ msgstr ""
 "effacés,\n"
 "  - désigner le dossier qui rassemblera les pourriels reçus."
 
 "effacés,\n"
 "  - désigner le dossier qui rassemblera les pourriels reçus."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "Hôte local"
 
 msgid "Localhost"
 msgstr "Hôte local"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr "TCP"
 
 msgid "TCP"
 msgstr "TCP"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr "Socket Unix"
 
 msgid "Unix Socket"
 msgstr "Socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "Activer la gestion du pourriel (module SpamAssassin)"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "Activer la gestion du pourriel (module SpamAssassin)"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "Transport"
 
 msgid "Transport"
 msgstr "Transport"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "Type de transport"
 
 msgid "Type of transport"
 msgstr "Type de transport"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "Nom d'utilisateur"
 
 msgid "User"
 msgstr "Nom d'utilisateur"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "Utilisateur à fournir au serveur « spamd »"
 
 msgid "User to use with spamd server"
 msgstr "Utilisateur à fournir au serveur « spamd »"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr "Serveur « spamd »"
 
 msgid "spamd"
 msgstr "Serveur « spamd »"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "Nom ou adresse IP de l'hôte exécutant le serveur « spamd »"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "Nom ou adresse IP de l'hôte exécutant le serveur « spamd »"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "Numéro du port du serveur « spamd »"
 
 msgid "Port of spamd server"
 msgstr "Numéro du port du serveur « spamd »"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "Chemin du socket Unix"
 
 msgid "Path of Unix socket"
 msgstr "Chemin du socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:354

 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."


@@ -8828,8 +9329,8 @@ msgstr ""
 "Temps maximal alloué pour l'analyse d'un message. Au delà, l'analyse est "
 "interrompue et le message est considéré comme légitime."
 
 "Temps maximal alloué pour l'analyse d'un message. Au delà, l'analyse est "
 "interrompue et le message est considéré comme légitime."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355 src/prefs_other.c:575
-#: src/prefs_summaries.c:493
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "secondes"
 
 msgid "seconds"
 msgstr "secondes"
 


@@ -8841,7 +9342,7 @@ msgstr "Orientation"
 msgid "The orientation of the tray."
 msgstr "L'orientation de la barre système."
 
 msgid "The orientation of the tray."
 msgstr "L'orientation de la barre système."
 

-#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:567

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Icône de la barre système"
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Icône de la barre système"


@@ -8910,7 +9411,7 @@ msgstr "
 msgid "Failed to register got iconified hook"
 msgstr "Échec lors de la déclaration du hook de repli dans la barre système"
 
 msgid "Failed to register got iconified hook"
 msgstr "Échec lors de la déclaration du hook de repli dans la barre système"
 

-#: src/plugins/trayicon/trayicon.c:484
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -8963,133 +9464,95 @@ msgstr "Le 'timestamp' APOP n'a pas 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "Erreur de syntaxe du 'timestamp' dans la bannière (non ascii)\n"
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "Erreur de protocole POP3\n"
 
 msgid "POP3 protocol error\n"
 msgstr "Erreur de protocole POP3\n"
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Réponse UIDL invalide : %s\n"
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Réponse UIDL invalide : %s\n"
 

-#: src/pop.c:817
+#: src/pop.c:822

 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3 : Suppression du message expiré %d [%s]\n"
 
 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3 : Suppression du message expiré %d [%s]\n"
 

-#: src/pop.c:833
+#: src/pop.c:838

 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3 : Message %d ignoré [%s] (%d octets)\n"
 
 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3 : Message %d ignoré [%s] (%d octets)\n"
 

-#: src/pop.c:865
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "boîte aux lettres bloquée\n"
 
 msgid "mailbox is locked\n"
 msgstr "boîte aux lettres bloquée\n"
 

-#: src/pop.c:868
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "Session expirée\n"
 
 msgid "Session timeout\n"
 msgstr "Session expirée\n"
 

-#: src/pop.c:887
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "Commande non supportée\n"
 
 msgid "command not supported\n"
 msgstr "Commande non supportée\n"
 

-#: src/pop.c:892
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "Erreur pendant la session POP3\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "Erreur pendant la session POP3\n"
 

-#: src/pop.c:1086
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 
 msgid "TOP command unsupported\n"
 msgstr "Commande TOP non supportée\n"
 

-#: src/prefs_account.c:242 src/prefs_account.c:1553 src/prefs_account.c:2286
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:245 src/prefs_account.c:1668 src/prefs_account.c:2299
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:247 src/wizard.c:1154
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 
 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "Aucun (SMTP seulement)"
 
 msgid "None (SMTP only)"
 msgstr "Aucun (SMTP seulement)"
 

-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "Compte%d"
-
-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "Configuration du nouveau compte"
-
-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Configuration du compte"
-
-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "_Général"
-
-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "Réce_ption"
-
-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "_Composition"
-
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "Con_fidentialité"
-
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "_SSL"
-
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "_Avancé"
-
-#: src/prefs_account.c:1190
+#: src/prefs_account.c:933

 msgid "Name of account"
 msgstr "Nom du compte"
 
 msgid "Name of account"
 msgstr "Nom du compte"
 

-#: src/prefs_account.c:1199
+#: src/prefs_account.c:942

 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 

-#: src/prefs_account.c:1207
+#: src/prefs_account.c:950

 msgid "Personal information"
 msgstr "Informations personnelles"
 
 msgid "Personal information"
 msgstr "Informations personnelles"
 

-#: src/prefs_account.c:1216
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr "Nom complet"
 
 msgid "Full name"
 msgstr "Nom complet"
 

-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "Adresse email"
 
 msgid "Mail address"
 msgstr "Adresse email"
 

-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "Société"
-
-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "Configuration des serveurs"
 
 msgid "Server information"
 msgstr "Configuration des serveurs"
 

-#: src/prefs_account.c:1287 src/wizard.c:1248
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -9097,92 +9560,93 @@ msgstr ""
 "<span weight=\"bold\">Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans le support IMAP.</span>"
 
 "<span weight=\"bold\">Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans le support IMAP.</span>"
 

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "Authentification à la connexion"
 
 msgid "Authenticate on connect"
 msgstr "Authentification à la connexion"
 

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "Fichier mbox local"
 
 msgid "Local mailbox"
 msgstr "Fichier mbox local"
 

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "Serveur d'envoi (SMTP)"
 
 msgid "SMTP server (send)"
 msgstr "Serveur d'envoi (SMTP)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "Commande externe :"
 
 msgid "command to send mails"
 msgstr "Commande externe :"
 

-#: src/prefs_account.c:1420 src/prefs_account.c:1852
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr "Nom d'utilisateur"
 
 msgid "User ID"
 msgstr "Nom d'utilisateur"
 

-#: src/prefs_account.c:1426 src/prefs_account.c:1872
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr "Mot de passe"
 
 msgid "Password"
 msgstr "Mot de passe"
 

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "Compte%d"
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

-#: src/prefs_account.c:1531 src/prefs_account.c:1620
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "Dossier de réception par défaut"
 
 msgid "Default inbox"
 msgstr "Dossier de réception par défaut"
 

-#: src/prefs_account.c:1538 src/prefs_account.c:1546 src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Les messages non filtrés seront placés dans ce dossier"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Les messages non filtrés seront placés dans ce dossier"
 

-#: src/prefs_account.c:1543 src/prefs_account.c:1632 src/prefs_account.c:2036
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "Pa_rcourir"
 
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
 

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Authentification sécurisée (APOP)"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "Suppression après"
 
 msgid "Remove after"
 msgstr "Suppression après"
 

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "0 jour : suppression immédiate"
 
 msgid "0 days: remove immediately"
 msgstr "0 jour : suppression immédiate"
 

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "jour(s)"
 
 msgid "days"
 msgstr "jour(s)"
 

-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "Réception de tous les messages sur le serveur"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1382

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -9192,74 +9656,88 @@ msgstr ""
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 
 "de les marquer pour un téléchargement complet ou une suppression (effectif "
 "qu'à la relève suivante)."
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "ko"
 
 msgid "KB"
 msgstr "ko"
 

-#: src/prefs_account.c:1642 src/prefs_account.c:2312
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 
 msgid "unlimited if 0 is specified"
 msgstr "pas de limite si 0 est spécifié"
 

-#: src/prefs_account.c:1674 src/prefs_account.c:1822
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "Authentification"
 
 msgid "Authentication method"
 msgstr "Authentification"
 

-#: src/prefs_account.c:1684 src/prefs_account.c:1832 src/prefs_send.c:278
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr "Automatique"
 
 msgid "Automatic"
 msgstr "Automatique"
 

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 
 msgid "IMAP server directory"
 msgstr "Répertoire sur le serveur IMAP4"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(généralement nul)"
 
 msgid "(usually empty)"
 msgstr "(généralement nul)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 
 msgid "Show subscribed folders only"
 msgstr "Afficher seulement les dossiers inscrits"
 

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr "Mode économique en bande passante"
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr ""
+"Ce mode utilise moins de bande passante mais peut apporter un ralentissement "
+"avec certains serveurs."
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "Permission aux modules de filtrer les messages à la réception"
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Le bouton « Relever » de la barre d'outil principale relève le courrier pour "
 "ce compte"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Le bouton « Relever » de la barre d'outil principale relève le courrier pour "
 "ce compte"
 

-#: src/prefs_account.c:1783 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "En-tête"
 
 msgid "Header"
 msgstr "En-tête"
 

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-Id: »"
 
 msgid "Generate Message-ID"
 msgstr "Génération de l'en-tête « Message-Id: »"
 

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "Authentification"
 
 msgid "Authentication"
 msgstr "Authentification"
 

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1894
+#: src/prefs_account.c:1711

 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."


@@ -9267,229 +9745,260 @@ msgstr ""
 "Veuillez laisser ces champs vides pour utiliser le nom d'utilisateur et le "
 "mot de passe spécifiés pour la réception."
 
 "Veuillez laisser ces champs vides pour utiliser le nom d'utilisateur et le "
 "mot de passe spécifiés pour la réception."
 

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "Délai maximal pour l'authentification POP :"
 
 msgid "POP authentication timeout: "
 msgstr "Délai maximal pour l'authentification POP :"
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "minute(s)"
 
 msgid "minutes"
 msgstr "minute(s)"
 

-#: src/prefs_account.c:1982 src/prefs_account.c:2028
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr "Signature"
 
 msgid "Signature"
 msgstr "Signature"
 

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "Insertion automatique de la signature"
 
 msgid "Insert signature automatically"
 msgstr "Insertion automatique de la signature"
 

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "Résultat d'une commande"
 
 msgid "Command output"
 msgstr "Résultat d'une commande"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 

-#: src/prefs_account.c:2057 src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1885 src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:2070 src/prefs_template.c:189
-msgid "Bcc"
-msgstr "Cci"
-
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "Répondre à"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 

-#: src/prefs_account.c:2107 src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Dictionnaire par défaut"
 

-#: src/prefs_account.c:2124 src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Dictionnaire alternatif par défaut"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr "Modèle de formatage des nouveaux messages"
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr ""
+"Utiliser un modèle de formatage personnalisé lors d'une réponse :"
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr ""
+"Utiliser un modèle de formatage personnalisé lors d'un transfert :"
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 
 msgid "Default privacy system"
 msgstr "Système de confidentialité par défaut"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 
 msgid "Always sign messages"
 msgstr "Toujours signer les messages"
 

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 
 msgid "Always encrypt messages"
 msgstr "Toujours chiffrer les messages"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Toujours chiffrer la réponse à un message chiffré"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
 "destinataire"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
 "destinataire"
 

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
 

-#: src/prefs_account.c:2290 src/prefs_account.c:2303 src/prefs_account.c:2315
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 

-#: src/prefs_account.c:2296 src/prefs_account.c:2309 src/prefs_account.c:2336
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL (mais utiliser STARTTLS si nécessaire)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Ne pas utiliser SSL (mais utiliser STARTTLS si nécessaire)"
 

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "Utiliser la communication SSL non bloquante"
 
 msgid "Use non-blocking SSL"
 msgstr "Utiliser la communication SSL non bloquante"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "À désactiver en cas de problèmes de connexion SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "À désactiver en cas de problèmes de connexion SSL"
 

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "Port SMTP"
 
 msgid "SMTP port"
 msgstr "Port SMTP"
 

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "Port POP3"
 
 msgid "POP3 port"
 msgstr "Port POP3"
 

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "Port NNTP"
 
 msgid "NNTP port"
 msgstr "Port NNTP"
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "Nom de domaine"
 
 msgid "Domain name"
 msgstr "Nom de domaine"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 
 msgid "Use command to communicate with server"
 msgstr "Utiliser une commande externe pour communiquer avec le serveur"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marquer les articles croisés comme lus et les colorier en"
 

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "Pa_rcourir"
 
 msgid "Browse"
 msgstr "Pa_rcourir"
 

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 
 msgid "Put sent messages in"
 msgstr "Sauvegarder les messages envoyés dans "
 

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 
 msgid "Put queued messages in"
 msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
 

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 
 msgid "Put draft messages in"
 msgstr "Sauvegarder les brouillons dans "
 

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 
 msgid "Put deleted messages in"
 msgstr "Sauvegarder les messages supprimés dans "
 

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 
 msgid "Account name is not entered."
 msgstr "Le nom du compte est non spécifié."
 

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 
 msgid "Mail address is not entered."
 msgstr "L'adresse email est non spécifiée."
 

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 
 msgid "SMTP server is not entered."
 msgstr "Le serveur d'envoi (SMTP) est non spécifié."
 

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur est non spécifié."
 
 msgid "User ID is not entered."
 msgstr "Le nom d'utilisateur est non spécifié."
 

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "Le serveur POP3 est non spécifié."
 
 msgid "POP3 server is not entered."
 msgstr "Le serveur POP3 est non spécifié."
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 
 msgid "The default inbox folder doesn't exist."
 msgstr "Le dossier de réception par défaut n'existe pas."
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "Le serveur IMAP4 est non spécifié."
 
 msgid "IMAP4 server is not entered."
 msgstr "Le serveur IMAP4 est non spécifié."
 

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 
 msgid "NNTP server is not entered."
 msgstr "Le serveur NNTP est non spécifié."
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 
 msgid "local mailbox filename is not entered."
 msgstr "Le fichier local mbox est non spécifié."
 

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 
 msgid "mail command is not entered."
 msgstr "La commande externe d'envoi est non spécifiée."
 

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "Réception"
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr "Composition"
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr "Modèles"
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "Avancé"
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "Configuration du nouveau compte"
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Configuration du compte"
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "Protocole :"
 
 msgid "Protocol:"
 msgstr "Protocole :"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (module non chargé)"


@@ -9507,20 +10016,20 @@ msgid "Command line"
 msgstr "Commande"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
 msgstr "Commande"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544

-#: src/prefs_filtering.c:454 src/prefs_matcher.c:679 src/prefs_template.c:270
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Remplacer"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Remplacer"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515

-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "Info..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
 msgid "Info..."
 msgstr "Info..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641

-#: src/prefs_filtering.c:761 src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764 src/prefs_filtering.c:839 src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(Nouveau)"
 
 msgid "(New)"
 msgstr "(Nouveau)"
 


@@ -9567,21 +10076,21 @@ msgstr "Supprimer l'action"
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1838
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 
 msgid "Entry not saved"
 msgstr "Règle non ajoutée"
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_matcher.c:1840
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+_Poursuivre l'édition"
 
 msgid "+_Continue editing"
 msgstr "+_Poursuivre l'édition"
 


@@ -9716,95 +10225,92 @@ msgstr ""
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y %H:%M"
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "Sélectionner automatiquement le compte"
 
 msgid "Automatic account selection"
 msgstr "Sélectionner automatiquement le compte"
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "en répondant"
 
 msgid "when replying"
 msgstr "en répondant"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "en transférant"
 
 msgid "when forwarding"
 msgstr "en transférant"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "en rééditant"
 
 msgid "when re-editing"
 msgstr "en rééditant"
 

-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "Transfert"
-
-#: src/prefs_compose_writing.c:141 src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "Transférer en pièce jointe"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Garder l'en-tête original « De: » (« From: ») pour les redirections"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr "Edition"
 
 msgid "Editing"
 msgstr "Edition"
 

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur auxiliaire"
 
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur auxiliaire"
 

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "Sauvegarder automatiquement le texte en brouillon tous les"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Sauvegarder automatiquement le texte en brouillon tous les"
 

-#: src/prefs_compose_writing.c:166 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caractères"
 
 msgid "characters"
 msgstr "caractères"
 

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "Réponse"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "Par défaut, répondre en citant"
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton « Répondre » prend en compte les listes"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton « Répondre » prend en compte les listes"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "Transfert"
+
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "Transférer en pièce jointe"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Garder l'en-tête original « De: » (« From: ») pour les redirections"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr ""
 "Lors d'un glisser-déplacer de fichier(s) sur la fenêtre de composition,"
 
 msgid "When dropping files into the Compose window"
 msgstr ""
 "Lors d'un glisser-déplacer de fichier(s) sur la fenêtre de composition,"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "Demander"
 
 msgid "Ask"
 msgstr "Demander"
 

-#: src/prefs_compose_writing.c:199 src/toolbar.c:475
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476

 msgid "Insert"
 msgstr "Insertion"
 
 msgid "Insert"
 msgstr "Insertion"
 

-#: src/prefs_compose_writing.c:200 src/toolbar.c:477
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478

 msgid "Attach"
 msgstr "Joindre"
 
 msgid "Attach"
 msgstr "Joindre"
 

-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr ""
-"Utiliser le modèle de formatage lors de la composition de nouveaux messages"
-

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "Modèle de formatage des nouveaux messages"
-
-#: src/prefs_compose_writing.c:267 src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " Description des symboles... "
+msgid "Quotation characters"
+msgstr "Préfixe de citation"

 
 

-#: src/prefs_compose_writing.c:387 src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311 src/prefs_spelling.c:441 src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "Composition"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "Traiter ces caractères comme préfixe de citation :"

 
 

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "Composer"
 
 msgid "Writing"
 msgstr "Composer"
 


@@ -9817,7 +10323,7 @@ msgid "From file..."
 msgstr "Depuis le fichier..."
 
 #: src/prefs_customheader.c:505 src/prefs_display_header.c:568
 msgstr "Depuis le fichier..."
 
 #: src/prefs_customheader.c:505 src/prefs_display_header.c:568

-#: src/prefs_matcher.c:1327 src/prefs_matcher.c:1337
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 


@@ -9884,7 +10390,7 @@ msgid "Displayed header configuration"
 msgstr "Configuration de l'affichage des en-têtes"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
 msgstr "Configuration de l'affichage des en-têtes"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435

-#: src/prefs_matcher.c:497
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "En-tête"
 
 msgid "Header name"
 msgstr "En-tête"
 


@@ -9952,7 +10458,7 @@ msgid "Copy"
 msgstr "Copier"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
 msgstr "Copier"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79

-#: src/summaryview.c:2448
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "Marque"
 
 msgid "Mark"
 msgstr "Marque"
 


@@ -9980,7 +10486,7 @@ msgstr "Marquer comme pourriel"
 msgid "Mark as ham"
 msgstr "Marquer comme courrier légitime"
 
 msgid "Mark as ham"
 msgstr "Marquer comme courrier légitime"
 

-#: src/prefs_filtering_action.c:170 src/toolbar.c:426 src/toolbar.c:524
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr "Transférer"
 
 msgid "Forward"
 msgstr "Transférer"
 


@@ -9989,7 +10495,7 @@ msgid "Redirect"
 msgstr "Rediriger"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
 msgstr "Rediriger"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468

-#: src/toolbar.c:184 src/toolbar.c:1825
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr "Exécuter"
 
 msgid "Execute"
 msgstr "Exécuter"
 


@@ -10009,7 +10515,7 @@ msgstr "D
 msgid "Hide"
 msgstr "Cacher"
 
 msgid "Hide"
 msgstr "Cacher"
 

-#: src/prefs_filtering_action.c:178 src/toolbar.c:187
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "Ignorer du fil de discussion"
 
 msgid "Ignore thread"
 msgstr "Ignorer du fil de discussion"
 


@@ -10021,7 +10527,7 @@ msgstr "Interrompre le filtrage"
 msgid "Filtering action configuration"
 msgstr "Actions de filtrage"
 
 msgid "Filtering action configuration"
 msgstr "Actions de filtrage"
 

-#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:412
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr "Action"
 
 msgid "Action"
 msgstr "Action"
 


@@ -10034,11 +10540,11 @@ msgid "Recipient"
 msgstr "Destinataire"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
 msgstr "Destinataire"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88

-#: src/summaryview.c:497
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "Score"
 
 msgid "Score"
 msgstr "Score"
 

-#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:550
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577

 msgid "Book/folder"
 msgstr "Carnet/dossier"
 
 msgid "Book/folder"
 msgstr "Carnet/dossier"
 


@@ -10070,44 +10576,25 @@ msgstr "Le carnet/dossier de destination n'est pas d
 msgid "No action was defined."
 msgstr "Aucune action n'a été spécifiée."
 
 msgid "No action was defined."
 msgstr "Aucune action n'a été spécifiée."
 

-#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "Caractère « % »"
 
 msgid "literal %"
 msgstr "Caractère « % »"
 

-#: src/prefs_filtering_action.c:1164 src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:494
-msgid "Date"
-msgstr "Date"
-
-#: src/prefs_filtering_action.c:1165 src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr "Identifiant du message"
-
-#: src/prefs_filtering_action.c:1166 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888 src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "Groupe de discussion"
-
-#: src/prefs_filtering_action.c:1167 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889 src/quote_fmt.c:52
-msgid "References"
-msgstr "Références"
-
-#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1890
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "Chemin du fichier (Ne doit pas être modifié !)"
 
 msgid "filename (should not be modified)"
 msgstr "Chemin du fichier (Ne doit pas être modifié !)"
 

-#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1891
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "Retour chariot"
 
 msgid "new line"
 msgstr "Retour chariot"
 

-#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1892
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "Caractère d'échappement"
 
 msgid "escape character for quotes"
 msgstr "Caractère d'échappement"
 

-#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1893
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "Préfixes de citation"
 
 msgid "quote character"
 msgstr "Préfixes de citation"
 


@@ -10132,52 +10619,52 @@ msgstr ""
 msgid "Current action list"
 msgstr "Actions enregistrées"
 
 msgid "Current action list"
 msgstr "Actions enregistrées"
 

-#: src/prefs_filtering.c:187 src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 

-#: src/prefs_filtering.c:249 src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "Tous"
 
 msgid "Filtering Account Menu|All"
 msgstr "Tous"
 

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "Condition"
 
 msgid "Condition"
 msgstr "Condition"
 

-#: src/prefs_filtering.c:403 src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr " Définir... "
 
 msgid " Define... "
 msgstr " Définir... "
 

-#: src/prefs_filtering.c:927 src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "La syntaxe de la condition est incorrecte."
 
 msgid "Condition string is not valid."
 msgstr "La syntaxe de la condition est incorrecte."
 

-#: src/prefs_filtering.c:963 src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "La syntaxe de l'action est incorrecte."
 
 msgid "Action string is not valid."
 msgstr "La syntaxe de l'action est incorrecte."
 

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "La condition est vide."
 
 msgid "Condition string is empty."
 msgstr "La condition est vide."
 

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "L'action est vide."
 
 msgid "Action string is empty."
 msgstr "L'action est vide."
 

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "Supprimer la règle"
 
 msgid "Delete rule"
 msgstr "Supprimer la règle"
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "Voulez-vous vraiment supprimer cette règle ?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Voulez-vous vraiment supprimer cette règle ?"
 

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "Activer"
 
 msgid "Enable"
 msgstr "Activer"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "Règle"
 
 msgid "Rule"
 msgstr "Règle"
 


@@ -10199,8 +10686,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Éléments masqués"
 
 msgid "Hidden columns"
 msgstr "Éléments masqués"
 

-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Éléments affichés"
 
 msgid "Displayed columns"
 msgstr "Éléments affichés"
 


@@ -10209,7 +10696,7 @@ msgstr "
 msgid " Use default "
 msgstr " Remise à zéro "
 
 msgid " Use default "
 msgstr " Remise à zéro "
 

-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676

 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "


@@ -10220,7 +10707,8 @@ msgstr ""
 "les appliquer récursivement à l'ensemble de la boîte aux lettres en cochant "
 "« Inclure les sous-dossiers ».</i>"
 
 "les appliquer récursivement à l'ensemble de la boîte aux lettres en cochant "
 "« Inclure les sous-dossiers ».</i>"
 

-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -10228,71 +10716,71 @@ msgstr ""
 "Inclure les\n"
 "sous-dossiers"
 
 "Inclure les\n"
 "sous-dossiers"
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr "Type de dossier"
 
 msgid "Folder type"
 msgstr "Type de dossier"
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "Enlever la RegExp suivante du sujet"
 
 msgid "Simplify Subject RegExp"
 msgstr "Enlever la RegExp suivante du sujet"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "Tester"
 
 msgid "Test RegExp"
 msgstr "Tester"
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr "Permissions chmod du dossier"
 
 msgid "Folder chmod"
 msgstr "Permissions chmod du dossier"
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Couleur du dossier"
 
 msgid "Folder color"
 msgstr "Couleur du dossier"
 

-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Sélection de la couleur pour le(s) dossier(s)"
 
 msgid "Pick color for folder"
 msgstr "Sélection de la couleur pour le(s) dossier(s)"
 

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "Exécuter le traitement au démarrage"
 
 msgid "Process at start-up"
 msgstr "Exécuter le traitement au démarrage"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "Relever les nouveaux messages"
 
 msgid "Scan for new mail"
 msgstr "Relever les nouveaux messages"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "Synchroniser pour une utilisation hors-ligne"
 
 msgid "Synchronise for offline use"
 msgstr "Synchroniser pour une utilisation hors-ligne"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "Demander un accusé de réception"
 
 msgid "Request Return Receipt"
 msgstr "Demander un accusé de réception"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Garder la copie des messages envoyés dans ce dossier"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Garder la copie des messages envoyés dans ce dossier"
 

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "Destinataire par défaut"
 
 msgid "Default To:"
 msgstr "Destinataire par défaut"
 

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "Répondre par défaut à"
 
 msgid "Default To: for replies"
 msgstr "Répondre par défaut à"
 

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "Général"
 
 msgid "General"
 msgstr "Général"
 

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"


@@ -10313,7 +10801,7 @@ msgstr "Utiliser une police diff
 msgid "Message Printing"
 msgstr "Impression d'un message"
 
 msgid "Message Printing"
 msgstr "Impression d'un message"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:669
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Affichage"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Affichage"


@@ -10322,7 +10810,7 @@ msgstr "Affichage"
 msgid "Fonts"
 msgstr "Polices"
 
 msgid "Fonts"
 msgstr "Polices"
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "Préférences"
 
 msgid "Preferences"
 msgstr "Préférences"
 


@@ -10346,90 +10834,90 @@ msgstr "Afficher les images dans le message"
 msgid "Image Viewer"
 msgstr "Visualiseur d'images"
 
 msgid "Image Viewer"
 msgstr "Visualiseur d'images"
 

-#: src/prefs_logging.c:117 src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "Limiter la taille des traces"
-
-#: src/prefs_logging.c:122 src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "Taille maximale des traces dans la fenêtre"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "Restreindre la fenêtre de traces à"

 
 

-#: src/prefs_logging.c:139 src/prefs_logging.c:258
+#: src/prefs_logging.c:133 src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0 pour ne plus écrire dans la fenêtre de traces"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 pour ne plus écrire dans la fenêtre de traces"
 

-#: src/prefs_logging.c:142 src/prefs_logging.c:261
+#: src/prefs_logging.c:136 src/prefs_logging.c:254

 msgid "lines"
 msgstr "lignes"
 
 msgid "lines"
 msgstr "lignes"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
-msgstr "Activer le déboguage des règles"
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "Traces de déboguage du filtrage/traitement"

 
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr "Activer le traçage des règles de filtrage/traitement"
+
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
+"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."
 msgstr ""
 "Si coché, active le déboguage des règles de filtrage et traitement.\n"
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
 "Si coché, active le déboguage des règles de filtrage et traitement.\n"

-"Les traces de déboguage sont disponibles via le menu 'Outils/Déboguage du "
+"Les traces de déboguage sont disponibles via le menu 'Outils/Traces de "

 "filtrage'.\n"
 "Attention : activer cette option va diminuer les performances du filtrage/"
 "traitement. Cela peut être critique lors de l'application de multiples "
 "règles sur un grand nombre de messages."
 
 "filtrage'.\n"
 "Attention : activer cette option va diminuer les performances du filtrage/"
 "traitement. Cela peut être critique lors de l'application de multiples "
 "règles sur un grand nombre de messages."
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."

 msgstr "Tracer les règles pour :"
 
 msgstr "Tracer les règles pour :"
 

-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgstr "Filtrage à la réception"
 
 msgid "filtering at incorporation"
 msgstr "Filtrage à la réception"
 

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgstr "Filtrage manuel"
 
 msgid "manually filtering"
 msgstr "Filtrage manuel"
 

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgstr "Traitement des dossiers"
 
 msgid "processing folders"
 msgstr "Traitement des dossiers"
 

-#: src/prefs_logging.c:190
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgstr "Pré-traitement des dossiers"
 
 msgid "pre-processing folders"
 msgstr "Pré-traitement des dossiers"
 

-#: src/prefs_logging.c:196
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgstr "Post-traitement des dossiers"
 
 msgid "post-processing folders"
 msgstr "Post-traitement des dossiers"
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
+#: src/prefs_logging.c:202
+msgid "Log level"

 msgstr "Niveau de détail"
 
 msgstr "Niveau de détail"
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "Faible"
 
 msgid "Low"
 msgstr "Faible"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "Moyen"
 
 msgid "Medium"
 msgstr "Moyen"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "Élevé"
 
 msgid "High"
 msgstr "Élevé"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not "
-"and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being "
-"processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped "
-"or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
+"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"
+"Caution: the higher the level, the greater the impact on performance."

 msgstr ""
 "Choisir le niveau de détails à afficher si le déboguage est activé.\n"
 " - Faible : lorsque les règles sont appliquées, affiche les conditions "
 msgstr ""
 "Choisir le niveau de détails à afficher si le déboguage est activé.\n"
 " - Faible : lorsque les règles sont appliquées, affiche les conditions "


@@ -10441,184 +10929,176 @@ msgstr ""
 "Attention : plus le niveau est élévé, plus cela aura d'impact sur les "
 "performances."
 
 "Attention : plus le niveau est élévé, plus cela aura d'impact sur les "
 "performances."
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "Traçage"
 
 msgid "Logging"
 msgstr "Traçage"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "Tous les messages"
 
 msgid "All messages"
 msgstr "Tous les messages"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr "À ou Cc"
-
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "En réponse à"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "Plus âgé que"
 
 msgid "Age greater than"
 msgstr "Plus âgé que"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "Moins agé que"
 
 msgid "Age lower than"
 msgstr "Moins agé que"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "En-têtes du message"
 
 msgid "Headers part"
 msgstr "En-têtes du message"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "Corps du message"
 
 msgid "Body part"
 msgstr "Corps du message"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "Tout le message"
 
 msgid "Whole message"
 msgstr "Tout le message"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "Message non lu"
 
 msgid "Unread flag"
 msgstr "Message non lu"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "Nouveau message"
 
 msgid "New flag"
 msgstr "Nouveau message"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "Message marqué"
 
 msgid "Marked flag"
 msgstr "Message marqué"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "Marqué comme supprimé"
 
 msgid "Deleted flag"
 msgstr "Marqué comme supprimé"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "Message répondu"
 
 msgid "Replied flag"
 msgstr "Message répondu"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "Message transféré"
 
 msgid "Forwarded flag"
 msgstr "Message transféré"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "Message bloqué"
 
 msgid "Locked flag"
 msgstr "Message bloqué"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "Pourriel"
 
 msgid "Spam flag"
 msgstr "Pourriel"
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Couleur"
 
 msgid "Color label"
 msgstr "Couleur"
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "Fil de discussion ignoré"
 
 msgid "Ignored thread"
 msgstr "Fil de discussion ignoré"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "Score plus grand que"
 
 msgid "Score greater than"
 msgstr "Score plus grand que"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "Score plus petit que"
 
 msgid "Score lower than"
 msgstr "Score plus petit que"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "Score égal à"
 
 msgid "Score equal to"
 msgstr "Score égal à"
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "Test"
 
 msgid "Test"
 msgstr "Test"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "Taille supérieure à"
 
 msgid "Size greater than"
 msgstr "Taille supérieure à"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "Taille inférieure à"
 
 msgid "Size smaller than"
 msgstr "Taille inférieure à"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "Taille égale à"
 
 msgid "Size exactly"
 msgstr "Taille égale à"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "Partiellement téléchargé"
 
 msgid "Partially downloaded"
 msgstr "Partiellement téléchargé"
 

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "Dans le carnet d'adresses"
 
 msgid "Found in addressbook"
 msgstr "Dans le carnet d'adresses"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "ou"
 
 msgid "or"
 msgstr "ou"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "et"
 
 msgid "and"
 msgstr "et"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "contient"
 
 msgid "contains"
 msgstr "contient"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "ne contient pas"
 
 msgid "does not contain"
 msgstr "ne contient pas"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "oui"
 
 msgid "yes"
 msgstr "oui"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "non"
 
 msgid "no"
 msgstr "non"
 

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "Conditions de filtrage"
 
 msgid "Condition configuration"
 msgstr "Conditions de filtrage"
 

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "Type de condition"
 
 msgid "Match type"
 msgstr "Type de condition"
 

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "En-têtes adresse"
 
 msgid "Address header"
 msgstr "En-têtes adresse"
 

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "Prédicat"
 
 msgid "Predicate"
 msgstr "Prédicat"
 

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "Utiliser des expressions régulières"
 
 msgid "Use regexp"
 msgstr "Utiliser des expressions régulières"
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "Op. booléen"
 
 msgid "Boolean Op"
 msgstr "Op. booléen"
 

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "La valeur n'est pas définie."
 
 msgid "Value is not set."
 msgstr "La valeur n'est pas définie."
 

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "toutes les adresses de toutes les en-têtes"
 
 msgid "all addresses in all headers"
 msgstr "toutes les adresses de toutes les en-têtes"
 

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "n'importe quelle adresse de n'importe quel en-tête"
 
 msgid "any address in any header"
 msgstr "n'importe quelle adresse de n'importe quel en-tête"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -10632,17 +11112,17 @@ msgstr ""
 "d'adresse, vous devez sélectionner 'Quelconque' dans la liste déroulante « "
 "carnet/dossier »."
 
 "d'adresse, vous devez sélectionner 'Quelconque' dans la liste déroulante « "
 "carnet/dossier »."
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "Condition de filtrage : « Test »"
 
 msgid "Match Type: 'Test'"
 msgstr "Condition de filtrage : « Test »"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 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"
 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"


@@ -10656,9 +11136,9 @@ msgstr ""
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgid "Current condition rules"

-msgstr "Conditions enregistées"
+msgstr "Conditions enregistrées"

 
 #: src/prefs_message.c:108
 msgid "Headers"
 
 #: src/prefs_message.c:108
 msgid "Headers"


@@ -10814,7 +11294,7 @@ msgstr "S
 msgid "Signatures"
 msgstr "Signature"
 
 msgid "Signatures"
 msgstr "Signature"
 

-#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:346
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr "Liste des dossiers"
 
 msgid "Folder list"
 msgstr "Liste des dossiers"
 


@@ -10986,33 +11466,9 @@ msgstr ""
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 

-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "Par défaut, répondre en citant"
-
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "Citation lors d'une réponse"
-
-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "Préfixe de citation"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "Citation lors d'un transfert"
-
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "Préfixe de citation"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "Traiter ces caractères comme préfixe de citation :"
-
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "Citation"
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "Modèle de formatage des nouveaux messages"

 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"


@@ -11046,7 +11502,7 @@ msgstr "Fen
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception"
 
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception"
 

-#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:448
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr "Toujours"
 
 msgid "Always"
 msgstr "Toujours"
 


@@ -11327,180 +11783,156 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Correcteur orthographique"
 
 msgid "Spell Checking"
 msgstr "Correcteur orthographique"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "nom abrégé du jour de la semaine"
 
 msgid "the full abbreviated weekday name"
 msgstr "nom abrégé du jour de la semaine"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "nom du mois abrégé"
 
 msgid "the abbreviated month name"
 msgstr "nom du mois abrégé"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "nom du mois"
 
 msgid "the full month name"
 msgstr "nom du mois"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr "l'année"
 
 msgid "the year as a decimal number"
 msgstr "l'année"
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 

-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "Format de la date"
 
 msgid "Date format"
 msgstr "Format de la date"
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "Symbole"
 
 msgid "Specifier"
 msgstr "Symbole"
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "Exemple"
 
 msgid "Example"
 msgstr "Exemple"
 

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgstr "Afficher le nombre de messages près du nom de dossier"
 
 msgid "Display message number next to folder name"
 msgstr "Afficher le nombre de messages près du nom de dossier"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "Aucun"
 
 msgid "No"
 msgstr "Aucun"
 

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgstr "Messages non lus"
 
 msgid "Unread messages"
 msgstr "Messages non lus"
 

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgstr "Messages non lus et total"
 
 msgid "Unread and Total messages"
 msgstr "Messages non lus et total"
 

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "Ouvrir le dernier dossier consulté au démarrage"
+
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "lettres"
 
 msgid "letters"
 msgstr "lettres"
 

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr "Liste des messages"
 
 msgid "Message list"
 msgstr "Liste des messages"
 

-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "À l'ouverture d'un dossier,"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"
+msgstr "Configurer la sélection par défaut à l'ouverture d'un dossier"

 
 

-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "Ne rien faire"
-
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "Sélectionner le 1er message non lu (ou nouveau ou marqué)"
-
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "Sélectionner le 1er message non lu (ou marqué ou nouveau)"
-
-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "Sélectionner le 1er message nouveau (ou non lu ou marqué)"
-
-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "Sélectionner le 1er message nouveau (ou marqué ou non lu)"
-
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "Sélectionner le 1er message marqué (ou nouveau ou non lu)"
-
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "Sélectionner le 1er message marqué (ou non lu ou nouveau)"
-
-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Affichage de la fenêtre « Plus de message non lu (ou nouveau) »"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Affichage de la fenêtre « Plus de message non lu (ou nouveau) »"
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "supposer « Oui »"
 
 msgid "Assume 'Yes'"
 msgstr "supposer « Oui »"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "supposer « Non »"
 
 msgid "Assume 'No'"
 msgstr "supposer « Non »"
 

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr "Toujours ouvrir les messages lorsqu'ils sont sélectionnés"
 
 msgid "Always open message when selected"
 msgstr "Toujours ouvrir les messages lorsqu'ils sont sélectionnés"
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "Utiliser aussi le sujet pour la création des fils de discussion"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Utiliser aussi le sujet pour la création des fils de discussion"
 

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 

-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:460

 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'"


@@ -11508,32 +11940,35 @@ msgstr ""
 "Permet (si désactivé) de retarder le déplacement, la copie et la suppression "
 "de messages jusqu'à la sélection de 'Outils/Exécuter'."
 
 "Permet (si désactivé) de retarder le déplacement, la copie et la suppression "
 "de messages jusqu'à la sélection de 'Outils/Exécuter'."
 

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"

 msgstr ""
 msgstr ""

-"Marquer le message comme lu seulement si ouvert dans une fenêtre séparée"
+"Marquer le message comme lu seulement si ouvert dans\n"
+"une fenêtre séparée ou si une réponse y a été donnée"

 
 

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "Marquer les messages comme lus après"
 
 msgid "Mark messages as read after"
 msgstr "Marquer les messages comme lus après"
 

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr "Afficher le nom de l'expéditeur en utilisant le carnet d'adresses"
 
 msgid "Display sender using address book"
 msgstr "Afficher le nom de l'expéditeur en utilisant le carnet d'adresses"
 

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr "Symboles pour formater la date"
 
 msgid "Date format help"
 msgstr "Symboles pour formater la date"
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmer avant de marquer tous les messages d'un dossier comme lus"
 
 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmer avant de marquer tous les messages d'un dossier comme lus"
 

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "Traduire les en-têtes"
 
 msgid "Translate header names"
 msgstr "Traduire les en-têtes"
 

-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:544

 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."


@@ -11541,11 +11976,11 @@ msgstr ""
 "L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
 "traduit dans le language présentement utilisé."
 
 "L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
 "traduit dans le language présentement utilisé."
 

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr "Liste des messages"
 
 msgid "Summaries"
 msgstr "Liste des messages"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2442
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr "Pièces jointes"
 
 msgid "Attachment"
 msgstr "Pièces jointes"
 


@@ -11567,35 +12002,67 @@ msgstr ""
 "pouvez utiliser les boutons « Monter » et « Descendre » ou simplement les "
 "faire glisser."
 
 "pouvez utiliser les boutons « Monter » et « Descendre » ou simplement les "
 "faire glisser."
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "Sélection du 1er message marqué"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "Sélection du 1er nouveau message"
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "Sélection du 1er message non lu"
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "Sélection du dernier message ouvert"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "Sélection du dernier message dans la liste"
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "Ne rien faire"
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "Actions à l'ouverture d'un dossier"
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "Actions possibles"
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "Ce nom est utilisé en tant que nom de menu."
 
 msgid "This name is used as the Menu item"
 msgstr "Ce nom est utilisé en tant que nom de menu."
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " Symboles... "
 
 msgid " Symbols... "
 msgstr " Symboles... "
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "Configuration des modèles"
 
 msgid "Template configuration"
 msgstr "Configuration des modèles"
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "Le nom du modèle n'est pas défini."
 
 msgid "Template name is not set."
 msgstr "Le nom du modèle n'est pas défini."
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment supprimer ce modèle ?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment supprimer ce modèle ?"
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "Modèles enregistrés"
 
 msgid "Current templates"
 msgstr "Modèles enregistrés"
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "Modèle"
 
 msgid "Template"
 msgstr "Modèle"
 


@@ -11735,10 +12202,6 @@ msgstr "Auteur :"
 msgid "URL:"
 msgstr "URL :"
 
 msgid "URL:"
 msgstr "URL :"
 

-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "Status :"
-

 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Prévisualisation"
 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Prévisualisation"


@@ -11843,11 +12306,11 @@ msgstr "Justification du message"
 msgid "No information available"
 msgstr "Aucune d'information trouvée"
 
 msgid "No information available"
 msgstr "Aucune d'information trouvée"
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr "Pas de clé de destinataire spécifiée."
 
 msgid "No recipient keys defined."
 msgstr "Pas de clé de destinataire spécifiée."
 

-#: src/procmime.c:341 src/procmime.c:343
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr "[Erreur de décodage BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erreur de décodage BASE64]\n"
 


@@ -11904,174 +12367,255 @@ msgstr ""
 msgid "Error occurred while posting the message to %s."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
 msgid "Error occurred while posting the message to %s."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "Filtrage des messages...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtrage des messages...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">Symboles :</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgstr "Personnaliser le format de la date (voir 'man strftime')"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "Personnaliser le format de la date (voir 'man strftime')"
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgstr "Adresse email de l'expéditeur"
 
 msgid "email address of sender"
 msgstr "Adresse email de l'expéditeur"
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr "Nom complet de l'expéditeur"
 
 msgid "full name of sender"
 msgstr "Nom complet de l'expéditeur"
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr "Prénom de l'expéditeur"
 
 msgid "first name of sender"
 msgstr "Prénom de l'expéditeur"
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr "Nom de l'expéditeur"
 
 msgid "last name of sender"
 msgstr "Nom de l'expéditeur"
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr "Initiales de l'expéditeur"
 
 msgid "initials of sender"
 msgstr "Initiales de l'expéditeur"
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr "Corps du message"
 
 msgid "message body"
 msgstr "Corps du message"
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr "Corps du message en tant que citation"
 
 msgid "quoted message body"
 msgstr "Corps du message en tant que citation"
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr "Corps du message sans signature"
 
 msgid "message body without signature"
 msgstr "Corps du message sans signature"
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgstr "Corps du message sans signature en tant que citation"
 
 msgid "quoted message body without signature"
 msgstr "Corps du message sans signature en tant que citation"
 

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "Dictionnaire courant"
+
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr "Position du curseur"
 
 msgid "cursor position"
 msgstr "Position du curseur"
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
+#: src/quote_fmt.c:67
+msgid "account property: your name"

 msgstr "Paramètre de compte : votre nom"
 
 msgstr "Paramètre de compte : votre nom"
 

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"

 msgstr "Paramètre de compte : votre adresse email"
 
 msgstr "Paramètre de compte : votre adresse email"
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
+#: src/quote_fmt.c:69
+msgid "account property: account name"

 msgstr "Paramètre de compte : nom du compte"
 
 msgstr "Paramètre de compte : nom du compte"
 

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
+#: src/quote_fmt.c:70
+msgid "account property: organization"

 msgstr "Paramètre de compte : société"
 
 msgstr "Paramètre de compte : société"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "Paramètre de compte : dictionnaire par défaut"
+
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "<span style=\"oblique\">Completion</span> par le carnet d'adresses : Cc"
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "<span style=\"oblique\">Completion</span> par le carnet d'adresses : From"
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "<span style=\"oblique\">Completion</span> par le carnet d'adresses : To"
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "Caractère « \\ »"
 
 msgid "literal backslash"
 msgstr "Caractère « \\ »"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "Caractère « ? »"
 
 msgid "literal question mark"
 msgstr "Caractère « ? »"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "Caractère « ! »"
 
 msgid "literal exclamation mark"
 msgstr "Caractère « ! »"
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "Caractère « | »"
 
 msgid "literal pipe"
 msgstr "Caractère « | »"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr "Caractère « { »"
 
 msgid "literal opening curly brace"
 msgstr "Caractère « { »"
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr "Caractère « } »"
 
 msgid "literal closing curly brace"
 msgstr "Caractère « } »"
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgstr "Tabulation"
 
 msgid "tab"
 msgstr "Tabulation"
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "Retour à la ligne"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">Commandes :</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"Si x est défini, insérer expr\n"
-"(x étant un des caractères « dfNFLIstcnri » ou af, ao)"
+"Si x est défini, insérer <span style=\"oblique\">expr</span>\n"
+"(x appartenant aux symboles [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] ou "
+"leurs équivalents longs)."

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"Si x n'est pas défini, insérer expr\n"
-"(x étant un des caractères « dfNFLIstcnri » ou af, ao)"
+"Si x n'est pas défini, insérer <span style=\"oblique\">expr</span>\n"
+"(x appartenant aux symboles [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] ou "
+"leurs équivalents longs)."

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 msgstr ""

-"Insérer un fichier.\n"
-"(sub_expr est évalué en tant que nom de fichier à insérer)"
+"Insérer un fichier :\n"
+"<span style=\"oblique\">sub_expr</span> est évalué en tant que chemin vers "
+"le fichier à insérer."

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 "the output from"
 msgstr ""

-"Insérer la sortie d'une ligne de commande.\n"
-"(sub_expr est évalué en tant que ligne de commande à exécuter pour en "
-"récupérer la sortie)"
+"Insérer la sortie d'une ligne de commande :\n"
+"<span style=\"oblique\">sub_expr</span> est évalué en tant que ligne de "
+"commande à exécuter pour en récupérer la sortie."

 
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "user-entered text"
 msgstr ""

-"Définit une variable « sub_expr » à remplacer par un texte fourni par "
-"l'utilisateur. Plusieurs appels identiques sont possibles : ils seront tous "
-"remplacés par le même texte associé à la variable."
+"Insérer un texte saisi par l'utilisateur :\n"
+"<span style=\"oblique\">sub_expr</span> définit une variable à remplacer "
+"par un texte fourni par l'utilisateur. Plusieurs appels identiques sont "
+"possibles : ils seront tous remplacés par le même texte associé à la "
+"variable."

 
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "Definition des termes :"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">Definition des termes :</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "Texte pouvant contenir n'importe quels symboles de la liste précédente"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"Texte pouvant contenir n'importe quels symboles ou commandes de la liste "
+"ci-dessus."

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
-msgstr "Idem à l'exception de ?x{}, !x{}, |f{}, |p{} et |i{}"
+"text that can contain any of the symbols (no\n"
+"commands) above"
+msgstr ""
+"Texte pouvant contenir n'importe quels symboles (pas de commandes) de la "
+"liste ci-dessus."

 
 

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:95
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+"La completion depuis le carnet d'adresses fonctionne seulement avec la "
+"première adresse de l'entête. Elle renseigne le nom complet du contact si "
+"l'adresse correspond exactement à celle d'un contact du carnet."
+
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "Description des symboles"
 
 msgid "Description of symbols"
 msgstr "Description des symboles"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "Il est possible d'utiliser les symboles suivants :"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "Il est possible d'utiliser les symboles et commandes suivants :"
+
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr ""
+"Utiliser un modèle de formatage personnalisé lors de la composition de "
+"nouveaux messages :"
+
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "Modèle de formatage lors d'une réponse"
+
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "Préfixe de citation"
+
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "Modèle de formatage lors d'un transfert"

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "Description des symboles..."
+
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr "Erreur dans le modèle de formatage lors d'une réponse."
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "Erreur dans le modèle de formatage lors d'un transfert."
+
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Veuillez saisir le texte pour remplacer '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Veuillez saisir le texte pour remplacer '%s'"
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "Remplacement de variable"
 
 msgid "Enter variable"
 msgstr "Remplacement de variable"
 


@@ -12214,10 +12758,6 @@ msgstr "Messages validant au moins UN des crit
 msgid "Match all of the following"
 msgstr "Messages validant TOUS les critères suivants"
 
 msgid "Match all of the following"
 msgstr "Messages validant TOUS les critères suivants"
 

-#: src/summary_search.c:356
-msgid "From:"
-msgstr "De :"
-

 #: src/summary_search.c:377
 msgid "Body:"
 msgstr ""
 #: src/summary_search.c:377
 msgid "Body:"
 msgstr ""


@@ -12232,379 +12772,387 @@ msgstr "Condition :"
 msgid "Find _all"
 msgstr "Chercher _tous"
 
 msgid "Find _all"
 msgstr "Chercher _tous"
 

-#: src/summary_search.c:675
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "Début de liste atteinte, reprise à la fin ?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Début de liste atteinte, reprise à la fin ?"
 

-#: src/summary_search.c:677
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "Fin de liste atteinte, reprise au début ?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Fin de liste atteinte, reprise au début ?"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/_Répondre"
 
 msgid "/_Reply"
 msgstr "/_Répondre"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/Rép_ondre à"
 
 msgid "/Repl_y to"
 msgstr "/Rép_ondre à"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/Répondre à/_tous"
 
 msgid "/Repl_y to/_all"
 msgstr "/Répondre à/_tous"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/Répondre à/l'_expéditeur"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Répondre à/l'_expéditeur"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/Répondre à/la _liste"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Répondre à/la _liste"
 

-#: src/summaryview.c:429 src/toolbar.c:247
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr "/_Transférer"
 
 msgid "/_Forward"
 msgstr "/_Transférer"
 

-#: src/summaryview.c:430 src/toolbar.c:248
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/Transférer en _pièce jointe"
 
 msgid "/For_ward as attachment"
 msgstr "/Transférer en _pièce jointe"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/Rediri_ger"
 
 msgid "/Redirect"
 msgstr "/Rediri_ger"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/_Déplacer..."
 
 msgid "/M_ove..."
 msgstr "/_Déplacer..."
 

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/_Copier..."
 
 msgid "/_Copy..."
 msgstr "/_Copier..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/Déplacer ver_s la corbeille"
 
 msgid "/Move to _trash"
 msgstr "/Déplacer ver_s la corbeille"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/S_upprimer définitivement..."
 
 msgid "/_Delete..."
 msgstr "/S_upprimer définitivement..."
 

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/_Marquer"
 
 msgid "/_Mark"
 msgstr "/_Marquer"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/Marquer/_Marquer"
 
 msgid "/_Mark/_Mark"
 msgstr "/Marquer/_Marquer"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/Marquer/_Démarquer"
 
 msgid "/_Mark/_Unmark"
 msgstr "/Marquer/_Démarquer"
 

-#: src/summaryview.c:441 src/summaryview.c:447 src/summaryview.c:450
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/Marquer/---"
 
 msgid "/_Mark/---"
 msgstr "/Marquer/---"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Marquer/Marquer comme _non lu"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Marquer/Marquer comme _non lu"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/Marquer/Marquer comme _lu"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Marquer/Marquer comme _lu"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/Marquer/Marquer _tous comme lus"
 
 msgid "/_Mark/Mark all read"
 msgstr "/Marquer/Marquer _tous comme lus"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/Marquer/Ignorer du f_il de discussion"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/Marquer/Ignorer du f_il de discussion"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/Marquer/Inclure dans _fil de discussion"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/Marquer/Inclure dans _fil de discussion"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/Marquer/Marquer comme _pourriel"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/Marquer/Marquer comme _pourriel"
 

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr "/Marquer/Marquer comme lé_gitime"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/Marquer/Marquer comme lé_gitime"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/Marquer/_Bloquer"
 
 msgid "/_Mark/Lock"
 msgstr "/Marquer/_Bloquer"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "/Marquer/Déblo_quer"
 
 msgid "/_Mark/Unlock"
 msgstr "/Marquer/Déblo_quer"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/Co_lorier"
 
 msgid "/Color la_bel"
 msgstr "/Co_lorier"
 

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "/A_jouter l'expéditeur au carnet d'adresses"
 
 msgid "/Add sender to address boo_k"
 msgstr "/A_jouter l'expéditeur au carnet d'adresses"
 

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/Créer une règle de filtr_age"
 
 msgid "/Create f_ilter rule"
 msgstr "/Créer une règle de filtr_age"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Créer une règle de filtrage/Automati_quement"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Créer une règle de filtrage/Automati_quement"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Créer une règle de filtrage/avec « _De »"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Créer une règle de filtrage/avec « _De »"
 

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Créer une règle de filtrage/_avec « À »"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Créer une règle de filtrage/_avec « À »"
 

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Créer une règle de filtrage/avec « _Sujet »"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Créer une règle de filtrage/avec « _Sujet »"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/Créer une règle de traiteme_nt"
 
 msgid "/Create processing rule"
 msgstr "/Créer une règle de traiteme_nt"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/Créer une règle de traitement/Automati_quement"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Créer une règle de traitement/Automati_quement"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/Créer une règle de traitement/avec « _De »"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Créer une règle de traitement/avec « _De »"
 

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/Créer une règle de traitement/_avec « À »"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Créer une règle de traitement/_avec « À »"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/Créer une règle de traitement/avec « _Sujet »"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Créer une règle de traitement/avec « _Sujet »"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/Vue/Code _source du message..."
 
 msgid "/_View/Message _source"
 msgstr "/Vue/Code _source du message..."
 

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/Vue/Tous les _en-têtes"
 
 msgid "/_View/All _headers"
 msgstr "/Vue/Tous les _en-têtes"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/Enregi_strer sous..."
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/_Imprimer..."
 
 msgid "/_Print..."
 msgstr "/_Imprimer..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr "Affiche/cache la barre de recherche rapide"
 
 msgid "Toggle quick search bar"
 msgstr "Affiche/cache la barre de recherche rapide"
 

-#: src/summaryview.c:1065
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr "Activer la sélection multiple"
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 

-#: src/summaryview.c:1591 src/summaryview.c:1643
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 

-#: src/summaryview.c:1604 src/summaryview.c:1656 src/summaryview.c:1703
-#: src/summaryview.c:1755 src/summaryview.c:1834
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Erreur interne : valeur inattendue de prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Erreur interne : valeur inattendue de prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 

-#: src/summaryview.c:1690 src/summaryview.c:1742
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 
 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 

-#: src/summaryview.c:1780 src/summaryview.c:1821
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqués. Aller au dossier suivant ?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqués. Aller au dossier suivant ?"
 

-#: src/summaryview.c:1859 src/summaryview.c:1884
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "Plus de messages coloriés"
 
 msgid "No more labeled messages"
 msgstr "Plus de messages coloriés"
 

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages coloriés. Rechercher depuis la fin ?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages coloriés. Rechercher depuis la fin ?"
 

-#: src/summaryview.c:1869 src/summaryview.c:1894
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "Plus de messages coloriés."
 
 msgid "No labeled messages."
 msgstr "Plus de messages coloriés."
 

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages coloriés. Rechercher depuis le début ?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages coloriés. Rechercher depuis le début ?"
 

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d détruit(s)"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d détruit(s)"
 

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé(s)"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé(s)"
 

-#: src/summaryview.c:2339 src/summaryview.c:2346
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié(s)"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié(s)"
 

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr " sélection"
 
 msgid " item selected"
 msgstr " sélection"
 

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr " sélections"
 
 msgid " items selected"
 msgstr " sélections"
 

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages..."
 
 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages..."
 

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "Définition de la liste des messages à partir des données du message..."
 
 msgid "Setting summary from message data..."
 msgstr "Définition de la liste des messages à partir des données du message..."
 

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(Pas de date)"
 
 msgid "(No Date)"
 msgstr "(Pas de date)"
 

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 
 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "Vous n'êtes pas l'auteur de cet article.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Vous n'êtes pas l'auteur de cet article.\n"
 

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
 
 msgid "Do you really want to delete the selected message?"
 msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
 

-#: src/summaryview.c:3817
+#: src/summaryview.c:3835

 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
 
 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
 

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "Ajouter ou écraser"
 
 msgid "Append or Overwrite"
 msgstr "Ajouter ou écraser"
 

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
 
 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "_Ajouter"
 
 msgid "_Append"
 msgstr "_Ajouter"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "_Ecraser"
 
 msgid "_Overwrite"
 msgstr "_Ecraser"
 

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "Construction des threads..."
 
 msgid "Building threads..."
 msgstr "Construction des threads..."
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "Ignorer ces règles"
 
 msgid "Skip these rules"
 msgstr "Ignorer ces règles"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Appliquer ces règles sans se soucier des comptes auxquels elles sont "
 "rattachées"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Appliquer ces règles sans se soucier des comptes auxquels elles sont "
 "rattachées"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
 

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "Filtrage"
 
 msgid "Filtering"
 msgstr "Filtrage"
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -12612,19 +13160,19 @@ msgstr ""
 "Il y a des règles de filtrage rattachées à des comptes.\n"
 "Veuillez sélectionner ce que vous souhaitez faire avec ces règles :"
 
 "Il y a des règles de filtrage rattachées à des comptes.\n"
 "Veuillez sélectionner ce que vous souhaitez faire avec ces règles :"
 

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "_Filtrer"
 
 msgid "_Filter"
 msgstr "_Filtrer"
 

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "Filtrage des messages..."
 
 msgid "Filtering..."
 msgstr "Filtrage des messages..."
 

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -12633,45 +13181,45 @@ msgstr ""
 "Erreur dans l'expression régulière (regexp) :\n"
 "%s"
 
 "Erreur dans l'expression régulière (regexp) :\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Revenir à la liste des dossiers (Vous avez des messages non lus)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Revenir à la liste des dossiers (Vous avez des messages non lus)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "Revenir à la liste des dossiers"
 
 msgid "Go back to the folder list"
 msgstr "Revenir à la liste des dossiers"
 

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/Composer un _nouveau message"
 
 msgid "/Compose _new message"
 msgstr "/Composer un _nouveau message"
 

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "/Ajouter au carnet d'_adresses"
 
 msgid "/Add to _address book"
 msgstr "/Ajouter au carnet d'_adresses"
 

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/Copier cette ad_resse"
 
 msgid "/Copy this add_ress"
 msgstr "/Copier cette ad_resse"
 

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/_Ouvrir l'image"
 
 msgid "/_Open image"
 msgstr "/_Ouvrir l'image"
 

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/Enregi_strer l'image sous..."
 
 msgid "/_Save image..."
 msgstr "/Enregi_strer l'image sous..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d octets)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d octets)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d octets)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d octets)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -12685,86 +13233,86 @@ msgstr ""
 "\n"
 "  Pour plus d'informations, veuillez sélectionner le menu « "
 
 "\n"
 "  Pour plus d'informations, veuillez sélectionner le menu « "
 

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "Outils/Fenêtre de traces"
 
 msgid "'View Log'"
 msgstr "Outils/Fenêtre de traces"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr " »."
 
 msgid " in the Tools menu for more information."
 msgstr " »."
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr ""
 "  Les actions suivantes peuvent être effectuées sur l'élément actuellement "
 "sélectionné\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr ""
 "  Les actions suivantes peuvent être effectuées sur l'élément actuellement "
 "sélectionné\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 "  en cliquant avec le bouton droit sur l'icône ou l'élément de la liste :\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 "  en cliquant avec le bouton droit sur l'icône ou l'élément de la liste :\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - Pour le sauvegarder, veuillez sélectionner « "
 
 msgid "     - To save, select "
 msgstr "     - Pour le sauvegarder, veuillez sélectionner « "
 

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "Enregistrer sous..."
 
 msgid "'Save as...'"
 msgstr "Enregistrer sous..."
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " » (raccourci : « y »);\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " » (raccourci : « y »);\n"
 

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - Pour l'afficher en tant que texte, veuillez sélectionner « "
 
 msgid "     - To display as text, select "
 msgstr "     - Pour l'afficher en tant que texte, veuillez sélectionner « "
 

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "Afficher comme du texte"
 
 msgid "'Display as text'"
 msgstr "Afficher comme du texte"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " » (raccourci : « t »);\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " » (raccourci : « t »);\n"
 

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr ""
 "     - Pour l'ouvrir avec le programme auxiliaire correspondant, veuillez "
 "sélectionner « "
 
 msgid "     - To open with an external program, select "
 msgstr ""
 "     - Pour l'ouvrir avec le programme auxiliaire correspondant, veuillez "
 "sélectionner « "
 

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "Ouvrir"
 
 msgid "'Open'"
 msgstr "Ouvrir"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " » (raccourci : « l »),\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " » (raccourci : « l »),\n"
 

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (un double-clique ou un clique avec le bouton "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (un double-clique ou un clique avec le bouton "
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "du milieu sont également possibles.);\n"
 
 msgid "mouse button)\n"
 msgstr "du milieu sont également possibles.);\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr ""
 "     - Pour l'ouvrir avec un programme auxiliaire de votre choix, veuillez "
 "sélectionner « "
 
 msgid "     - Or use "
 msgstr ""
 "     - Pour l'ouvrir avec un programme auxiliaire de votre choix, veuillez "
 "sélectionner « "
 

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "Ouvrir avec..."
 
 msgid "'Open with...'"
 msgstr "Ouvrir avec..."
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " » (raccourci : « o »).\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " » (raccourci : « o »).\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -12775,7 +13323,7 @@ msgstr ""
 "    %s\n"
 "Code de retour %d\n"
 
 "    %s\n"
 "Code de retour %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -12793,243 +13341,243 @@ msgstr ""
 "\n"
 "Voulez-vous quand même ouvrir l'URL pointé ?"
 
 "\n"
 "Voulez-vous quand même ouvrir l'URL pointé ?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "Attention : Tentative d'hameçonnage (phishing)"
 
 msgid "Phishing attempt warning"
 msgstr "Attention : Tentative d'hameçonnage (phishing)"
 

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 
 msgid "_Open URL"
 msgstr "_Ouvrir l'URL"
 

-#: src/toolbar.c:171 src/toolbar.c:1637
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "Relever le courrier de tous les comptes"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Relever le courrier de tous les comptes"
 

-#: src/toolbar.c:172 src/toolbar.c:1651
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "Relever le courrier du compte courant"
 
 msgid "Receive Mail on current Account"
 msgstr "Relever le courrier du compte courant"
 

-#: src/toolbar.c:173 src/toolbar.c:1657
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "Envoyer les messages en attente"
 
 msgid "Send Queued Messages"
 msgstr "Envoyer les messages en attente"
 

-#: src/toolbar.c:174 src/toolbar.c:1682
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "Composer un message"
 
 msgid "Compose Email"
 msgstr "Composer un message"
 

-#: src/toolbar.c:175 src/toolbar.c:1686
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr "Composer un article"
 
 msgid "Compose News"
 msgstr "Composer un article"
 

-#: src/toolbar.c:176 src/toolbar.c:1728 src/toolbar.c:1738
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "Répondre au message"
 
 msgid "Reply to Message"
 msgstr "Répondre au message"
 

-#: src/toolbar.c:177 src/toolbar.c:1745 src/toolbar.c:1755
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
 msgid "Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 

-#: src/toolbar.c:178 src/toolbar.c:1762 src/toolbar.c:1772
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "Répondre à tous"
 
 msgid "Reply to All"
 msgstr "Répondre à tous"
 

-#: src/toolbar.c:179 src/toolbar.c:1779 src/toolbar.c:1789
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "Répondre à la liste"
 
 msgid "Reply to Mailing-list"
 msgstr "Répondre à la liste"
 

-#: src/toolbar.c:180 src/toolbar.c:1669
+#: src/toolbar.c:181 src/toolbar.c:1678

 msgid "Open email"
 msgstr "Ouvrir le message"
 
 msgid "Open email"
 msgstr "Ouvrir le message"
 

-#: src/toolbar.c:181 src/toolbar.c:1796 src/toolbar.c:1806
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "Transférer le(s) message(s) sélectionné(s)"
 
 msgid "Forward Message"
 msgstr "Transférer le(s) message(s) sélectionné(s)"
 

-#: src/toolbar.c:182 src/toolbar.c:1813
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgstr "Déplacer le(s) message(s) sélectionné(s) vers la corbeille"
 
 msgid "Trash Message"
 msgstr "Déplacer le(s) message(s) sélectionné(s) vers la corbeille"
 

-#: src/toolbar.c:183 src/toolbar.c:1819
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "Supprimer le(s) message(s) sélectionné(s)"
 
 msgid "Delete Message"
 msgstr "Supprimer le(s) message(s) sélectionné(s)"
 

-#: src/toolbar.c:185 src/toolbar.c:1831
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "Aller au message non lu précédent"
 
 msgid "Go to Previous Unread Message"
 msgstr "Aller au message non lu précédent"
 

-#: src/toolbar.c:186 src/toolbar.c:1838
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "Aller au message non lu suivant"
 
 msgid "Go to Next Unread Message"
 msgstr "Aller au message non lu suivant"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "Appliquer l'opération d'apprentissage de SpamAssassin"
 
 msgid "Learn Spam or Ham"
 msgstr "Appliquer l'opération d'apprentissage de SpamAssassin"
 

-#: src/toolbar.c:190 src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "Aller à la liste des dossiers"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "Ouvrir le dossier / la liste des dossiers"

 
 

-#: src/toolbar.c:192 src/toolbar.c:1847
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr "Envoyer le message"
 
 msgid "Send Message"
 msgstr "Envoyer le message"
 

-#: src/toolbar.c:193 src/toolbar.c:1853
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 

-#: src/toolbar.c:194 src/toolbar.c:1859
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr "Sauvegarder dans le dossier brouillon"
 
 msgid "Save to draft folder"
 msgstr "Sauvegarder dans le dossier brouillon"
 

-#: src/toolbar.c:195 src/toolbar.c:1865
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr "Insérer un fichier"
 
 msgid "Insert file"
 msgstr "Insérer un fichier"
 

-#: src/toolbar.c:196 src/toolbar.c:1871
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 msgid "Attach file"
 msgstr "Joindre un fichier"
 

-#: src/toolbar.c:197 src/toolbar.c:1877
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "Insérer la signature"
 
 msgid "Insert signature"
 msgstr "Insérer la signature"
 

-#: src/toolbar.c:198 src/toolbar.c:1883
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur auxiliaire"
 
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur auxiliaire"
 

-#: src/toolbar.c:199 src/toolbar.c:1889
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "Justifier le paragraphe actuel"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Justifier le paragraphe actuel"
 

-#: src/toolbar.c:200 src/toolbar.c:1895
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 

-#: src/toolbar.c:203 src/toolbar.c:1908
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "Vérifier l'orthographe"
 
 msgid "Check spelling"
 msgstr "Vérifier l'orthographe"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Actions Claws Mail"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Actions Claws Mail"
 

-#: src/toolbar.c:206 src/toolbar.c:1931
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "Interrompre la relève du courrier"
 
 msgid "Cancel receiving"
 msgstr "Interrompre la relève du courrier"
 

-#: src/toolbar.c:207 src/toolbar.c:1663
+#: src/toolbar.c:208 src/toolbar.c:1672

 msgid "Close window"
 msgstr "Fermer la fenêtre"
 
 msgid "Close window"
 msgstr "Fermer la fenêtre"
 

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/Répondre en _citant le message"
 
 msgid "/Reply with _quote"
 msgstr "/Répondre en _citant le message"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/Répondre _sans citer le message"
 
 msgid "/_Reply without quote"
 msgstr "/Répondre _sans citer le message"
 

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/Répondre à tous en _citant le message"
 
 msgid "/Reply to all with _quote"
 msgstr "/Répondre à tous en _citant le message"
 

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/Répondre à tous _sans citer le message"
 
 msgid "/_Reply to all without quote"
 msgstr "/Répondre à tous _sans citer le message"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/Répondre à la liste en _citant le message"
 
 msgid "/Reply to list with _quote"
 msgstr "/Répondre à la liste en _citant le message"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/Répondre à la liste _sans citer le message"
 
 msgid "/_Reply to list without quote"
 msgstr "/Répondre à la liste _sans citer le message"
 

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr "/Répondre à l'expéditeur en _citant le message"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Répondre à l'expéditeur en _citant le message"
 

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/Répondre à l'expéditeur _sans citer le message"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Répondre à l'expéditeur _sans citer le message"
 

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "/Marquer comme _pourriel"
 
 msgid "/Learn as _Spam"
 msgstr "/Marquer comme _pourriel"
 

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "/Marquer comme _légitime"
 
 msgid "/Learn as _Ham"
 msgstr "/Marquer comme _légitime"
 

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr "Relever"
 
 msgid "Get Mail"
 msgstr "Relever"
 

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr "Composer"
 
 msgid "Toolbar|Compose"
 msgstr "Composer"
 

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "Ouvrir"
 
 msgid "Open"
 msgstr "Ouvrir"
 

-#: src/toolbar.c:421 src/toolbar.c:521
+#: src/toolbar.c:422 src/toolbar.c:522

 msgid "Reply"
 msgstr "Répondre"
 
 msgid "Reply"
 msgstr "Répondre"
 

-#: src/toolbar.c:423 src/toolbar.c:522
+#: src/toolbar.c:424 src/toolbar.c:523

 msgid "All"
 msgstr "À tous"
 
 msgid "All"
 msgstr "À tous"
 

-#: src/toolbar.c:424 src/toolbar.c:523
-msgid "Sender"
-msgstr "À l'expéditeur"
-
-#: src/toolbar.c:430 src/toolbar.c:528
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr "Pourriel"
 
 msgid "Spam"
 msgstr "Pourriel"
 

-#: src/toolbar.c:433 src/toolbar.c:530
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr "Suivant"
 
 msgid "Next"
 msgstr "Suivant"
 

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "Plus tard"
 
 msgid "Send later"
 msgstr "Plus tard"
 

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "Brouillon"
 
 msgid "Draft"
 msgstr "Brouillon"
 

-#: src/toolbar.c:1644
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "Ouvrir la liste des dossiers"
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "Relever le courrier du compte sélectionné"
 
 msgid "Receive Mail on selected Account"
 msgstr "Relever le courrier du compte sélectionné"
 

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "Composer un message avec le compte sélectionné"
 
 msgid "Compose with selected Account"
 msgstr "Composer un message avec le compte sélectionné"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "Légitime"
 
 msgid "Ham"
 msgstr "Légitime"
 

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme pourriel(s)"
 
 msgid "Learn Spam"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme pourriel(s)"
 

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
 
 msgid "Learn Ham"
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme pourriel/légitime(s)"
 
 msgid "Learn as..."
 msgstr "Marquer le(s) courriel(s) sélectionné(s) comme pourriel/légitime(s)"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "Transmettre à l'opérateur d'apprentissage de pourriel"
 
 msgid "Learn"
 msgstr "Transmettre à l'opérateur d'apprentissage de pourriel"
 

diff --git a/po/hu.po b/po/hu.po
index 32bcb00389104757b5fb9a120daa44c76bcda812..5a3ccde808284bebebf20d481ffc99f40780a148 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Claws Mail 2.9.0\n"
+"Project-Id-Version: Claws Mail 2.9.2\n"

 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-04-04 02:09+0200\n"
-"PO-Revision-Date: 2007-04-14 19:35+0100\n"
+"POT-Creation-Date: 2007-06-29 17:13+0200\n"
+"PO-Revision-Date: 2007-06-30 14:45+0100\n"

 "Last-Translator: rezso <rezso@rezso.net>\n"
 "Language-Team: NONE <rezso@rezso.net>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: rezso <rezso@rezso.net>\n"
 "Language-Team: NONE <rezso@rezso.net>\n"
 "MIME-Version: 1.0\n"


@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -28,64 +28,64 @@ msgstr ""
 "Zárd be az ablakokat a fiókok módosítása előtt!"
 
 # src/folderview.c:1567 src/folderview.c:1814
 "Zárd be az ablakokat a fiókok módosítása előtt!"
 
 # src/folderview.c:1567 src/folderview.c:1814

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr "A mappa nem hozható létre."
 
 # src/account.c:513
 msgid "Can't create folder."
 msgstr "A mappa nem hozható létre."
 
 # src/account.c:513

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "Fiókok szerkesztése"
 
 msgid "Edit accounts"
 msgstr "Fiókok szerkesztése"
 

-#: src/account.c:701
+#: src/account.c:715

 msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox in the 'G' column indicates which accounts will be included."
 msgstr "Az 'E-mail fogadása' a megadott sorrendben fogja letölteni az üzeneteket a fiókokról, az 'F' oszlopban lévő jelölőnégyzet határozza meg, hogy mely fiókokról."
 
 # src/account.c:620
 msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox in the 'G' column indicates which accounts will be included."
 msgstr "Az 'E-mail fogadása' a megadott sorrendben fogja letölteni az üzeneteket a fiókokról, az 'F' oszlopban lévő jelölőnégyzet határozza meg, hogy mely fiókokról."
 
 # src/account.c:620

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr "_Alapértelmezett fiókként beállít "
 
 msgid " _Set as default account "
 msgstr "_Alapértelmezett fiókként beállít "
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Fiókok távoli mappákkal nem másolhatók."
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Fiókok távoli mappákkal nem másolhatók."
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "%s másolata"
 
 # src/account.c:673
 #, c-format
 msgid "Copy of %s"
 msgstr "%s másolata"
 
 # src/account.c:673

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tényleg törölni kívánod a(z) '%s' fiókt?"
 
 # src/mainwindow.c:1044 src/mainwindow.c:1061
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tényleg törölni kívánod a(z) '%s' fiókt?"
 
 # src/mainwindow.c:1044 src/mainwindow.c:1061

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
 # src/account.c:672
 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
 # src/account.c:672

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "Fiók törlése"
 
 msgid "Delete account"
 msgstr "Fiók törlése"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "A"
 
 # src/account.c:672
 msgid "Accounts List Default Column Name|D"
 msgstr "A"
 
 # src/account.c:672

-#: src/account.c:1472
-#: src/prefs_folder_item.c:740
+#: src/account.c:1488
+#: src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "Alapértelmezett fiók"
 
 msgid "Default account"
 msgstr "Alapértelmezett fiók"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "F"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "F"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 


@@ -94,13 +94,13 @@ msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 # src/editaddress.c:980 src/editbook.c:190 src/editgroup.c:254
 # 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/editaddress.c:980 src/editbook.c:190 src/editgroup.c:254
 # 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:1493
-#: src/addressadd.c:196
-#: src/addressbook.c:132
-#: src/compose.c:5870
-#: src/compose.c:6181
-#: src/editaddress.c:1043
-#: src/editaddress.c:1092
+#: src/account.c:1509
+#: src/addressadd.c:199
+#: src/addressbook.c:133
+#: src/compose.c:6036
+#: src/compose.c:6349
+#: src/editaddress.c:1044
+#: src/editaddress.c:1093

 #: src/editbook.c:175
 #: src/editgroup.c:287
 #: src/editjpilot.c:270
 #: src/editbook.c:175
 #: src/editgroup.c:287
 #: src/editjpilot.c:270


@@ -108,23 +108,23 @@ msgstr "A 'Levelek fogadása' minden bejelölt fiókot ellenőriz"
 #: src/editvcard.c:183
 #: src/importmutt.c:226
 #: src/importpine.c:226
 #: src/editvcard.c:183
 #: src/importmutt.c:226
 #: src/importpine.c:226

-#: src/mimeview.c:213
+#: src/mimeview.c:215

 #: src/plugins/pgpcore/select-keys.c:404
 #: src/plugins/pgpcore/select-keys.c:404

-#: src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480
-#: src/prefs_template.c:185
+#: src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478
+#: src/prefs_template.c:196

 msgid "Name"
 msgstr "Név"
 
 # src/account.c:552 src/prefs_account.c:803
 msgid "Name"
 msgstr "Név"
 
 # src/account.c:552 src/prefs_account.c:803

-#: src/account.c:1500
-#: src/prefs_account.c:1258
-#: src/prefs_account.c:2849
+#: src/account.c:1516
+#: src/prefs_account.c:1001
+#: src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "Protokoll"
 
 # src/account.c:553
 msgid "Protocol"
 msgstr "Protokoll"
 
 # src/account.c:553

-#: src/account.c:1507
+#: src/account.c:1523

 #: src/ssl_manager.c:102
 msgid "Server"
 msgstr "Szerver"
 #: src/ssl_manager.c:102
 msgid "Server"
 msgstr "Szerver"


@@ -193,30 +193,30 @@ msgstr ""
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134

-#: src/action.c:1153
-#: src/action.c:1303
+#: src/action.c:1154
+#: src/action.c:1304

 msgid "Completed"
 msgstr "Kész"
 
 # src/prefs_actions.c:1552
 msgid "Completed"
 msgstr "Kész"
 
 # src/prefs_actions.c:1552

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Fut:  %s\n"
 
 # src/prefs_actions.c:1556
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Fut:  %s\n"
 
 # src/prefs_actions.c:1556

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Befejezve: %s\n"
 
 # src/prefs_actions.c:1590
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Befejezve: %s\n"
 
 # src/prefs_actions.c:1590

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "Műveletek bemenetei/kimenetei"
 
 # src/summaryview.c:2695
 msgid "Action's input/output"
 msgstr "Műveletek bemenetei/kimenetei"
 
 # src/summaryview.c:2695

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -227,12 +227,12 @@ msgstr ""
 "('%%h'  az argumentummal helyettesítődik)\n"
 "  %s"
 
 "('%%h'  az argumentummal helyettesítődik)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "A művelet rejtett felhasználói argumentuma"
 
 # src/summaryview.c:2695
 msgid "Action's hidden user argument"
 msgstr "A művelet rejtett felhasználói argumentuma"
 
 # src/summaryview.c:2695

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -243,199 +243,210 @@ msgstr ""
 "('%%u' az argumentummal lesz helyettesítve)\n"
 "  %s"
 
 "('%%u' az argumentummal lesz helyettesítve)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "A művelet felhasználói argumentuma"
 
 # src/addressbook.c:3099
 #: src/addr_compl.c:597
 msgid "Action's user argument"
 msgstr "A művelet felhasználói argumentuma"
 
 # src/addressbook.c:3099
 #: src/addr_compl.c:597

-#: src/addressbook.c:4403
+#: src/addressbook.c:4596

 msgid "Group"
 msgstr "Csoport"
 
 # src/summaryview.c:369
 msgid "Group"
 msgstr "Csoport"
 
 # src/summaryview.c:369

-#: src/addressadd.c:174
+#: src/addressadd.c:177

 #: src/prefs_filtering_action.c:179
 msgid "Add to address book"
 msgstr "Felvétel a címjegyzékbe"
 
 # src/addressadd.c:193 src/compose.c:3993 src/editaddress.c:195
 # src/select-keys.c:300
 #: src/prefs_filtering_action.c:179
 msgid "Add to address book"
 msgstr "Felvétel a címjegyzékbe"
 
 # src/addressadd.c:193 src/compose.c:3993 src/editaddress.c:195
 # src/select-keys.c:300

-#: src/addressadd.c:208
+#: src/addressadd.c:211

 #: src/plugins/pgpcore/select-keys.c:405
 #: src/plugins/pgpcore/select-keys.c:405

-#: src/toolbar.c:479
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "Cím"
 
 # src/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256
 msgid "Address"
 msgstr "Cím"
 
 # 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/addressadd.c:218
-#: src/addressbook.c:134
-#: src/editaddress.c:851
-#: src/editaddress.c:915
+#: src/addressadd.c:221
+#: src/addressbook.c:135
+#: src/editaddress.c:852
+#: src/editaddress.c:916

 #: src/editgroup.c:289
 msgid "Remarks"
 msgstr "Megjegyzések"
 
 # src/addressadd.c:225
 #: src/editgroup.c:289
 msgid "Remarks"
 msgstr "Megjegyzések"
 
 # src/addressadd.c:225

-#: src/addressadd.c:240
+#: src/addressadd.c:243

 #: src/addressbook_foldersel.c:164
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
 #: src/addressbook_foldersel.c:164
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 

+# src/addressbook.c:837
+#: src/addressadd.c:430
+#: src/addressbook.c:3048
+#: src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "Cím(ek) felvétele"
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "A címet nem sikerült felvenni."
+

 # src/addressbook.c:3083
 # src/addressbook.c:3083

-#: src/addressbook.c:133
-#: src/editaddress.c:849
-#: src/editaddress.c:897
+#: src/addressbook.c:134
+#: src/editaddress.c:850
+#: src/editaddress.c:898

 #: src/editgroup.c:288
 #: src/expldifdlg.c:521
 #: src/exporthtml.c:591
 #: src/exporthtml.c:755
 #: src/editgroup.c:288
 #: src/expldifdlg.c:521
 #: src/exporthtml.c:591
 #: src/exporthtml.c:755

-#: src/ldif.c:779
+#: src/ldif.c:781

 msgid "Email Address"
 msgstr "E-mail cím"
 
 # src/addressbook.c:356 src/compose.c:572 src/mainwindow.c:641
 msgid "Email Address"
 msgstr "E-mail cím"
 
 # src/addressbook.c:356 src/compose.c:572 src/mainwindow.c:641

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/_Címjegyzék"
 
 # src/addressbook.c:335
 msgid "/_Book"
 msgstr "/_Címjegyzék"
 
 # src/addressbook.c:335

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/_Címjegyzék/Új címjegyzék"
 
 # src/addressbook.c:380 src/addressbook.c:390
 msgid "/_Book/New _Book"
 msgstr "/_Címjegyzék/Új címjegyzék"
 
 # src/addressbook.c:380 src/addressbook.c:390

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr "/_Címjegyzék/Új Mappa"
 
 # src/addressbook.c:336
 msgid "/_Book/New _Folder"
 msgstr "/_Címjegyzék/Új Mappa"
 
 # src/addressbook.c:336

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/_Címjegyzék/Új _V-Card"
 
 # src/addressbook.c:338
 msgid "/_Book/New _vCard"
 msgstr "/_Címjegyzék/Új _V-Card"
 
 # src/addressbook.c:338

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/_Címjegyzék/Új _J-Pilot"
 
 # src/editldap.c:546
 msgid "/_Book/New _JPilot"
 msgstr "/_Címjegyzék/Új _J-Pilot"
 
 # src/editldap.c:546

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Címjegyzék/Új LDAP szerver hozzáadása"
 
 # src/mainwindow.c:645 src/mainwindow.c:656 src/mainwindow.c:658
 # src/mainwindow.c:661 src/mainwindow.c:663
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Címjegyzék/Új LDAP szerver hozzáadása"
 
 # src/mainwindow.c:645 src/mainwindow.c:656 src/mainwindow.c:658
 # src/mainwindow.c:661 src/mainwindow.c:663

-#: src/addressbook.c:436
-#: src/addressbook.c:439
+#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/_Címjegyzék/---"
 
 # src/compose.c:573 src/mainwindow.c:642
 msgid "/_Book/---"
 msgstr "/_Címjegyzék/---"
 
 # src/compose.c:573 src/mainwindow.c:642

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/_Címjegyzék//_Címjegyzék szerkesztése"
 
 # src/addressbook.c:345
 msgid "/_Book/_Edit book"
 msgstr "/_Címjegyzék//_Címjegyzék szerkesztése"
 
 # src/addressbook.c:345

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/_Címjegyzék/Címjegyzék _törlése"
 
 # src/addressbook.c:347
 msgid "/_Book/_Delete book"
 msgstr "/_Címjegyzék/Címjegyzék _törlése"
 
 # src/addressbook.c:347

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/_Címjegyzék/_Mentés"
 
 # src/addressbook.c:348 src/compose.c:455
 msgid "/_Book/_Save"
 msgstr "/_Címjegyzék/_Mentés"
 
 # src/addressbook.c:348 src/compose.c:455

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/_Címjegyzék/_Bezárás"
 
 # src/addressbook.c:349
 msgid "/_Book/_Close"
 msgstr "/_Címjegyzék/_Bezárás"
 
 # src/addressbook.c:349

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/_Cím"
 
 # src/addressbook.c:355
 msgid "/_Address"
 msgstr "/_Cím"
 
 # src/addressbook.c:355

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/_Cím/Összes kijelölése"
 
 # src/addressbook.c:353
 msgid "/_Address/_Select all"
 msgstr "/_Cím/Összes kijelölése"
 
 # src/addressbook.c:353

-#: src/addressbook.c:444
-#: src/addressbook.c:448
-#: src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445
+#: src/addressbook.c:449
+#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
 # src/addressbook.c:354
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
 # src/addressbook.c:354

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/_Cím/_Kivágás"
 
 # src/addressbook.c:349
 msgid "/_Address/C_ut"
 msgstr "/_Cím/_Kivágás"
 
 # src/addressbook.c:349

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/_Cím/_Másolás"
 
 # src/addressbook.c:355
 msgid "/_Address/_Copy"
 msgstr "/_Cím/_Másolás"
 
 # src/addressbook.c:355

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/_Cím/_Beillesztés"
 
 # src/addressbook.c:354
 msgid "/_Address/_Paste"
 msgstr "/_Cím/_Beillesztés"
 
 # src/addressbook.c:354

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
 # src/addressbook.c:355
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
 # src/addressbook.c:355

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Töröl"
 
 # src/addressbook.c:350
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Töröl"
 
 # src/addressbook.c:350

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgid "/_Address/New _Address"

-msgstr "/_Cím/_Új Cím"
+msgstr "/_Cím/_Új cím"

 
 # src/addressbook.c:351
 
 # src/addressbook.c:351

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új _csoport"
 
 # src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új _csoport"
 
 # src/addressbook.c:354

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgid "/_Address/_Mail To"

-msgstr "/_Cím/Mail to"
+msgstr "/_Cím/E-_mail küldése"

 
 # src/addressbook.c:356 src/compose.c:572 src/mainwindow.c:641
 
 # src/addressbook.c:356 src/compose.c:572 src/mainwindow.c:641

-#: src/addressbook.c:456
-#: src/compose.c:790
+#: src/addressbook.c:457
+#: src/compose.c:801

 #: src/mainwindow.c:814
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
 # src/addressbook.c:357
 #: src/mainwindow.c:814
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
 # src/addressbook.c:357

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Eszközök/_LDIF fájl importálás..."
 
 # src/addressbook.c:357
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Eszközök/_LDIF fájl importálás..."
 
 # src/addressbook.c:357

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Eszközök/_Mutt fájl importálás..."
 
 # src/addressbook.c:357
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Eszközök/_Mutt fájl importálás..."
 
 # src/addressbook.c:357

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Eszközök/_Pine fájl importálás..."
 
 # src/mainwindow.c:645 src/mainwindow.c:656 src/mainwindow.c:658
 # src/mainwindow.c:661 src/mainwindow.c:663
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Eszközök/_Pine fájl importálás..."
 
 # src/mainwindow.c:645 src/mainwindow.c:656 src/mainwindow.c:658
 # src/mainwindow.c:661 src/mainwindow.c:663

-#: src/addressbook.c:460
+#: src/addressbook.c:461

 #: src/mainwindow.c:823
 #: src/mainwindow.c:846
 #: src/mainwindow.c:848
 #: src/mainwindow.c:823
 #: src/mainwindow.c:846
 #: src/mainwindow.c:848


@@ -450,26 +461,26 @@ msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
 # src/addressbook.c:357
 msgstr "/_Eszközök/---"
 
 # src/addressbook.c:357

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Eszközök/_Exportálás HTML-be..."
 
 # src/addressbook.c:357
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Eszközök/_Exportálás HTML-be..."
 
 # src/addressbook.c:357

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Eszközök/_Exportálás LDIF-be..."
 
 # src/addressbook.c:358 src/compose.c:576 src/mainwindow.c:683
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Eszközök/_Exportálás LDIF-be..."
 
 # src/addressbook.c:358 src/compose.c:576 src/mainwindow.c:683

-#: src/addressbook.c:463
-#: src/compose.c:795
+#: src/addressbook.c:464
+#: src/compose.c:806

 #: src/mainwindow.c:892
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Segítség"
 
 # src/addressbook.c:359 src/compose.c:577 src/mainwindow.c:694
 #: src/mainwindow.c:892
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Segítség"
 
 # src/addressbook.c:359 src/compose.c:577 src/mainwindow.c:694

-#: src/addressbook.c:464
-#: src/compose.c:796
+#: src/addressbook.c:465
+#: src/compose.c:807

 #: src/mainwindow.c:898
 #: src/messageview.c:337
 msgid "/_Help/_About"
 #: src/mainwindow.c:898
 #: src/messageview.c:337
 msgid "/_Help/_About"


@@ -477,76 +488,76 @@ msgstr "/_Segítség/_A programról"
 
 # src/addressbook.c:382 src/addressbook.c:392 src/compose.c:457
 # src/mainwindow.c:436
 
 # src/addressbook.c:382 src/addressbook.c:392 src/compose.c:457
 # src/mainwindow.c:436

-#: src/addressbook.c:469
-#: src/addressbook.c:485
-#: src/compose.c:563
+#: src/addressbook.c:470
+#: src/addressbook.c:486
+#: src/compose.c:574

 #: src/mainwindow.c:530
 #: src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
 # src/addressbook.c:383 src/addressbook.c:393 src/summaryview.c:356
 #: src/mainwindow.c:530
 #: src/messageview.c:168
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
 # src/addressbook.c:383 src/addressbook.c:393 src/summaryview.c:356

-#: src/addressbook.c:470
-#: src/addressbook.c:486
+#: src/addressbook.c:471
+#: src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/_Törlés"
 
 # src/addressbook.c:335
 msgid "/_Delete"
 msgstr "/_Törlés"
 
 # src/addressbook.c:335

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/Új _címjegyzék"
 
 # src/addressbook.c:380 src/addressbook.c:390
 msgid "/New _Book"
 msgstr "/Új _címjegyzék"
 
 # src/addressbook.c:380 src/addressbook.c:390

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr "/Új mappa"
 
 # src/addressbook.c:379 src/addressbook.c:389
 msgid "/New _Folder"
 msgstr "/Új mappa"
 
 # src/addressbook.c:379 src/addressbook.c:389

-#: src/addressbook.c:474
-#: src/addressbook.c:489
+#: src/addressbook.c:475
+#: src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/Új csoport"
 
 msgid "/New _Group"
 msgstr "/Új csoport"
 

-#: src/addressbook.c:476
-#: src/addressbook.c:491
+#: src/addressbook.c:477
+#: src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/Kivágás"
 
 # src/summaryview.c:355
 msgid "/C_ut"
 msgstr "/Kivágás"
 
 # src/summaryview.c:355

-#: src/addressbook.c:477
-#: src/addressbook.c:492
+#: src/addressbook.c:478
+#: src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/_Másolás"
 
 # src/compose.c:463
 msgid "/_Copy"
 msgstr "/_Másolás"
 
 # src/compose.c:463

-#: src/addressbook.c:478
-#: src/addressbook.c:493
+#: src/addressbook.c:479
+#: src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
 # src/summaryview.c:390
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
 # src/summaryview.c:390

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "/_Mindent kijelöl"
 
 # src/addressbook.c:378 src/addressbook.c:388
 msgid "/_Select all"
 msgstr "/_Mindent kijelöl"
 
 # src/addressbook.c:378 src/addressbook.c:388

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/Új cím"
 
 # src/mainwindow.c:1270 src/setup.c:57
 msgid "/New _Address"
 msgstr "/Új cím"
 
 # src/mainwindow.c:1270 src/setup.c:57

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/Új ü_zenet"
 
 msgid "/_Mail To"
 msgstr "/Új ü_zenet"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/_Bejegyzés böngészése"
 
 msgid "/_Browse Entry"
 msgstr "/_Bejegyzés böngészése"
 

-#: src/addressbook.c:511
-#: src/crash.c:451
-#: src/crash.c:470
-#: src/importldif.c:119
+#: src/addressbook.c:512
+#: src/crash.c:452
+#: src/crash.c:471
+#: src/importldif.c:120

 #: src/plugins/pgpcore/sgpgme.c:138
 #: src/prefs_themes.c:684
 #: src/prefs_themes.c:716
 #: src/plugins/pgpcore/sgpgme.c:138
 #: src/prefs_themes.c:684
 #: src/prefs_themes.c:716


@@ -554,174 +565,162 @@ msgstr "/_Bejegyzés böngészése"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 msgid "Unknown"
 msgstr "Ismeretlen"
 

-#: src/addressbook.c:518
-#: src/addressbook.c:537
-#: src/importldif.c:126
+#: src/addressbook.c:519
+#: src/addressbook.c:538
+#: src/importldif.c:127

 msgid "Success"
 msgstr "Sikeres"
 
 msgid "Success"
 msgstr "Sikeres"
 

-#: src/addressbook.c:519
-#: src/importldif.c:127
+#: src/addressbook.c:520
+#: src/importldif.c:128

 msgid "Bad arguments"
 msgstr "Hibás argumentumok"
 
 # src/compose.c:2233
 msgid "Bad arguments"
 msgstr "Hibás argumentumok"
 
 # src/compose.c:2233

-#: src/addressbook.c:520
-#: src/importldif.c:128
+#: src/addressbook.c:521
+#: src/importldif.c:129

 msgid "File not specified"
 msgstr "Nincs megadva fájl."
 
 # src/import.c:224
 msgid "File not specified"
 msgstr "Nincs megadva fájl."
 
 # src/import.c:224

-#: src/addressbook.c:521
-#: src/importldif.c:129
+#: src/addressbook.c:522
+#: src/importldif.c:130

 msgid "Error opening file"
 msgstr "Fájl megnyitási hiba."
 
 # src/importldif.c:333
 msgid "Error opening file"
 msgstr "Fájl megnyitási hiba."
 
 # src/importldif.c:333

-#: src/addressbook.c:522
-#: src/importldif.c:130
+#: src/addressbook.c:523
+#: src/importldif.c:131

 msgid "Error reading file"
 msgstr "Fájl olvasási hiba"
 
 msgid "Error reading file"
 msgstr "Fájl olvasási hiba"
 

-#: src/addressbook.c:523
-#: src/importldif.c:131
+#: src/addressbook.c:524
+#: src/importldif.c:132

 msgid "End of file encountered"
 msgstr "Fájl vége"
 
 msgid "End of file encountered"
 msgstr "Fájl vége"
 

-#: src/addressbook.c:524
-#: src/importldif.c:132
+#: src/addressbook.c:525
+#: src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "Memóriafoglalási hiba"
 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336
 msgid "Error allocating memory"
 msgstr "Memóriafoglalási hiba"
 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336

-#: src/addressbook.c:525
-#: src/importldif.c:133
+#: src/addressbook.c:526
+#: src/importldif.c:134

 msgid "Bad file format"
 msgstr "Rossz fájl formátum"
 
 # src/import.c:224
 msgid "Bad file format"
 msgstr "Rossz fájl formátum"
 
 # src/import.c:224

-#: src/addressbook.c:526
-#: src/importldif.c:134
+#: src/addressbook.c:527
+#: src/importldif.c:135

 msgid "Error writing to file"
 msgstr "Fájl írási hiba."
 
 # src/prefs_common.c:918
 msgid "Error writing to file"
 msgstr "Fájl írási hiba."
 
 # src/prefs_common.c:918

-#: src/addressbook.c:527
-#: src/importldif.c:135
+#: src/addressbook.c:528
+#: src/importldif.c:136

 msgid "Error opening directory"
 msgstr "Könyvtármegnyitási hiba"
 
 # src/compose.c:2233
 msgid "Error opening directory"
 msgstr "Könyvtármegnyitási hiba"
 
 # src/compose.c:2233

-#: src/addressbook.c:528
-#: src/importldif.c:136
+#: src/addressbook.c:529
+#: src/importldif.c:137

 msgid "No path specified"
 msgstr "Nincs megadva elérési út."
 
 # src/inc.c:621
 msgid "No path specified"
 msgstr "Nincs megadva elérési út."
 
 # src/inc.c:621

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "LDAP szerver kapcsolódási hiba"
 
 msgid "Error connecting to LDAP server"
 msgstr "LDAP szerver kapcsolódási hiba"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "LDAP inicializálási hiba"
 
 # src/editldap.c:215 src/editldap.c:534
 msgid "Error initializing LDAP"
 msgstr "LDAP inicializálási hiba"
 
 # src/editldap.c:215 src/editldap.c:534

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "LDAP szerver kapcsolódási hiba"
 
 # src/importldif.c:333
 msgid "Error binding to LDAP server"
 msgstr "LDAP szerver kapcsolódási hiba"
 
 # src/importldif.c:333

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "LDAP adatbázis keresési hiba"
 
 msgid "Error searching LDAP database"
 msgstr "LDAP adatbázis keresési hiba"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "Időtúllépés az LDAP művelet során"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Időtúllépés az LDAP művelet során"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "Hibás LDAP kersési feltétel"
 
 msgid "Error in LDAP search criteria"
 msgstr "Hibás LDAP kersési feltétel"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr "Nincs a keresési feltételnek megfelelő LDAP bejegyzés"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Nincs a keresési feltételnek megfelelő LDAP bejegyzés"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "LDAP keresés megszakítva"
 
 # src/ssl.c:100
 msgid "LDAP search terminated on request"
 msgstr "LDAP keresés megszakítva"
 
 # src/ssl.c:100

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "TLS kapcsolathívási hiba"
 
 msgid "Error starting TLS connection"
 msgstr "TLS kapcsolathívási hiba"
 

+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"
+msgstr "Azonosító név (dn) hiányzik"
+
+# src/prefs_account.c:792
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "Kötelező információ hiányzik"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "Másik kapcsolat már használja ezt a kulcsot"
+
+# src/prefs_account.c:1138
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "Erős(ebb) hitelesítés szükséges"
+

 # src/sourcewindow.c:143
 # src/sourcewindow.c:143

-#: src/addressbook.c:920
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "Források"
 
 # src/addressbook.c:493 src/compose.c:3994 src/prefs_common.c:1959
 msgid "Sources"
 msgstr "Források"
 
 # src/addressbook.c:493 src/compose.c:3994 src/prefs_common.c:1959

-#: src/addressbook.c:924
+#: src/addressbook.c:929

 #: src/prefs_other.c:513
 #: src/prefs_other.c:513

-#: src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "Címjegyzék"
 
 # src/addressbook.c:630
 msgid "Address book"
 msgstr "Címjegyzék"
 
 # src/addressbook.c:630

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "Keresendő név:"
 
 msgid "Lookup name:"
 msgstr "Keresendő név:"
 

-# src/addressbook.c:642 src/headerview.c:55 src/prefs_template.c:170
-# src/summary_search.c:155
-#: src/addressbook.c:1129
-#: src/compose.c:2131
-#: src/compose.c:4481
-#: src/compose.c:5705
-#: src/compose.c:6519
-#: src/compose.c:9648
-#: src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "Címzett:"
-
-# src/addressbook.c:646
-#: src/addressbook.c:1133
-#: src/compose.c:2115
-#: src/compose.c:4217
-#: src/compose.c:4480
-#: src/compose.c:9657
-#: src/matcher.c:770
-msgid "Cc:"
-msgstr "Másolatot kap:"
-
-# src/addressbook.c:650
-#: src/addressbook.c:1137
-#: src/compose.c:2118
-#: src/compose.c:4248
-msgid "Bcc:"
-msgstr "Titkos másolatot kap:"
-

 # src/addressbook.c:837
 # src/addressbook.c:837

-#: src/addressbook.c:1387
-#: src/addressbook.c:1433
+#: src/addressbook.c:1392
+#: src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Ez a címadat csak olvasható, nem törölhető."
 
 # src/folderview.c:1994
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Ez a címadat csak olvasható, nem törölhető."
 
 # src/folderview.c:1994

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "Csoport törlése"
 
 # src/compose.c:5128
 msgid "Delete group"
 msgstr "Csoport törlése"
 
 # src/compose.c:5128

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -730,20 +729,20 @@ msgstr ""
 "A benne lévő címek elvesznek."
 
 # src/addressbook.c:838
 "A benne lévő címek elvesznek."
 
 # src/addressbook.c:838

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nem lehet beilleszteni. A cél címjegyzék csak olvasható."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nem lehet beilleszteni. A cél címjegyzék csak olvasható."
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "Nem lehet beilleszteni címcsoportba."
 
 # src/compose.c:5128
 msgid "Cannot paste into an address group."
 msgstr "Nem lehet beilleszteni címcsoportba."
 
 # src/compose.c:5128

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Törölni akarod '%s' találatait és címeit?"
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Törölni akarod '%s' találatait és címeit?"


@@ -753,38 +752,38 @@ msgstr "Törölni akarod '%s' találatait és címeit?"
 # src/prefs_actions.c:377 src/prefs_display_header.c:278
 # src/prefs_display_header.c:334 src/prefs_filter.c:398
 # src/prefs_template.c:224
 # src/prefs_actions.c:377 src/prefs_display_header.c:278
 # src/prefs_display_header.c:334 src/prefs_filter.c:398
 # src/prefs_template.c:224

-#: src/addressbook.c:2735
-#: src/addressbook.c:2761
-#: src/addressbook.c:2768
+#: src/addressbook.c:2752
+#: src/addressbook.c:2778
+#: src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Törlés"
 
 # src/addressbook.c:1657
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Törlés"
 
 # src/addressbook.c:1657

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, 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 "Tényleg törölni akarod '%s'-t? Ha csak a mappát törlöd, a címek átkerülnek a szülő mappába."
 
 # src/folderview.c:1695
 #, 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 "Tényleg törölni akarod '%s'-t? Ha csak a mappát törlöd, a címek átkerülnek a szülő mappába."
 
 # src/folderview.c:1695

-#: src/addressbook.c:2747
+#: src/addressbook.c:2764

 #: src/imap_gtk.c:302
 #: src/mh_gtk.c:182
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
 # src/folderview.c:1695
 #: src/imap_gtk.c:302
 #: src/mh_gtk.c:182
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
 # src/folderview.c:1695

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+Csak mappa törlése"
 
 # src/addressbook.c:1660
 msgid "+Delete _folder only"
 msgstr "+Csak mappa törlése"
 
 # src/addressbook.c:1660

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "Mappa és címek törlése"
 
 # src/compose.c:5128
 msgid "Delete folder and _addresses"
 msgstr "Mappa és címek törlése"
 
 # src/compose.c:5128

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -794,7 +793,7 @@ msgstr ""
 "A benne lévő címek elvesznek."
 
 # src/compose.c:5128
 "A benne lévő címek elvesznek."
 
 # src/compose.c:5128

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -803,23 +802,34 @@ msgstr ""
 "Tényleg törölni akarod '%s'-t?\n"
 "A benne lévő címek elvesznek."
 
 "Tényleg törölni akarod '%s'-t?\n"
 "A benne lévő címek elvesznek."
 

+# src/grouplistdialog.c:203
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr "'%s' keresése "
+
+#: src/addressbook.c:3031
+#: src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "Új kapcsolatok"
+

 # src/addressbook.c:2341 src/addressbook.c:2474
 # src/addressbook.c:2341 src/addressbook.c:2474

-#: src/addressbook.c:3638
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
 # src/addressbook.c:2345 src/addressbook.c:2478
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
 # src/addressbook.c:2345 src/addressbook.c:2478

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
 # src/addressbook.c:2355 src/addressbook.c:2488
 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
 # src/addressbook.c:2355 src/addressbook.c:2488

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
 # src/addressbook.c:2360
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
 # src/addressbook.c:2360

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -828,7 +838,7 @@ msgstr ""
 "nem sikerült menteni az új cím index fájlt."
 
 # src/addressbook.c:2373
 "nem sikerült menteni az új cím index fájlt."
 
 # src/addressbook.c:2373

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -837,7 +847,7 @@ msgstr ""
 "de létrehoztam egy üres új címjegyzéket."
 
 # src/addressbook.c:2379
 "de létrehoztam egy üres új címjegyzéket."
 
 # src/addressbook.c:2379

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -846,7 +856,7 @@ msgstr ""
 "nem sikerült menteni az új cím index fájlt."
 
 # src/addressbook.c:2384
 "nem sikerült menteni az új cím index fájlt."
 
 # src/addressbook.c:2384

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -855,100 +865,94 @@ msgstr ""
 "és nem sikerült az új címjegyzék létrehozása sem."
 
 # src/addressbook.c:2391
 "és nem sikerült az új címjegyzék létrehozása sem."
 
 # src/addressbook.c:2391

-#: src/addressbook.c:3688
-#: src/addressbook.c:3694
+#: src/addressbook.c:3898
+#: src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
 # src/addressbook.c:2430
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
 # src/addressbook.c:2430

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
 # src/addressbook.c:2431 src/addressbook.c:2531
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
 # src/addressbook.c:2431 src/addressbook.c:2531

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "Keresés..."
 
 msgid "Busy searching..."
 msgstr "Keresés..."
 

-# src/grouplistdialog.c:203
-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr "'%s' keresése "
-

 # src/addressbook.c:3035 src/prefs_common.c:824
 # src/addressbook.c:3035 src/prefs_common.c:824

-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "Csatoló"
 
 # src/addressbook.c:3051 src/importldif.c:505
 msgid "Interface"
 msgstr "Csatoló"
 
 # src/addressbook.c:3051 src/importldif.c:505

-#: src/addressbook.c:4355
+#: src/addressbook.c:4548

 #: src/addressbook_foldersel.c:192
 #: src/exphtmldlg.c:375
 #: src/expldifdlg.c:394
 #: src/addressbook_foldersel.c:192
 #: src/exphtmldlg.c:375
 #: src/expldifdlg.c:394

-#: src/exporthtml.c:973
-#: src/importldif.c:651
+#: src/exporthtml.c:974
+#: src/importldif.c:660

 msgid "Address Book"
 msgstr "Címjegyzék"
 
 # src/addressbook.c:3067
 msgid "Address Book"
 msgstr "Címjegyzék"
 
 # src/addressbook.c:3067

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "Személy"
 
 # src/addressbook.c:3083
 msgid "Person"
 msgstr "Személy"
 
 # src/addressbook.c:3083

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "E-mail cím"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 msgid "EMail Address"
 msgstr "E-mail cím"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698

-#: src/addressbook.c:4419
+#: src/addressbook.c:4612

 #: src/exporthtml.c:875
 #: src/folderview.c:469
 #: src/exporthtml.c:875
 #: src/folderview.c:469

-#: src/prefs_account.c:2542
+#: src/prefs_account.c:2452

 #: src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr "Mappa"
 
 # src/addressbook.c:3131
 #: src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr "Mappa"
 
 # src/addressbook.c:3131

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 # src/addressbook.c:3147 src/addressbook.c:3163
 msgid "vCard"
 msgstr "vCard"
 
 # src/addressbook.c:3147 src/addressbook.c:3163

-#: src/addressbook.c:4451
-#: src/addressbook.c:4467
+#: src/addressbook.c:4644
+#: src/addressbook.c:4660

 msgid "JPilot"
 msgstr "J-Pilot"
 
 # src/addressbook.c:3179
 msgid "JPilot"
 msgstr "J-Pilot"
 
 # src/addressbook.c:3179

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "LDAP szerverek"
 
 # src/addressbook.c:3179
 msgid "LDAP servers"
 msgstr "LDAP szerverek"
 
 # src/addressbook.c:3179

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "LDAP lekérdezés"
 
 msgid "LDAP Query"
 msgstr "LDAP lekérdezés"
 

-#: src/addressbook.c:4822
+#: src/addressbook.c:5015

 #: src/addressbook_foldersel.c:389
 #: src/matcher.c:312
 #: src/addressbook_foldersel.c:389
 #: src/matcher.c:312

-#: src/matcher.c:1097
-#: src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67
-#: src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527
-#: src/prefs_matcher.c:1347
-#: src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366
-#: src/prefs_matcher.c:2119
-#: src/prefs_matcher.c:2123
+#: src/matcher.c:1183
+#: src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68
+#: src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554
+#: src/prefs_matcher.c:1374
+#: src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393
+#: src/prefs_matcher.c:2146
+#: src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "Bármely"
 
 msgid "Any"
 msgstr "Bármely"
 


@@ -993,14 +997,14 @@ msgstr "Mappa :"
 #: src/addrgather.c:365
 #: src/exphtmldlg.c:543
 #: src/expldifdlg.c:626
 #: src/addrgather.c:365
 #: src/exphtmldlg.c:543
 #: src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgid "Address Book :"

-msgstr "Címjegyzék :"
+msgstr "Címjegyzék:"

 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/addrgather.c:375
 msgid "Folder Size :"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/addrgather.c:375
 msgid "Folder Size :"

-msgstr "Mappa méret :"
+msgstr "Mappa mérete:"

 
 # src/prefs_account.c:1118
 #: src/addrgather.c:390
 
 # src/prefs_account.c:1118
 #: src/addrgather.c:390


@@ -1023,9 +1027,9 @@ msgstr "Cím számláló"
 
 # src/alertpanel.c:133 src/main.c:245
 #: src/addrgather.c:537
 
 # src/alertpanel.c:133 src/main.c:245
 #: src/addrgather.c:537

-#: src/alertpanel.c:155
-#: src/compose.c:4832
-#: src/compose.c:9569
+#: src/alertpanel.c:158
+#: src/compose.c:4910
+#: src/compose.c:9841

 #: src/messageview.c:589
 #: src/messageview.c:602
 #: src/plugins/pgpcore/sgpgme.c:579
 #: src/messageview.c:589
 #: src/messageview.c:602
 #: src/plugins/pgpcore/sgpgme.c:579


@@ -1041,7 +1045,7 @@ msgstr "Fejléc mezők"
 #: src/addrgather.c:539
 #: src/exphtmldlg.c:663
 #: src/expldifdlg.c:737
 #: src/addrgather.c:539
 #: src/exphtmldlg.c:663
 #: src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "Befejezés"
 
 msgid "Finish"
 msgstr "Befejezés"
 


@@ -1054,35 +1058,44 @@ msgid "Harvest Email Addresses - from Folder"
 msgstr "E-mail címek kigyűjtése mappából"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105
 msgstr "E-mail címek kigyűjtése mappából"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "Általános címek"
 
 # src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
 msgid "Common addresses"
 msgstr "Általános címek"
 
 # src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "Személyes címek"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105
 msgid "Personal addresses"
 msgstr "Személyes címek"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "Általános cím"
 
 # src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
 msgid "Common address"
 msgstr "Általános cím"
 
 # src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "Személyes cím"
 
 msgid "Personal address"
 msgstr "Személyes cím"
 

+# src/editgroup.c:308
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "Cím(ek) frissítése"
+
+#: src/addrindex.c:1738
+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:120 src/compose.c:4590 src/main.c:410

-#: src/alertpanel.c:142
-#: src/compose.c:7673
+#: src/alertpanel.c:145
+#: src/compose.c:7902

 msgid "Notice"
 msgstr "Megjegyzés"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
 msgid "Notice"
 msgstr "Megjegyzés"
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475

-#: src/alertpanel.c:168
-#: src/alertpanel.c:191
-#: src/compose.c:4772
+#: src/alertpanel.c:171
+#: src/alertpanel.c:194
+#: src/compose.c:4850

 #: src/inc.c:619
 #: src/plugins/pgpcore/sgpgme.c:150
 #: src/plugins/pgpcore/sgpgme.c:241
 #: src/inc.c:619
 #: src/plugins/pgpcore/sgpgme.c:150
 #: src/plugins/pgpcore/sgpgme.c:241


@@ -1090,12 +1103,12 @@ msgid "Error"
 msgstr "Hiba"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
 msgstr "Hiba"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "Napló megtekintése"
 
 # src/alertpanel.c:249
 msgid "_View log"
 msgstr "Napló megtekintése"
 
 # src/alertpanel.c:249

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "Mutasd ezt az üzenetet legközelebb"
 
 msgid "Show this message next time"
 msgstr "Mutasd ezt az üzenetet legközelebb"
 


@@ -1131,7 +1144,7 @@ msgstr "%s:%d NNTP szerverhez nem lehet kapcsolódni\n"
 # src/ssl.c:106
 #: src/common/nntp.c:80
 #: src/common/session.c:166
 # src/ssl.c:106
 #: src/common/nntp.c:80
 #: src/common/session.c:166

-#: src/imap.c:848
+#: src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "SSL kézfogás sikertelen\n"
 
 msgid "SSL handshake failed\n"
 msgstr "SSL kézfogás sikertelen\n"
 


@@ -1159,84 +1172,84 @@ msgid "Error occurred while sending command\n"
 msgstr "Hiba parancsküldés közben\n"
 
 # src/inc.c:807
 msgstr "Hiba parancsküldés közben\n"
 
 # src/inc.c:807

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr "Semmi"
 
 msgid "Nothing"
 msgstr "Semmi"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr "egy megjelenítő"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 msgid "a viewer"
 msgstr "egy megjelenítő"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "folders"
 msgstr "mappa"
 
 # src/summaryview.c:3150
 msgid "folders"
 msgstr "mappa"
 
 # src/summaryview.c:3150

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr "szűrés"
 
 msgid "filtering"
 msgstr "szűrés"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr "egy titkosítás-kezelő"
 
 msgid "a privacy interface"
 msgstr "egy titkosítás-kezelő"
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr "értesítő"
 
 msgid "a notifier"
 msgstr "értesítő"
 

-#: src/common/plugin.c:61
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr "egy segédeszköz"
 
 # src/send.c:375
 msgid "an utility"
 msgstr "egy segédeszköz"
 
 # src/send.c:375

-#: src/common/plugin.c:62
+#: src/common/plugin.c:63

 msgid "things"
 msgstr "egyéb"
 
 msgid "things"
 msgstr "egyéb"
 

-#: src/common/plugin.c:260
+#: src/common/plugin.c:269

 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "A plugin %s (%s)-t biztosít, amit a(z) %s plugin már telepített."
 
 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "A plugin %s (%s)-t biztosít, amit a(z) %s plugin már telepített."
 

-#: src/common/plugin.c:295
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr "A plugin már betöltve"
 
 msgid "Plugin already loaded"
 msgstr "A plugin már betöltve"
 

-#: src/common/plugin.c:305
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr "Nem sikerült memóriát lefoglalni a plugin számára"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Nem sikerült memóriát lefoglalni a plugin számára"
 

-#: src/common/plugin.c:332
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "A modul licence nem GPL-kompatibilis."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "A modul licence nem GPL-kompatibilis."
 

-#: src/common/plugin.c:339
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr "Claws Mail GTK1 modul."
 
 msgid "This module is for Claws Mail GTK1."
 msgstr "Claws Mail GTK1 modul."
 

-#: src/common/plugin.c:555
+#: src/common/plugin.c:599

 #, c-format
 msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
 msgstr "A Claws Mail verziója újabb, mint amellyel a(z) '%s' plugin fordítva lett."
 
 #, c-format
 msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
 msgstr "A Claws Mail verziója újabb, mint amellyel a(z) '%s' plugin fordítva lett."
 

-#: src/common/plugin.c:558
+#: src/common/plugin.c:602

 msgid "Your version of Claws Mail is newer than the version the plugin was built with."
 msgstr "A Claws Mail verziója újabb, mint amellyel a plugin fordítva lett."
 
 msgid "Your version of Claws Mail is newer than the version the plugin was built with."
 msgstr "A Claws Mail verziója újabb, mint amellyel a plugin fordítva lett."
 

-#: src/common/plugin.c:567
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "A Claws Mail verziója túl régi a(z) '%s' pluginhoz."
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "A Claws Mail verziója túl régi a(z) '%s' pluginhoz."
 

-#: src/common/plugin.c:569
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A Claws Mail verziója túl régi a pluginhoz."
 
 # src/smtp.c:200
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A Claws Mail verziója túl régi a pluginhoz."
 
 # src/smtp.c:200
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"

-msgstr "SMTP AUTH nem elérhetőr\n"
+msgstr "SMTP AUTH nem elérhető\n"

 
 #: src/common/smtp.c:518
 #: src/common/smtp.c:568
 
 #: src/common/smtp.c:518
 #: src/common/smtp.c:568


@@ -1252,7 +1265,7 @@ msgstr "Hiba az SMTP folyamat közben\n"
 
 # src/pop.c:162 src/pop.c:191 src/pop.c:243
 #: src/common/smtp.c:548
 
 # src/pop.c:162 src/pop.c:191 src/pop.c:243
 #: src/common/smtp.c:548

-#: src/pop.c:881
+#: src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "Hiba történt az azonosítás közben\n"
 
 msgid "error occurred on authentication\n"
 msgstr "Hiba történt az azonosítás közben\n"
 


@@ -1263,11 +1276,11 @@ msgstr "Az üzenet túl nagy (Maximális méret: %s)\n"
 
 # src/pop.c:134
 #: src/common/smtp.c:635
 
 # src/pop.c:134
 #: src/common/smtp.c:635

-#: src/pop.c:874
+#: src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "TLS folyamat nem indítható\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "TLS folyamat nem indítható\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "írta ekkor: fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "írta ekkor: fd%d: %s\n"


@@ -1290,12 +1303,12 @@ msgstr "SSL kapcsolódás sikertelen (%s)\n"
 #: src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238
 #: src/common/ssl_certificate.c:244
 #: src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238
 #: src/common/ssl_certificate.c:244

-#: src/gtk/sslcertwindow.c:68
-#: src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103
-#: src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:69
+#: src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86
+#: src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104
+#: src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<nincs a tanúsítványban>"
 
 msgid "<not in certificate>"
 msgstr "<nincs a tanúsítványban>"
 


@@ -1320,250 +1333,250 @@ msgstr "X509 alapértelmezett útvonalak nem tölthetők be"
 msgid "(Subject cleared by RegExp)"
 msgstr "(RegExp-pel megtisztított tárgy)"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "(RegExp-pel megtisztított tárgy)"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%d byte"
 
 #, c-format
 msgid "%dB"
 msgstr "%d byte"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d KB"
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02d KB"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02d MB"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f GB"
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Vasárnap"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Vasárnap"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "Hétfő"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Hétfő"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Kedd"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Kedd"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Szerda"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Szerda"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Csütörtök"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Csütörtök"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "Péntek"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Péntek"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Szombat"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Szombat"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "Január"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "Január"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "Február"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "Február"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "Március"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "Március"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "Április"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "Április"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "Május"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "Május"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "Június"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "Június"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "Július"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "Július"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "Augusztus"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "Augusztus"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "Szeptember"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "Szeptember"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "Október"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "Október"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "November"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "November"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "December"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "December"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Vas"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Vas"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Hét"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Hét"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Ked"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Ked"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Sze"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Sze"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Csü"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Csü"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Pén"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Pén"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Szo"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Szo"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Febr"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Febr"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Márc"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Márc"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Ápr"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Ápr"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "Máj"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "Máj"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jún"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jún"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Júl"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Júl"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aug"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Aug"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Szept"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Szept"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Okt"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Okt"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dec"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dec"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "DE"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "DE"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "DU"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "DU"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "de"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "de"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "du"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "du"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%Y. %B. %d, %a %H:%M:%S"
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%Y. %B. %d, %a %H:%M:%S"
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%Y. %M. %d."
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%Y. %M. %d."
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 # src/compose.c:442
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 # src/compose.c:442

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
 # src/compose.c:443
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
 # src/compose.c:443

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
 # src/compose.c:445 src/folderview.c:229 src/folderview.c:245
 # src/folderview.c:260

-#: src/compose.c:543
+#: src/compose.c:554

 #: src/folderview.c:293
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok"
 
 # src/compose.c:557 src/mainwindow.c:604
 #: src/folderview.c:293
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok"
 
 # src/compose.c:557 src/mainwindow.c:604

-#: src/compose.c:548
+#: src/compose.c:559

 #: src/mainwindow.c:755
 #: src/messageview.c:289
 msgid "/_Message"
 msgstr "/_Üzenet"
 
 # src/compose.c:558
 #: src/mainwindow.c:755
 #: src/messageview.c:289
 msgid "/_Message"
 msgstr "/_Üzenet"
 
 # src/compose.c:558

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/_Üzenet/_Küldés"
 
 # src/compose.c:560
 msgid "/_Message/S_end"
 msgstr "/_Üzenet/_Küldés"
 
 # src/compose.c:560

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/_Üzenet/Küldés késő_bb"
 
 # src/compose.c:562 src/compose.c:568 src/mainwindow.c:609
 # src/mainwindow.c:611 src/mainwindow.c:613 src/mainwindow.c:620
 # src/mainwindow.c:625 src/mainwindow.c:627 src/mainwindow.c:631
 msgid "/_Message/Send _later"
 msgstr "/_Üzenet/Küldés késő_bb"
 
 # src/compose.c:562 src/compose.c:568 src/mainwindow.c:609
 # src/mainwindow.c:611 src/mainwindow.c:613 src/mainwindow.c:620
 # src/mainwindow.c:625 src/mainwindow.c:627 src/mainwindow.c:631

-#: src/compose.c:553
-#: src/compose.c:557
-#: src/compose.c:560
+#: src/compose.c:564
+#: src/compose.c:568
+#: src/compose.c:571

 #: src/mainwindow.c:765
 #: src/mainwindow.c:775
 #: src/mainwindow.c:788
 #: src/mainwindow.c:765
 #: src/mainwindow.c:775
 #: src/mainwindow.c:788


@@ -1574,605 +1587,629 @@ msgstr "/_Üzenet/Küldés késő_bb"
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/Ü_zenet/_Fájl csatolása"
 
 # src/compose.c:452
 msgid "/_Message/_Attach file"
 msgstr "/Ü_zenet/_Fájl csatolása"
 
 # src/compose.c:452

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/Ü_zenet/Fájl _beszúrása"
 
 # src/compose.c:453
 msgid "/_Message/_Insert file"
 msgstr "/Ü_zenet/Fájl _beszúrása"
 
 # src/compose.c:453

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/Ü_zenet/_Aláírás beszúrása"
 
 # src/compose.c:558
 msgid "/_Message/Insert si_gnature"
 msgstr "/Ü_zenet/_Aláírás beszúrása"
 
 # src/compose.c:558

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/Ü_zenet/_Mentés"
 
 msgid "/_Message/_Save"
 msgstr "/Ü_zenet/_Mentés"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/Ü_zenet/Be_zárás"
 
 # src/compose.c:458
 msgid "/_Message/_Close"
 msgstr "/Ü_zenet/Be_zárás"
 
 # src/compose.c:458

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
 # src/compose.c:459
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
 # src/compose.c:459

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
 # src/compose.c:460 src/compose.c:538 src/mainwindow.c:440
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
 # src/compose.c:460 src/compose.c:538 src/mainwindow.c:440

-#: src/compose.c:566
-#: src/compose.c:654
-#: src/compose.c:657
-#: src/compose.c:663
+#: src/compose.c:577
+#: src/compose.c:665
+#: src/compose.c:668
+#: src/compose.c:674

 #: src/mainwindow.c:535
 #: src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
 # src/compose.c:461
 #: src/mainwindow.c:535
 #: src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
 # src/compose.c:461

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
 # src/compose.c:462 src/mainwindow.c:437
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
 # src/compose.c:462 src/mainwindow.c:437

-#: src/compose.c:568
+#: src/compose.c:579

 #: src/mainwindow.c:531
 #: src/messageview.c:169
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
 # src/compose.c:463
 #: src/mainwindow.c:531
 #: src/messageview.c:169
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
 # src/compose.c:463

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
 # src/compose.c:463
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
 # src/compose.c:463

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/_Szerkesztés/Speciális beillesztés"
 
 # src/compose.c:464
 msgid "/_Edit/Special paste"
 msgstr "/_Szerkesztés/Speciális beillesztés"
 
 # src/compose.c:464

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Szerkesztés/Speciális beillesztés/idézetként"
 
 # src/mainwindow.c:439
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Szerkesztés/Speciális beillesztés/idézetként"
 
 # src/mainwindow.c:439

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgid "/_Edit/Special paste/_wrapped"

-msgstr "/_Szerkesztés/Speciális beillesztés/tördelt"
+msgstr "/_Szerkesztés/Speciális beillesztés/sortörésekkel"

 
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Szerkesztés/Speciális beillesztés/_törés nélkül"
 
 # src/compose.c:466 src/mainwindow.c:438
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Szerkesztés/Speciális beillesztés/_törés nélkül"
 
 # src/compose.c:466 src/mainwindow.c:438

-#: src/compose.c:577
+#: src/compose.c:588

 #: src/mainwindow.c:532
 #: src/messageview.c:170
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöl"
 
 # src/compose.c:467
 #: src/mainwindow.c:532
 #: src/messageview.c:170
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöl"
 
 # src/compose.c:467

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/_Szerkesztés/_Továbbiak"
 
 # src/compose.c:468
 msgid "/_Edit/A_dvanced"
 msgstr "/_Szerkesztés/_Továbbiak"
 
 # src/compose.c:468

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Szerkesztés/_Továbbiak/Karakter mozgatása visszafelé"
 
 # src/compose.c:473
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Szerkesztés/_Továbbiak/Karakter mozgatása visszafelé"
 
 # src/compose.c:473

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Szerkesztés/_Továbbiak/Karakter mozgatása előre"
 
 # src/compose.c:478
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Szerkesztés/_Továbbiak/Karakter mozgatása előre"
 
 # src/compose.c:478

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Szerkesztés/_Továbbiak/Szó mozgatása visszafelé"
 
 # src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Szerkesztés/_Továbbiak/Szó mozgatása visszafelé"
 
 # src/compose.c:483

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Szerkesztés/_Továbbiak/Szó mozgatása előre"
 
 # src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Szerkesztés/_Továbbiak/Szó mozgatása előre"
 
 # src/compose.c:488

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a sor elejére"
 
 # src/compose.c:493
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a sor elejére"
 
 # src/compose.c:493

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a sor végére"
 
 # src/compose.c:498
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a sor végére"
 
 # src/compose.c:498

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés az előző sorra"
 
 # src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés az előző sorra"
 
 # src/compose.c:503

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a következő sorra"
 
 # src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Szerkesztés/_Továbbiak/Áthelyezés a következő sorra"
 
 # src/compose.c:508

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy karakter törlése visszafelé"
 
 # src/compose.c:513
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy karakter törlése visszafelé"
 
 # src/compose.c:513

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy karakter törlése előre"
 
 # src/compose.c:518
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy karakter törlése előre"
 
 # src/compose.c:518

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy szó törlése visszafelé"
 
 # src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy szó törlése visszafelé"
 
 # src/compose.c:523

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy szó törlése előre"
 
 # src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Szerkesztés/_Továbbiak/Egy szó törlése előre"
 
 # src/compose.c:528

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Szerkesztés/_Továbbiak/Sor törlése"
 
 # src/compose.c:467
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Szerkesztés/_Továbbiak/Sor törlése"
 
 # src/compose.c:467

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Szerkesztés/_Továbbiak/Egész sor tölése"
 
 # src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Szerkesztés/_Továbbiak/Egész sor tölése"
 
 # src/compose.c:533

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Szerkesztés/_Továbbiak/Törlés a sor végéig"
 
 # src/compose.c:458
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Szerkesztés/_Továbbiak/Törlés a sor végéig"
 
 # src/compose.c:458

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/_Szerkesztés/_Keresés"
 
 # src/compose.c:539
 msgid "/_Edit/_Find"
 msgstr "/_Szerkesztés/_Keresés"
 
 # src/compose.c:539

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekezdés törése"
 
 # src/compose.c:541
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekezdés törése"
 
 # src/compose.c:541

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Szerkesztés/Minden hosszú _sor törése"
 
 # src/compose.c:462 src/mainwindow.c:437
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Szerkesztés/Minden hosszú _sor törése"
 
 # src/compose.c:462 src/mainwindow.c:437

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/Aut_omatikus tördelés"
 
 # src/compose.c:543
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/Aut_omatikus tördelés"
 
 # src/compose.c:543

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés külső programmal"
 
 # src/mimeview.c:114
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés külső programmal"
 
 # src/mimeview.c:114

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/_Helyesírás"
 
 msgid "/_Spelling"
 msgstr "/_Helyesírás"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Helyesírás/Mindet vagy a kijelöltet ellenőrzi"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Helyesírás/Mindet vagy a kijelöltet ellenőrzi"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Helyesírás/Kijelöl minden helytelen szót"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Helyesírás/Kijelöl minden helytelen szót"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Helyesírás/Ellenőriz visszafelé"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Helyesírás/Ellenőriz visszafelé"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Helyesírás/Előre a következő helytelen szóig"
 
 # src/mimeview.c:114
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Helyesírás/Előre a következő helytelen szóig"
 
 # src/mimeview.c:114

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/_Helyesírás/---"
 
 # src/mimeview.c:114
 msgid "/_Spelling/---"
 msgstr "/_Helyesírás/---"
 
 # src/mimeview.c:114

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/_Helyesírás/Opciók"
 
 # src/mimeview.c:114
 msgid "/_Spelling/Options"
 msgstr "/_Helyesírás/Opciók"
 
 # src/mimeview.c:114

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/_Opciók"
 
 # src/mainwindow.c:667
 msgid "/_Options"
 msgstr "/_Opciók"
 
 # src/mainwindow.c:667

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/_Opciók/Válasz _módja"
 
 # src/mainwindow.c:621
 msgid "/_Options/Reply _mode"
 msgstr "/_Opciók/Válasz _módja"
 
 # src/mainwindow.c:621

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opciók/Válasz _módja/Normál"
 
 # src/mainwindow.c:616
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opciók/Válasz _módja/Normál"
 
 # src/mainwindow.c:616

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opciók/Válasz _módja/_Mindenkinek"
 
 # src/mainwindow.c:617
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opciók/Válasz _módja/_Mindenkinek"
 
 # src/mainwindow.c:617

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opciók/Válasz _módja/_Feladónak"
 
 # src/summaryview.c:345
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opciók/Válasz _módja/_Feladónak"
 
 # src/summaryview.c:345

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opciók/Válasz _módja/Levelezőlistára"
 
 # src/mainwindow.c:693
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opciók/Válasz _módja/Levelezőlistára"
 
 # src/mainwindow.c:693

-#: src/compose.c:686
-#: src/compose.c:691
-#: src/compose.c:698
-#: src/compose.c:700
+#: src/compose.c:697

 #: src/compose.c:702
 #: src/compose.c:702

+#: src/compose.c:709
+#: src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/_Opciók/---"
 
 msgid "/_Options/---"
 msgstr "/_Opciók/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/_Opciók/Titkosítás"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Opciók/Titkosítás"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opciók/Titkosítás/Nincs"
 
 # src/compose.c:569
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opciók/Titkosítás/Nincs"
 
 # src/compose.c:569

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/_Opciók/_Aláírás"
 
 # src/compose.c:570
 msgid "/_Options/Si_gn"
 msgstr "/_Opciók/_Aláírás"
 
 # src/compose.c:570

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/_Opciók/_Titkosít"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opciók/_Titkosít"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/_Opciók/_Prioritás"
 
 # src/compose.c:569
 msgid "/_Options/_Priority"
 msgstr "/_Opciók/_Prioritás"
 
 # src/compose.c:569

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opciók/Prioritás/Legmagasabb"
 
 # src/compose.c:569
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opciók/Prioritás/Legmagasabb"
 
 # src/compose.c:569

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opciók/Prioritás/Magas"
 
 # src/mainwindow.c:621
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opciók/Prioritás/Magas"
 
 # src/mainwindow.c:621

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opciók/Prioritás/Normál"
 
 # src/mainwindow.c:621
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opciók/Prioritás/Normál"
 
 # src/mainwindow.c:621

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opciók/Prioritás/Alacsony"
 
 # src/mainwindow.c:624
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opciók/Prioritás/Alacsony"
 
 # src/mainwindow.c:624

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opciók/Prioritás/Legalacsonyabb"
 
 # src/mainwindow.c:624
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opciók/Prioritás/Legalacsonyabb"
 
 # src/mainwindow.c:624

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opciók/Visszaigazolás ké_rése"
 
 # src/mainwindow.c:667
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opciók/Visszaigazolás ké_rése"
 
 # src/mainwindow.c:667

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opciók/Hi_vatkozások eltávolítása"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opciók/Hi_vatkozások eltávolítása"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/_Opciók/_Karakterkódolás"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opciók/_Karakterkódolás"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opciók/_Karakterkódolás/_Automatikus"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opciók/_Karakterkódolás/_Automatikus"
 

-#: src/compose.c:711
-#: src/compose.c:717
-#: src/compose.c:725
-#: src/compose.c:729
-#: src/compose.c:735
-#: src/compose.c:739
-#: src/compose.c:745
-#: src/compose.c:751
-#: src/compose.c:755
-#: src/compose.c:765
-#: src/compose.c:769
-#: src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722
+#: src/compose.c:728
+#: src/compose.c:736
+#: src/compose.c:740
+#: src/compose.c:746
+#: src/compose.c:750
+#: src/compose.c:756
+#: src/compose.c:762
+#: src/compose.c:766
+#: src/compose.c:776
+#: src/compose.c:780
+#: src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opciók/_Karakterkódolás/---"
 
 # src/mainwindow.c:526
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opciók/_Karakterkódolás/---"
 
 # src/mainwindow.c:526

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opciók/_Karakterkódolás/7bit ascii (US-ASC_II)"
 
 # src/mainwindow.c:530
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opciók/_Karakterkódolás/7bit ascii (US-ASC_II)"
 
 # src/mainwindow.c:530

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opciók/_Karakterkódolás/Unicode (_UTF-8)"
 
 # src/mainwindow.c:534
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opciók/_Karakterkódolás/Unicode (_UTF-8)"
 
 # src/mainwindow.c:534

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opciók/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
 # src/mainwindow.c:536
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opciók/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
 # src/mainwindow.c:536

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opciók/_Karakterkódolás/_Nyugat-Európai (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opciók/_Karakterkódolás/_Nyugat-Európai (ISO-8859-15)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opciók/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
 # src/mainwindow.c:540
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opciók/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
 # src/mainwindow.c:540

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opciók/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
 # src/mainwindow.c:543
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opciók/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
 # src/mainwindow.c:543

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opciók/_Karakterkódolás/_Balti (ISO-8859-13)"
 
 # src/mainwindow.c:545
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opciók/_Karakterkódolás/_Balti (ISO-8859-13)"
 
 # src/mainwindow.c:545

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opciók/_Karakterkódolás/Balti (ISO-8859-_4)"
 
 # src/mainwindow.c:548
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opciók/_Karakterkódolás/Balti (ISO-8859-_4)"
 
 # src/mainwindow.c:548

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opciók/_Karakterkódolás/Görög (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opciók/_Karakterkódolás/Görög (ISO-8859-_7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opciók/_Karakterkódolás/Héber (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opciók/_Karakterkódolás/Héber (ISO-8859-_8)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opciók/_Karakterkódolás/Héber (Windows-1255)"
 
 # src/mainwindow.c:545
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opciók/_Karakterkódolás/Héber (Windows-1255)"
 
 # src/mainwindow.c:545

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opciók/_Karakterkódolás/Arab (ISO-8859-_6)"
 
 # src/mainwindow.c:558
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opciók/_Karakterkódolás/Arab (ISO-8859-_6)"
 
 # src/mainwindow.c:558

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opciók/_Karakterkódolás/Arab (Windows-1256)"
 
 # src/mainwindow.c:551
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opciók/_Karakterkódolás/Arab (Windows-1256)"
 
 # src/mainwindow.c:551

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opciók/_Karakterkódolás/Török (ISO-8859-_9)"
 
 # src/mainwindow.c:554
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opciók/_Karakterkódolás/Török (ISO-8859-_9)"
 
 # src/mainwindow.c:554

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
 # src/mainwindow.c:556
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
 # src/mainwindow.c:556

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (KOI8-_R)"
 
 # src/mainwindow.c:556
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (KOI8-_R)"
 
 # src/mainwindow.c:556

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (KOI8-_R)"
 
 # src/mainwindow.c:558
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (KOI8-_R)"
 
 # src/mainwindow.c:558

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (Windows-1251)"
 
 # src/mainwindow.c:562
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opciók/_Karakterkódolás/Cirill (Windows-1251)"
 
 # src/mainwindow.c:562

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opciók/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
 # src/mainwindow.c:574
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opciók/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
 # src/mainwindow.c:574

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opciók/_Karakterkódolás/Egyszerüsített kínai (_GB2312)"
 
 # src/mainwindow.c:574
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opciók/_Karakterkódolás/Egyszerüsített kínai (_GB2312)"
 
 # src/mainwindow.c:574

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opciók/_Karakterkódolás/Egyszerüsített kínai (GBK)"
 
 # src/mainwindow.c:576
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opciók/_Karakterkódolás/Egyszerüsített kínai (GBK)"
 
 # src/mainwindow.c:576

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opciók/_Karakterkódolás/Tradícionális Kínai (_Big5)"
 
 # src/mainwindow.c:578
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opciók/_Karakterkódolás/Tradícionális Kínai (_Big5)"
 
 # src/mainwindow.c:578

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opciók/_Karakterkódolás/Tradícionális Kínai (EUC-_TW)"
 
 # src/mainwindow.c:583
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opciók/_Karakterkódolás/Tradícionális Kínai (EUC-_TW)"
 
 # src/mainwindow.c:583

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opciók/_Karakterkódolás/Koreai (EUC-_KR)"
 
 # src/mainwindow.c:588
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opciók/_Karakterkódolás/Koreai (EUC-_KR)"
 
 # src/mainwindow.c:588

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opciók/_Karakterkódolás/Thai (TIS-620)"
 
 # src/mainwindow.c:590
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opciók/_Karakterkódolás/Thai (TIS-620)"
 
 # src/mainwindow.c:590

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opciók/_Karakterkódolás/Thai (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opciók/_Karakterkódolás/Thai (Windows-874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/_Eszközök/_Vonalzó mutatása"
 
 # src/compose.c:573 src/mainwindow.c:642
 msgid "/_Tools/Show _ruler"
 msgstr "/_Eszközök/_Vonalzó mutatása"
 
 # src/compose.c:573 src/mainwindow.c:642

-#: src/compose.c:792
+#: src/compose.c:803

 #: src/messageview.c:307
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
 # src/compose.c:574
 #: src/messageview.c:307
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
 # src/compose.c:574

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/Sablonok"
 
 # src/compose.c:575 src/mainwindow.c:657
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/Sablonok"
 
 # src/compose.c:575 src/mainwindow.c:657

-#: src/compose.c:794
+#: src/compose.c:805

 #: src/mainwindow.c:849
 #: src/messageview.c:334
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/Műveletek"
 
 # src/compose.c:1157
 #: src/mainwindow.c:849
 #: src/messageview.c:334
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/Műveletek"
 
 # src/compose.c:1157

-#: src/compose.c:1049
-#: src/prefs_compose_writing.c:369
+#: src/compose.c:1078
+#: src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "Tárgy formátum hiba az új üzenetben."
 
 # src/compose.c:1157
 msgid "New message subject format error."
 msgstr "Tárgy formátum hiba az új üzenetben."
 
 # src/compose.c:1157

-#: src/compose.c:1078
-#: src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "Törzs formátum hiba az új üzenetben."
+#: src/compose.c:1107
+#: src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "Törzs formátum hiba az új üzenet %d. sorában."

 
 # src/compose.c:1157
 
 # src/compose.c:1157

-#: src/compose.c:1440
-#: src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "Üzenet válasz formátum hiba."
+#: src/compose.c:1481
+#: src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "Üzenetre válasz formátum hiba a(z) %d. sorban."

 
 # src/compose.c:1157
 
 # src/compose.c:1157

-#: src/compose.c:1557
-#: src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "Üzenet továbbítás formátum hiba."
+#: src/compose.c:1614
+#: src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "Üzenet továbbítási formátum hiba a(z) %d. sorban."

 
 

-#: src/compose.c:1677
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr "Továbbítás: több e-mail"
 
 # src/compose.c:1157
 msgid "Fw: multiple emails"
 msgstr "Továbbítás: több e-mail"
 
 # src/compose.c:1157

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "Üzenet átirányítás formátum hiba."
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "Üzenet átirányítási formátum hiba a(z) %d. sorban."
+
+# src/addressbook.c:646
+#: src/compose.c:2176
+#: src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Másolatot kap:"
+
+# src/addressbook.c:650
+#: src/compose.c:2179
+#: src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Titkos másolatot kap:"

 
 # src/prefs_account.c:1311
 
 # src/prefs_account.c:1311

-#: src/compose.c:2121
+#: src/compose.c:2182
+#: src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
 # src/headerview.c:56
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
 # src/headerview.c:56

-#: src/compose.c:2124
-#: src/compose.c:5702
-#: src/compose.c:6521
-#: src/compose.c:9667
+#: src/compose.c:2185
+#: src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "Hírcsoportok:"
 
 msgid "Newsgroups:"
 msgstr "Hírcsoportok:"
 

-#: src/compose.c:2127
+#: src/compose.c:2188
+#: src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr "Válasz e hírcsoport(ok)ba:"
 
 msgid "Followup-To:"
 msgstr "Válasz e hírcsoport(ok)ba:"
 

+# src/addressbook.c:642 src/headerview.c:55 src/prefs_template.c:170
+# src/summary_search.c:155
+#: src/compose.c:2192
+#: src/gtk/headers.h:12
+#: src/summary_search.c:363
+msgid "To:"
+msgstr "Címzett:"
+

 # src/textview.c:557
 # src/textview.c:557

-#: src/compose.c:2306
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "'%s' fájl csatolása megtörtént."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "'%s' fájl csatolása megtörtént."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:2310
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "A fájl nem csatolható (karakterkészlet átalakítása nem sikerült)."
 
 # src/compose.c:1145
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "A fájl nem csatolható (karakterkészlet átalakítása nem sikerült)."
 
 # src/compose.c:1145

-#: src/compose.c:2541
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
 # src/compose.c:1404
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
 # src/compose.c:1404

-#: src/compose.c:3146
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr "%s fájl üres."
 
 # src/compose.c:1408
 #, c-format
 msgid "File %s is empty."
 msgstr "%s fájl üres."
 
 # src/compose.c:1408

-#: src/compose.c:3150
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható"
 
 # src/compose.c:1432
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható"
 
 # src/compose.c:1432

-#: src/compose.c:3177
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
 # src/compose.c:2097
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
 # src/compose.c:2097

-#: src/compose.c:3998
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
 # src/compose.c:2099
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
 # src/compose.c:2099

-#: src/compose.c:4005
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
 # src/compose.c:2099
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
 # src/compose.c:2099

-#: src/compose.c:4008
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "%s üzenet írása - [nincs tárgy]"
 
 # src/mainwindow.c:612
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "%s üzenet írása - [nincs tárgy]"
 
 # src/mainwindow.c:612

-#: src/compose.c:4010
+#: src/compose.c:4085

 msgid "Compose message"
 msgstr "Üzenet írása"
 
 # src/compose.c:2308
 msgid "Compose message"
 msgstr "Üzenet írása"
 
 # src/compose.c:2308

-#: src/compose.c:4037
+#: src/compose.c:4112

 #: src/messageview.c:624
 msgid ""
 "Account for sending mail is not specified.\n"
 #: src/messageview.c:624
 msgid ""
 "Account for sending mail is not specified.\n"


@@ -2183,44 +2220,45 @@ msgstr ""
 
 # 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:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810

-#: src/compose.c:4230
-#: src/compose.c:4261
-#: src/compose.c:4293
-#: src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4305
+#: src/compose.c:4336
+#: src/compose.c:4368
+#: src/prefs_account.c:2945
+#: src/toolbar.c:415
+#: src/toolbar.c:471

 msgid "Send"
 msgstr "Küldés"
 
 msgid "Send"
 msgstr "Küldés"
 

-#: src/compose.c:4231
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Az egyetlen címzett az alapértelmezett CC cím. Elküldés?"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Az egyetlen címzett az alapértelmezett CC cím. Elküldé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:4232
-#: src/compose.c:4263
-#: src/compose.c:4295
-#: src/compose.c:4772
+#: src/compose.c:4307
+#: src/compose.c:4338
+#: src/compose.c:4370
+#: src/compose.c:4850

 msgid "+_Send"
 msgstr "+Küldé_s"
 
 msgid "+_Send"
 msgstr "+Küldé_s"
 

-#: src/compose.c:4262
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Az egyetlen címzett az alapértelmezett BCC cím. Elküldés?"
 
 # src/compose.c:2233
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Az egyetlen címzett az alapértelmezett BCC cím. Elküldés?"
 
 # src/compose.c:2233

-#: src/compose.c:4279
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
 # src/compose.c:2242
 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
 # src/compose.c:2242

-#: src/compose.c:4294
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr "Tárgy nincs megadva. Így is elküldöd?"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tárgy nincs megadva. Így is elküldöd?"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:4341
-#: src/compose.c:8026
+#: src/compose.c:4416
+#: src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -2231,8 +2269,8 @@ msgstr ""
 "A karakterkészlet átalakítása nem sikerült."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 "A karakterkészlet átalakítása nem sikerült."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:4344
-#: src/compose.c:8029
+#: src/compose.c:4419
+#: src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -2243,8 +2281,8 @@ msgstr ""
 "A címzett titkosító kulcsa nem hozzáférhető."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 "A címzett titkosító kulcsa nem hozzáférhető."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:4348
-#: src/compose.c:8023
+#: src/compose.c:4425
+#: src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -2256,7 +2294,7 @@ msgstr ""
 "Az aláírás nem sikerült: %s"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 "Az aláírás nem sikerült: %s"
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:4351
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -2268,12 +2306,12 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675
 "%s."
 
 # src/prefs_actions.c:670 src/prefs_actions.c:675

-#: src/compose.c:4353
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr "Az üzenet nem tehető sorba a küldéshez."
 
 msgid "Could not queue message for sending."
 msgstr "Az üzenet nem tehető sorba a küldéshez."
 

-#: src/compose.c:4368
-#: src/compose.c:4429
+#: src/compose.c:4445
+#: src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -2281,7 +2319,7 @@ msgstr ""
 "Az üzenet besorolva, de nincs elküldve.\n"
 "Használd \"Várakozó üzenetek elküldése\" opciót."
 
 "Az üzenet besorolva, de nincs elküldve.\n"
 "Használd \"Várakozó üzenetek elküldése\" opciót."
 

-#: src/compose.c:4423
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -2291,7 +2329,7 @@ msgstr ""
 "Próbáld újra a \"Várakozó üzenetek elküldése\" opcióval a főablakban."
 
 # src/compose.c:2497
 "Próbáld újra a \"Várakozó üzenetek elküldése\" opcióval a főablakban."
 
 # src/compose.c:2497

-#: src/compose.c:4769
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -2302,7 +2340,7 @@ msgstr ""
 "a megadott %s karakterkészletre.\n"
 "Elküldöd %s kódolással?"
 
 "a megadott %s karakterkészletre.\n"
 "Elküldöd %s kódolással?"
 

-#: src/compose.c:4828
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -2315,41 +2353,56 @@ msgstr ""
 "\n"
 "Elküldöd így?"
 
 "\n"
 "Elküldöd így?"
 

-#: src/compose.c:5016
+# src/inc.c:462
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr "Titkosítási figyelmeztetés"
+
+# src/send.c:375
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr "+F_olytatás"
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr "Nincs elérhető fiók az üzenetküldéshez!"
 
 msgid "No account for sending mails available!"
 msgstr "Nincs elérhető fiók az üzenetküldéshez!"
 

-#: src/compose.c:5026
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgid "No account for posting news available!"

-msgstr "Nincs elérhető fiók  a hirküldéshez!"
+msgstr "Nincs elérhető fiók  a hírküldéshez!"
+
+# src/summaryview.c:369
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr "Felvétel a _címjegyzékbe"

 
 

-#: src/compose.c:5719
+#: src/compose.c:5876

 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
 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:5858
+#: src/compose.c:6024

 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
 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:5864
-#: src/compose.c:6180
-#: src/mimeview.c:212
+#: src/compose.c:6030
+#: src/compose.c:6348
+#: src/mimeview.c:214

 #: src/plugins/pgpcore/select-keys.c:402
 #: src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:402
 #: src/prefs_summary_column.c:86

-#: src/summaryview.c:495
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "Méret"
 
 # src/prefs_common.c:1065
 msgid "Size"
 msgstr "Méret"
 
 # src/prefs_common.c:1065

-#: src/compose.c:5934
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr "Elküldött üzenet mentése:"
 
 # src/colorlabel.c:51
 msgid "Save Message to "
 msgstr "Elküldött üzenet mentése:"
 
 # src/colorlabel.c:51

-#: src/compose.c:5956
+#: src/compose.c:6122

 #: src/editjpilot.c:289
 #: src/editldap.c:526
 #: src/editvcard.c:202
 #: src/editjpilot.c:289
 #: src/editldap.c:526
 #: src/editvcard.c:202


@@ -2357,43 +2410,44 @@ msgstr "Elküldött üzenet mentése:"
 #: src/import.c:171
 #: src/importmutt.c:242
 #: src/importpine.c:242
 #: src/import.c:171
 #: src/importmutt.c:242
 #: src/importpine.c:242

-#: src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:387

 #: src/prefs_spelling.c:207
 msgid "_Browse"
 msgstr "_Böngészés"
 
 # src/compose.c:3460 src/compose.c:4384
 #: src/prefs_spelling.c:207
 msgid "_Browse"
 msgstr "_Böngészés"
 
 # src/compose.c:3460 src/compose.c:4384

-#: src/compose.c:6179
-#: src/compose.c:7433
+#: src/compose.c:6347
+#: src/compose.c:7662

 msgid "MIME type"
 msgstr "MIME típus"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
 msgid "MIME type"
 msgstr "MIME típus"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241

-#: src/compose.c:6253
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr "_Fejléc"
 
 # src/mimeview.c:196
 msgid "Hea_der"
 msgstr "_Fejléc"
 
 # src/mimeview.c:196

-#: src/compose.c:6257
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr "_Csatolások"
 
 # src/prefs_common.c:826 src/select-keys.c:324
 msgid "_Attachments"
 msgstr "_Csatolások"
 
 # src/prefs_common.c:826 src/select-keys.c:324

-#: src/compose.c:6261
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr "_Egyebek"
 
 # src/headerview.c:57 src/prefs_template.c:172 src/summary_search.c:162
 msgid "Othe_rs"
 msgstr "_Egyebek"
 
 # src/headerview.c:57 src/prefs_template.c:172 src/summary_search.c:162

-#: src/compose.c:6276
+#: src/compose.c:6445
+#: src/gtk/headers.h:18

 #: src/summary_search.c:370
 msgid "Subject:"
 msgstr "Tárgy:"
 
 #: src/summary_search.c:370
 msgid "Subject:"
 msgstr "Tárgy:"
 

-#: src/compose.c:6483
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -2402,89 +2456,90 @@ msgstr ""
 "Helyesírás-ellenőrző nem indítható.\n"
 "%s"
 
 "Helyesírás-ellenőrző nem indítható.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Feladó: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Feladó: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr "Az e-mailhez használandó fiók"
 
 # src/editaddress.c:460
 msgid "Account to use for this email"
 msgstr "Az e-mailhez használandó fiók"
 
 # src/editaddress.c:460

-#: src/compose.c:6632
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr "A használt küldő cím."
 
 msgid "Sender address to be used"
 msgstr "A használt küldő cím."
 

-#: src/compose.c:6793
+#: src/compose.c:6967

 #, c-format
 msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
 msgstr "A(z) '%s' titkosító nincs betöltve. Az üzenetet nem fogod tudni aláírni vagy titkosítani."
 
 # src/prefs_template.c:438
 #, c-format
 msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
 msgstr "A(z) '%s' titkosító nincs betöltve. Az üzenetet nem fogod tudni aláírni vagy titkosítani."
 
 # src/prefs_template.c:438

-#: src/compose.c:6955
-#: src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "Törzs formátum hiba a sablonban."
+#: src/compose.c:7167
+#: src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "Törzs formátum hiba a sablon %d. sorában."

 
 # src/prefs_template.c:438
 
 # src/prefs_template.c:438

-#: src/compose.c:7063
-#: src/prefs_template.c:587
+#: src/compose.c:7277
+#: src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "Címzett formátum hiba a sablonban."
 
 # src/prefs_template.c:438
 msgid "Template To format error."
 msgstr "Címzett formátum hiba a sablonban."
 
 # src/prefs_template.c:438

-#: src/compose.c:7076
-#: src/prefs_template.c:592
+#: src/compose.c:7295
+#: src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "Másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438
 msgid "Template Cc format error."
 msgstr "Másolatot kap formátum hiba a sablonban."
 
 # src/prefs_template.c:438

-#: src/compose.c:7089
-#: src/prefs_template.c:597
+#: src/compose.c:7313
+#: src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "Titkos másolatot kap formátum hiba a sablonban."
 
 # src/compose.c:1157
 msgid "Template Bcc format error."
 msgstr "Titkos másolatot kap formátum hiba a sablonban."
 
 # src/compose.c:1157

-#: src/compose.c:7103
-#: src/prefs_template.c:602
+#: src/compose.c:7332
+#: src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "Tárgy formátum hiba a sablonban."
 
 # src/compose.c:4280
 msgid "Template subject format error."
 msgstr "Tárgy formátum hiba a sablonban."
 
 # src/compose.c:4280

-#: src/compose.c:7327
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
 # src/compose.c:4298
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
 # src/compose.c:4298

-#: src/compose.c:7342
+#: src/compose.c:7571

 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
 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:7415
+#: src/compose.c:7644

 msgid "Properties"
 msgstr "Tulajdonságok"
 
 # src/compose.c:4386
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 # src/compose.c:4386

-#: src/compose.c:7466
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr "Kódolás"
 
 # src/compose.c:4409 src/prefs_folder_item.c:177
 msgid "Encoding"
 msgstr "Kódolás"
 
 # src/compose.c:4409 src/prefs_folder_item.c:177

-#: src/compose.c:7486
+#: src/compose.c:7715

 msgid "Path"
 msgstr "Elérési út"
 
 # src/compose.c:4410
 msgid "Path"
 msgstr "Elérési út"
 
 # src/compose.c:4410

-#: src/compose.c:7487
+#: src/compose.c:7716

 #: src/prefs_toolbar.c:1069
 msgid "File name"
 msgstr "Fájlnév"
 
 # src/compose.c:4587
 #: src/prefs_toolbar.c:1069
 msgid "File name"
 msgstr "Fájlnév"
 
 # src/compose.c:4587

-#: src/compose.c:7670
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -2495,22 +2550,22 @@ msgstr ""
 "Processz leállítása?\n"
 "Processzcsoport azonosító: %d"
 
 "Processz leállítása?\n"
 "Processzcsoport azonosító: %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr "Új üzenet: bemenet a figyelt processzből\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Új üzenet: bemenet a figyelt processzből\n"
 

-#: src/compose.c:7993
+#: src/compose.c:8222

 #: src/messageview.c:729
 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/messageview.c:729
 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:8018
+#: src/compose.c:8247

 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
 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:8020
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2522,22 +2577,57 @@ msgstr ""
 "%s."
 
 # src/prefs_actions.c:683
 "%s."
 
 # src/prefs_actions.c:683

-#: src/compose.c:8193
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr "A vázlat nem menthető."
 
 msgid "Could not save draft."
 msgstr "A vázlat nem menthető."
 

+# src/prefs_actions.c:683
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr "A vázlat nem menthető."
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"A vázlat nem menthető.\n"
+"Mégsem lépsz ki, vagy eldobod ezt az üzenetet?"
+
+# 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/compose.c:8393
+msgid "_Cancel exit"
+msgstr "_Mégsem lép ki"
+
+# src/compose.c:5095
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr "_E-mail eldobása"
+

 # src/compose.c:5055 src/compose.c:5069
 # src/compose.c:5055 src/compose.c:5069

-#: src/compose.c:8271
-#: src/compose.c:8294
+#: src/compose.c:8527
+#: src/compose.c:8550

 msgid "Select file"
 msgstr "Fájl kiválasztása"
 
 msgid "Select file"
 msgstr "Fájl kiválasztása"
 

-#: src/compose.c:8307
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' fájl nem olvasható."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' fájl nem olvasható."
 

-#: src/compose.c:8309
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2547,70 +2637,71 @@ msgstr ""
 "nem érvényes karaktereket tartalmaz, a beszúrás hibás lehet."
 
 # src/compose.c:5093
 "nem érvényes karaktereket tartalmaz, a beszúrás hibás lehet."
 
 # src/compose.c:5093

-#: src/compose.c:8362
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr "Üzenet eldobása"
 
 # src/compose.c:5094
 msgid "Discard message"
 msgstr "Üzenet eldobása"
 
 # src/compose.c:5094

-#: src/compose.c:8363
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr "Az üzenet megváltozott. Elveted?"
 
 # src/compose.c:5095
 msgid "This message has been modified. Discard it?"
 msgstr "Az üzenet megváltozott. Elveted?"
 
 # src/compose.c:5095

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr "Elvetés"
 
 # src/compose.c:5095
 msgid "_Discard"
 msgstr "Elvetés"
 
 # src/compose.c:5095

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr "Mentés a Vázlatokhoz"
 
 # src/compose.c:5128
 msgid "_Save to Drafts"
 msgstr "Mentés a Vázlatokhoz"
 
 # src/compose.c:5128

-#: src/compose.c:8408
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Alkalmazni kívánod a(z) '%s' sablont?"
 
 # src/compose.c:5130
 #, 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:8410
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
 # src/compose.c:5131
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
 # src/compose.c:5131

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr "Cse_re"
 
 # src/compose.c:3946 src/compose.c:5131
 msgid "_Replace"
 msgstr "Cse_re"
 
 # src/compose.c:3946 src/compose.c:5131

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr "Beszúrás"
 
 msgid "_Insert"
 msgstr "Beszúrás"
 

-#: src/compose.c:9142
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr "Beszúrás vagy csatolás?"
 
 msgid "Insert or attach?"
 msgstr "Beszúrás vagy csatolás?"
 

-#: src/compose.c:9143
+#: src/compose.c:9417

 msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
 msgstr "A fájl(ok)at az üzenet törzsébe beszúrva (beágyazva), vagy csatolásként szeretnéd elküldeni?"
 
 # src/compose.c:3946 src/compose.c:5131
 msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
 msgstr "A fájl(ok)at az üzenet törzsébe beszúrva (beágyazva), vagy csatolásként szeretnéd elküldeni?"
 
 # src/compose.c:3946 src/compose.c:5131

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr "+_Beszúrás"
 
 # src/compose.c:3954
 msgid "+_Insert"
 msgstr "+_Beszúrás"
 
 # src/compose.c:3954

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr "_Csatolás"
 
 # src/compose.c:1145
 msgid "_Attach"
 msgstr "_Csatolás"
 
 # src/compose.c:1145

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "Idézet formátum hiba."
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "Idézet formátum hiba a(z) %d. sorban."

 
 

-#: src/compose.c:9563
+#: src/compose.c:9835

 #, c-format
 msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
 msgstr "%d üzenetre akarsz válaszolni. Az üzenetablakok egyszerre fognak megnyílni. Folytatod?"
 #, c-format
 msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
 msgstr "%d üzenetre akarsz válaszolni. Az üzenetablakok egyszerre fognak megnyílni. Folytatod?"


@@ -2642,8 +2733,8 @@ msgstr "Debug log"
 # 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/crash.c:251
 # 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/crash.c:251

-#: src/toolbar.c:483
-#: src/toolbar.c:534
+#: src/toolbar.c:484
+#: src/toolbar.c:535

 msgid "Close"
 msgstr "Bezárás"
 
 msgid "Close"
 msgstr "Bezárás"
 


@@ -2657,100 +2748,100 @@ msgid "Create bug report"
 msgstr "Hibajelentés készítése"
 
 # src/prefs_account.c:792
 msgstr "Hibajelentés készítése"
 
 # src/prefs_account.c:792

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "összeomlási információ mentése"
 
 # src/editaddress.c:318
 msgid "Save crash information"
 msgstr "összeomlási információ mentése"
 
 # src/editaddress.c:318

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "Új személy hozzáadása"
 
 # src/editaddress.c:319
 msgid "Add New Person"
 msgstr "Új személy hozzáadása"
 
 # src/editaddress.c:319

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "Személy adatai"
 
 # src/editaddress.c:460
 msgid "Edit Person Details"
 msgstr "Személy adatai"
 
 # src/editaddress.c:460

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "Egy e-mail címet meg kell adni."
 
 # src/editaddress.c:579
 msgid "An Email address must be supplied."
 msgstr "Egy e-mail címet meg kell adni."
 
 # src/editaddress.c:579

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "Nevet és értéket kell adni."
 
 # src/compose.c:5095
 msgid "A Name and Value must be supplied."
 msgstr "Nevet és értéket kell adni."
 
 # src/compose.c:5095

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "Elvetés"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
 msgid "Discard"
 msgstr "Elvetés"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "Alkalmaz"
 
 # src/editaddress.c:637
 msgid "Apply"
 msgstr "Alkalmaz"
 
 # src/editaddress.c:637

-#: src/editaddress.c:651
-#: src/editaddress.c:700
+#: src/editaddress.c:652
+#: src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "Személy adatainak szerkesztése"
 
 # src/editaddress.c:734
 msgid "Edit Person Data"
 msgstr "Személy adatainak szerkesztése"
 
 # src/editaddress.c:734

-#: src/editaddress.c:761
+#: src/editaddress.c:762

 #: src/expldifdlg.c:508
 #: src/exporthtml.c:752
 #: src/expldifdlg.c:508
 #: src/exporthtml.c:752

-#: src/ldif.c:763
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "Megjelenítendő név"
 
 # src/editaddress.c:740 src/editaddress.c:744
 msgid "Display Name"
 msgstr "Megjelenítendő név"
 
 # src/editaddress.c:740 src/editaddress.c:744

-#: src/editaddress.c:767
-#: src/editaddress.c:771
-#: src/ldif.c:771
+#: src/editaddress.c:768
+#: src/editaddress.c:772
+#: src/ldif.c:773

 msgid "Last Name"
 msgstr "Vezetéknév"
 
 # src/editaddress.c:741 src/editaddress.c:743
 msgid "Last Name"
 msgstr "Vezetéknév"
 
 # src/editaddress.c:741 src/editaddress.c:743

-#: src/editaddress.c:768
-#: src/editaddress.c:770
-#: src/ldif.c:767
+#: src/editaddress.c:769
+#: src/editaddress.c:771
+#: src/ldif.c:769

 msgid "First Name"
 msgstr "Keresztnév"
 
 # src/editaddress.c:746
 msgid "First Name"
 msgstr "Keresztnév"
 
 # src/editaddress.c:746

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "Becenév"
 
 # src/editaddress.c:784 src/editaddress.c:841
 msgid "Nickname"
 msgstr "Becenév"
 
 # src/editaddress.c:784 src/editaddress.c:841

-#: src/editaddress.c:850
-#: src/editaddress.c:906
+#: src/editaddress.c:851
+#: src/editaddress.c:907

 msgid "Alias"
 msgstr "Álnév"
 
 # src/editaddress.c:933 src/editaddress.c:989 src/prefs_customheader.c:205
 msgid "Alias"
 msgstr "Álnév"
 
 # src/editaddress.c:933 src/editaddress.c:989 src/prefs_customheader.c:205

-#: src/editaddress.c:1044
-#: src/editaddress.c:1101
+#: src/editaddress.c:1045
+#: src/editaddress.c:1102

 #: src/prefs_customheader.c:222
 #: src/prefs_customheader.c:222

-#: src/prefs_matcher.c:536
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "Érték"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190
 msgid "Value"
 msgstr "Érték"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "Felhasználói adat"
 
 # src/editaddress.c:783 src/editaddress.c:832 src/editaddress.c:1041
 # src/editgroup.c:255
 msgid "_User Data"
 msgstr "Felhasználói adat"
 
 # src/editaddress.c:783 src/editaddress.c:832 src/editaddress.c:1041
 # src/editgroup.c:255

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "E-mail címek"
 
 # src/editaddress.c:1042
 msgid "_Email Addresses"
 msgstr "E-mail címek"
 
 # src/editaddress.c:1042

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "Egyéb adatok"
 
 msgid "O_ther Attributes"
 msgstr "Egyéb adatok"
 


@@ -2790,7 +2881,7 @@ msgstr " Fájl ellenőrzés"
 #: src/editvcard.c:195
 #: src/importmutt.c:235
 #: src/importpine.c:235
 #: src/editvcard.c:195
 #: src/importmutt.c:235
 #: src/importpine.c:235

-#: src/prefs_account.c:2004
+#: src/prefs_account.c:1836

 msgid "File"
 msgstr "Fájl"
 
 msgid "File"
 msgstr "Fájl"
 


@@ -2970,6 +3061,7 @@ msgstr "TLS"
 
 # src/prefs_account.c:681
 #: src/editldap.c:471
 
 # src/prefs_account.c:681
 #: src/editldap.c:471

+#: src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 


@@ -3090,6 +3182,7 @@ msgstr "A keresés eredményeként visszaadott bejegyzések maximális száma."
 
 # src/editldap.c:461 src/prefs_account.c:668
 #: src/editldap.c:808
 
 # src/editldap.c:461 src/prefs_account.c:668
 #: src/editldap.c:808

+#: src/prefs_account.c:2909

 msgid "Basic"
 msgstr "Egyszerű"
 
 msgid "Basic"
 msgstr "Egyszerű"
 


@@ -3100,7 +3193,7 @@ msgstr "Keresés"
 
 # src/editldap.c:462
 #: src/editldap.c:810
 
 # src/editldap.c:462
 #: src/editldap.c:810

-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "Részletes"
 
 msgid "Extended"
 msgstr "Részletes"
 


@@ -3191,7 +3284,7 @@ msgstr "HTML kimeneti fájl"
 #: src/expldifdlg.c:415
 #: src/export.c:179
 #: src/import.c:178
 #: src/expldifdlg.c:415
 #: src/export.c:179
 #: src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "Böngészés"
 
 msgid "B_rowse"
 msgstr "Böngészés"
 


@@ -3205,8 +3298,8 @@ msgstr "Stíluslap"
 #: src/gtk/gtkaspell.c:1661
 #: src/gtk/gtkaspell.c:2394
 #: src/mainwindow.c:1022
 #: src/gtk/gtkaspell.c:1661
 #: src/gtk/gtkaspell.c:2394
 #: src/mainwindow.c:1022

-#: src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "Nincs"
 
 msgid "None"
 msgstr "Nincs"
 


@@ -3226,19 +3319,19 @@ msgstr "Teljes"
 # src/prefs_customheader.c:261
 #: src/exphtmldlg.c:460
 msgid "Custom"
 # src/prefs_customheader.c:261
 #: src/exphtmldlg.c:460
 msgid "Custom"

-msgstr "Felhasználói"
+msgstr "Egyéni"

 
 #: src/exphtmldlg.c:461
 msgid "Custom-2"
 
 #: src/exphtmldlg.c:461
 msgid "Custom-2"

-msgstr "Felhasználói-2"
+msgstr "Egyéni-2"

 
 #: src/exphtmldlg.c:462
 msgid "Custom-3"
 
 #: src/exphtmldlg.c:462
 msgid "Custom-3"

-msgstr "Felhasználói-3"
+msgstr "Egyéni-3"

 
 #: src/exphtmldlg.c:463
 msgid "Custom-4"
 
 #: src/exphtmldlg.c:463
 msgid "Custom-4"

-msgstr "Felhasználói-4"
+msgstr "Egyéni-4"

 
 # src/prefs_account.c:756
 #: src/exphtmldlg.c:470
 
 # src/prefs_account.c:756
 #: src/exphtmldlg.c:470


@@ -3266,12 +3359,12 @@ msgstr "E-mail linkek formázása"
 # src/editaddress.c:1042
 #: src/exphtmldlg.c:498
 msgid "Format User Attributes"
 # src/editaddress.c:1042
 #: src/exphtmldlg.c:498
 msgid "Format User Attributes"

-msgstr "Felhasználó adatok formázása"
+msgstr "Felhasználói adatok formázása"

 
 # src/importldif.c:689
 #: src/exphtmldlg.c:553
 #: src/expldifdlg.c:636
 
 # src/importldif.c:689
 #: src/exphtmldlg.c:553
 #: src/expldifdlg.c:636

-#: src/importldif.c:919
+#: src/importldif.c:922

 msgid "File Name :"
 msgstr "Fájlnév :"
 
 msgid "File Name :"
 msgstr "Fájlnév :"
 


@@ -3287,7 +3380,7 @@ msgstr "Címjegyzék exportálása HTML fájlba..."
 # src/importldif.c:790
 #: src/exphtmldlg.c:661
 #: src/expldifdlg.c:735
 # src/importldif.c:790
 #: src/exphtmldlg.c:661
 #: src/expldifdlg.c:735

-#: src/importldif.c:1027
+#: src/importldif.c:1042

 msgid "File Info"
 msgstr "Fájl információk"
 
 msgid "File Info"
 msgstr "Fájl információk"
 


@@ -3426,7 +3519,7 @@ msgstr "Azonosító név"
 
 # src/mainwindow.c:427
 #: src/export.c:120
 
 # src/mainwindow.c:427
 #: src/export.c:120

-#: src/summaryview.c:6586
+#: src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr "Exportálás mbox fájlba"
 
 msgid "Export to mbox file"
 msgstr "Exportálás mbox fájlba"
 


@@ -3470,107 +3563,107 @@ msgstr "Teljes név"
 
 # src/importldif.c:791
 #: src/exporthtml.c:762
 
 # src/importldif.c:791
 #: src/exporthtml.c:762

-#: src/importldif.c:1028
+#: src/importldif.c:1043

 msgid "Attributes"
 msgstr "Adatok"
 
 # src/addressbook.c:3051 src/importldif.c:505
 msgid "Attributes"
 msgstr "Adatok"
 
 # src/addressbook.c:3051 src/importldif.c:505

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Claws Mail címjegyzék"
 
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail címjegyzék"
 

-#: src/exporthtml.c:1077
+#: src/exporthtml.c:1078

 #: src/exportldif.c:551
 msgid "Name already exists but is not a directory."
 msgstr "A név már létezik, de nem könyvtár."
 
 #: src/exportldif.c:551
 msgid "Name already exists but is not a directory."
 msgstr "A név már létezik, de nem könyvtár."
 

-#: src/exporthtml.c:1080
+#: src/exporthtml.c:1081

 #: src/exportldif.c:554
 msgid "No permissions to create directory."
 msgstr "Nincs jogosultság a könyvtár létrehozására."
 
 #: src/exportldif.c:554
 msgid "No permissions to create directory."
 msgstr "Nincs jogosultság a könyvtár létrehozására."
 

-#: src/exporthtml.c:1083
+#: src/exporthtml.c:1084

 #: src/exportldif.c:557
 msgid "Name is too long."
 msgstr "A név túl hosszú."
 
 # src/compose.c:2233
 #: src/exportldif.c:557
 msgid "Name is too long."
 msgstr "A név túl hosszú."
 
 # src/compose.c:2233

-#: src/exporthtml.c:1086
+#: src/exporthtml.c:1087

 #: src/exportldif.c:560
 msgid "Not specified."
 msgstr "Nincs megadva."
 
 # src/foldersel.c:223 src/folderview.c:875 src/prefs_folder_item.c:206
 #: src/exportldif.c:560
 msgid "Not specified."
 msgstr "Nincs megadva."
 
 # src/foldersel.c:223 src/folderview.c:875 src/prefs_folder_item.c:206

-#: src/folder.c:1334
+#: src/folder.c:1343

 #: src/foldersel.c:370
 #: src/foldersel.c:370

-#: src/prefs_folder_item.c:239
+#: src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "Bejövő"
 
 # src/foldersel.c:226 src/folderview.c:882 src/prefs_folder_item.c:207
 msgid "Inbox"
 msgstr "Bejövő"
 
 # src/foldersel.c:226 src/folderview.c:882 src/prefs_folder_item.c:207

-#: src/folder.c:1338
+#: src/folder.c:1347

 #: src/foldersel.c:374
 msgid "Sent"
 msgstr "Elküldött"
 
 # src/foldersel.c:229 src/folderview.c:889 src/prefs_folder_item.c:209
 #: src/foldersel.c:374
 msgid "Sent"
 msgstr "Elküldött"
 
 # src/foldersel.c:229 src/folderview.c:889 src/prefs_folder_item.c:209

-#: src/folder.c:1342
+#: src/folder.c:1351

 #: src/foldersel.c:378
 #: src/foldersel.c:378

-#: src/prefs_folder_item.c:242
+#: src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "Küldendő"
 
 # src/foldersel.c:232 src/folderview.c:896 src/prefs_folder_item.c:210
 msgid "Queue"
 msgstr "Küldendő"
 
 # src/foldersel.c:232 src/folderview.c:896 src/prefs_folder_item.c:210

-#: src/folder.c:1346
+#: src/folder.c:1355

 #: src/foldersel.c:382
 #: src/foldersel.c:382

-#: src/prefs_folder_item.c:243
-#: src/toolbar.c:385
-#: src/toolbar.c:428
-#: src/toolbar.c:526
+#: src/prefs_folder_item.c:270
+#: src/toolbar.c:386
+#: src/toolbar.c:429
+#: src/toolbar.c:527

 msgid "Trash"
 msgstr "Kuka"
 
 # src/foldersel.c:235 src/folderview.c:905 src/prefs_folder_item.c:208
 msgid "Trash"
 msgstr "Kuka"
 
 # src/foldersel.c:235 src/folderview.c:905 src/prefs_folder_item.c:208

-#: src/folder.c:1350
+#: src/folder.c:1359

 #: src/foldersel.c:386
 #: src/foldersel.c:386

-#: src/prefs_folder_item.c:241
+#: src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "Vázlatok"
 
 msgid "Drafts"
 msgstr "Vázlatok"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Feldolgozás (%s)...\n"
 
 # src/summaryview.c:2611
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Feldolgozás (%s)...\n"
 
 # src/summaryview.c:2611

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Összes üzenet vétele: %s... \n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Összes üzenet vétele: %s... \n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "%s másolása ide: %s...\n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "%s másolása ide: %s...\n"
 
 # src/imap.c:664 src/imap.c:717 src/mh.c:282 src/mh.c:378

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s áthelyezése ide: %s...\n"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s áthelyezése ide: %s...\n"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "%s cache frissítése..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "%s cache frissítése..."
 

-#: src/folder.c:3864
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "Üzenetek feldolgozása..."
 
 msgid "Processing messages..."
 msgstr "Üzenetek feldolgozása..."
 

-#: src/folder.c:3993
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "%s szinkronizációja kapcsolat nélküli munkához...\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "%s szinkronizációja kapcsolat nélküli munkához...\n"


@@ -3662,7 +3755,7 @@ msgstr "Összesen"
 # src/folderview.c:285
 #. TRANSLATORS: This in Number sign in American style
 #: src/folderview.c:473
 # src/folderview.c:285
 #. TRANSLATORS: This in Number sign in American style
 #: src/folderview.c:473

-#: src/summaryview.c:496
+#: src/summaryview.c:502

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 


@@ -3673,20 +3766,20 @@ msgstr "Mappa információ beállítása..."
 
 # src/summaryview.c:364
 #: src/folderview.c:816
 
 # src/summaryview.c:364
 #: src/folderview.c:816

-#: src/summaryview.c:3555
+#: src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "Összes megjelölése olvasottként"
 
 # src/prefs_customheader.c:540
 #: src/folderview.c:817
 msgid "Mark all as read"
 msgstr "Összes megjelölése olvasottként"
 
 # src/prefs_customheader.c:540
 #: src/folderview.c:817

-#: src/summaryview.c:3556
+#: src/summaryview.c:3574

 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/folderview.c:606 src/mainwindow.c:2712 src/setup.c:81
 #: src/folderview.c:1034
 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/folderview.c:606 src/mainwindow.c:2712 src/setup.c:81
 #: src/folderview.c:1034

-#: src/imap.c:3420
-#: src/mainwindow.c:3897
+#: src/imap.c:3449
+#: src/mainwindow.c:3900

 #: src/setup.c:90
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 #: src/setup.c:90
 #, c-format
 msgid "Scanning folder %s%c%s ..."


@@ -3694,8 +3787,8 @@ msgstr "%s%c%s mappa átvizsgálása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/folderview.c:1038
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/folderview.c:1038

-#: src/imap.c:3425
-#: src/mainwindow.c:3902
+#: src/imap.c:3454
+#: src/mainwindow.c:3905

 #: src/setup.c:95
 #, c-format
 msgid "Scanning folder %s ..."
 #: src/setup.c:95
 #, c-format
 msgid "Scanning folder %s ..."


@@ -3728,85 +3821,84 @@ msgid "Couldn't scan folder %s\n"
 msgstr "%s mappa nem vizsgálható\n"
 
 # src/folderview.c:749
 msgstr "%s mappa nem vizsgálható\n"
 
 # src/folderview.c:749

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 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
 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:2059
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "%s mappa bezárása..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #, 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:2149
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "%s mappa megnyitása..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "%s mappa megnyitása..."
 

-#: src/folderview.c:2162
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgstr "Mappa nem volt megnyitható."
 
 # src/mainwindow.c:1229
 msgid "Folder could not be opened."
 msgstr "Mappa nem volt megnyitható."
 
 # src/mainwindow.c:1229

-#: src/folderview.c:2324
+#: src/folderview.c:2339

 #: src/mainwindow.c:2121
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
 # src/mainwindow.c:1230
 #: src/mainwindow.c:2121
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
 # src/mainwindow.c:1230

-#: src/folderview.c:2325
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
 # src/mainwindow.c:1229
 msgid "Delete all messages in trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
 # src/mainwindow.c:1229

-#: src/folderview.c:2326
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgstr "+_Kuka ürítése"
 
 msgid "+_Empty trash"
 msgstr "+_Kuka ürítése"
 

-#: src/folderview.c:2370
-#: src/inc.c:1478
-#: src/toolbar.c:2320
+#: src/folderview.c:2385
+#: src/inc.c:1479
+#: src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "Kapcsolat nélküli jelzés"
 
 msgid "Offline warning"
 msgstr "Kapcsolat nélküli jelzés"
 

-#: src/folderview.c:2371
-#: src/toolbar.c:2321
+#: src/folderview.c:2386
+#: src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr "Kapcsolat nélkül dolgozol. Kapcsolódsz?"
 
 # src/mainwindow.c:1822
 msgid "You're working offline. Override?"
 msgstr "Kapcsolat nélkül dolgozol. Kapcsolódsz?"
 
 # src/mainwindow.c:1822

-#: src/folderview.c:2382
-#: src/toolbar.c:2340
+#: src/folderview.c:2397
+#: src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:1822
 msgid "Send queued messages"
 msgstr "Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:1822

-#: src/folderview.c:2383
-#: src/toolbar.c:2341
+#: src/folderview.c:2398
+#: src/toolbar.c:2350

 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
 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:2384
+#: src/folderview.c:2399

 #: src/messageview.c:590
 #: src/messageview.c:607
 #: src/messageview.c:590
 #: src/messageview.c:607

-#: src/prefs_account.c:1122
-#: src/toolbar.c:2342
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "_Küldés"
 
 # src/main.c:623 src/mainwindow.c:2337
 msgid "_Send"
 msgstr "_Küldés"
 
 # src/main.c:623 src/mainwindow.c:2337

-#: src/folderview.c:2392
-#: src/toolbar.c:2360
+#: src/folderview.c:2407
+#: src/toolbar.c:2369

 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
 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:2395
-#: src/main.c:1762
-#: src/toolbar.c:2363
+#: src/folderview.c:2410
+#: src/main.c:1796
+#: src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3816,76 +3908,76 @@ msgstr ""
 "%s"
 
 # src/prefs_customheader.c:540
 "%s"
 
 # src/prefs_customheader.c:540

-#: src/folderview.c:2462
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Biztosan '%s' mappába akarod másolni '%s' mappát?"
 
 # src/prefs_customheader.c:540
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Biztosan '%s' mappába akarod másolni '%s' mappát?"
 
 # src/prefs_customheader.c:540

-#: src/folderview.c:2463
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Biztosan '%s' almappájaként akarod létrehozni '%s' mappát?"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Biztosan '%s' almappájaként akarod létrehozni '%s' mappát?"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgstr "Mappa másolása"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
 msgid "Copy folder"
 msgstr "Mappa másolása"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

-#: src/folderview.c:2465
+#: 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
 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:2476
+#: 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
 #, 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:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s áthelyezése %s-ba(be)..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s áthelyezése %s-ba(be)..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr "A forrás és a cél megegyezik."
 
 msgid "Source and destination are the same."
 msgstr "A forrás és a cél megegyezik."
 

-#: src/folderview.c:2510
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgstr "Egy mappa nem másolható az almappájába."
 
 msgid "Can't copy a folder to one of its children."
 msgstr "Egy mappa nem másolható az almappájába."
 

-#: src/folderview.c:2511
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgstr "Egy mappa nem helyezhető át az almappájába."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Egy mappa nem helyezhető át az almappájába."
 

-#: src/folderview.c:2514
+#: src/folderview.c:2529

 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
 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:2517
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr "Másolás sikertelen!"
 
 # src/message_search.c:183 src/summary_search.c:300
 msgid "Copy failed!"
 msgstr "Másolás sikertelen!"
 
 # src/message_search.c:183 src/summary_search.c:300

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr "Áthelyezés sikertelen!"
 
 # src/mainwindow.c:666
 msgid "Move failed!"
 msgstr "Áthelyezés sikertelen!"
 
 # src/mainwindow.c:666

-#: src/folderview.c:2568
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s mappa beállításainak feldolgozása"
 
 # src/prefs_common.c:2052 src/summaryview.c:2694
 #: src/gedit-print.c:147
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s mappa beállításainak feldolgozása"
 
 # src/prefs_common.c:2052 src/summaryview.c:2694
 #: src/gedit-print.c:147

-#: src/messageview.c:1544
-#: src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/messageview.c:1556
+#: src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "Nyomtatás"
 
 msgid "Print"
 msgstr "Nyomtatás"
 


@@ -3913,79 +4005,79 @@ msgid "Page %N of %Q"
 msgstr "%N / %Q oldal"
 
 # src/headerview.c:56
 msgstr "%N / %Q oldal"
 
 # src/headerview.c:56

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "Hírcsoport feliratkozás"
 
 msgid "Newsgroup subscription"
 msgstr "Hírcsoport feliratkozás"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "Válaszd ki, mely hírcsoportokra iratkozol fel:"
 
 # src/grouplistdialog.c:195
 msgid "Select newsgroups for subscription:"
 msgstr "Válaszd ki, mely hírcsoportokra iratkozol fel:"
 
 # src/grouplistdialog.c:195

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "Hírcsoportok keresése"
 
 # src/grouplistdialog.c:203
 msgid "Find groups:"
 msgstr "Hírcsoportok keresése"
 
 # src/grouplistdialog.c:203

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " Keresés "
 
 # src/grouplistdialog.c:215
 msgid " Search "
 msgstr " Keresés "
 
 # src/grouplistdialog.c:215

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgid "Newsgroup name"

-msgstr "Hírcsoport név"
+msgstr "Hírcsoport neve"

 
 # src/grouplistdialog.c:216
 
 # src/grouplistdialog.c:216

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "Üzenetek"
 
 # src/grouplistdialog.c:217 src/prefs_folder_item.c:190
 msgid "Messages"
 msgstr "Üzenetek"
 
 # src/grouplistdialog.c:217 src/prefs_folder_item.c:190

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "Típus"
 
 # src/grouplistdialog.c:347
 msgid "Type"
 msgstr "Típus"
 
 # src/grouplistdialog.c:347

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "moderálva"
 
 # src/grouplistdialog.c:349
 msgid "moderated"
 msgstr "moderálva"
 
 # src/grouplistdialog.c:349

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "csak olvasható"
 
 # src/grouplistdialog.c:351
 msgid "readonly"
 msgstr "csak olvasható"
 
 # src/grouplistdialog.c:351

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "ismeretlen"
 
 # src/grouplistdialog.c:398
 msgid "unknown"
 msgstr "ismeretlen"
 
 # src/grouplistdialog.c:398

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "Nem tudom olvasni a hírcsoportok listáját."
 
 # src/grouplistdialog.c:441 src/summaryview.c:703
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem tudom olvasni a hírcsoportok listáját."
 
 # src/grouplistdialog.c:441 src/summaryview.c:703

-#: src/grouplistdialog.c:447
-#: src/summaryview.c:1367
+#: src/grouplistdialog.c:457
+#: src/summaryview.c:1385

 msgid "Done."
 msgstr "Kész."
 
 # src/grouplistdialog.c:477
 msgid "Done."
 msgstr "Kész."
 
 # src/grouplistdialog.c:477

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoport(ot) megkaptam (%s olvasott)"
 
 # src/mimeview.c:864
 #: src/gtk/about.c:79
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoport(ot) megkaptam (%s olvasott)"
 
 # src/mimeview.c:864
 #: src/gtk/about.c:79

-#: src/textview.c:214
+#: src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "Megnyitás webböngészővel"
 
 #: src/gtk/about.c:80
 msgid "/_Open with Web browser"
 msgstr "Megnyitás webböngészővel"
 
 #: src/gtk/about.c:80

-#: src/textview.c:215
+#: src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/_Link másolása"
 
 msgid "/Copy this _link"
 msgstr "/_Link másolása"
 


@@ -4296,7 +4388,7 @@ msgstr "Mozgasd a mappákat felfelé vagy lefelé a mappalista sorrendjének mó
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/gtk/foldersort.c:214
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 #: src/gtk/foldersort.c:214

-#: src/toolbar.c:409
+#: src/toolbar.c:410

 msgid "Folders"
 msgstr "Mappák"
 
 msgid "Folders"
 msgstr "Mappák"
 


@@ -4540,80 +4632,574 @@ msgstr "Fejléc és lábléc betűtípusának leírása"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "A fejlécekhez és láblécekhez használandó betűtípus (pl. \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "A fejlécekhez és láblécekhez használandó betűtípus (pl. \"Monospace 10\")"
 

-# src/summaryview.c:954
-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "Új üzenet"
-
-# src/summaryview.c:898
-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "Olvasatlan üzenet"
+# src/prefs_summary_column.c:72 src/summaryview.c:400
+#: src/gtk/headers.h:8
+#: src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913
+#: src/prefs_summary_column.c:85
+#: src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "Dátum"

 
 

-# src/summaryview.c:342
-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "Megválaszolt üzenet"
+# src/prefs_summary_column.c:72 src/summaryview.c:400
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "Dátum:"

 
 

-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "Továbbított üzenet"
+# src/prefs_summary_column.c:71 src/summaryview.c:399
+#: src/gtk/headers.h:9
+#: src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83
+#: src/quote_fmt.c:49
+#: src/summaryview.c:498
+msgid "From"
+msgstr "Feladó"

 
 

-# src/summaryview.c:364
-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "Az üzenet figyelmen kívül hagyott témában van"
+# src/compose.c:3512 src/headerview.c:54 src/summary_search.c:148
+#: src/gtk/headers.h:9
+#: src/summary_search.c:356
+msgid "From:"
+msgstr "Feladó:"

 
 

-# src/grouplistdialog.c:216
-#: src/gtk/icon_legend.c:72
-msgid "Message is spam"
-msgstr "Az üzenet spam"
+# src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
+# src/prefs_account.c:672 src/prefs_common.c:810
+#: src/gtk/headers.h:10
+#: src/toolbar.c:425
+#: src/toolbar.c:524
+msgid "Sender"
+msgstr "Válasz a feladónak"

 
 

-# src/mimeview.c:196
-#: src/gtk/icon_legend.c:74
-msgid "Message has attachment(s)"
-msgstr "Mellékletes üzenet"
+# src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
+# src/prefs_account.c:672 src/prefs_common.c:810
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "Feladó:"

 
 

-# src/compose.c:5093
-#: src/gtk/icon_legend.c:75
-msgid "Digitally signed message"
-msgstr "Digitálisan aláírt üzenet"
+# src/prefs_account.c:1311
+#: src/gtk/headers.h:11
+#: src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "Válaszcím"

 
 

-# src/summaryview.c:898
-#: src/gtk/icon_legend.c:76
-msgid "Encrypted message"
-msgstr "Titkosított üzenet"
+# src/addressbook.c:642 src/headerview.c:55 src/prefs_template.c:170
+# src/summary_search.c:155
+#: src/gtk/headers.h:12
+#: src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84
+#: src/prefs_template.c:198
+#: src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "Címzett"

 
 

-# src/summaryview.c:349
-#: src/gtk/icon_legend.c:77
-msgid "Message is signed and has attachment(s)"
-msgstr "Aláírt és melléket(ek)et tartalmazó üzenet."
+# src/prefs_account.c:1285
+#: src/gtk/headers.h:13
+#: src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163
+#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912
+#: src/prefs_template.c:199
+#: src/quote_fmt.c:57
+msgid "Cc"
+msgstr "Másolat"

 
 

-# src/summaryview.c:349
-#: src/gtk/icon_legend.c:78
-msgid "Message is encrypted and has attachment(s)"
-msgstr "Titkosított és melléket(ek)et tartalmazó üzenet."
+# src/prefs_account.c:1298
+#: src/gtk/headers.h:14
+#: src/prefs_account.c:1902
+#: src/prefs_template.c:200
+msgid "Bcc"
+msgstr "Titkos másolat"

 
 

-# src/summaryview.c:1010 src/summaryview.c:1035
-#: src/gtk/icon_legend.c:80
-msgid "Marked message"
-msgstr "Megjelölt üzenet"
+# src/prefs_common.c:818
+#: src/gtk/headers.h:15
+#: src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914
+#: src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr "Üzenet azonosító"

 
 

-#: src/gtk/icon_legend.c:81
-msgid "Message is marked for deletion"
-msgstr "Az üzenet kijelölve törlésre"
+# src/prefs_common.c:818
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr "Üzenet azonosító:"

 
 

-# src/grouplistdialog.c:216
-#: src/gtk/icon_legend.c:82
-msgid "Message is marked for moving"
-msgstr "Az üzenet kijelölve áthelyezésre"
+# src/prefs_account.c:1311
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr "Megválaszolt üzenet"

 
 

-#: src/gtk/icon_legend.c:83
-msgid "Message is marked for copying"
-msgstr "Az üzenet kijelölve másolásra"
+# src/prefs_account.c:1311
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr "Megválaszolt üzenet:"

 
 

-# src/summaryview.c:1010 src/summaryview.c:1035
-#: src/gtk/icon_legend.c:85
+# src/grouplistdialog.c:243
+#: src/gtk/headers.h:17
+#: src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:1916
+#: src/quote_fmt.c:59
+msgid "References"
+msgstr "Hivatkozások"
+
+# src/grouplistdialog.c:243
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr "Hivatkozások:"
+
+# src/prefs_summary_column.c:70 src/summaryview.c:398
+#: src/gtk/headers.h:18
+#: src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82
+#: src/prefs_template.c:201
+#: src/quote_fmt.c:55
+#: src/quote_fmt.c:155
+#: src/summaryview.c:497
+msgid "Subject"
+msgstr "Tárgy"
+
+# src/prefs_common.c:883 src/prefs_common.c:1046
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr "Megjegyzések"
+
+# src/prefs_common.c:883 src/prefs_common.c:1046
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr "Megjegyzések:"
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr "Kulcsszavak"
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr "Kulcsszavak:"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr "Továbbküldés ideje"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr "Továbbküldés ideje:"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr "Továbbküldő"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr "Továbbküldő:"
+
+# src/summaryview.c:344
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr "Továbbküldő"
+
+# src/summaryview.c:344
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr "Továbbküldő:"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr "Továbbküldve"
+
+# src/prefs_account.c:1311
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr "Továbbküldve:"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr "Továbbküldés másolatban"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr "Továbbküldés másolatban:"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr "Továbbküldés titkos másolatban"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr "Továbbküldés titkos másolatban:"
+
+# src/prefs_common.c:818
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr "Továbbküldési üzenet azonosító"
+
+# src/prefs_common.c:818
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr "Továbbküldési üzenet azonosító:"
+
+# src/rfc2015.c:136 src/rfc2015.c:171 src/sigstatus.c:222
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr "Válaszcím"
+
+# src/rfc2015.c:136 src/rfc2015.c:171 src/sigstatus.c:222
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr "Válaszcím:"
+
+# src/prefs_account.c:670 src/prefs_common.c:808
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr "Fogadva"
+
+# src/prefs_account.c:670 src/prefs_common.c:808
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr "Fogadva:"
+
+# src/headerview.c:56
+#: src/gtk/headers.h:32
+#: src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:1915
+#: src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "Hírcsoportok"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr "Válasz e hírcsoportba"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr "Elküldve"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr "Elküldve:"
+
+# src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
+# src/prefs_account.c:672 src/prefs_common.c:810
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr "Olvasott"
+
+# src/foldersel.c:226 src/folderview.c:882 src/prefs_folder_item.c:207
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr "Olvasott:"
+
+# src/progressdialog.c:53
+#: src/gtk/headers.h:36
+#: src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137
+#: src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "Állapot"
+
+# src/progressdialog.c:53
+#: src/gtk/headers.h:36
+#: src/prefs_themes.c:923
+msgid "Status:"
+msgstr "Állapot:"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr "Face"
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr "Face:"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr "Visszaigazolás címzettje"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr "Visszaigazolás címzettje:"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr "Visszaigazolás címzettje"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr "Visszaigazolás címzettje:"
+
+# src/prefs_filter.c:353
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr "Küldő szoftver"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr "Levelezőkliens"
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr "Tartalomtípus"
+
+#: src/gtk/headers.h:41
+#: src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr "Tartalomtípus:"
+
+# src/prefs_common.c:1276
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr "Tartalom átviteli kódolása"
+
+# src/prefs_common.c:1276
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr "Tartalom átviteli kódolása:"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr "MIME verzió"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr "MIME verzió: "
+
+# src/grouplistdialog.c:243
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr "Elsőbbség"
+
+# src/grouplistdialog.c:243
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr "Elsőbbség:"
+
+# src/prefs_account.c:768
+#: src/gtk/headers.h:45
+#: src/prefs_account.c:971
+msgid "Organization"
+msgstr "Szervezet"
+
+# src/prefs_account.c:768
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Szervezet:"
+
+# src/mainwindow.c:618
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "Levelezőlista"
+
+# src/mainwindow.c:618
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "Levelezőlista:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr "Üzenet a listára"
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr "Üzenet a listára:"
+
+# src/folderview.c:250
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr "Feliratkozás a listára"
+
+# src/folderview.c:250
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr "Feliratkozás a listára:"
+
+# src/folderview.c:250
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr "Leiratkozás a listáról"
+
+# src/folderview.c:250
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr "Leiratkozás a listáról:"
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr "Leírás a listáról"
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr "Leírás a listáról:"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr "Lista archívuma"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr "Lista archívuma:"
+
+# src/prefs_common.c:826 src/select-keys.c:324
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr "Lista tulajdonosa"
+
+# src/prefs_common.c:826 src/select-keys.c:324
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr "Lista tulajdonosa:"
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr "X-címke"
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr "X-címke:"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr "Levelezőkliens"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr "Levelezőkliens:"
+
+# src/progressdialog.c:53
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr "Státusz"
+
+# src/progressdialog.c:53
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr "Státusz:"
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr "X-Face"
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr "X-Face:"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr "Nem archivált"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr "Nem archivált:"
+
+# src/summaryview.c:342
+#: src/gtk/headers.h:62
+#: src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr "Megválaszolt üzenet"
+
+# src/summaryview.c:342
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr "Megválaszolt üzenet:"
+
+#: src/gtk/headers.h:63
+#: src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr "Címzett vagy másolat"
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr "Címzett vagy másolat:"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr "Feladó, címzett vagy tárgy"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr "Feladó, címzett vagy tárgy:"
+
+# src/summaryview.c:954
+#: src/gtk/icon_legend.c:67
+msgid "New message"
+msgstr "Új üzenet"
+
+# src/summaryview.c:898
+#: src/gtk/icon_legend.c:68
+msgid "Unread message"
+msgstr "Olvasatlan üzenet"
+
+# src/summaryview.c:342
+#: src/gtk/icon_legend.c:69
+msgid "Message has been replied to"
+msgstr "Megválaszolt üzenet"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been forwarded"
+msgstr "Továbbított üzenet"
+
+# src/summaryview.c:364
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "Az üzenet figyelmen kívül hagyott témában van"
+
+# src/grouplistdialog.c:216
+#: src/gtk/icon_legend.c:72
+msgid "Message is spam"
+msgstr "Az üzenet spam"
+
+# src/mimeview.c:196
+#: src/gtk/icon_legend.c:74
+msgid "Message has attachment(s)"
+msgstr "Mellékletes üzenet"
+
+# src/compose.c:5093
+#: src/gtk/icon_legend.c:75
+msgid "Digitally signed message"
+msgstr "Digitálisan aláírt üzenet"
+
+# src/summaryview.c:898
+#: src/gtk/icon_legend.c:76
+msgid "Encrypted message"
+msgstr "Titkosított üzenet"
+
+# src/summaryview.c:349
+#: src/gtk/icon_legend.c:77
+msgid "Message is signed and has attachment(s)"
+msgstr "Aláírt és melléket(ek)et tartalmazó üzenet."
+
+# src/summaryview.c:349
+#: src/gtk/icon_legend.c:78
+msgid "Message is encrypted and has attachment(s)"
+msgstr "Titkosított és melléket(ek)et tartalmazó üzenet."
+
+# src/summaryview.c:1010 src/summaryview.c:1035
+#: src/gtk/icon_legend.c:80
+msgid "Marked message"
+msgstr "Megjelölt üzenet"
+
+#: src/gtk/icon_legend.c:81
+msgid "Message is marked for deletion"
+msgstr "Az üzenet kijelölve törlésre"
+
+# src/grouplistdialog.c:216
+#: src/gtk/icon_legend.c:82
+msgid "Message is marked for moving"
+msgstr "Az üzenet kijelölve áthelyezésre"
+
+#: src/gtk/icon_legend.c:83
+msgid "Message is marked for copying"
+msgstr "Az üzenet kijelölve másolásra"
+
+# src/summaryview.c:1010 src/summaryview.c:1035
+#: src/gtk/icon_legend.c:85

 msgid "Locked message"
 msgstr "Zárolt üzenet."
 
 msgid "Locked message"
 msgstr "Zárolt üzenet."
 


@@ -4656,12 +5242,12 @@ msgstr "Adat megjegyzése"
 
 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200
 
 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "_Log törlése"
 
 msgid "Clear _Log"
 msgstr "_Log törlése"
 

-#: src/gtk/pluginwindow.c:151
-#: src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158
+#: src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4672,21 +5258,21 @@ msgstr ""
 "Verzió: "
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475
 "Verzió: "
 
 # src/alertpanel.c:146 src/compose.c:2496 src/inc.c:475

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "Hiba:"
 
 msgid "Error: "
 msgstr "Hiba:"
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "A plugin nem működik."
 
 # src/foldersel.c:146
 msgid "Plugin is not functional."
 msgstr "A plugin nem működik."
 
 # src/foldersel.c:146

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "Betöltendő pluginek kiválasztása"
 
 # src/compose.c:2346
 msgid "Select the Plugins to load"
 msgstr "Betöltendő pluginek kiválasztása"
 
 # src/compose.c:2346

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -4697,256 +5283,255 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287
-#: src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294
+#: src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Pluginek"
 
 # src/prefs_common.c:2314
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Pluginek"
 
 # src/prefs_common.c:2314

-#: src/gtk/pluginwindow.c:321
-#: src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328
+#: src/prefs_summaries.c:212

 msgid "Description"
 msgstr "Leírás"
 
 msgid "Description"
 msgstr "Leírás"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr "A Claws Mail weboldalán további pluginek is elérhetőek."
 
 # src/summaryview.c:354
 msgid "More plugins are available from the Claws Mail website."
 msgstr "A Claws Mail weboldalán további pluginek is elérhetőek."
 
 # src/summaryview.c:354

-#: src/gtk/pluginwindow.c:344
+#: src/gtk/pluginwindow.c:351

 #: src/prefs_themes.c:862
 msgid "Get more..."
 msgstr "Továbbiak..."
 
 #: src/prefs_themes.c:862
 msgid "Get more..."
 msgstr "Továbbiak..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "Plugin betöltése..."
 
 msgid "Load Plugin..."
 msgstr "Plugin betöltése..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "Plugin eltávolítása"
 
 msgid "Unload Plugin"
 msgstr "Plugin eltávolítása"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "Egy vagy több plugin betöltése"
 
 # src/summaryview.c:1461
 msgid "Click here to load one or more plugins"
 msgstr "Egy vagy több plugin betöltése"
 
 # src/summaryview.c:1461

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "Kijelölt pluginek eltávolítása"
 
 msgid "Unload the selected plugin"
 msgstr "Kijelölt pluginek eltávolítása"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "Betöltött pluginek"
 
 msgid "Loaded plugins"
 msgstr "Betöltött pluginek"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "Oldal index"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
 #: src/gtk/progressdialog.c:140
 msgid "Page Index"
 msgstr "Oldal index"
 
 # src/mainwindow.c:1906 src/prefs_folder_item.c:240 src/progressdialog.c:52
 #: src/gtk/progressdialog.c:140

-#: src/prefs_account.c:842
+#: src/prefs_account.c:2908
+#: src/prefs_account.c:2926
+#: src/prefs_account.c:2944
+#: src/prefs_account.c:2962
+#: src/prefs_account.c:2980
+#: src/prefs_account.c:2998
+#: src/prefs_account.c:3017
+#: src/prefs_account.c:3036

 #: src/prefs_filtering_action.c:399
 #: src/prefs_filtering_action.c:399

-#: src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/prefs_filtering.c:374
+#: src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "Fiók"
 
 msgid "Account"
 msgstr "Fiók"
 

-# src/progressdialog.c:53
-#: src/gtk/progressdialog.c:148
-#: src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80
-#: src/summaryview.c:2458
-msgid "Status"
-msgstr "Állapot"
-

 # src/grouplistdialog.c:216
 # src/grouplistdialog.c:216

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "összes üzenet"
 
 msgid "all messages"
 msgstr "összes üzenet"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "# -nál régebbi üzenetek"
 
 msgid "messages whose age is greater than #"
 msgstr "# -nál régebbi üzenetek"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "# -nál korábbi üzenetek"
 
 msgid "messages whose age is less than #"
 msgstr "# -nál korábbi üzenetek"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "az üzenettörzsben S-t tartalmazó üzenetek"
 
 msgid "messages which contain S in the message body"
 msgstr "az üzenettörzsben S-t tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "az üzenet bármely részében S-t tartalmazó üzenetek"
 
 msgid "messages which contain S in the whole message"
 msgstr "az üzenet bármely részében S-t tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "üzenetek, amelyekből S másolatot kapott"
 
 msgid "messages carbon-copied to S"
 msgstr "üzenetek, amelyekből S másolatot kapott"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "üzenet, amelynek vagy címzettje, vagy másolatot kapottja S"
 
 # src/summaryview.c:2351
 msgid "message is either to: or cc: to S"
 msgstr "üzenet, amelynek vagy címzettje, vagy másolatot kapottja S"
 
 # src/summaryview.c:2351

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "törölt üzenet"
 
 msgid "deleted messages"
 msgstr "törölt üzenet"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "üzenetek, amelyek S-t tartalmaznak a Feladó mezőben"
 
 msgid "messages which contain S in the Sender field"
 msgstr "üzenetek, amelyek S-t tartalmaznak a Feladó mezőben"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "igaz, ha \"S\" végrehajtása sikerült"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "igaz, ha \"S\" végrehajtása sikerült"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "S felhasználótól származó üzenetek"
 
 # src/mainwindow.c:1858
 msgid "messages originating from user S"
 msgstr "S felhasználótól származó üzenetek"
 
 # src/mainwindow.c:1858

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "továbbított üzenet"
 
 msgid "forwarded messages"
 msgstr "továbbított üzenet"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "S fejlécet tartalmazó üzenetek"
 
 msgid "messages which contain header S"
 msgstr "S fejlécet tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "S Message-ID (üzenetazonosító) fejlécet tartalmazó üzenetek"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "S Message-ID (üzenetazonosító) fejlécet tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgid "messages which contain S in inreplyto header"

-msgstr "a 'válaszcím' fejlécben S-t tartalmazó üzenetek"
+msgstr "a 'megválaszolt üzenet' fejlécben S-t tartalmazó üzenetek"

 
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "# színnel megjelölt üzenetek"
 
 # src/summaryview.c:1010 src/summaryview.c:1035
 msgid "messages which are marked with color #"
 msgstr "# színnel megjelölt üzenetek"
 
 # src/summaryview.c:1010 src/summaryview.c:1035

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "zárolt üzenet"
 
 msgid "locked messages"
 msgstr "zárolt üzenet"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "S hírcsoportban lévő üzenetek"
 
 # src/summaryview.c:954
 msgid "messages which are in newsgroup S"
 msgstr "S hírcsoportban lévő üzenetek"
 
 # src/summaryview.c:954

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "új üzenet"
 
 # src/grouplistdialog.c:216
 msgid "new messages"
 msgstr "új üzenet"
 
 # src/grouplistdialog.c:216

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "régi üzenet"
 
 msgid "old messages"
 msgstr "régi üzenet"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "hiányos (nem teljes egészében letöltött) üzenetek"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "hiányos (nem teljes egészében letöltött) üzenetek"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "megválaszolt üzenetek"
 
 # src/summaryview.c:898
 msgid "messages which have been replied to"
 msgstr "megválaszolt üzenetek"
 
 # src/summaryview.c:898

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "olvasott üzenet"
 
 msgid "read messages"
 msgstr "olvasott üzenet"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "a tárgyban S-t tartalamzó üzenetek"
 
 msgid "messages which contain S in subject"
 msgstr "a tárgyban S-t tartalamzó üzenetek"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "# pontértékű üzenetek"
 
 msgid "messages whose score is equal to #"
 msgstr "# pontértékű üzenetek"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "# -nál nagyobb pontértékű üzenetek"
 
 msgid "messages whose score is greater than #"
 msgstr "# -nál nagyobb pontértékű üzenetek"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "# -nál kisebb pontértékű üzenetek"
 
 msgid "messages whose score is lower than #"
 msgstr "# -nál kisebb pontértékű üzenetek"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "# méretű üzenetek"
 
 msgid "messages whose size is equal to #"
 msgstr "# méretű üzenetek"
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "# -nál nagyobb méretű üzenetek"
 
 msgid "messages whose size is greater than #"
 msgstr "# -nál nagyobb méretű üzenetek"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "# -nál kisebb méretű üzenetek"
 
 msgid "messages whose size is smaller than #"
 msgstr "# -nál kisebb méretű üzenetek"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "S-nek küldött üzenetek"
 
 # src/summaryview.c:1010 src/summaryview.c:1035
 msgid "messages which have been sent to S"
 msgstr "S-nek küldött üzenetek"
 
 # src/summaryview.c:1010 src/summaryview.c:1035

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "megjelölt üzenet"
 
 # src/summaryview.c:898
 msgid "marked messages"
 msgstr "megjelölt üzenet"
 
 # src/summaryview.c:898

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "olvasatlan üzenet"
 
 msgid "unread messages"
 msgstr "olvasatlan üzenet"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "a Hivatkozások fejlécben S-t tartalmazó üzenetek"
 
 msgid "messages which contain S in References header"
 msgstr "a Hivatkozások fejlécben S-t tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "sikeres parancsvégrehajtás esetén az üzenetek 0-val térnek vissza - %F az üzenetfájl"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "sikeres parancsvégrehajtás esetén az üzenetek 0-val térnek vissza - %F az üzenetfájl"
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "az X-Label fejlécben S-t tartalmazó üzenetek"
 
 msgid "messages which contain S in X-Label header"
 msgstr "az X-Label fejlécben S-t tartalmazó üzenetek"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "logikai AND operátor"
 
 msgid "logical AND operator"
 msgstr "logikai AND operátor"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "logikai OR operátor"
 
 msgid "logical OR operator"
 msgstr "logikai OR operátor"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "logikai NOT operátor"
 
 # src/message_search.c:121 src/summary_search.c:181
 msgid "logical NOT operator"
 msgstr "logikai NOT operátor"
 
 # src/message_search.c:121 src/summary_search.c:181

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "Nagy-/Kisbetű érzékeny keresés"
 
 msgid "case sensitive search"
 msgstr "Nagy-/Kisbetű érzékeny keresés"
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "minden szűrőkifejezés engedélyezett"
 
 # src/editldap.c:462
 msgid "all filtering expressions are allowed"
 msgstr "minden szűrőkifejezés engedélyezett"
 
 # src/editldap.c:462

-#: src/gtk/quicksearch.c:387
+#: src/gtk/quicksearch.c:424

 #: src/summary_search.c:401
 msgid "Extended Search"
 msgstr "Részletes keresés"
 
 #: src/summary_search.c:401
 msgid "Extended Search"
 msgstr "Részletes keresés"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 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"
 "\n"
 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"
 "\n"


@@ -4956,155 +5541,122 @@ msgstr ""
 "\n"
 "A következő szimbólumok használhatók:"
 
 "\n"
 "A következő szimbólumok használhatók:"
 

-# src/prefs_summary_column.c:70 src/summaryview.c:398
-#: src/gtk/quicksearch.c:484
-#: src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160
-#: src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882
-#: src/prefs_summary_column.c:82
-#: src/prefs_template.c:190
-#: src/quote_fmt.c:48
-#: src/summaryview.c:491
-msgid "Subject"
-msgstr "Tárgy"
-
-# src/prefs_summary_column.c:71 src/summaryview.c:399
-#: src/gtk/quicksearch.c:488
-#: src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83
-#: src/quote_fmt.c:42
-#: src/summaryview.c:492
-msgid "From"
-msgstr "Feladó"
-
-# src/addressbook.c:642 src/headerview.c:55 src/prefs_template.c:170
-# src/summary_search.c:155
-#: src/gtk/quicksearch.c:492
-#: src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84
-#: src/prefs_template.c:187
-#: src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "Címzett"
-

 # src/prefs_account.c:670 src/prefs_common.c:808
 # src/prefs_account.c:670 src/prefs_common.c:808

-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr "Rekurzív"
 
 msgid "Recursive"
 msgstr "Rekurzív"
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr "Kiemelt"
 
 msgid "Sticky"
 msgstr "Kiemelt"
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "Előgépelés"
 
 msgid "Type-ahead"
 msgstr "Előgépelés"
 

+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr "Futtatás kiválasztáskor"
+

 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200
 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200

-#: src/gtk/quicksearch.c:554
-#: src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:614
+#: src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr " Töröl"
 
 msgid " Clear "
 msgstr " Töröl"
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "Jelenlegi keresés törlése"
 
 # src/editldap.c:390
 msgid "Clear the current search"
 msgstr "Jelenlegi keresés törlése"
 
 # src/editldap.c:390

-#: src/gtk/quicksearch.c:577
+#: src/gtk/quicksearch.c:637

 #: src/summary_search.c:354
 msgid "Edit search criteria"
 msgstr "Keresési feltétel szerkesztése"
 
 # src/editldap.c:462
 #: src/summary_search.c:354
 msgid "Edit search criteria"
 msgstr "Keresési feltétel szerkesztése"
 
 # src/editldap.c:462

-#: src/gtk/quicksearch.c:583
-#: src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643
+#: src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr " Bővített szimbólumok..."
 
 msgid " Extended Symbols... "
 msgstr " Bővített szimbólumok..."
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr "Információ a további szimbólumokról"
 
 # src/mainwindow.c:1062
 msgid "Information about extended symbols"
 msgstr "Információ a további szimbólumokról"
 
 # src/mainwindow.c:1062

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "Információk"
 
 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200
 msgid "Info"
 msgstr "Információk"
 
 # src/editaddress.c:883 src/editaddress.c:1016 src/message_search.c:134
 # src/summary_search.c:200

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "Törlés"
 
 msgid "Clear"
 msgstr "Törlés"
 

-#: src/gtk/quicksearch.c:1090
-#: src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157
+#: src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Keresés itt: %s...\n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Keresés itt: %s...\n"
 

-#: src/gtk/sslcertwindow.c:129
-#: src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322
-#: src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130
+#: src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323
+#: src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "helyes"
 
 # src/prefs_common.c:826 src/select-keys.c:324
 msgid "correct"
 msgstr "helyes"
 
 # src/prefs_common.c:826 src/select-keys.c:324

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "Tulajdonos"
 
 # src/prefs_account.c:1372
 msgid "Owner"
 msgstr "Tulajdonos"
 
 # src/prefs_account.c:1372

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "Aláíró"
 
 # src/addressbook.c:592
 msgid "Signer"
 msgstr "Aláíró"
 
 # src/addressbook.c:592

-#: src/gtk/sslcertwindow.c:142
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143
+#: src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Név:"
 
 # src/prefs_account.c:768
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Név:"
 
 # src/prefs_account.c:768

-#: src/gtk/sslcertwindow.c:149
-#: src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150
+#: src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Szervezet:"
 
 msgid "Organization: "
 msgstr "Szervezet:"
 

-#: src/gtk/sslcertwindow.c:156
-#: src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157
+#: src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "Helység:"
 
 # src/rfc2015.c:257
 msgid "Location: "
 msgstr "Helység:"
 
 # src/rfc2015.c:257

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "Ujjlenyomat:"
 
 # src/compose.c:3964 src/prefs_common.c:1186
 msgid "Fingerprint: "
 msgstr "Ujjlenyomat:"
 
 # src/compose.c:3964 src/prefs_common.c:1186

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "Aláírás státusza:"
 
 msgid "Signature status: "
 msgstr "Aláírás státusza:"
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "Lejár:"
 
 msgid "Expires on: "
 msgstr "Lejár:"
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "%s SSL tanúsítványa"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "%s SSL tanúsítványa"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -5114,36 +5666,36 @@ msgstr ""
 "Elfogadod?"
 
 # src/rfc2015.c:248
 "Elfogadod?"
 
 # src/rfc2015.c:248

-#: src/gtk/sslcertwindow.c:284
-#: src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285
+#: src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "Aláírás státusza: %s"
 
 # src/summaryview.c:2677
 #, c-format
 msgid "Signature status: %s"
 msgstr "Aláírás státusza: %s"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:291
-#: src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292
+#: src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "Tanúsítvány megtekintése"
 
 msgid "_View certificate"
 msgstr "Tanúsítvány megtekintése"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "Ismeretlen SSL tanúsítvány"
 
 # src/send.c:375
 msgid "Unknown SSL Certificate"
 msgstr "Ismeretlen SSL tanúsítvány"
 
 # src/send.c:375

-#: src/gtk/sslcertwindow.c:297
-#: src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298
+#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "Kapcsolódás megszakítása"
 
 msgid "_Cancel connection"
 msgstr "Kapcsolódás megszakítása"
 

-#: src/gtk/sslcertwindow.c:297
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298
+#: src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "Elfogadás és mentés"
 
 msgid "_Accept and save"
 msgstr "Elfogadás és mentés"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -5153,50 +5705,50 @@ msgstr ""
 "Folytatod?"
 
 # src/summaryview.c:2677
 "Folytatod?"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "Lejárt SSL tanúsítvány"
 
 msgid "Expired SSL Certificate"
 msgstr "Lejárt SSL tanúsítvány"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "Elfogadás"
 
 # src/summaryview.c:2677
 msgid "_Accept"
 msgstr "Elfogadás"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "Új tanúsítvány:"
 
 # src/summaryview.c:2677
 msgid "New certificate:"
 msgstr "Új tanúsítvány:"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "Ismert tanúsítvány:"
 
 msgid "Known certificate:"
 msgstr "Ismert tanúsítvány:"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "%s tanúsítványa megváltozott. Elfogadod?"
 
 # src/summaryview.c:2677
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "%s tanúsítványa megváltozott. Elfogadod?"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "Tanúsítványok megtekintése"
 
 # src/summaryview.c:2677
 msgid "_View certificates"
 msgstr "Tanúsítványok megtekintése"
 
 # src/summaryview.c:2677

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "Módosított SSL tanúsítvány"
 
 # src/headerview.c:174 src/summaryview.c:1856
 msgid "Changed SSL Certificate"
 msgstr "Módosított SSL tanúsítvány"
 
 # src/headerview.c:174 src/summaryview.c:1856

-#: src/headerview.c:195
-#: src/summaryview.c:2866
-#: src/summaryview.c:2877
+#: src/headerview.c:194
+#: src/summaryview.c:2884
+#: src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
 # src/headerview.c:189 src/summaryview.c:1871
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
 # src/headerview.c:189 src/summaryview.c:1871

-#: src/headerview.c:210
-#: src/summaryview.c:2901
-#: src/summaryview.c:2904
+#: src/headerview.c:209
+#: src/summaryview.c:2919
+#: src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 


@@ -5214,11 +5766,7 @@ msgstr "Fájlméret :"
 msgid "Load Image"
 msgstr "Kép betöltése"
 
 msgid "Load Image"
 msgstr "Kép betöltése"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr "Tartalomtípus:"
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -5228,47 +5776,47 @@ msgstr ""
 "\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."
 
 "\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."
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s\n"
 
 # src/inc.c:462
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Kapcsolódás %s szerverhez nem sikerült: bejelentkezés elutasítva. %s\n"
 
 # src/inc.c:462

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Kapcsolódás nem sikerült: %s"
 
 # src/imap.c:351
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Kapcsolódás nem sikerült: %s"
 
 # src/imap.c:351

-#: src/imap.c:666
-#: src/imap.c:669
+#: src/imap.c:672
+#: src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s IMAP kapcsolat megszakadt. Újrakapcsolódás...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s IMAP kapcsolat megszakadt. Újrakapcsolódás...\n"
 

-#: src/imap.c:718
-#: src/imap.c:2447
-#: src/imap.c:2956
-#: src/imap.c:3041
-#: src/imap.c:3386
-#: src/imap.c:4143
+#: src/imap.c:740
+#: src/imap.c:2474
+#: src/imap.c:2983
+#: src/imap.c:3068
+#: src/imap.c:3415
+#: src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Az IMAP szerver eléréséhez hálózati kapcsolat kell."
 
 # src/send.c:375
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Az IMAP szerver eléréséhez hálózati kapcsolat kell."
 
 # src/send.c:375

-#: src/imap.c:797
+#: src/imap.c:821

 #: src/inc.c:773
 #: src/news.c:295
 #: src/send_message.c:299
 msgid "Insecure connection"
 msgstr "Nem biztonságos kapcsolat"
 
 #: src/inc.c:773
 #: src/news.c:295
 #: src/send_message.c:299
 msgid "Insecure connection"
 msgstr "Nem biztonságos kapcsolat"
 

-#: src/imap.c:798
+#: src/imap.c:822

 #: src/inc.c:774
 #: src/news.c:296
 #: src/send_message.c:300
 #: src/inc.c:774
 #: src/news.c:296
 #: src/send_message.c:300


@@ -5282,7 +5830,7 @@ msgstr ""
 "Folytatod a kapcsolódást a szerverhez? A kommunikáció nem lesz titkosítva."
 
 # src/send.c:375
 "Folytatod a kapcsolódást a szerverhez? A kommunikáció nem lesz titkosítva."
 
 # src/send.c:375

-#: src/imap.c:804
+#: src/imap.c:828

 #: src/inc.c:780
 #: src/news.c:302
 #: src/send_message.c:306
 #: src/inc.c:780
 #: src/news.c:302
 #: src/send_message.c:306


@@ -5290,155 +5838,155 @@ msgid "Con_tinue connecting"
 msgstr "Kapcsolódás foly_tatása"
 
 # src/send.c:371
 msgstr "Kapcsolódás foly_tatása"
 
 # src/send.c:371

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Kapcsolódás %s IMAP4 szerverhez..."
 
 # src/imap.c:1661
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Kapcsolódás %s IMAP4 szerverhez..."
 
 # src/imap.c:1661

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni"
 
 # src/imap.c:1661
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni"
 
 # src/imap.c:1661

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni\n"
 
 # src/imap.c:1685
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem sikerült kapcsódni\n"
 
 # src/imap.c:1685

-#: src/imap.c:884
-#: src/imap.c:2764
+#: src/imap.c:908
+#: src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "TLS folyamat nem indítható.\n"
 
 # src/send.c:371
 msgid "Can't start TLS session.\n"
 msgstr "TLS folyamat nem indítható.\n"
 
 # src/send.c:371

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Kapcsolódás %s IMAP4 szerverhez...\n"
 
 # src/send.c:371
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Kapcsolódás %s IMAP4 szerverhez...\n"
 
 # src/send.c:371

-#: src/imap.c:932
-#: src/imap.c:935
+#: src/imap.c:956
+#: src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre."
 
 # src/send.c:536
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nem lehet bejelentkezni %s IMAP szerverre."
 
 # src/send.c:536

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "Üzenetek hozzáadása..."
 
 # src/main.c:411
 msgid "Adding messages..."
 msgstr "Üzenetek hozzáadása..."
 
 # src/main.c:411

-#: src/imap.c:1305
+#: src/imap.c:1329

 #: src/mh.c:500
 msgid "Copying messages..."
 msgstr "Üzenetek másolása..."
 
 # src/imap.c:870 src/imap.c:922
 #: src/mh.c:500
 msgid "Copying messages..."
 msgstr "Üzenetek másolása..."
 
 # src/imap.c:870 src/imap.c:922

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "törölt jelző nem állítható be\n"
 
 # src/imap.c:877 src/imap.c:930 src/imap.c:981
 msgid "can't set deleted flags\n"
 msgstr "törölt jelző nem állítható be\n"
 
 # src/imap.c:877 src/imap.c:930 src/imap.c:981

-#: src/imap.c:1487
-#: src/imap.c:3894
+#: src/imap.c:1511
+#: src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "nem törölhető\n"
 
 msgid "can't expunge\n"
 msgstr "nem törölhető\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Nem felírt mappák keresése itt: %s..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Nem felírt mappák keresése itt: %s..."
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s almappáinak vizsgálata..."
 
 # src/imap.c:1351
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s almappáinak vizsgálata..."
 
 # src/imap.c:1351

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem tudtam postaládát létrehozni: LIST hiba\n"
 
 # src/imap.c:1372
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem tudtam postaládát létrehozni: LIST hiba\n"
 
 # src/imap.c:1372

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "nem tudtam postaládát létehozni\n"
 
 msgid "can't create mailbox\n"
 msgstr "nem tudtam postaládát létehozni\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr "Az új mappa neve nem tartalmazhat útvonalelválasztó karaktert"
 
 # src/imap.c:1443
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Az új mappa neve nem tartalmazhat útvonalelválasztó karaktert"
 
 # src/imap.c:1443

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s postaláda nem nevezhető át %s -ra(re)\n"
 
 # src/imap.c:1509
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s postaláda nem nevezhető át %s -ra(re)\n"
 
 # src/imap.c:1509

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "nem tudtam törölni a postaládát\n"
 
 # src/send.c:285
 msgid "can't delete mailbox\n"
 msgstr "nem tudtam törölni a postaládát\n"
 
 # src/send.c:285

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr "LIST sikertelen\n"
 
 # src/imap.c:2202
 msgid "LIST failed\n"
 msgstr "LIST sikertelen\n"
 
 # src/imap.c:2202

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "A szerver TLS-t követel a bejelentkezéshez.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "A szerver TLS-t követel a bejelentkezéshez.\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "A lehetőségek nem frissíthetőek.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "A lehetőségek nem frissíthetőek.\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL 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"
 
 #, c-format
 msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL 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"
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "Szerverbejelentkezések letiltva.\n"
 
 # src/summaryview.c:2611
 msgid "Server logins are disabled.\n"
 msgstr "Szerverbejelentkezések letiltva.\n"
 
 # src/summaryview.c:2611

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "Üzenet vétele..."
 
 # src/imap.c:2831 src/imap.c:2868
 msgid "Fetching message..."
 msgstr "Üzenet vétele..."
 
 # src/imap.c:2831 src/imap.c:2868

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Az iconv nem tudja konvertálni az UTF7-et %s kódolásra\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Az iconv nem tudja konvertálni az UTF7-et %s kódolásra\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Az iconv nem tudja konvertálni %s kódolást UTF7-re\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Az iconv nem tudja konvertálni %s kódolást UTF7-re\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "Az iconv nem tudja konvertálni az UTF7-et UTF8-ra\n"
 
 # src/imap.c:870 src/imap.c:922
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "Az iconv nem tudja konvertálni az UTF7-et UTF8-ra\n"
 
 # src/imap.c:870 src/imap.c:922

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "törölt jelzés nem állítható be: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "törölt jelzés nem állítható be: %d\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
 "\n"
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws Mail has been built without IMAP support; your IMAP account(s) are disabled.\n"
 "\n"


@@ -5600,7 +6148,7 @@ msgstr "Rekurzív keresés"
 
 # src/prefs_common.c:2314
 #: src/imap_gtk.c:453
 
 # src/prefs_common.c:2314
 #: src/imap_gtk.c:453

-#: src/imap_gtk.c:496
+#: src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "Feliratkozások"
 
 msgid "Subscriptions"
 msgstr "Feliratkozások"
 


@@ -5625,36 +6173,42 @@ msgid "All of them"
 msgstr "Ezek mindegyike"
 
 #: src/imap_gtk.c:481
 msgstr "Ezek mindegyike"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
-msgstr "A mappa már felírt, és nincs nem felírt almappája."
+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."
+msgstr ""
+"Ez egy feljegyzett mappa, amely nem feljegyzett almappákat tartalmaz.\n"
+"\n"
+"Ha ezek egy másik kliens által létrehozott új mappák, használd az \"Új mappák ellenőrzése\" opciót a postaláda gyökérmappájában."

 
 # src/compose.c:5128
 
 # src/compose.c:5128

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "%s a(z) '%s' mappára?"
 
 # src/folderview.c:250
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "%s a(z) '%s' mappára?"
 
 # src/folderview.c:250

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "feliratkozás"
 
 # src/folderview.c:250
 msgid "subscribe"
 msgstr "feliratkozás"
 
 # src/folderview.c:250

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "leiratkozás"
 
 msgid "unsubscribe"
 msgstr "leiratkozás"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgstr "Alkalmazás az almappákra"
 
 # src/folderview.c:250
 msgid "Apply to subfolders"
 msgstr "Alkalmazás az almappákra"
 
 # src/folderview.c:250

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+_Feliratkozás"
 
 # src/folderview.c:250
 msgid "+_Subscribe"
 msgstr "+_Feliratkozás"
 
 # src/folderview.c:250

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+_Leiratkozás"
 
 msgid "+_Unsubscribe"
 msgstr "+_Leiratkozás"
 


@@ -5698,136 +6252,132 @@ msgid "Select importing file"
 msgstr "Importálandó fájl kiválasztása"
 
 # src/importldif.c:118
 msgstr "Importálandó fájl kiválasztása"
 
 # src/importldif.c:118

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr "Add meg a címjegyzék nevét és a fájlt az impotáláshoz."
 
 # src/importldif.c:121
 msgid "Please specify address book name and file to import."
 msgstr "Add meg a címjegyzék nevét és a fájlt az impotáláshoz."
 
 # src/importldif.c:121

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "Válaszd ki és nevezd át az LDIF mezőneveket az importáláshoz."
 
 # src/importldif.c:124
 msgid "Select and rename LDIF field names to import."
 msgstr "Válaszd ki és nevezd át az LDIF mezőneveket az importáláshoz."
 
 # src/importldif.c:124

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "Fájl importálva."
 
 # src/importldif.c:312
 msgid "File imported."
 msgstr "Fájl importálva."
 
 # src/importldif.c:312

-#: src/importldif.c:451
+#: src/importldif.c:452

 #: src/importmutt.c:125
 #: src/importpine.c:125
 msgid "Please select a file."
 msgstr "Válassz ki egy fájlt."
 
 # src/importldif.c:318
 #: src/importmutt.c:125
 #: src/importpine.c:125
 msgid "Please select a file."
 msgstr "Válassz ki egy fájlt."
 
 # src/importldif.c:318

-#: src/importldif.c:457
+#: src/importldif.c:458

 #: src/importmutt.c:130
 #: src/importpine.c:130
 msgid "Address book name must be supplied."
 msgstr "Címjegyzék nevet meg kell adni."
 
 #: src/importmutt.c:130
 #: src/importpine.c:130
 msgid "Address book name must be supplied."
 msgstr "Címjegyzék nevet meg kell adni."
 

-# src/importldif.c:333
-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "Hiba az LDIF mezők olvasásakor."
-

 # src/importldif.c:356
 # src/importldif.c:356

-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "Az LDIF fájl impotálása sikerült."
 
 # src/importldif.c:441
 msgid "LDIF file imported successfully."
 msgstr "Az LDIF fájl impotálása sikerült."
 
 # src/importldif.c:441

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "LDIF fájl kiválasztása"
 
 msgid "Select LDIF File"
 msgstr "LDIF fájl kiválasztása"
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid "Specify the name for the address book that will be created from the LDIF file data."
 msgstr "Az LDIF adatfájlból készülő címjegyzék neve"
 
 # src/importldif.c:516
 msgid "Specify the name for the address book that will be created from the LDIF file data."
 msgstr "Az LDIF adatfájlból készülő címjegyzék neve"
 
 # src/importldif.c:516

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "Fájlnév"
 
 msgid "File Name"
 msgstr "Fájlnév"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "Az importálandó LDIF fájl teljes elérési útja és neve. "
 
 # src/importldif.c:121
 msgid "The full file specification of the LDIF file to import."
 msgstr "Az importálandó LDIF fájl teljes elérési útja és neve. "
 
 # src/importldif.c:121

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "Az importálandó LDIF fájl kiválasztása."
 
 msgid "Select the LDIF file to import."
 msgstr "Az importálandó LDIF fájl kiválasztása."
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr "R"
 
 # src/importldif.c:557
 msgid "R"
 msgstr "R"
 
 # src/importldif.c:557

-#: src/importldif.c:726
-#: src/summaryview.c:489
+#: src/importldif.c:735
+#: src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 # src/importldif.c:558 src/importldif.c:607
 msgid "S"
 msgstr "S"
 
 # src/importldif.c:558 src/importldif.c:607

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "LDIF mezőnév"
 
 # src/importldif.c:559
 msgid "LDIF Field Name"
 msgstr "LDIF mezőnév"
 
 # src/importldif.c:559

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "Tulajdonság név"
 
 # src/importldif.c:558 src/importldif.c:607
 msgid "Attribute Name"
 msgstr "Tulajdonság név"
 
 # src/importldif.c:558 src/importldif.c:607

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "LDIF mezö"
 
 # src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF mezö"
 
 # src/importldif.c:617

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "Tulajdonság"
 
 msgid "Attribute"
 msgstr "Tulajdonság"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Az LDIF mező átnevezhető Felhasználó attribútum névre."
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Az LDIF mező átnevezhető Felhasználó attribútum névre."
 

-#: src/importldif.c:811
-msgid "???"
-msgstr "???"
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "Válaszd ki az alábbi listából az átnevezendő vagy importálandó  LDIF mezőket. A fenntartott mezők (az \"R\" oszlopban megjelöltek), automatikusan importálva lesznek, és nem nevezhetők át. A Kijelölés (\"S\") oszlopban egy kattintás kijelöli a mezőt importálásra. Egy szimpla kattintás bárhol a sorban kijelöli a mezőt átnevezésre a lista alatti területen. Dupla kattintás bárhol a sorban ki is jelöli a mezőt importálásra."
 
 # src/foldersel.c:146
 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 "Válaszd ki az alábbi listából az átnevezendő vagy importálandó  LDIF mezőket. A fenntartott mezők (az \"R\" oszlopban megjelöltek), automatikusan importálva lesznek, és nem nevezhetők át. A Kijelölés (\"S\") oszlopban egy kattintás kijelöli a mezőt importálásra. Egy szimpla kattintás bárhol a sorban kijelöli a mezőt átnevezésre a lista alatti területen. Dupla kattintás bárhol a sorban ki is jelöli a mezőt importálásra."
 
 # src/foldersel.c:146

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "Kijelölés importálásra"
 
 msgid "Select for Import"
 msgstr "Kijelölés importálásra"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "Válaszd ki a címjegyzékbe importálandó LDIF mezőt."
 
 # src/editaddress.c:877 src/editaddress.c:1010 src/importldif.c:633
 msgid "Select the LDIF field for import into the address book."
 msgstr "Válaszd ki a címjegyzékbe importálandó LDIF mezőt."
 
 # src/editaddress.c:877 src/editaddress.c:1010 src/importldif.c:633

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " Módosítás"
 
 msgid " Modify "
 msgstr " Módosítás"
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr "A gomb frissíteni fogja a lenti listát a megadott adatokkal."
 
 msgid "This button will update the list above with the data supplied."
 msgstr "A gomb frissíteni fogja a lenti listát a megadott adatokkal."
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "Importált rekord:"
 
 # src/importldif.c:727
 msgid "Records Imported :"
 msgstr "Importált rekord:"
 
 # src/importldif.c:727

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "LDIF adatok importja a címjegyzékbe"
 
 msgid "Import LDIF file into Address Book"
 msgstr "LDIF adatok importja a címjegyzékbe"
 

+# src/inc.c:470
+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr "Feldolgozás"
+

 # src/import.c:224
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 # src/import.c:224
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."


@@ -5916,13 +6466,13 @@ msgstr "Azonosítás nem sikerült"
 # src/inc.c:470
 #: src/inc.c:612
 #: src/prefs_summary_column.c:89
 # src/inc.c:470
 #: src/inc.c:612
 #: src/prefs_summary_column.c:89

-#: src/summaryview.c:2454
+#: src/summaryview.c:2472

 msgid "Locked"
 msgstr "Zárolt"
 
 # src/editldap.c:420
 #: src/inc.c:622
 msgid "Locked"
 msgstr "Zárolt"
 
 # src/editldap.c:420
 #: src/inc.c:622

-#: src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Időtúllépés"
 
 msgid "Timeout"
 msgstr "Időtúllépés"
 


@@ -6121,22 +6671,22 @@ msgstr "Kapcsolódási időtúllépés: %s:%d"
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s Kapcsolat nélküli módban vagy. Kapcsolódsz %d percre?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s Kapcsolat nélküli módban vagy. Kapcsolódsz %d percre?"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sKapcsolat nélkül dolgozol. Kapcsolódsz?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sKapcsolat nélkül dolgozol. Kapcsolódsz?"
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "Csak egyszer"
 
 # src/editaddress.c:746
 msgid "On_ly once"
 msgstr "Csak egyszer"
 
 # src/editaddress.c:746

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "Becenév"
 
 msgid "Nick Name"
 msgstr "Becenév"
 


@@ -6158,82 +6708,107 @@ msgstr "Kilépés..."
 #: src/main.c:329
 #, c-format
 msgid ""
 #: src/main.c:329
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"%s (vagy korábbi) beállításokat találtam.\n"
+"%s beállításokat találtam.\n"

 "Szeretnéd felhasználni e beállításokat?"
 
 "Szeretnéd felhasználni e beállításokat?"
 

-#: src/main.c:337
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"A Sylpheed szűrési szabályokat konvertálhatod az itt \n"
+"található scriptek egyikével: %s."
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "Régi beállítások megtartása"
 
 msgid "Keep old configuration"
 msgstr "Régi beállítások megtartása"
 

-#: src/main.c:340
+#: src/main.c:347

 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."
 msgstr "A mentés megtartása lehetővé teszi, hogy visszatérj egy korábbi verzióhoz, de eltarthat egy ideig, ha gyorsítótárazott IMAP vagy Hír adatod van, és plusz helyet foglal a lemezen."
 
 # src/mainwindow.c:666
 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."
 msgstr "A mentés megtartása lehetővé teszi, hogy visszatérj egy korábbi verzióhoz, de eltarthat egy ideig, ha gyorsítótárazott IMAP vagy Hír adatod van, és plusz helyet foglal a lemezen."
 
 # src/mainwindow.c:666

-#: src/main.c:349
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "Beállítások átvitele"
 
 # src/mainwindow.c:666
 msgid "Migration of configuration"
 msgstr "Beállítások átvitele"
 
 # src/mainwindow.c:666

-#: src/main.c:360
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "Beállítások másolása... Ez sokáig tarthat..."
 
 # src/message_search.c:183 src/summary_search.c:300
 msgid "Copying configuration... This may take a while..."
 msgstr "Beállítások másolása... Ez sokáig tarthat..."
 
 # src/message_search.c:183 src/summary_search.c:300

-#: src/main.c:369
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "Migráció sikertelen!"
 
 # src/mainwindow.c:666
 msgid "Migration failed!"
 msgstr "Migráció sikertelen!"
 
 # src/mainwindow.c:666

-#: src/main.c:378
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "Beállítások átvétele..."
 
 # src/main.c:161
 msgid "Migrating configuration..."
 msgstr "Beállítások átvétele..."
 
 # src/main.c:161

-#: src/main.c:695
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "a glib nem támogatja a g_thread-et.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "a glib nem támogatja a g_thread-et.\n"
 

-#: src/main.c:701
+#: src/main.c:713

 msgid "Claws Mail has been compiled with a more recent GTK+ library than is currently available. This will cause crashes. You need to upgrade GTK+ or recompile Claws Mail."
 msgstr "A Claws Mail a jelenleg elérhetőnél újabb GTK+ függvénykönyvtárral lett fordítva. Ez a program összeomlását okozhatja. Frissítsd a GTK+-t, vagy fordítsd újra a Claws Mail-t. "
 
 msgid "Claws Mail has been compiled with a more recent GTK+ library than is currently available. This will cause crashes. You need to upgrade GTK+ or recompile Claws Mail."
 msgstr "A Claws Mail a jelenleg elérhetőnél újabb GTK+ függvénykönyvtárral lett fordítva. Ez a program összeomlását okozhatja. Frissítsd a GTK+-t, vagy fordítsd újra a Claws Mail-t. "
 

-#: src/main.c:710
+#: src/main.c:722

 msgid "Claws Mail has been compiled with an older GTK+ library than is currently available. This will cause crashes. You need to recompile Claws Mail."
 msgstr "A Claws Mail a jelenleg elérhetőnél régebbi GTK+ függvénykönyvtárral lett fordítva. Ez a program összeomlását okozhatja. Fordítsd újra a Claws Mail-t. "
 
 msgid "Claws Mail has been compiled with an older GTK+ library than is currently available. This will cause crashes. You need to recompile Claws Mail."
 msgstr "A Claws Mail a jelenleg elérhetőnél régebbi GTK+ függvénykönyvtárral lett fordítva. Ez a program összeomlását okozhatja. Fordítsd újra a Claws Mail-t. "
 

-#: src/main.c:995
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (vagy régebbi)"
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (vagy régebbi)"
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (vagy régebbi)"
+
+#: src/main.c:1013

 msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."
 msgstr "Egy vagy több plugin betöltése nem sikerült. Ellenőrizd a plugin beállításokat."
 
 msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."
 msgstr "Egy vagy több plugin betöltése nem sikerült. Ellenőrizd a plugin beállításokat."
 

-#: src/main.c:1014
+#: src/main.c:1032

 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."
 msgstr "A Claws Mail egy részben beállított postaládát talált. Lehet, hogy ez egy nem működő IMAP fiók miatt van. Próbáld meg a \"Mappafa újraépítése\" funkcióval javítani."
 
 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."
 msgstr "A Claws Mail egy részben beállított postaládát talált. Lehet, hogy ez egy nem működő IMAP fiók miatt van. Próbáld meg a \"Mappafa újraépítése\" funkcióval javítani."
 

-#: src/main.c:1020
+#: src/main.c:1038

 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."
 msgstr "A Claws Mail egy beállított postafiókot talált, de nem tudja betölteni. Lehet, hogy ezt egy elavult külső plugin okozza. Telepítsd újra a plugint, és próbáld meg ismét."
 
 # src/main.c:368
 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."
 msgstr "A Claws Mail egy beállított postafiókot talált, de nem tudja betölteni. Lehet, hogy ezt egy elavult külső plugin okozza. Telepítsd újra a plugint, és próbáld meg ismét."
 
 # src/main.c:368

-#: src/main.c:1281
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPTION]...\n"
 
 # src/main.c:371
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPTION]...\n"
 
 # src/main.c:371

-#: src/main.c:1283
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 

-#: src/main.c:1284
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      felratkozás a megadott URI címre, ha az lehetséges"
 
 # src/main.c:372
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      felratkozás a megadott URI címre, ha az lehetséges"
 
 # src/main.c:372

-#: src/main.c:1285
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -6244,27 +6819,27 @@ msgstr ""
 "                          csatolásával"
 
 # src/main.c:375
 "                          csatolásával"
 
 # src/main.c:375

-#: src/main.c:1288
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr "  --receive              új üzenetek vétele"
 
 # src/main.c:376
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új üzenetek vétele"
 
 # src/main.c:376

-#: src/main.c:1289
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új üzenetek vétele minden fiókról"
 
 # src/main.c:377
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új üzenetek vétele minden fiókról"
 
 # src/main.c:377

-#: src/main.c:1290
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --küldés                összes postázandó üzenet küldése"
 
 # src/main.c:378
 msgid "  --send                 send all queued messages"
 msgstr "  --küldés                összes postázandó üzenet küldése"
 
 # src/main.c:378

-#: src/main.c:1291
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...   az összes üzenet számának megjelenítése"
 
 # src/main.c:378
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...   az összes üzenet számának megjelenítése"
 
 # src/main.c:378

-#: src/main.c:1292
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -6272,7 +6847,7 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                         összes mappa státuszának megjelenítése"
 
 "  --status-full [mappa]...\n"
 "                         összes mappa státuszának megjelenítése"
 

-#: src/main.c:1294
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"


@@ -6281,61 +6856,61 @@ msgstr ""
 "                         a mappa egy mappaazonosító, mint 'mappa/almappa'"
 
 # src/main.c:379
 "                         a mappa egy mappaazonosító, mint 'mappa/almappa'"
 
 # src/main.c:379

-#: src/main.c:1296
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               online módba váltás"
 
 # src/main.c:379
 msgid "  --online               switch to online mode"
 msgstr "  --online               online módba váltás"
 
 # src/main.c:379

-#: src/main.c:1297
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              offline módba váltás"
 
 # src/main.c:377
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              offline módba váltás"
 
 # src/main.c:377

-#: src/main.c:1298
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       kilépés a Claws Mail-ból"
 
 # src/main.c:379
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       kilépés a Claws Mail-ból"
 
 # src/main.c:379

-#: src/main.c:1299
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső mód"
 
 # src/main.c:380
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső mód"
 
 # src/main.c:380

-#: src/main.c:1300
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              a segítség kiírása és kilépés"
 
 # src/main.c:381
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              a segítség kiírása és kilépés"
 
 # src/main.c:381

-#: src/main.c:1301
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           verziószám kiírása és kilépés"
 
 # src/main.c:381
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           verziószám kiírása és kilépés"
 
 # src/main.c:381

-#: src/main.c:1302
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           konfigurációs könyvtár kijelzése"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           konfigurációs könyvtár kijelzése"
 

-#: src/main.c:1342
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr "Ismeretlen opció\n"
 
 msgid "Unknown option\n"
 msgstr "Ismeretlen opció\n"
 

-#: src/main.c:1360
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Feldolgozás (%s)..."
 
 # src/folderview.c:1695
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Feldolgozás (%s)..."
 
 # src/folderview.c:1695

-#: src/main.c:1363
+#: src/main.c:1389

 msgid "top level folder"
 msgstr "felső szintű mappa"
 
 # src/main.c:418
 msgid "top level folder"
 msgstr "felső szintű mappa"
 
 # src/main.c:418

-#: src/main.c:1432
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "Várakozó üzenetek"
 
 # src/main.c:419
 msgid "Queued messages"
 msgstr "Várakozó üzenetek"
 
 # src/main.c:419

-#: src/main.c:1433
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen üzenetek. Mégis kilép?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen üzenetek. Mégis kilép?"
 


@@ -6447,7 +7022,7 @@ msgstr "/_Szerkesztés/Gyorskeresés"
 # src/compose.c:545 src/mainwindow.c:445 src/summaryview.c:381
 #: src/mainwindow.c:540
 #: src/messageview.c:175
 # src/compose.c:545 src/mainwindow.c:445 src/summaryview.c:381
 #: src/mainwindow.c:540
 #: src/messageview.c:175

-#: src/summaryview.c:477
+#: src/summaryview.c:483

 msgid "/_View"
 msgstr "/_Nézet"
 
 msgid "/_View"
 msgstr "/_Nézet"
 


@@ -7000,7 +7575,7 @@ msgstr "/_Nézet/Dekódolás/_Uuencode"
 
 # src/mainwindow.c:598 src/summaryview.c:382
 #: src/mainwindow.c:745
 
 # src/mainwindow.c:598 src/summaryview.c:382
 #: src/mainwindow.c:745

-#: src/summaryview.c:478
+#: src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 


@@ -7247,7 +7822,7 @@ msgstr "/Ü_zenet/_Megjelöl/_Spam"
 # src/mainwindow.c:636
 #: src/mainwindow.c:806
 msgid "/_Message/_Mark/Mark as _ham"
 # src/mainwindow.c:636
 #: src/mainwindow.c:806
 msgid "/_Message/_Mark/Mark as _ham"

-msgstr "/Ü_zenet/_Megjelöl/_Nem spam"
+msgstr "/Ü_zenet/_Megjelöl/Nem s_pam"

 
 # src/mainwindow.c:632
 #: src/mainwindow.c:808
 
 # src/mainwindow.c:632
 #: src/mainwindow.c:808


@@ -7296,7 +7871,7 @@ msgstr "/_Eszközök/_Címek kigyűjtése/Ü_zenetekből..."
 # src/mainwindow.c:646
 #: src/mainwindow.c:824
 msgid "/_Tools/_Filter all messages in folder"
 # src/mainwindow.c:646
 #: src/mainwindow.c:824
 msgid "/_Tools/_Filter all messages in folder"

-msgstr "/_Eszközök/Összes üzenetek _szűrése a mappában"
+msgstr "/_Eszközök/Összes üzenet _szűrése a mappában"

 
 # src/mainwindow.c:646
 #: src/mainwindow.c:826
 
 # src/mainwindow.c:646
 #: src/mainwindow.c:826


@@ -7313,25 +7888,25 @@ msgstr "/_Eszközök/_Szűrési szabályok létrehozása"
 #: src/mainwindow.c:829
 #: src/messageview.c:313
 msgid "/_Tools/_Create filter rule/_Automatically"
 #: src/mainwindow.c:829
 #: src/messageview.c:313
 msgid "/_Tools/_Create filter rule/_Automatically"

-msgstr "/_Eszközök/_Szűrési szabályok létrehozása/Automatikusan"
+msgstr "/_Eszközök/_Szűrési szabályok létrehozása/_Automatikusan"

 
 # src/mainwindow.c:650
 #: src/mainwindow.c:831
 #: src/messageview.c:315
 msgid "/_Tools/_Create filter rule/by _From"
 
 # src/mainwindow.c:650
 #: src/mainwindow.c:831
 #: src/messageview.c:315
 msgid "/_Tools/_Create filter rule/by _From"

-msgstr "/_Eszközök/_Szűrési szabályok létrehozása/Feladó szerint"
+msgstr "/_Eszközök/_Szűrési szabályok létrehozása/_Feladó szerint"

 
 # src/mainwindow.c:652
 #: src/mainwindow.c:833
 #: src/messageview.c:317
 msgid "/_Tools/_Create filter rule/by _To"
 
 # src/mainwindow.c:652
 #: src/mainwindow.c:833
 #: src/messageview.c:317
 msgid "/_Tools/_Create filter rule/by _To"

-msgstr "/_Eszközök/_Szűrési szabályok létrehozása/Cimzett szerint"
+msgstr "/_Eszközök/_Szűrési szabályok létrehozása/_Címzett szerint"

 
 # src/mainwindow.c:654
 #: src/mainwindow.c:835
 #: src/messageview.c:319
 msgid "/_Tools/_Create filter rule/by _Subject"
 
 # src/mainwindow.c:654
 #: src/mainwindow.c:835
 #: src/messageview.c:319
 msgid "/_Tools/_Create filter rule/by _Subject"

-msgstr "/_Eszközök/_Szűrési szabályok létrehozása/Tárgy szerint"
+msgstr "/_Eszközök/_Szűrési szabályok létrehozása/_Tárgy szerint"

 
 # src/mainwindow.c:647
 #: src/mainwindow.c:837
 
 # src/mainwindow.c:647
 #: src/mainwindow.c:837


@@ -7341,22 +7916,22 @@ msgstr "/_Eszközök/_Feldolgozási szabály létrehozása"
 # src/mainwindow.c:648
 #: src/mainwindow.c:838
 msgid "/_Tools/C_reate processing rule/_Automatically"
 # src/mainwindow.c:648
 #: src/mainwindow.c:838
 msgid "/_Tools/C_reate processing rule/_Automatically"

-msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/Automatikusan"
+msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/_Automatikusan"

 
 # src/mainwindow.c:650
 #: src/mainwindow.c:840
 msgid "/_Tools/C_reate processing rule/by _From"
 
 # src/mainwindow.c:650
 #: src/mainwindow.c:840
 msgid "/_Tools/C_reate processing rule/by _From"

-msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/Feladó szerint"
+msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/_Feladó szerint"

 
 # src/mainwindow.c:652
 #: src/mainwindow.c:842
 msgid "/_Tools/C_reate processing rule/by _To"
 
 # src/mainwindow.c:652
 #: src/mainwindow.c:842
 msgid "/_Tools/C_reate processing rule/by _To"

-msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/Cimzett szerint"
+msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/_Címzett szerint"

 
 # src/mainwindow.c:654
 #: src/mainwindow.c:844
 msgid "/_Tools/C_reate processing rule/by _Subject"
 
 # src/mainwindow.c:654
 #: src/mainwindow.c:844
 msgid "/_Tools/C_reate processing rule/by _Subject"

-msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/Tárgy szerint"
+msgstr "/_Eszközök/_Feldolgozási szabályok létrehozása/_Tárgy szerint"

 
 # src/addressbook.c:357
 #: src/mainwindow.c:847
 
 # src/addressbook.c:357
 #: src/mainwindow.c:847


@@ -7396,13 +7971,13 @@ msgstr "/_Eszközök/SSL _tanúsítványok..."
 
 # src/mainwindow.c:664
 #: src/mainwindow.c:867
 
 # src/mainwindow.c:664
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/_Eszközök/Szűrési hibakeresési ablak"
+msgid "/_Tools/Filtering Log"
+msgstr "/_Eszközök/Szűrési napló"

 
 

-# src/mainwindow.c:664
+# src/logwindow.c:57

 #: src/mainwindow.c:868
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/_Eszközök/_Napló ablak"
+msgid "/_Tools/Network _Log"
+msgstr "/_Eszközök/_Hálózat napló"

 
 # src/mainwindow.c:666
 #: src/mainwindow.c:870
 
 # src/mainwindow.c:666
 #: src/mainwindow.c:870


@@ -7504,27 +8079,26 @@ msgstr "Kapcsolat nélküli módban vagy. Kattints az ikonra a kapcsolódáshoz.
 msgid "Select account"
 msgstr "Fiók kiválasztása"
 
 msgid "Select account"
 msgstr "Fiók kiválasztása"
 

-# src/logwindow.c:57
+# src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

 #: src/mainwindow.c:1300
 #: src/mainwindow.c:1300

-#: src/prefs_logging.c:114
-msgid "Protocol log"
-msgstr "Protokoll napló"
+#: src/prefs_logging.c:112
+msgid "Network log"
+msgstr "Hálózat napló"

 
 # src/mainwindow.c:666
 #: src/mainwindow.c:1304
 
 # src/mainwindow.c:666
 #: src/mainwindow.c:1304

-#: src/prefs_logging.c:152

 msgid "Filtering/processing debug log"
 msgstr "Szűrési/feldolgozási hibakeresés napló"
 
 #: src/mainwindow.c:1323
 msgid "Filtering/processing debug log"
 msgstr "Szűrési/feldolgozási hibakeresés napló"
 
 #: src/mainwindow.c:1323

-#: src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
-msgstr "szűrési hibakeresés engedélyezve\n"
+#: src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr "szűrési napló engedélyezve\n"

 
 #: src/mainwindow.c:1325
 
 #: src/mainwindow.c:1325

-#: src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
-msgstr "szűrési hibakeresés letiltva.\n"
+#: src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr "szűrési napló letiltva\n"

 
 # src/mainwindow.c:1044 src/mainwindow.c:1061
 #: src/mainwindow.c:1715
 
 # src/mainwindow.c:1044 src/mainwindow.c:1061
 #: src/mainwindow.c:1715


@@ -7533,7 +8107,7 @@ msgstr "szűrési hibakeresés letiltva.\n"
 #: src/mainwindow.c:1828
 #: src/mainwindow.c:1871
 #: src/plugins/trayicon/trayicon.c:147
 #: src/mainwindow.c:1828
 #: src/mainwindow.c:1871
 #: src/plugins/trayicon/trayicon.c:147

-#: src/prefs_folder_item.c:765
+#: src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "Névtelen"
 
 msgid "Untitled"
 msgstr "Névtelen"
 


@@ -7556,7 +8130,7 @@ msgstr "Új postaláda"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "Add meg a postaláda helyét.\n"
 "scanned automatically."
 msgstr ""
 "Add meg a postaláda helyét.\n"


@@ -7586,185 +8160,156 @@ msgstr ""
 "Postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
 "Postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "A küldés nincs engedélyezve"
 
 # src/import.c:224
 msgid "No posting allowed"
 msgstr "A küldés nincs engedélyezve"
 
 # src/import.c:224

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "Az mbox fájl importálása nem sikerült."
 
 # src/mainwindow.c:427
 msgid "Mbox import has failed."
 msgstr "Az mbox fájl importálása nem sikerült."
 
 # src/mainwindow.c:427

-#: src/mainwindow.c:3053
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3055
+#: src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "Az mbox fájl exportálása nem sikerült."
 
 # src/mainwindow.c:2182
 msgid "Export to mbox has failed."
 msgstr "Az mbox fájl exportálása nem sikerült."
 
 # src/mainwindow.c:2182

-#: src/mainwindow.c:3085
-#: src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087
+#: src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr "Kilépés"
 
 msgid "Exit"
 msgstr "Kilépés"
 

-#: src/mainwindow.c:3085
-#: src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087
+#: src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr "Kilépés a Claws Mail-ból?"
 
 # src/prefs_common.c:910
 msgid "Exit Claws Mail?"
 msgstr "Kilépés a Claws Mail-ból?"
 
 # src/prefs_common.c:910

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr "Mappaszinkronizáció"
 
 msgid "Folder synchronisation"
 msgstr "Mappaszinkronizáció"
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr "Szinkronizálod a mappáidat most?"
 
 # src/compose.c:452
 msgid "Do you want to synchronise your folders now?"
 msgstr "Szinkronizálod a mappáidat most?"
 
 # src/compose.c:452

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+_Szinkronizáció"
 
 # src/summaryview.c:2393 src/summaryview.c:2395
 msgid "+_Synchronise"
 msgstr "+_Szinkronizáció"
 
 # src/summaryview.c:2393 src/summaryview.c:2395

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "Többszörös üzenetek törlése..."
 
 # src/summaryview.c:2393 src/summaryview.c:2395
 msgid "Deleting duplicated messages..."
 msgstr "Többszörös üzenetek törlése..."
 
 # src/summaryview.c:2393 src/summaryview.c:2395

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d többszörös üzenet törölve %d mappában.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d többszörös üzenet törölve %d mappában.\n"
 

-#: src/mainwindow.c:3774
-#: src/summaryview.c:4907
+#: src/mainwindow.c:3777
+#: src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr "Mappaszabályok előtt alkalmazandó feldolgozási szabályok"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Mappaszabályok előtt alkalmazandó feldolgozási szabályok"
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr "Mappaszabályok után alkalmazandó feldolgozási szabályok"
 
 # src/mainwindow.c:666
 msgid "Processing rules to apply after folder rules"
 msgstr "Mappaszabályok után alkalmazandó feldolgozási szabályok"
 
 # src/mainwindow.c:666

-#: src/mainwindow.c:3792
-#: src/summaryview.c:4918
+#: src/mainwindow.c:3795
+#: src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "Szűrési beállítások"
 
 msgid "Filtering configuration"
 msgstr "Szűrési beállítások"
 

-# src/prefs_summary_column.c:70 src/summaryview.c:398
-#: src/matcher.c:750
-#: src/matcher.c:752
-msgid "subject"
-msgstr "tárgy"
-
-# src/prefs_display_header.c:312
-#: src/matcher.c:754
-#: src/matcher.c:756
-msgid "From: header"
-msgstr "From: fejléc"
-

 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241

-#: src/matcher.c:758
-#: src/matcher.c:760
-#: src/matcher.c:766
-msgid "To: header"
-msgstr "To: fejléc"
-
-# src/prefs_account.c:1111 src/prefs_customheader.c:188
-# src/prefs_filter.c:241
-#: src/matcher.c:762
-#: src/matcher.c:764
-#: src/matcher.c:767
-msgid "Cc: header"
-msgstr "Cc: fejléc"
-
-# src/headerview.c:56
-#: src/matcher.c:975
-#: src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "Hírcsoportok: fejléc"
-
-# src/summaryview.c:344
-#: src/matcher.c:979
-#: src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "InReplyTo: fejléc"
-
-#: src/matcher.c:985
-#: src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr "InReplyTo: feljéc (hivatkozások)"
+#: src/matcher.c:782
+#: src/matcher.c:793
+#: src/matcher.c:804
+#: src/matcher.c:814
+#: src/matcher.c:815
+#: src/matcher.c:827
+#: src/matcher.c:828
+#: src/matcher.c:1044
+#: src/matcher.c:1056
+#: src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "%s fejléc"

 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241

-#: src/matcher.c:1071
-#: src/matcher.c:1073
+#: src/matcher.c:1157
+#: src/matcher.c:1159

 msgid "header"
 msgstr "fejléc"
 
 # src/prefs_display_header.c:222
 msgid "header"
 msgstr "fejléc"
 
 # src/prefs_display_header.c:222

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 msgid "header line"
 msgstr "fejléc sor"
 
 # src/prefs_display_header.c:222
 msgid "header line"
 msgstr "fejléc sor"
 
 # src/prefs_display_header.c:222

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 msgid "headers line"
 msgstr "fejlécek sor"
 
 # src/prefs_common.c:818
 msgid "headers line"
 msgstr "fejlécek sor"
 
 # src/prefs_common.c:818

-#: src/matcher.c:1086
-#: src/matcher.c:1088
+#: src/matcher.c:1172
+#: src/matcher.c:1174

 msgid "message line"
 msgstr "üzenet sor"
 
 msgid "message line"
 msgstr "üzenet sor"
 

-#: src/matcher.c:1099
-#: src/matcher.c:1232
-#: src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344
-#: src/prefs_matcher.c:1361
-#: src/prefs_matcher.c:2116
+#: src/matcher.c:1185
+#: src/matcher.c:1318
+#: src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371
+#: src/prefs_matcher.c:1388
+#: src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "Összes"
 
 # src/prefs_actions.c:318
 msgid "Filtering Matcher Menu|All"
 msgstr "Összes"
 
 # src/prefs_actions.c:318

-#: src/matcher.c:1306
-#: src/matcher.c:1309
+#: src/matcher.c:1392
+#: src/matcher.c:1395

 msgid "body line"
 msgstr "törzs sor"
 
 # src/summaryview.c:2611
 msgid "body line"
 msgstr "törzs sor"
 
 # src/summaryview.c:2611

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "ellenőrzés, ha az üzenet egyezik [ %s ]\n"
 
 # src/summaryview.c:954
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "ellenőrzés, ha az üzenet egyezik [ %s ]\n"
 
 # src/summaryview.c:954

-#: src/matcher.c:1542
-#: src/matcher.c:1561
-#: src/matcher.c:1574
+#: src/matcher.c:1628
+#: src/matcher.c:1647
+#: src/matcher.c:1660

 msgid "message matches\n"
 msgstr "üzenet egyezés\n"
 
 msgid "message matches\n"
 msgstr "üzenet egyezés\n"
 

-#: src/matcher.c:1549
-#: src/matcher.c:1567
-#: src/matcher.c:1576
+#: src/matcher.c:1635
+#: src/matcher.c:1653
+#: src/matcher.c:1662

 msgid "message does not match\n"
 msgstr "üzenet nem egyezik\n"
 
 # src/prefs_filter.c:263 src/prefs_filter.c:687 src/prefs_filter.c:843
 # src/prefs_filter.c:853
 msgid "message does not match\n"
 msgstr "üzenet nem egyezik\n"
 
 # src/prefs_filter.c:263 src/prefs_filter.c:687 src/prefs_filter.c:843
 # src/prefs_filter.c:853

-#: src/matcher.c:1829
-#: src/matcher.c:1830
-#: src/matcher.c:1831
-#: src/matcher.c:1832
-#: src/matcher.c:1833
-#: src/matcher.c:1834
-#: src/matcher.c:1835
-#: src/matcher.c:1836
+#: src/matcher.c:1915
+#: src/matcher.c:1916
+#: src/matcher.c:1917
+#: src/matcher.c:1918
+#: src/matcher.c:1919
+#: src/matcher.c:1920
+#: src/matcher.c:1921
+#: src/matcher.c:1922

 msgid "(none)"
 msgstr "(nincs)"
 
 msgid "(none)"
 msgstr "(nincs)"
 


@@ -7794,9 +8339,9 @@ msgstr "A fájl már létezik. Felülírod?"
 
 # src/mimeview.c:803 src/summaryview.c:2669
 #: src/mbox.c:531
 
 # src/mimeview.c:803 src/summaryview.c:2669
 #: src/mbox.c:531

-#: src/messageview.c:1180
-#: src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/messageview.c:1192
+#: src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "Felülírás"
 
 msgid "Overwrite"
 msgstr "Felülírás"
 


@@ -7827,36 +8372,36 @@ msgstr "Keresett szöveg:"
 
 # src/message_search.c:121 src/summary_search.c:181
 #: src/message_search.c:210
 
 # src/message_search.c:121 src/summary_search.c:181
 #: src/message_search.c:210

-#: src/prefs_matcher.c:655
+#: src/prefs_matcher.c:682

 #: src/summary_search.c:396
 msgid "Case sensitive"
 msgstr "Nagy-/Kisbetű"
 
 # src/message_search.c:183 src/summary_search.c:300
 #: src/summary_search.c:396
 msgid "Case sensitive"
 msgstr "Nagy-/Kisbetű"
 
 # src/message_search.c:183 src/summary_search.c:300

-#: src/message_search.c:325
-#: src/summary_search.c:661
+#: src/message_search.c:326
+#: src/summary_search.c:668

 msgid "Search failed"
 msgstr "Keresés sikertelen"
 
 # src/message_search.c:184 src/summary_search.c:301
 msgid "Search failed"
 msgstr "Keresés sikertelen"
 
 # src/message_search.c:184 src/summary_search.c:301

-#: src/message_search.c:326
-#: src/summary_search.c:662
+#: src/message_search.c:327
+#: src/summary_search.c:669

 msgid "Search string not found."
 msgstr "A keresett karaktersorozatot nem találtam."
 
 # src/message_search.c:191
 msgid "Search string not found."
 msgstr "A keresett karaktersorozatot nem találtam."
 
 # src/message_search.c:191

-#: src/message_search.c:335
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr "Az üzenet elejére értem; folytassam a végétől?"
 
 # src/message_search.c:194
 msgid "Beginning of message reached; continue from end?"
 msgstr "Az üzenet elejére értem; folytassam a végétől?"
 
 # src/message_search.c:194

-#: src/message_search.c:338
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr "Az üzenet végére értem; folytassam az elejétől?"
 
 # src/message_search.c:197 src/summary_search.c:310
 msgid "End of message reached; continue from beginning?"
 msgstr "Az üzenet végére értem; folytassam az elejétől?"
 
 # src/message_search.c:197 src/summary_search.c:310

-#: src/message_search.c:341
-#: src/summary_search.c:673
+#: src/message_search.c:342
+#: src/summary_search.c:680

 msgid "Search finished"
 msgstr "A keresés befejeződött"
 
 msgid "Search finished"
 msgstr "A keresés befejeződött"
 


@@ -7888,22 +8433,22 @@ msgstr "/_Eszközök/Feldolgozási szabály létrehozása"
 # src/mainwindow.c:648
 #: src/messageview.c:323
 msgid "/_Tools/Create processing rule/_Automatically"
 # src/mainwindow.c:648
 #: src/messageview.c:323
 msgid "/_Tools/Create processing rule/_Automatically"

-msgstr "/_Eszközök/Feldolgozási szabály létrehozása/Automatikusan"
+msgstr "/_Eszközök/Feldolgozási szabály létrehozása/_Automatikusan"

 
 # src/mainwindow.c:650
 #: src/messageview.c:325
 msgid "/_Tools/Create processing rule/by _From"
 
 # src/mainwindow.c:650
 #: src/messageview.c:325
 msgid "/_Tools/Create processing rule/by _From"

-msgstr "/_Eszközök/Feldolgozási szabály létrehozása/Feladó szerint"
+msgstr "/_Eszközök/Feldolgozási szabály létrehozása/_Feladó szerint"

 
 # src/mainwindow.c:652
 #: src/messageview.c:327
 msgid "/_Tools/Create processing rule/by _To"
 
 # src/mainwindow.c:652
 #: src/messageview.c:327
 msgid "/_Tools/Create processing rule/by _To"

-msgstr "/_Eszközök/Feldolgozási szabály létrehozása/Cimzett szerint"
+msgstr "/_Eszközök/Feldolgozási szabály létrehozása/_Címzett szerint"

 
 # src/mainwindow.c:654
 #: src/messageview.c:329
 msgid "/_Tools/Create processing rule/by _Subject"
 
 # src/mainwindow.c:654
 #: src/messageview.c:329
 msgid "/_Tools/Create processing rule/by _Subject"

-msgstr "/_Eszközök/Feldolgozási szabály létrehozása/Tárgy szerint"
+msgstr "/_Eszközök/Feldolgozási szabály létrehozása/_Tárgy szerint"

 
 # src/mainwindow.c:1619 src/messageview.c:115
 #: src/messageview.c:455
 
 # src/mainwindow.c:1619 src/messageview.c:115
 #: src/messageview.c:455


@@ -7949,47 +8494,48 @@ msgstr ""
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
 #: src/messageview.c:817
 "Nem ajánlott az olvasási visszaigazolás elküldése."
 
 #: src/messageview.c:817

-#: src/procmime.c:883
+#: src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "%s nem fejthető vissza"
 
 # src/mimeview.c:798 src/summaryview.c:2664
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "%s nem fejthető vissza"
 
 # src/mimeview.c:798 src/summaryview.c:2664

-#: src/messageview.c:1175
-#: src/mimeview.c:1606
-#: src/summaryview.c:4187
-#: src/summaryview.c:4190
-#: src/textview.c:2648
+#: src/messageview.c:1184
+#: src/messageview.c:1187
+#: src/mimeview.c:1663
+#: src/summaryview.c:4209
+#: src/summaryview.c:4212
+#: src/textview.c:2659

 msgid "Save as"
 msgstr "Mentés másként"
 
 # src/mimeview.c:804 src/summaryview.c:2670
 msgid "Save as"
 msgstr "Mentés másként"
 
 # src/mimeview.c:804 src/summaryview.c:2670

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 # src/summaryview.c:2677
 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 # src/summaryview.c:2677

-#: src/messageview.c:1189
-#: src/summaryview.c:4207
-#: src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201
+#: src/summaryview.c:4229
+#: src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' fájl nem menthető el."
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' fájl nem menthető el."
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "Az üzenet visszaigazolást kér."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Az üzenet visszaigazolást kér."
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "Ez az üzenet visszaigazolást kér."
 
 msgid "This message asks for a return receipt."
 msgstr "Ez az üzenet visszaigazolást kér."
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "Visszaigazolás küldése"
 
 msgid "Send receipt"
 msgstr "Visszaigazolás küldése"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -7998,7 +8544,7 @@ msgstr ""
 "és törölve lesz a szerverről."
 
 # src/compose.c:5094
 "és törölve lesz a szerverről."
 
 # src/compose.c:5094

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -8007,17 +8553,17 @@ msgstr ""
 "Az üzenet csak részben érkezett meg.\n"
 "%s"
 
 "Az üzenet csak részben érkezett meg.\n"
 "%s"
 

-#: src/messageview.c:1308
-#: src/messageview.c:1330
+#: src/messageview.c:1320
+#: src/messageview.c:1342

 msgid "Mark for download"
 msgstr "Kijelölés letöltésre"
 
 msgid "Mark for download"
 msgstr "Kijelölés letöltésre"
 

-#: src/messageview.c:1309

 #: src/messageview.c:1321
 #: src/messageview.c:1321

+#: src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "Kjelölés törlésre"
 
 msgid "Mark for deletion"
 msgstr "Kjelölés törlésre"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -8028,13 +8574,13 @@ msgstr ""
 
 # 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/addressadd.c:203 src/addressbook.c:490 src/editaddress.c:196
 # src/editaddress.c:785 src/editaddress.c:850 src/editgroup.c:256

-#: src/messageview.c:1319
-#: src/messageview.c:1332
+#: src/messageview.c:1331
+#: src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Kijelölés visszavonása"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Kijelölés visszavonása"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -8043,11 +8589,11 @@ msgstr ""
 "Az üzenet részben lett letöltve,\n"
 "%s - és törölve lesz"
 
 "Az üzenet részben lett letöltve,\n"
 "%s - és törölve lesz"
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "Fogadás visszaigazolása"
 
 msgid "Return Receipt Notification"
 msgstr "Fogadás visszaigazolása"
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt notification:"
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt notification:"


@@ -8068,23 +8614,23 @@ 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/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/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "_Mégsem"
 
 # src/prefs_account.c:1138
 msgid "_Cancel"
 msgstr "_Mégsem"
 
 # src/prefs_account.c:1138

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "Feljegyzés küldése"
 
 # src/compose.c:2362
 msgid "_Send Notification"
 msgstr "Feljegyzés küldése"
 
 # src/compose.c:2362

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nem nyomtatható: az üzenet nem tartalmaz szöveget."
 
 # src/summaryview.c:2695
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nem nyomtatható: az üzenet nem tartalmaz szöveget."
 
 # src/summaryview.c:2695

-#: src/messageview.c:1545
-#: src/summaryview.c:4247
+#: src/messageview.c:1557
+#: src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -8094,8 +8640,8 @@ msgstr ""
 "('%s' fájlnévként helyettesítődik)"
 
 # src/summaryview.c:2701
 "('%s' fájlnévként helyettesítődik)"
 
 # src/summaryview.c:2701

-#: src/messageview.c:1551
-#: src/summaryview.c:4253
+#: src/messageview.c:1563
+#: src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -8105,10 +8651,10 @@ msgstr ""
 "'%s'"
 
 # src/news.c:776 src/news.c:801
 "'%s'"
 
 # src/news.c:776 src/news.c:801

-#: src/messageview.c:1829
-#: src/messageview.c:1835
-#: src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841
+#: src/messageview.c:1847
+#: src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr "Hiba történt a tanulás közben.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Hiba történt a tanulás közben.\n"
 


@@ -8154,108 +8700,111 @@ msgid "_Remove"
 msgstr "/_Törlés"
 
 # src/mimeview.c:114
 msgstr "/_Törlés"
 
 # src/mimeview.c:114

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr "/_Megnyit"
-
-# src/mimeview.c:115

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
-msgstr "/Megnyit mint..."
+msgid "/_Open (l)"
+msgstr "/_Megnyitás (I)"

 
 

-# src/mimeview.c:116
+# src/mimeview.c:115

 #: src/mimeview.c:170
 #: src/mimeview.c:170

-msgid "/_Display as text"
-msgstr "/Megjelenít _szövegként"
+msgid "/Open _with (o)..."
+msgstr "/Megnyitás _ezzel (o)..."

 
 

-# src/mimeview.c:117 src/summaryview.c:387
+# src/mimeview.c:116

 #: src/mimeview.c:171
 #: src/mimeview.c:171

-#: src/summaryview.c:483
-msgid "/_Save as..."
-msgstr "/Mentés másként..."
+msgid "/_Display as text (t)"
+msgstr "/Megjelenítés _szövegként (t)"

 
 # src/mimeview.c:117 src/summaryview.c:387
 #: src/mimeview.c:172
 
 # src/mimeview.c:117 src/summaryview.c:387
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr "/Menté_s másként (y)..."
+
+# src/mimeview.c:117 src/summaryview.c:387
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/Összes mentése..."
 
 msgid "/Save _all..."
 msgstr "/Összes mentése..."
 

+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr "/Következő rész (a)"
+

 # src/mimeview.c:148
 # src/mimeview.c:148

-#: src/mimeview.c:211
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "MIME típus"
 
 # src/mimeview.c:120
 msgid "MIME Type"
 msgstr "MIME típus"
 
 # src/mimeview.c:120

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "Aláírás ellenőrzése"
 
 # src/prefs_account.c:747
 msgid "Check signature"
 msgstr "Aláírás ellenőrzése"
 
 # src/prefs_account.c:747

-#: src/mimeview.c:764
-#: src/mimeview.c:769
-#: src/mimeview.c:774
+#: src/mimeview.c:766
+#: src/mimeview.c:771
+#: src/mimeview.c:776

 msgid "View full information"
 msgstr "Összes információ megjelenítése"
 
 # src/summaryview.c:915 src/summaryview.c:971
 msgid "View full information"
 msgstr "Összes információ megjelenítése"
 
 # src/summaryview.c:915 src/summaryview.c:971

-#: src/mimeview.c:779
-#: src/mimeview.c:783
+#: src/mimeview.c:781
+#: src/mimeview.c:785

 msgid "Check again"
 msgstr "Újraellenőrzés"
 
 msgid "Check again"
 msgstr "Újraellenőrzés"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Kattints az ikonra vagy üsd le a 'C'-t az ellenőrzéséhez."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Kattints az ikonra vagy üsd le a 'C'-t az ellenőrzéséhez."
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "Időtúllépés az aláírás ellenőrzésekor. Az ellenőrzés újbóli megpróbálásához kattints az ikonra, vagy üsd le a 'C' billentyűt."
 
 # src/sigstatus.c:129
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "Időtúllépés az aláírás ellenőrzésekor. Az ellenőrzés újbóli megpróbálásához kattints az ikonra, vagy üsd le a 'C' billentyűt."
 
 # src/sigstatus.c:129

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "Aláírás ellenőrzése..."
 
 msgid "Checking signature..."
 msgstr "Aláírás ellenőrzése..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "Vissza az e-mailhez"
 
 # src/mimeview.c:757 src/mimeview.c:811 src/mimeview.c:830 src/mimeview.c:854
 msgid "Go back to email"
 msgstr "Vissza az e-mailhez"
 
 # src/mimeview.c:757 src/mimeview.c:811 src/mimeview.c:830 src/mimeview.c:854

-#: src/mimeview.c:1388
-#: src/mimeview.c:1472
-#: src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438
+#: src/mimeview.c:1522
+#: src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "A többrészes üzenet egy darabja nem menthető: %s"
 
 # src/mimeview.c:804 src/summaryview.c:2670
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "A többrészes üzenet egy darabja nem menthető: %s"
 
 # src/mimeview.c:804 src/summaryview.c:2670

-#: src/mimeview.c:1461
-#: src/textview.c:2658
+#: src/mimeview.c:1511
+#: src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "'%s' létező fájl felülírása?"
 
 # src/foldersel.c:146
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "'%s' létező fájl felülírása?"
 
 # src/foldersel.c:146

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgstr "Célmappa kiválasztása"
 
 msgid "Select destination folder"
 msgstr "Célmappa kiválasztása"
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' nem könyvtár."
 
 # src/mimeview.c:864
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' nem könyvtár."
 
 # src/mimeview.c:864

-#: src/mimeview.c:1734
-#: src/mimeview.c:1742
-#: src/textview.c:2589
+#: src/mimeview.c:1791
+#: src/mimeview.c:1799
+#: src/textview.c:2600

 msgid "Open with"
 msgstr "Megnyitás ezzel:"
 
 # src/mimeview.c:865
 msgid "Open with"
 msgstr "Megnyitás ezzel:"
 
 # src/mimeview.c:865

-#: src/mimeview.c:1735
-#: src/mimeview.c:1743
-#: src/textview.c:2590
+#: src/mimeview.c:1792
+#: src/mimeview.c:1800
+#: src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -8398,27 +8947,28 @@ msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
 # src/compose.c:2346
 msgstr "_Leiratkozás"
 
 # src/compose.c:2346

-#: src/news_gtk.c:302
+#: src/news_gtk.c:303
+#: src/news_gtk.c:305

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Hiba történt '%s' üzeneteinek letöltése közben."
 
 # src/addressbook.c:380 src/addressbook.c:390
 #: src/plugins/bogofilter/bogofilter.c:77
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Hiba történt '%s' üzeneteinek letöltése közben."
 
 # src/addressbook.c:380 src/addressbook.c:390
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 msgid "Bogofilter"
 msgstr "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: üzenettörzs(ek) vétele..."
 
 # src/summaryview.c:2611
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: üzenettörzs(ek) vétele..."
 
 # src/summaryview.c:2611

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: üzenetek vizsgálata..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: üzenetek vizsgálata..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 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."
 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."


@@ -8426,28 +8976,28 @@ msgstr ""
 "A Bogofilter plugin nem tudja megvizsgálni az üzenetet. A hiba lehetséges oka, hogy nem lett tanítva.\n"
 "A \"/Megjelölés/Spam\" és a \"/Megjelölés/Nem spam\" opciókkal tanítsd a Bogofiltert pár száz spam, illetve nem spam üzenettel."
 
 "A Bogofilter plugin nem tudja megvizsgálni az üzenetet. A hiba lehetséges oka, hogy nem lett tanítva.\n"
 "A \"/Megjelölés/Spam\" és a \"/Megjelölés/Nem spam\" opciókkal tanítsd a Bogofiltert pár száz spam, illetve nem spam üzenettel."
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
 msgstr "A Bogofilter plugin nem tudja megvizsgálni az üzenetet. `%s %s %s` parancs nem futtatható."
 
 # src/summaryview.c:2611
 #, c-format
 msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
 msgstr "A Bogofilter plugin nem tudja megvizsgálni az üzenetet. `%s %s %s` parancs nem futtatható."
 
 # src/summaryview.c:2611

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: tanulás üzenetből..."
 
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: tanulás üzenetből..."
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "A tanulás sikertelen; `%s` %d státusszal tért vissza."
 
 # src/summaryview.c:2611
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "A tanulás sikertelen; `%s` %d státusszal tért vissza."
 
 # src/summaryview.c:2611

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: tanulás üzenetekből..."
 
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: tanulás üzenetekből..."
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"


@@ -8456,12 +9006,12 @@ msgstr ""
 "A tanulás sikertelen; `%s %s %s` hibával tért vissza:\n"
 "%s"
 
 "A tanulás sikertelen; `%s %s %s` hibával tért vissza:\n"
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834
+#: src/plugins/bogofilter/bogofilter.c:838

 #: src/privacy.c:61
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #: src/privacy.c:61
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:963

 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"
 "\n"
 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"
 "\n"


@@ -8479,107 +9029,113 @@ msgstr ""
 "\n"
 "A beállítások a /Beállítások/Közös beállítások/Pluginek/Bogofilter menüpontban találhatóak."
 
 "\n"
 "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:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam detection"
 msgstr "Spamszűrés"
 
 # src/send.c:391
 msgid "Spam detection"
 msgstr "Spamszűrés"
 
 # src/send.c:391

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594

 msgid "Spam learning"
 msgstr "Spam tanítás"
 
 # src/prefs_account.c:1029
 msgid "Spam learning"
 msgstr "Spam tanítás"
 
 # src/prefs_account.c:1029

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "Üzenetek feldolgozása fogadás közben"
 
 # src/editldap.c:434
 msgid "Process messages on receiving"
 msgstr "Üzenetek feldolgozása fogadás közben"
 
 # src/editldap.c:434

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "Maximális méret"
 
 # src/textview.c:557
 msgid "Maximum size"
 msgstr "Maximális méret"
 
 # src/textview.c:557

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr "Az ennél nagyobb üzenetek nem lesznek ellenőrizve"
 
 msgid "Messages larger than this will not be checked"
 msgstr "Az ennél nagyobb üzenetek nem lesznek ellenőrizve"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "kB"
 
 # src/mimeview.c:798 src/summaryview.c:2664
 msgid "kB"
 msgstr "kB"
 
 # src/mimeview.c:798 src/summaryview.c:2664

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "Spam mentése ide:"
 
 msgid "Save spam in"
 msgstr "Spam mentése ide:"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "A spamként megjelölt üzenetek tárolási mappája. Hagy üresen az alapértelmezett kuka mappa használatához."
 
 msgid "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "A spamként megjelölt üzenetek tárolási mappája. Hagy üresen az alapértelmezett kuka mappa használatához."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgstr "Kattints a gombra a spam tárolási mappájának kijelöléséhez"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Kattints a gombra a spam tárolási mappájának kijelöléséhez"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgstr "Ha bizonytalan, ide kerüljön:"
 
 msgid "When unsure, move to"
 msgstr "Ha bizonytalan, ide kerüljön:"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:213

 msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the inbox folder."
 msgstr "A bizonytalan spam státuszú üzenetek tárolási mappája. Hagy üresen az alapértelmezett bejövő üzenetek mappájának használatához"
 
 msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the inbox folder."
 msgstr "A bizonytalan spam státuszú üzenetek tárolási mappája. Hagy üresen az alapértelmezett bejövő üzenetek mappájának használatához"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr "Kattints a gombra a bizonytalan spam státuszú üzenetek tárolási mappájának kiválasztásához."
 
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr "Kattints a gombra a bizonytalan spam státuszú üzenetek tárolási mappájának kiválasztásához."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgstr "X-Bogosity fejléc beszúrása"
 
 # src/mainwindow.c:419
 msgid "Insert X-Bogosity header"
 msgstr "X-Bogosity fejléc beszúrása"
 
 # src/mainwindow.c:419

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "Csak az MH mappákban"
 
 # src/summaryview.c:369
 msgid "Only done for messages in MH folders"
 msgstr "Csak az MH mappákban"
 
 # src/summaryview.c:369

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgstr "Engedélyezett feladókat találtam a címjegyzékben/mappában"
 
 msgid "Whitelist senders found in address book/folder"
 msgstr "Engedélyezett feladókat találtam a címjegyzékben/mappában"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:238

 msgid "Messages coming from your address book contacts will be received in the normal folder even if detected as spam"
 msgstr "A címjegyzékben szereplő partnerektől érkezett üzenetek a normál bejövő mappába kerülnek akkor is, ha spam-nek jelöltek."
 
 # src/export.c:174 src/export.c:180 src/import.c:179 src/import.c:185
 # src/prefs_account.c:1046 src/prefs_filter.c:346
 msgid "Messages coming from your address book contacts will be received in the normal folder even if detected as spam"
 msgstr "A címjegyzékben szereplő partnerektől érkezett üzenetek a normál bejövő mappába kerülnek akkor is, ha spam-nek jelöltek."
 
 # src/export.c:174 src/export.c:180 src/import.c:179 src/import.c:185
 # src/prefs_account.c:1046 src/prefs_filter.c:346

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/plugins/bogofilter/bogofilter_gtk.c:256

 #: src/prefs_filtering_action.c:498
 #: src/prefs_filtering_action.c:505
 #: src/prefs_filtering_action.c:498
 #: src/prefs_filtering_action.c:505

-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "Kiválasztás..."
 
 msgid "Select ..."
 msgstr "Kiválasztás..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgstr "Kattints a gombra a címlista vagy a mappa kiválasztásához a címjegyzékben"
 
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Kattints a gombra a címlista vagy a mappa kiválasztásához a címjegyzékben"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr "Bogofilter hívás"
 
 msgid "Bogofilter call"
 msgstr "Bogofilter hívás"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "A bogofilter program elérési útja"
 
 msgid "Path to bogofilter executable"
 msgstr "A bogofilter program elérési útja"
 

+# src/summaryview.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "Spam megjelölése olvasottként"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -8594,7 +9150,7 @@ msgstr "ClamAV: üzenet vizsgálata..."
 msgid "Failed to register mail filtering hook"
 msgstr "E-mail szűrési szabálylánc regisztrálása sikertelen."
 
 msgid "Failed to register mail filtering hook"
 msgstr "E-mail szűrési szabálylánc regisztrálása sikertelen."
 

-#: src/plugins/clamav/clamav_plugin.c:303
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from an IMAP, LOCAL or POP account.\n"
 "\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from an IMAP, LOCAL or POP account.\n"
 "\n"


@@ -8608,7 +9164,7 @@ msgstr ""
 "\n"
 "A beállítások a /Beállítások/Közös beállítások/Pluginek/Clam AntiVirus részben találhatók."
 
 "\n"
 "A beállítások a /Beállítások/Közös beállítások/Pluginek/Clam AntiVirus részben találhatók."
 

-#: src/plugins/clamav/clamav_plugin.c:330
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr "Víruskeresés"
 
 msgid "Virus detection"
 msgstr "Víruskeresés"
 


@@ -8653,7 +9209,7 @@ msgstr "Kattints a gombra a fertőzött levelek tárolási mappájának kiválas
 
 # src/compose.c:443
 #: src/plugins/demo/demo.c:31
 
 # src/compose.c:443
 #: src/plugins/demo/demo.c:31

-#: src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr "Demo"
 
 msgid "Demo"
 msgstr "Demo"
 


@@ -8661,7 +9217,7 @@ msgstr "Demo"
 msgid "Failed to register log text hook"
 msgstr "A naplószöveg szabálylánc regisztrálása nem sikerült."
 
 msgid "Failed to register log text hook"
 msgstr "A naplószöveg szabálylánc regisztrálása nem sikerült."
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 "\n"
 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"
 "\n"


@@ -8699,7 +9255,7 @@ msgstr "Megegyezik a Dillo '--fullwindow' opciójával."
 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML megjelenítő"
 
 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML megjelenítő"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -8709,13 +9265,13 @@ msgstr ""
 "\n"
 "A beállításokat a /Beállítás/Tulajdonságok/Pluginek/Dillo böngésző menüpontban találod."
 
 "\n"
 "A beállításokat a /Beállítás/Tulajdonságok/Pluginek/Dillo böngésző menüpontban találod."
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr "text/html"
 
 # src/passphrase.c:85
 #: src/plugins/pgpcore/passphrase.c:97
 msgid "text/html"
 msgstr "text/html"
 
 # src/passphrase.c:85
 #: src/plugins/pgpcore/passphrase.c:97

-#: src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "Jelmondat"
 
 msgid "Passphrase"
 msgstr "Jelmondat"
 


@@ -8854,7 +9410,7 @@ msgstr "   A kulcs szerepel a kulcsgyűjteményedben.\n"
 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like PGP/Mime.\n"
 "\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like PGP/Mime.\n"
 "\n"


@@ -8873,85 +9429,85 @@ msgstr ""
 "A GPGME írója Werner Koch <dd9jn@gnu.org>, 2001."
 
 # src/prefs_actions.c:875
 "A GPGME írója Werner Koch <dd9jn@gnu.org>, 2001."
 
 # src/prefs_actions.c:875

-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94

 msgid "Core operations"
 msgstr "Alap műveletek"
 
 # src/prefs_common.c:1782
 msgid "Core operations"
 msgstr "Alap műveletek"
 
 # src/prefs_common.c:1782

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "Aláírások automatikus ellenőrzése"
 
 msgid "Automatically check signatures"
 msgstr "Aláírások automatikus ellenőrzése"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "gpg-agent használata a jelszavak kezelésére"
 
 # src/prefs_common.c:1788
 msgid "Use gpg-agent to manage passwords"
 msgstr "gpg-agent használata a jelszavak kezelésére"
 
 # src/prefs_common.c:1788

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "Jelmondat tárolása a memóriában"
 
 # src/prefs_common.c:1803
 msgid "Store passphrase in memory"
 msgstr "Jelmondat tárolása a memóriában"
 
 # src/prefs_common.c:1803

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "Lejárati idő"
 
 # src/prefs_common.c:1829
 msgid "Expire after"
 msgstr "Lejárati idő"
 
 # src/prefs_common.c:1829

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "('0' esetén a jelmondat az egész munkafolyamatra tárolódik)"
 
 # src/prefs_common.c:950
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "('0' esetén a jelmondat az egész munkafolyamatra tárolódik)"
 
 # src/prefs_common.c:950

-#: src/plugins/pgpcore/prefs_gpg.c:142
+#: src/plugins/pgpcore/prefs_gpg.c:144

 #: src/prefs_receive.c:157
 msgid "minute(s)"
 msgstr "percben"
 
 # src/prefs_common.c:1839
 #: src/prefs_receive.c:157
 msgid "minute(s)"
 msgstr "percben"
 
 # src/prefs_common.c:1839

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel tiltása egy jelmondat beadásakor"
 
 # src/prefs_common.c:1844
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel tiltása egy jelmondat beadásakor"
 
 # src/prefs_common.c:1844

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
 # src/prefs_account.c:1372
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
 # src/prefs_account.c:1372

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr "Digitális aláírás kulcs"
 
 # src/prefs_account.c:1380
 msgid "Sign key"
 msgstr "Digitális aláírás kulcs"
 
 # src/prefs_account.c:1380

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPg kulcs használata"
 
 # src/prefs_account.c:1389
 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPg kulcs használata"
 
 # src/prefs_account.c:1389

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "Kulcs választás e-mail címed alapján"
 
 # src/prefs_account.c:1398
 msgid "Select key by your email address"
 msgstr "Kulcs választás e-mail címed alapján"
 
 # src/prefs_account.c:1398

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
 # src/prefs_account.c:1414
 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
 # src/prefs_account.c:1414

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "Felhasználó- vagy kulcs-azonosító"
 
 # src/rfc2015.c:136 src/rfc2015.c:171 src/sigstatus.c:222
 msgid "User or key ID:"
 msgstr "Felhasználó- vagy kulcs-azonosító"
 
 # src/rfc2015.c:136 src/rfc2015.c:171 src/sigstatus.c:222

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "Titkos kulcs nem található."
 
 msgid "No secret key found."
 msgstr "Titkos kulcs nem található."
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "Új kulcspár generálása"
 
 msgid "Generate a new key pair"
 msgstr "Új kulcspár generálása"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr "GPG"
 
 msgid "GPG"
 msgstr "GPG"
 


@@ -8988,7 +9544,7 @@ msgstr "Választ"
 
 # src/prefs_common.c:826 src/select-keys.c:324
 #: src/plugins/pgpcore/select-keys.c:428
 
 # src/prefs_common.c:826 src/select-keys.c:324
 #: src/plugins/pgpcore/select-keys.c:428

-#: src/prefs_logging.c:372
+#: src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Egyéb"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Egyéb"


@@ -9274,13 +9830,13 @@ msgstr "A szövegadat semmilyen értelmezhető karakterkészletre nem konvertál
 
 #: src/plugins/pgpinline/pgpinline.c:275
 #: src/plugins/pgpinline/pgpinline.c:554
 
 #: src/plugins/pgpinline/pgpinline.c:275
 #: src/plugins/pgpinline/pgpinline.c:554

-#: src/plugins/pgpinline/pgpinline.c:676
-#: src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpinline/pgpinline.c:693
+#: src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72
 #: src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320
 #: src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72
 #: src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320
 #: src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:594
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "A GPG context nem inicializálható, %s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "A GPG context nem inicializálható, %s"


@@ -9348,27 +9904,31 @@ msgstr "Adat aláírása sikertelen, nincs eredmény."
 msgid "Data signing failed, no contents."
 msgstr "Adat aláírása sikertelen, nincs tartalom."
 
 msgid "Data signing failed, no contents."
 msgstr "Adat aláírása sikertelen, nincs tartalom."
 

-#: src/plugins/pgpinline/pgpinline.c:685
-#: src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid "Please note that attachments are not encrypted by the PGP/Inline system, nor are email headers, like Subject."
+msgstr "A PGP/Inline nem titkosítja a csatolásokat, illetve a fejléceket, mint pl. Tárgy."
+
+#: src/plugins/pgpinline/pgpinline.c:702
+#: src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nem vehető fel a GPG kulcs: %s, %s"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nem vehető fel a GPG kulcs: %s, %s"
 
 # src/editbook.c:120 src/editjpilot.c:192 src/editvcard.c:99

-#: src/plugins/pgpinline/pgpinline.c:706
-#: src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Az ideiglenes fájl nem hozható létre, %s"
 
 # src/inc.c:462
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Az ideiglenes fájl nem hozható létre, %s"
 
 # src/inc.c:462

-#: src/plugins/pgpinline/pgpinline.c:734
-#: src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751
+#: src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "A titkosítás sikertelen, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "A titkosítás sikertelen, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 


@@ -9376,7 +9936,7 @@ msgstr "PGP/Inline"
 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 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"
 "\n"
 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"
 "\n"


@@ -9416,7 +9976,11 @@ msgstr "A visszafejtett fájlrészek nem értelmezhetőek."
 msgid "Couldn't create temporary file: %s"
 msgstr "Az ideiglenes fájl nem hozható létre: %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "Az ideiglenes fájl nem hozható létre: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid "Please note that email headers, like Subject, are not encrypted by the PGP/Mime system."
+msgstr "A PGP/Mime nem titkosítja a fejléceket, mint pl. Tárgy."
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 


@@ -9424,7 +9988,7 @@ msgstr "PGP/Mime"
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59

 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"
 "\n"
 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"
 "\n"


@@ -9443,43 +10007,43 @@ msgstr ""
 "GPGME copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75
 "GPGME copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "A SpamAssassin plugin nem tud kapcsolódni a spamd-hez.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "A SpamAssassin plugin nem tud kapcsolódni a spamd-hez.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "A SpamAssassin plugin vizsgálata sikertelen.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "A SpamAssassin plugin vizsgálata sikertelen.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "A SpamAssassin plugin letiltva a beállításainál.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "A SpamAssassin plugin letiltva a beállításainál.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: üzenet vizsgálata..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: üzenet vizsgálata..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
+#: src/plugins/spamassassin/spamassassin.c:314

 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."
 msgstr "A SpamAssassin plugin nem tudja megvizsgálni az üzenetet. A hiba lehetséges oka, hogy a spamd daemon nem érhető el. Győződj meg róla, hogy a spamd fut és elérhető."
 
 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."
 msgstr "A SpamAssassin plugin nem tudja megvizsgálni az üzenetet. A hiba lehetséges oka, hogy a spamd daemon nem érhető el. Győződj meg róla, hogy a spamd fut és elérhető."
 

-#: src/plugins/spamassassin/spamassassin.c:370
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
 msgstr "Az e-mail távoli ellenőrzéséhez aktív hálózati kapcsolat kell."
 
 msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
 msgstr "Az e-mail távoli ellenőrzéséhez aktív hálózati kapcsolat kell."
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "A felhasználónév vétele nem sikerült"
 
 msgid "Failed to get username"
 msgstr "A felhasználónév vétele nem sikerült"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "A SpamAssassin plugin betöltve, de letiltva a beállításainál.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "A SpamAssassin plugin betöltve, de letiltva a beállításainál.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:562

 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"
 "\n"
 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"
 "\n"


@@ -9498,62 +10062,62 @@ msgstr ""
 "A beállítások a /Beállítások/Közös beállítások/Pluginek/SpamAssassin menüpontban találhatóak."
 
 # src/prefs_common.c:897
 "A beállítások a /Beállítások/Közös beállítások/Pluginek/SpamAssassin menüpontban találhatóak."
 
 # src/prefs_common.c:897

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "Localhost"
 
 msgid "Localhost"
 msgstr "Localhost"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr "TCP"
 
 msgid "TCP"
 msgstr "TCP"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr "Unix Socket"
 
 msgid "Unix Socket"
 msgstr "Unix Socket"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "SpamAssassin plugin engedélyezése"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "SpamAssassin plugin engedélyezése"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "Továbbítás"
 
 msgid "Transport"
 msgstr "Továbbítás"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "Továbbítás típusa"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190
 msgid "Type of transport"
 msgstr "Továbbítás típusa"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "Felhasználó"
 
 msgid "User"
 msgstr "Felhasználó"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "A spamd szerver felhasználója"
 
 msgid "User to use with spamd server"
 msgstr "A spamd szerver felhasználója"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr "spamd"
 
 msgid "spamd"
 msgstr "spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "A spamd szerver hostneve vagy IP címe"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "A spamd szerver hostneve vagy IP címe"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "A spamd szerver portja"
 
 msgid "Port of spamd server"
 msgstr "A spamd szerver portja"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "A Unix socket útvonala"
 
 msgid "Path of Unix socket"
 msgstr "A Unix socket útvonala"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:354

 msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
 msgstr "Az ellenőrzés megengedett maximális ideje. Ha az ellenőrzés ennél hosszabb ideig tartana, meg lesz szakítva."
 
 msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
 msgstr "Az ellenőrzés megengedett maximális ideje. Ha az ellenőrzés ennél hosszabb ideig tartana, meg lesz szakítva."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355
+#: src/plugins/spamassassin/spamassassin_gtk.c:359

 #: src/prefs_other.c:575
 #: src/prefs_other.c:575

-#: src/prefs_summaries.c:493
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "másodperc múlva"
 
 msgid "seconds"
 msgstr "másodperc múlva"
 


@@ -9567,7 +10131,7 @@ msgid "The orientation of the tray."
 msgstr "A tálca tájolása."
 
 #: src/plugins/trayicon/trayicon.c:61
 msgstr "A tálca tájolása."
 
 #: src/plugins/trayicon/trayicon.c:61

-#: src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:567

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Tálca ikon"
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Tálca ikon"


@@ -9639,7 +10203,7 @@ msgstr "A bezárás szabálylánc regisztrálása nem sikerült."
 msgid "Failed to register got iconified hook"
 msgstr "Az ikonizálási szabálylánc regisztrálása nem sikerült."
 
 msgid "Failed to register got iconified hook"
 msgstr "Az ikonizálási szabálylánc regisztrálása nem sikerült."
 

-#: src/plugins/trayicon/trayicon.c:484
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"
 "\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"
 "\n"


@@ -9688,169 +10252,121 @@ msgstr "A szükséges APOP időpecsét nem található az üdvözlésben\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Időpecsét szintaktikai hiba az üdvözlésben\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Időpecsét szintaktikai hiba az üdvözlésben\n"
 

+# src/pop.c:215
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "Időpecsét szintaktikai hiba az üdvözlésben (nem ASCII)\n"
+

 # src/pop.c:265 src/pop.c:304
 # src/pop.c:265 src/pop.c:304

-#: src/pop.c:183
-#: src/pop.c:210
+#: src/pop.c:188
+#: src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "POP3 protokoll hiba\n"
 
 # src/news.c:750
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokoll hiba\n"
 
 # src/news.c:750

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "érvénytelen UIDL válasz: %s\n"
 
 # src/pop.c:65
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "érvénytelen UIDL válasz: %s\n"
 
 # src/pop.c:65

-#: src/pop.c:817
+#: src/pop.c:822

 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: %d elavult üzenet törlése [%s]\n"
 
 # src/pop.c:71
 #, c-format
 msgid "POP3: Deleting expired message %d [%s]\n"
 msgstr "POP3: %d elavult üzenet törlése [%s]\n"
 
 # src/pop.c:71

-#: src/pop.c:833
+#: src/pop.c:838

 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: %d üzenet kihagyása [%s] (%d byte)\n"
 
 # src/pop.c:187 src/pop.c:239
 #, c-format
 msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: %d üzenet kihagyása [%s] (%d byte)\n"
 
 # src/pop.c:187 src/pop.c:239

-#: src/pop.c:865
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "postaláda zárolt\n"
 
 msgid "mailbox is locked\n"
 msgstr "postaláda zárolt\n"
 

-#: src/pop.c:868
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "Session timeout\n"
 
 # src/prefs_actions.c:804
 msgid "Session timeout\n"
 msgstr "Session timeout\n"
 
 # src/prefs_actions.c:804

-#: src/pop.c:887
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "a parancs nem támogatott\n"
 
 # src/pop.c:162 src/pop.c:191 src/pop.c:243
 msgid "command not supported\n"
 msgstr "a parancs nem támogatott\n"
 
 # src/pop.c:162 src/pop.c:191 src/pop.c:243

-#: src/pop.c:892
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 folyamat közben\n"
 
 # src/prefs_actions.c:804
 msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 folyamat közben\n"
 
 # src/prefs_actions.c:804

-#: src/pop.c:1086
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "A TOP parancs nem támogatott\n"
 
 # src/prefs_account.c:957 src/prefs_account.c:1495
 msgid "TOP command unsupported\n"
 msgstr "A TOP parancs nem támogatott\n"
 
 # src/prefs_account.c:957 src/prefs_account.c:1495

-#: src/prefs_account.c:242
-#: src/prefs_account.c:1553
-#: src/prefs_account.c:2286
+#: src/prefs_account.c:304
+#: src/prefs_account.c:1340
+#: src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 # src/prefs_account.c:817 src/prefs_account.c:1512 src/prefs_account.c:1674
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 # src/prefs_account.c:817 src/prefs_account.c:1512 src/prefs_account.c:1674

-#: src/prefs_account.c:245
-#: src/prefs_account.c:1668
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:307
+#: src/prefs_account.c:1452
+#: src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 # src/prefs_account.c:819
 msgid "IMAP4"
 msgstr "IMAP4"
 
 # src/prefs_account.c:819

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "Hírek (NNTP)"
 
 # src/mbox.c:79
 msgid "News (NNTP)"
 msgstr "Hírek (NNTP)"
 
 # src/mbox.c:79

-#: src/prefs_account.c:247
+#: src/prefs_account.c:309

 #: src/wizard.c:1154
 msgid "Local mbox file"
 msgstr "Helyi postaláda fájl (mbox)"
 
 # src/prefs_account.c:821
 #: src/wizard.c:1154
 msgid "Local mbox file"
 msgstr "Helyi postaláda fájl (mbox)"
 
 # src/prefs_account.c:821

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "Nincs (csak SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Nincs (csak SMTP)"
 

-# src/prefs_account.c:603
-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "%d fiók"
-
-# src/prefs_account.c:622
-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "Új fiók beállításai"
-
-# src/prefs_account.c:627
-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Fiók beállításai"
-
-# src/editldap.c:461 src/prefs_account.c:668
-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "_Egyszerű"
-
-# src/prefs_account.c:670 src/prefs_common.c:808
-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "_Fogadás"
-
-# src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
-# src/prefs_folder_item.c:134
-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "_Szerkesztés"
-
-# src/prefs_account.c:677 src/prefs_common.c:821
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "_Titkosítás"
-
-# src/prefs_account.c:681
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "SS_L"
-
-# src/prefs_account.c:684
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "_Haladó"
-

 # src/prefs_account.c:734
 # src/prefs_account.c:734

-#: src/prefs_account.c:1190
+#: src/prefs_account.c:933

 msgid "Name of account"
 msgstr "Fiók neve"
 
 # src/prefs_account.c:743
 msgid "Name of account"
 msgstr "Fiók neve"
 
 # src/prefs_account.c:743

-#: src/prefs_account.c:1199
+#: src/prefs_account.c:942

 msgid "Set as default"
 msgstr "Alapértelmezettként beállít"
 
 # src/prefs_account.c:747
 msgid "Set as default"
 msgstr "Alapértelmezettként beállít"
 
 # src/prefs_account.c:747

-#: src/prefs_account.c:1207
+#: src/prefs_account.c:950

 msgid "Personal information"
 msgstr "Személyes információ"
 
 # src/prefs_account.c:756
 msgid "Personal information"
 msgstr "Személyes információ"
 
 # src/prefs_account.c:756

-#: src/prefs_account.c:1216
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr "Teljes név"
 
 # src/prefs_account.c:762
 msgid "Full name"
 msgstr "Teljes név"
 
 # src/prefs_account.c:762

-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "E-mail cím"
 
 msgid "Mail address"
 msgstr "E-mail cím"
 

-# src/prefs_account.c:768
-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "Szervezet"
-

 # src/prefs_account.c:792
 # src/prefs_account.c:792

-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "Szerver információ"
 
 msgid "Server information"
 msgstr "Szerver információ"
 

-#: src/prefs_account.c:1287
+#: src/prefs_account.c:1030

 #: src/wizard.c:1248
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 #: src/wizard.c:1248
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"


@@ -9860,484 +10376,538 @@ msgstr ""
 "nem tartalmaz IMAP támogatást.</span>"
 
 # src/prefs_account.c:834
 "nem tartalmaz IMAP támogatást.</span>"
 
 # src/prefs_account.c:834

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "Ez a szerver megkívánja az azonosítást"
 
 # src/prefs_account.c:1161
 msgid "This server requires authentication"
 msgstr "Ez a szerver megkívánja az azonosítást"
 
 # src/prefs_account.c:1161

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "Azonosítás kapcsolódáskor"
 
 # src/prefs_account.c:873
 msgid "Authenticate on connect"
 msgstr "Azonosítás kapcsolódáskor"
 
 # src/prefs_account.c:873

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "Hírszerver"
 
 # src/prefs_account.c:879
 msgid "News server"
 msgstr "Hírszerver"
 
 # src/prefs_account.c:879

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "Szerver fogadáshoz"
 
 # src/mbox.c:79
 msgid "Server for receiving"
 msgstr "Szerver fogadáshoz"
 
 # src/mbox.c:79

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "Helyi postaláda"
 
 # src/prefs_account.c:885
 msgid "Local mailbox"
 msgstr "Helyi postaláda"
 
 # src/prefs_account.c:885

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "A mail parancs használata az SMTP szerver helyett"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "A mail parancs használata az SMTP szerver helyett"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "e-mail küldés parancsa"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190
 msgid "command to send mails"
 msgstr "e-mail küldés parancsa"
 
 # src/prefs_account.c:892 src/prefs_account.c:1190

-#: src/prefs_account.c:1420
-#: src/prefs_account.c:1852
+#: src/prefs_account.c:1163
+#: src/prefs_account.c:1669

 msgid "User ID"
 msgstr "Felhasználó-azonosító"
 
 # src/prefs_account.c:898 src/prefs_account.c:1199
 msgid "User ID"
 msgstr "Felhasználó-azonosító"
 
 # src/prefs_account.c:898 src/prefs_account.c:1199

-#: src/prefs_account.c:1426
-#: src/prefs_account.c:1872
+#: src/prefs_account.c:1169
+#: src/prefs_account.c:1689

 msgid "Password"
 msgstr "Jelszó"
 
 msgid "Password"
 msgstr "Jelszó"
 

+# src/prefs_account.c:603
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "%d fiók"
+

 # src/prefs_common.c:897
 # src/prefs_common.c:897

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "Helyi"
 
 # src/prefs_account.c:1037
 msgid "Local"
 msgstr "Helyi"
 
 # src/prefs_account.c:1037

-#: src/prefs_account.c:1531
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1318
+#: src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "Alapértelmezett Bejövő"
 
 # src/prefs_account.c:1060
 msgid "Default inbox"
 msgstr "Alapértelmezett Bejövő"
 
 # src/prefs_account.c:1060

-#: src/prefs_account.c:1538
-#: src/prefs_account.c:1546
-#: src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325
+#: src/prefs_account.c:1333
+#: src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "A szűretlen üzenetek e mappába kerülnek"
 
 # src/colorlabel.c:51
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "A szűretlen üzenetek e mappába kerülnek"
 
 # src/colorlabel.c:51

-#: src/prefs_account.c:1543
-#: src/prefs_account.c:1632
-#: src/prefs_account.c:2036
+#: src/prefs_account.c:1330
+#: src/prefs_account.c:1416
+#: src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "_Böngészés"
 
 # src/prefs_account.c:834
 msgid "Bro_wse"
 msgstr "_Böngészés"
 
 # src/prefs_account.c:834

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos azonosítás használata (APOP)"
 
 # src/prefs_account.c:965
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos azonosítás használata (APOP)"
 
 # src/prefs_account.c:965

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "Üzenetek törlése a szerveren fogadás után"
 
 # src/prefs_account.c:976
 msgid "Remove messages on server when received"
 msgstr "Üzenetek törlése a szerveren fogadás után"
 
 # src/prefs_account.c:976

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "Eltávolítás"
 
 # src/prefs_account.c:1002
 msgid "Remove after"
 msgstr "Eltávolítás"
 
 # src/prefs_account.c:1002

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "0 nap: eltávolítás azonnal"
 
 # src/prefs_account.c:985
 msgid "0 days: remove immediately"
 msgstr "0 nap: eltávolítás azonnal"
 
 # src/prefs_account.c:985

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "nap után"
 
 msgid "days"
 msgstr "nap után"
 

-# src/prefs_account.c:1009
-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "Minden üzenet letöltése a szerverről"
-

 # src/prefs_account.c:1015
 # src/prefs_account.c:1015

-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "Vételi mérethatár"
 
 msgid "Receive size limit"
 msgstr "Vételi mérethatár"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1382

 msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
 msgstr "Az e határ feletti méretű üzenetek csak részben lesznek letöltve. Kijelölésükkor teljesen letöltheted, vagy törölheted őket."
 
 msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
 msgstr "Az e határ feletti méretű üzenetek csak részben lesznek letöltve. Kijelölésükkor teljesen letöltheted, vagy törölheted őket."
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "KB"
 
 # src/prefs_account.c:1529
 msgid "KB"
 msgstr "KB"
 
 # src/prefs_account.c:1529

-#: src/prefs_account.c:1642
-#: src/prefs_account.c:2312
+#: src/prefs_account.c:1426
+#: src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 # src/prefs_common.c:971
 msgid "NNTP"
 msgstr "NNTP"
 
 # src/prefs_common.c:971

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "Letöltendő cikkek maximális száma"
 
 msgid "Maximum number of articles to download"
 msgstr "Letöltendő cikkek maximális száma"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "0 megadása esetén korlátlan"
 
 # src/prefs_account.c:1161
 msgid "unlimited if 0 is specified"
 msgstr "0 megadása esetén korlátlan"
 
 # src/prefs_account.c:1161

-#: src/prefs_account.c:1674
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1458
+#: src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "Azonosítási eljárás"
 
 # src/prefs_account.c:1171
 msgid "Authentication method"
 msgstr "Azonosítási eljárás"
 
 # src/prefs_account.c:1171

-#: src/prefs_account.c:1684
-#: src/prefs_account.c:1832
+#: src/prefs_account.c:1468
+#: src/prefs_account.c:1649

 #: src/prefs_send.c:278
 msgid "Automatic"
 msgstr "Automatikus"
 
 # src/prefs_account.c:1685
 #: src/prefs_send.c:278
 msgid "Automatic"
 msgstr "Automatikus"
 
 # src/prefs_account.c:1685

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(általában üres)"
 
 msgid "(usually empty)"
 msgstr "(általában üres)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "Csak feliratkozott mappák megjelenítése"
 
 msgid "Show subscribed folders only"
 msgstr "Csak feliratkozott mappák megjelenítése"
 

+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr "Sávszélesség-hatékony mód"
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr "Kisebb sávszélességet használ, de lassabb lehet, szervertől függően."
+

 # src/prefs_account.c:1029
 # src/prefs_account.c:1029

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 
 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 

+# src/prefs_account.c:1029
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "Szűrés engedélyezése fogadás közben pluginek használatával"
+

 # src/prefs_account.c:1067
 # src/prefs_account.c:1067

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-mail fogadása' ellenőrzi, van-e új üzenet ezen a címen"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-mail fogadása' ellenőrzi, van-e új üzenet ezen a címen"
 
 # src/prefs_account.c:1111 src/prefs_customheader.c:188
 # src/prefs_filter.c:241

-#: src/prefs_account.c:1783
+#: src/prefs_account.c:1600

 #: src/prefs_customheader.c:205
 #: src/prefs_customheader.c:205

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "Fejléc"
 
 # src/prefs_account.c:1119
 msgid "Header"
 msgstr "Fejléc"
 
 # src/prefs_account.c:1119

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "Üzenet azonosító generálása"
 
 # src/prefs_account.c:1126
 msgid "Generate Message-ID"
 msgstr "Üzenet azonosító generálása"
 
 # src/prefs_account.c:1126

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgid "Add user-defined header"

-msgstr "Felhasználó által definiált fejléc hozzáfűzése"
+msgstr "Egyéni fejléc hozzáadása"

 
 # src/prefs_account.c:1138
 
 # src/prefs_account.c:1138

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "Azonosítás"
 
 # src/prefs_account.c:1146
 msgid "Authentication"
 msgstr "Azonosítás"
 
 # src/prefs_account.c:1146

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP hitelesítés (SMTP AUTH)"
 
 # src/prefs_account.c:1221
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP hitelesítés (SMTP AUTH)"
 
 # src/prefs_account.c:1221

-#: src/prefs_account.c:1894
+#: src/prefs_account.c:1711

 msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
 msgstr "Ezen beállítások üresen hagyása esetén a fogadáshoz megadott felhasználói azonosító és jelszó lesz használva."
 
 # src/prefs_account.c:1230
 msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
 msgstr "Ezen beállítások üresen hagyása esetén a fogadáshoz megadott felhasználói azonosító és jelszó lesz használva."
 
 # src/prefs_account.c:1230

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "Küldés előtt azonosítás POP3-mal"
 
 # src/prefs_account.c:1161
 msgid "Authenticate with POP3 before sending"
 msgstr "Küldés előtt azonosítás POP3-mal"
 
 # src/prefs_account.c:1161

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "POP azonosítás időtúllépés: "
 
 # src/prefs_common.c:950
 msgid "POP authentication timeout: "
 msgstr "POP azonosítás időtúllépés: "
 
 # src/prefs_common.c:950

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "perc"
 
 # src/compose.c:3964 src/prefs_common.c:1186
 msgid "minutes"
 msgstr "perc"
 
 # src/compose.c:3964 src/prefs_common.c:1186

-#: src/prefs_account.c:1982
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:1814
+#: src/prefs_account.c:1860

 msgid "Signature"
 msgstr "Aláírás"
 
 # src/prefs_common.c:1206
 msgid "Signature"
 msgstr "Aláírás"
 
 # src/prefs_common.c:1206

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "Aláírás automatikus beillesztése"
 
 # src/prefs_common.c:1197
 msgid "Insert signature automatically"
 msgstr "Aláírás automatikus beillesztése"
 
 # src/prefs_common.c:1197

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "Parancs kimenete"
 
 # src/prefs_account.c:1276
 msgid "Command output"
 msgstr "Parancs kimenete"
 
 # src/prefs_account.c:1276

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 

-# src/prefs_account.c:1285
-#: src/prefs_account.c:2057
-#: src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1885
-#: src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "Másolat"
-
-# src/prefs_account.c:1298
-#: src/prefs_account.c:2070
-#: src/prefs_template.c:189
-msgid "Bcc"
-msgstr "Titkos másolat"
-
-# src/prefs_account.c:1311
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "Válasz"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "Helyesírás-ellenőrzés szótárai"
 
 msgid "Spell check dictionaries"
 msgstr "Helyesírás-ellenőrzés szótárai"
 

-#: src/prefs_account.c:2107
-#: src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939
+#: src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Alapértelmezett szótár"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Alapértelmezett szótár"
 

-#: src/prefs_account.c:2124
-#: src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956
+#: src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Alapértelmezett alternatív szótár"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Alapértelmezett alternatív szótár"
 

-#: src/prefs_account.c:2188
+# src/inc.c:312
+#: src/prefs_account.c:2036
+#: src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr "Meghatározott formátum használata új üzenetekhez"
+
+#: src/prefs_account.c:2044
+#: src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr "Meghatározott válasz idézés formátum használata"
+
+#: src/prefs_account.c:2052
+#: src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr "Meghatározott továbbítási idézés formátum használata"
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "Alapértelmezett titkosítás"
 
 # src/grouplistdialog.c:216
 msgid "Default privacy system"
 msgstr "Alapértelmezett titkosítás"
 
 # src/grouplistdialog.c:216

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "Mindig aláírja az üzeneteket"
 
 # src/prefs_account.c:965
 msgid "Always sign messages"
 msgstr "Mindig aláírja az üzeneteket"
 
 # src/prefs_account.c:965

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "Mindig titkosítja az üzeneteket"
 
 # src/prefs_account.c:965
 msgid "Always encrypt messages"
 msgstr "Mindig titkosítja az üzeneteket"
 
 # src/prefs_account.c:965

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Mindig titkosítja az üzeneteket titkosított üzenetekre válaszoláskor"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Mindig titkosítja az üzeneteket titkosított üzenetekre válaszoláskor"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Egyúttal az elküldött üzenetek titkosítása a saját kulcsoddal"
 
 # src/prefs_common.c:1065
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Egyúttal az elküldött üzenetek titkosítása a saját kulcsoddal"
 
 # src/prefs_common.c:1065

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "Titkosított üzenetek mentése titkosítás nélkül"
 
 # src/prefs_account.c:1503 src/prefs_account.c:1520 src/prefs_account.c:1536
 # src/prefs_account.c:1554
 msgid "Save sent encrypted messages as clear text"
 msgstr "Titkosított üzenetek mentése titkosítás nélkül"
 
 # src/prefs_account.c:1503 src/prefs_account.c:1520 src/prefs_account.c:1536
 # src/prefs_account.c:1554

-#: src/prefs_account.c:2290
-#: src/prefs_account.c:2303
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2219
+#: src/prefs_account.c:2232
+#: src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "SSL használatának mellőzése"
 
 # src/prefs_account.c:1506
 msgid "Don't use SSL"
 msgstr "SSL használatának mellőzése"
 
 # src/prefs_account.c:1506

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
 # src/prefs_account.c:1509 src/prefs_account.c:1526 src/prefs_account.c:1560
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
 # src/prefs_account.c:1509 src/prefs_account.c:1526 src/prefs_account.c:1560

-#: src/prefs_account.c:2296
-#: src/prefs_account.c:2309
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2225
+#: src/prefs_account.c:2238
+#: src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolathoz"
 
 # src/prefs_account.c:1523
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolathoz"
 
 # src/prefs_account.c:1523

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
 # src/prefs_account.c:1544
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
 # src/prefs_account.c:1544

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
 # src/prefs_account.c:1546
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
 # src/prefs_account.c:1546

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "SSL használatának mellőzése (de szükség esetén STARTTLS használata)"
 
 # src/prefs_account.c:1557
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "SSL használatának mellőzése (de szükség esetén STARTTLS használata)"
 
 # src/prefs_account.c:1557

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "Nem blokkoló SSL használata"
 
 msgid "Use non-blocking SSL"
 msgstr "Nem blokkoló SSL használata"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Kapcsold ki, ha problémák vannak az SSL kapcsolódással"
 
 # src/prefs_account.c:1644
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Kapcsold ki, ha problémák vannak az SSL kapcsolódással"
 
 # src/prefs_account.c:1644

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "SMTP port"
 
 # src/prefs_account.c:1650
 msgid "SMTP port"
 msgstr "SMTP port"
 
 # src/prefs_account.c:1650

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "POP3 port"
 
 # src/prefs_account.c:1656
 msgid "POP3 port"
 msgstr "POP3 port"
 
 # src/prefs_account.c:1656

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
 # src/prefs_account.c:1662
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
 # src/prefs_account.c:1662

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "NNTP port"
 
 # src/prefs_account.c:1667
 msgid "NNTP port"
 msgstr "NNTP port"
 
 # src/prefs_account.c:1667

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "Domain név"
 
 msgid "Domain name"
 msgstr "Domain név"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "A szerverrel történő kommunikációhoz használandó parancs"
 
 msgid "Use command to communicate with server"
 msgstr "A szerverrel történő kommunikációhoz használandó parancs"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Több címre is elküldött üzenetek megjelölése olvasottként és színnel:"
 
 # src/colorlabel.c:51
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Több címre is elküldött üzenetek megjelölése olvasottként és színnel:"
 
 # src/colorlabel.c:51

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "Böngészés"
 
 # src/prefs_account.c:1739
 msgid "Browse"
 msgstr "Böngészés"
 
 # src/prefs_account.c:1739

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek mentése ide:"
 
 # src/prefs_account.c:1743
 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek mentése ide:"
 
 # src/prefs_account.c:1743

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "Várakozó üzenetek mentése ide:"
 
 # src/prefs_account.c:1741
 msgid "Put queued messages in"
 msgstr "Várakozó üzenetek mentése ide:"
 
 # src/prefs_account.c:1741

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "Vázlatok mentése ide:"
 
 # src/prefs_account.c:1743
 msgid "Put draft messages in"
 msgstr "Vázlatok mentése ide:"
 
 # src/prefs_account.c:1743

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek ide:"
 
 # src/prefs_account.c:1803
 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek ide:"
 
 # src/prefs_account.c:1803

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "Fiók neve nincs megadva."
 
 # src/prefs_account.c:1807
 msgid "Account name is not entered."
 msgstr "Fiók neve nincs megadva."
 
 # src/prefs_account.c:1807

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "E-mail cím nincs megadva."
 
 # src/prefs_account.c:1812
 msgid "Mail address is not entered."
 msgstr "E-mail cím nincs megadva."
 
 # src/prefs_account.c:1812

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "SMTP szerver nincs megadva."
 
 # src/prefs_account.c:1817
 msgid "SMTP server is not entered."
 msgstr "SMTP szerver nincs megadva."
 
 # src/prefs_account.c:1817

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "Felhasználói azonosító nincs megadva."
 
 # src/prefs_account.c:1822
 msgid "User ID is not entered."
 msgstr "Felhasználói azonosító nincs megadva."
 
 # src/prefs_account.c:1822

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "POP3 szerver nincs megadva."
 
 msgid "POP3 server is not entered."
 msgstr "POP3 szerver nincs megadva."
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "Az alapértelmezett bejövő üzenet mappa nem létezik."
 
 # src/prefs_account.c:1827
 msgid "The default inbox folder doesn't exist."
 msgstr "Az alapértelmezett bejövő üzenet mappa nem létezik."
 
 # src/prefs_account.c:1827

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 szerver nincs megadva."
 
 # src/prefs_account.c:1832
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 szerver nincs megadva."
 
 # src/prefs_account.c:1832

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "NNTP szerver nincs megadva."
 
 # src/prefs_account.c:1803
 msgid "NNTP server is not entered."
 msgstr "NNTP szerver nincs megadva."
 
 # src/prefs_account.c:1803

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "helyi postaláda fájl nincs megadva."
 
 # src/prefs_account.c:1807
 msgid "local mailbox filename is not entered."
 msgstr "helyi postaláda fájl nincs megadva."
 
 # src/prefs_account.c:1807

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "üzenet parancs nincs megadva."
 
 msgid "mail command is not entered."
 msgstr "üzenet parancs nincs megadva."
 

+# src/prefs_account.c:670 src/prefs_common.c:808
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "Fogadás"
+
+# src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
+# src/prefs_folder_item.c:134
+#: src/prefs_account.c:2963
+#: src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459
+#: src/prefs_quote.c:179
+#: src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144
+#: src/toolbar.c:1683
+msgid "Compose"
+msgstr "Új üzenet"
+
+# src/prefs_template.c:373
+#: src/prefs_account.c:2981
+#: src/prefs_folder_item.c:1475
+#: src/prefs_quote.c:180
+msgid "Templates"
+msgstr "Sablonok"
+
+# src/prefs_account.c:677 src/prefs_common.c:821
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "Titkosítás"
+
+# src/prefs_account.c:684
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "Haladó"
+
+# src/prefs_account.c:622
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "Új fiók beállításai"
+
+# src/prefs_account.c:627
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Fiók beállításai"
+

 # src/editjpilot.c:225
 # src/editjpilot.c:225

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "Aláírás fájl kiválasztása"
 
 # src/account.c:552 src/prefs_account.c:803
 msgid "Select signature file"
 msgstr "Aláírás fájl kiválasztása"
 
 # src/account.c:552 src/prefs_account.c:803

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "Protokoll:"
 
 msgid "Protocol:"
 msgstr "Protokoll:"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin nincs betöltve)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin nincs betöltve)"


@@ -10360,9 +10930,9 @@ msgstr "Parancssor"
 # src/compose.c:5131
 #: src/prefs_actions.c:275
 #: src/prefs_filtering_action.c:544
 # src/compose.c:5131
 #: src/prefs_actions.c:275
 #: src/prefs_filtering_action.c:544

-#: src/prefs_filtering.c:454
-#: src/prefs_matcher.c:679
-#: src/prefs_template.c:270
+#: src/prefs_filtering.c:452
+#: src/prefs_matcher.c:706
+#: src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Csere"
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Csere"


@@ -10371,19 +10941,19 @@ msgstr "Csere"
 # src/importldif.c:525 src/prefs_account.c:1726
 #: src/prefs_actions.c:291
 #: src/prefs_filtering_action.c:515
 # src/importldif.c:525 src/prefs_account.c:1726
 #: src/prefs_actions.c:291
 #: src/prefs_filtering_action.c:515

-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "Információ... "
 
 # src/prefs_actions.c:734 src/prefs_filter.c:613 src/prefs_template.c:302
 #: src/prefs_actions.c:458
 #: src/prefs_filtering_action.c:641
 msgid "Info..."
 msgstr "Információ... "
 
 # src/prefs_actions.c:734 src/prefs_filter.c:613 src/prefs_template.c:302
 #: src/prefs_actions.c:458
 #: src/prefs_filtering_action.c:641

+#: src/prefs_filtering.c:759

 #: src/prefs_filtering.c:761
 #: src/prefs_filtering.c:761

-#: src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764
-#: src/prefs_filtering.c:839
-#: src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_filtering.c:762
+#: src/prefs_filtering.c:837
+#: src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(Új)"
 
 msgid "(New)"
 msgstr "(Új)"
 


@@ -10441,31 +11011,31 @@ msgstr "Tényleg töröljem ezt a műveletet?"
 
 #: src/prefs_actions.c:749
 #: src/prefs_actions.c:769
 
 #: src/prefs_actions.c:749
 #: src/prefs_actions.c:769

-#: src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274
-#: src/prefs_matcher.c:1838
-#: src/prefs_template.c:426
-#: src/prefs_template.c:443
+#: src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272
+#: src/prefs_matcher.c:1865
+#: src/prefs_template.c:473
+#: src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "Bejegyzés nincs elmentve"
 
 #: src/prefs_actions.c:750
 #: src/prefs_actions.c:770
 msgid "Entry not saved"
 msgstr "Bejegyzés nincs elmentve"
 
 #: src/prefs_actions.c:750
 #: src/prefs_actions.c:770

-#: src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275
-#: src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273
+#: src/prefs_template.c:474
+#: src/prefs_template.c:491

 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:751
 #: src/prefs_actions.c:771
 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:751
 #: src/prefs_actions.c:771

-#: src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276
-#: src/prefs_matcher.c:1840
-#: src/prefs_template.c:428
-#: src/prefs_template.c:445
+#: src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274
+#: src/prefs_matcher.c:1867
+#: src/prefs_template.c:475
+#: src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+Szerkesztés _folytatása"
 
 msgid "+_Continue editing"
 msgstr "+Szerkesztés _folytatása"
 


@@ -10611,118 +11181,109 @@ msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
 # src/prefs_common.c:2829
 msgstr "%y/%m/%d(%a) %H:%M"
 
 # src/prefs_common.c:2829

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "Automatikus fiókválasztás"
 
 # src/prefs_common.c:1288
 msgid "Automatic account selection"
 msgstr "Automatikus fiókválasztás"
 
 # src/prefs_common.c:1288

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "válasznál"
 
 msgid "when replying"
 msgstr "válasznál"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "továbbításnál"
 
 msgid "when forwarding"
 msgstr "továbbításnál"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "újraszerkesztésnél"
 
 msgid "when re-editing"
 msgstr "újraszerkesztésnél"
 

-# src/mainwindow.c:1857
-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "Továbbítás"
-
-# src/summaryview.c:349
-#: src/prefs_compose_writing.c:141
-#: src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "Csatolásként továbbít"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Az eredeti 'From' fejléc megőrzése átirányítás esetén"
-

 # src/account.c:588
 # src/account.c:588

-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr "Szerkesztés"
 
 # src/prefs_common.c:1216
 msgid "Editing"
 msgstr "Szerkesztés"
 
 # src/prefs_common.c:1216

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
 # src/compose.c:3937
 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
 # src/compose.c:3937

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatikus mentés a Vázlatok mappába minden"
 
 # src/prefs_common.c:1258
 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatikus mentés a Vázlatok mappába minden"
 
 # src/prefs_common.c:1258

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:154

 #: src/prefs_wrapping.c:97
 msgid "characters"
 #: src/prefs_wrapping.c:97
 msgid "characters"

-msgstr "karakter"
+msgstr "karakter után"

 
 # src/prefs_common.c:1226
 
 # src/prefs_common.c:1226

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "Visszavonások maximális száma"
 
 msgid "Undo level"
 msgstr "Visszavonások maximális száma"
 

+# src/mainwindow.c:1840 src/prefs_common.c:1278
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "Válasz"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "Válasz esetén automatikusan idéz a feladótól"
+

 # src/prefs_common.c:1290
 # src/prefs_common.c:1290

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgid "Reply button invokes mailing list reply"

-msgstr "`Válasz` gomb esetén válasz a listára"
+msgstr "'Válasz' gomb esetén válasz a listára"
+
+# src/mainwindow.c:1857
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "Továbbítás"

 
 

-#: src/prefs_compose_writing.c:190
+# src/summaryview.c:349
+#: src/prefs_compose_writing.c:185
+#: src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "Csatolásként továbbít"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Az eredeti 'From' fejléc megőrzése átirányítás esetén"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr "Fájl behúzásakor a szerkesztőablakba"
 
 msgid "When dropping files into the Compose window"
 msgstr "Fájl behúzásakor a szerkesztőablakba"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "Kérdés"
 
 # src/compose.c:3946 src/compose.c:5131
 msgid "Ask"
 msgstr "Kérdés"
 
 # src/compose.c:3946 src/compose.c:5131

-#: src/prefs_compose_writing.c:199
-#: src/toolbar.c:475
+#: src/prefs_compose_writing.c:200
+#: src/toolbar.c:476

 msgid "Insert"
 msgstr "Beszúrás"
 
 # src/compose.c:3954
 msgid "Insert"
 msgstr "Beszúrás"
 
 # src/compose.c:3954

-#: src/prefs_compose_writing.c:200
-#: src/toolbar.c:477
+#: src/prefs_compose_writing.c:201
+#: src/toolbar.c:478

 msgid "Attach"
 msgstr "Csatolás"
 
 msgid "Attach"
 msgstr "Csatolás"
 

-# src/inc.c:312
-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "Új üzenetek szerkesztési formátuma"
-
-# src/summaryview.c:954
+# src/prefs_common.c:1258

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "Új üzenet formátuma"
-
-# src/prefs_common.c:1419
-#: src/prefs_compose_writing.c:267
-#: src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " Szimbólumok leírása..."
+msgid "Quotation characters"
+msgstr "Karakterek idézet jelölésére"

 
 

-# src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
-# src/prefs_folder_item.c:134
-#: src/prefs_compose_writing.c:387
-#: src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311
-#: src/prefs_spelling.c:441
-#: src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "Új üzenet"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "Idézet jeleként kezeli a következő karaktereket: "

 
 # src/alertpanel.c:133 src/main.c:245
 
 # src/alertpanel.c:133 src/main.c:245

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "Írás"
 
 msgid "Writing"
 msgstr "Írás"
 


@@ -10738,9 +11299,9 @@ msgstr "Fájlból..."
 # src/prefs_customheader.c:485 src/prefs_display_header.c:527
 # src/prefs_filter.c:674
 #: src/prefs_customheader.c:505
 # src/prefs_customheader.c:485 src/prefs_display_header.c:527
 # src/prefs_filter.c:674
 #: src/prefs_customheader.c:505

-#: src/prefs_display_header.c:567
-#: src/prefs_matcher.c:1327
-#: src/prefs_matcher.c:1337
+#: src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354
+#: src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr "Fejléc neve nincs beállítva."
 
 msgid "Header name is not set."
 msgstr "Fejléc neve nincs beállítva."
 


@@ -10813,7 +11374,7 @@ msgstr "Megjelenített fejléc beállítása"
 # src/prefs_display_header.c:222
 #: src/prefs_display_header.c:251
 #: src/prefs_filtering_action.c:435
 # src/prefs_display_header.c:222
 #: src/prefs_display_header.c:251
 #: src/prefs_filtering_action.c:435

-#: src/prefs_matcher.c:497
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "Fejléc neve"
 
 msgid "Header name"
 msgstr "Fejléc neve"
 


@@ -10833,7 +11394,7 @@ msgid "Show all unspecified headers"
 msgstr "Az összes meghatározatlan fejléc mutatása"
 
 # src/prefs_display_header.c:537
 msgstr "Az összes meghatározatlan fejléc mutatása"
 
 # src/prefs_display_header.c:537

-#: src/prefs_display_header.c:577
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr "Ez a fejléc már szerepel a listán."
 
 msgid "This header is already in the list."
 msgstr "Ez a fejléc már szerepel a listán."
 


@@ -10891,7 +11452,7 @@ msgstr "Másolás"
 # src/prefs_summary_column.c:67
 #: src/prefs_filtering_action.c:162
 #: src/prefs_summary_column.c:79
 # src/prefs_summary_column.c:67
 #: src/prefs_filtering_action.c:162
 #: src/prefs_summary_column.c:79

-#: src/summaryview.c:2448
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "Megjelölés"
 
 msgid "Mark"
 msgstr "Megjelölés"
 


@@ -10927,8 +11488,8 @@ msgstr "Megjelölés mint nem spam"
 
 # src/mainwindow.c:1857
 #: src/prefs_filtering_action.c:170
 
 # src/mainwindow.c:1857
 #: src/prefs_filtering_action.c:170

-#: src/toolbar.c:426
-#: src/toolbar.c:524
+#: src/toolbar.c:427
+#: src/toolbar.c:525

 msgid "Forward"
 msgstr "Továbbítás"
 
 msgid "Forward"
 msgstr "Továbbítás"
 


@@ -10940,8 +11501,8 @@ msgstr "Átirányítás"
 # src/mainwindow.c:1877
 #: src/prefs_filtering_action.c:173
 #: src/prefs_filtering_action.c:468
 # src/mainwindow.c:1877
 #: src/prefs_filtering_action.c:173
 #: src/prefs_filtering_action.c:468

-#: src/toolbar.c:184
-#: src/toolbar.c:1825
+#: src/toolbar.c:185
+#: src/toolbar.c:1834

 msgid "Execute"
 msgstr "Futtatás"
 
 msgid "Execute"
 msgstr "Futtatás"
 


@@ -10968,7 +11529,7 @@ msgstr "Elrejt"
 
 # src/summaryview.c:364
 #: src/prefs_filtering_action.c:178
 
 # src/summaryview.c:364
 #: src/prefs_filtering_action.c:178

-#: src/toolbar.c:187
+#: src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "Téma figyelmen kívül hagyása"
 
 msgid "Ignore thread"
 msgstr "Téma figyelmen kívül hagyása"
 


@@ -10983,7 +11544,7 @@ msgid "Filtering action configuration"
 msgstr "Szűrési művelet beállítások"
 
 #: src/prefs_filtering_action.c:363
 msgstr "Szűrési művelet beállítások"
 
 #: src/prefs_filtering_action.c:363

-#: src/prefs_filtering.c:412
+#: src/prefs_filtering.c:410

 msgid "Action"
 msgstr "Művelet"
 
 msgid "Action"
 msgstr "Művelet"
 


@@ -10999,13 +11560,13 @@ msgstr "Címzett"
 
 #: src/prefs_filtering_action.c:478
 #: src/prefs_summary_column.c:88
 
 #: src/prefs_filtering_action.c:478
 #: src/prefs_summary_column.c:88

-#: src/summaryview.c:497
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "Pontozás"
 
 # src/addressbook.c:380 src/addressbook.c:390
 #: src/prefs_filtering_action.c:483
 msgid "Score"
 msgstr "Pontozás"
 
 # src/addressbook.c:380 src/addressbook.c:390
 #: src/prefs_filtering_action.c:483

-#: src/prefs_matcher.c:550
+#: src/prefs_matcher.c:577

 msgid "Book/folder"
 msgstr "Címjegyzék/mappa"
 
 msgid "Book/folder"
 msgstr "Címjegyzék/mappa"
 


@@ -11047,61 +11608,30 @@ msgid "No action was defined."
 msgstr "Nincs definiált művelet."
 
 #: src/prefs_filtering_action.c:1159
 msgstr "Nincs definiált művelet."
 
 #: src/prefs_filtering_action.c:1159

-#: src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "% jel"
 
 msgid "literal %"
 msgstr "% jel"
 

-# src/prefs_summary_column.c:72 src/summaryview.c:400
-#: src/prefs_filtering_action.c:1164
-#: src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85
-#: src/quote_fmt.c:41
-#: src/summaryview.c:494
-msgid "Date"
-msgstr "Dátum"
-
-# src/prefs_common.c:818
-#: src/prefs_filtering_action.c:1165
-#: src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr "Üzenet azonositó"
-
-# src/headerview.c:56
-#: src/prefs_filtering_action.c:1166
-#: src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888
-#: src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "Hírcsoportok"
-
-# src/grouplistdialog.c:243
-#: src/prefs_filtering_action.c:1167
-#: src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889
-#: src/quote_fmt.c:52
-msgid "References"
-msgstr "Hivatkozások"
-

 #: src/prefs_filtering_action.c:1168
 #: src/prefs_filtering_action.c:1168

-#: src/prefs_matcher.c:1890
+#: src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "fájlnév (nem célszerű módosítani)"
 
 #: src/prefs_filtering_action.c:1169
 msgid "filename (should not be modified)"
 msgstr "fájlnév (nem célszerű módosítani)"
 
 #: src/prefs_filtering_action.c:1169

-#: src/prefs_matcher.c:1891
+#: src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "új sor"
 
 #: src/prefs_filtering_action.c:1170
 msgid "new line"
 msgstr "új sor"
 
 #: src/prefs_filtering_action.c:1170

-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "idézetek jelölőkaraktere"
 
 # src/prefs_common.c:1258
 #: src/prefs_filtering_action.c:1171
 msgid "escape character for quotes"
 msgstr "idézetek jelölőkaraktere"
 
 # src/prefs_common.c:1258
 #: src/prefs_filtering_action.c:1171

-#: src/prefs_matcher.c:1893
+#: src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "idézet karakter"
 
 msgid "quote character"
 msgstr "idézet karakter"
 


@@ -11126,66 +11656,66 @@ msgid "Current action list"
 msgstr "Jelenlegi műveletek listája"
 
 # src/mainwindow.c:666
 msgstr "Jelenlegi műveletek listája"
 
 # src/mainwindow.c:666

-#: src/prefs_filtering.c:187
-#: src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185
+#: src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "Szűrési/feldolgozási beállítások"
 
 # src/mainwindow.c:666
 msgid "Filtering/Processing configuration"
 msgstr "Szűrési/feldolgozási beállítások"
 
 # src/mainwindow.c:666

-#: src/prefs_filtering.c:249
-#: src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247
+#: src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "Mind"
 
 # src/prefs_filter.c:225
 msgid "Filtering Account Menu|All"
 msgstr "Mind"
 
 # src/prefs_filter.c:225

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "Feltétel"
 
 msgid "Condition"
 msgstr "Feltétel"
 

-#: src/prefs_filtering.c:403
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401
+#: src/prefs_filtering.c:423

 msgid " Define... "
 msgstr " Meghatározás..."
 
 # src/message_search.c:184 src/summary_search.c:301
 msgid " Define... "
 msgstr " Meghatározás..."
 
 # src/message_search.c:184 src/summary_search.c:301

-#: src/prefs_filtering.c:927
-#: src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925
+#: src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "A feltétel karaktersorozat nem érvényes."
 
 # src/message_search.c:184 src/summary_search.c:301
 msgid "Condition string is not valid."
 msgstr "A feltétel karaktersorozat nem érvényes."
 
 # src/message_search.c:184 src/summary_search.c:301

-#: src/prefs_filtering.c:963
-#: src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961
+#: src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "A művelet karaktersorozat nem érvényes."
 
 # src/prefs_actions.c:287
 msgid "Action string is not valid."
 msgstr "A művelet karaktersorozat nem érvényes."
 
 # src/prefs_actions.c:287

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "Feltétel szöveg üres."
 
 # src/prefs_actions.c:287
 msgid "Condition string is empty."
 msgstr "Feltétel szöveg üres."
 
 # src/prefs_actions.c:287

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "A művelet szövege üres."
 
 # src/prefs_filter.c:796
 msgid "Action string is empty."
 msgstr "A művelet szövege üres."
 
 # src/prefs_filter.c:796

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "Szabály törlése"
 
 # src/prefs_filter.c:797
 msgid "Delete rule"
 msgstr "Szabály törlése"
 
 # src/prefs_filter.c:797

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "Valóban töröljem ezt a szabályt?"
 
 # src/prefs_common.c:2353
 msgid "Do you really want to delete this rule?"
 msgstr "Valóban töröljem ezt a szabályt?"
 
 # src/prefs_common.c:2353

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "Engedélyezés"
 
 msgid "Enable"
 msgstr "Engedélyezés"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "Szabály"
 
 msgid "Rule"
 msgstr "Szabály"
 


@@ -11210,8 +11740,8 @@ msgstr "Rejtett oszlopok"
 
 # src/prefs_summary_column.c:261
 #: src/prefs_folder_column.c:280
 
 # src/prefs_summary_column.c:261
 #: src/prefs_folder_column.c:280

-#: src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536
+#: src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527

 #: src/prefs_summary_column.c:294
 msgid "Displayed columns"
 msgstr "Megjelenített oszlopok"
 #: src/prefs_summary_column.c:294
 msgid "Displayed columns"
 msgstr "Megjelenített oszlopok"


@@ -11224,13 +11754,14 @@ msgstr "Megjelenített oszlopok"
 msgid " Use default "
 msgstr " Alapértelmezés használata"
 
 msgid " Use default "
 msgstr " Alapértelmezés használata"
 

-#: src/prefs_folder_item.c:202
-#: src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:229
+#: src/prefs_folder_item.c:676

 msgid "<i>These preferences will not be saved as this folder is a top-level one. However you can use them to set them to the whole mailbox tree using \"Apply to subfolders\".</i>"
 msgstr "<i>A beállítások nem lesznek elmentve e mappához. Viszont beállíthatod őket a teljes postaláda fára, az \"Alkalmazás almappákra\". opcióval.</i>"
 
 msgid "<i>These preferences will not be saved as this folder is a top-level one. However you can use them to set them to the whole mailbox tree using \"Apply to subfolders\".</i>"
 msgstr "<i>A beállítások nem lesznek elmentve e mappához. Viszont beállíthatod őket a teljes postaláda fára, az \"Alkalmazás almappákra\". opcióval.</i>"
 

-#: src/prefs_folder_item.c:214
-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241
+#: src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -11239,82 +11770,82 @@ msgstr ""
 "almappákra"
 
 # src/prefs_folder_item.c:205
 "almappákra"
 
 # src/prefs_folder_item.c:205

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "Normál"
 
 msgid "Normal"
 msgstr "Normál"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "Elküldött"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698
 msgid "Outbox"
 msgstr "Elküldött"
 
 # src/addressbook.c:3115 src/folderview.c:282 src/prefs_account.c:1698

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr "Mappa típusa"
 
 msgid "Folder type"
 msgstr "Mappa típusa"
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "Tárgy egyszerűsítése reguláris kifejezéssel"
 
 msgid "Simplify Subject RegExp"
 msgstr "Tárgy egyszerűsítése reguláris kifejezéssel"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "RegExp próba"
 
 # src/addressbook.c:1660
 msgid "Test RegExp"
 msgstr "RegExp próba"
 
 # src/addressbook.c:1660

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr "Mappa jogok"
 
 # src/addressbook.c:1660
 msgid "Folder chmod"
 msgstr "Mappa jogok"
 
 # src/addressbook.c:1660

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Mappa szín"
 
 # src/prefs_common.c:2574
 msgid "Folder color"
 msgstr "Mappa szín"
 
 # src/prefs_common.c:2574

-#: src/prefs_folder_item.c:367
-#: src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394
+#: src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Szín kiválasztása a mappához"
 
 # src/summaryview.c:586
 msgid "Pick color for folder"
 msgstr "Szín kiválasztása a mappához"
 
 # src/summaryview.c:586

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "Feldolgozás induláskor"
 
 msgid "Process at start-up"
 msgstr "Feldolgozás induláskor"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "Új e-mailek keresése"
 
 msgid "Scan for new mail"
 msgstr "Új e-mailek keresése"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "Szinkronizáció kapcsolat nélküli munkához"
 
 msgid "Synchronise for offline use"
 msgstr "Szinkronizáció kapcsolat nélküli munkához"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "Visszaigazolás kérése"
 
 msgid "Request Return Receipt"
 msgstr "Visszaigazolás kérése"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Az elküldött üzenetek másolata ebbe a mappába kerüljön az Elküldött helyett"
 
 # src/prefs_common.c:2920 src/prefs_common.c:3242
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Az elküldött üzenetek másolata ebbe a mappába kerüljön az Elküldött helyett"
 
 # src/prefs_common.c:2920 src/prefs_common.c:3242

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "Alapértelmezett címzett: "
 
 # src/prefs_common.c:2920 src/prefs_common.c:3242
 msgid "Default To:"
 msgstr "Alapértelmezett címzett: "
 
 # src/prefs_common.c:2920 src/prefs_common.c:3242

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "Alapértelmezett címzett: a válaszokhoz "
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
 msgid "Default To: for replies"
 msgstr "Alapértelmezett címzett: a válaszokhoz "
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "Általános"
 
 # src/prefs_folder_item.c:107
 msgid "General"
 msgstr "Általános"
 
 # src/prefs_folder_item.c:107

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s mappa beállításai"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s mappa beállításai"


@@ -11341,7 +11872,7 @@ msgstr "Üzenet nyomtatása"
 # src/prefs_common.c:816
 #: src/prefs_fonts.c:197
 #: src/prefs_msg_colors.c:834
 # src/prefs_common.c:816
 #: src/prefs_fonts.c:197
 #: src/prefs_msg_colors.c:834

-#: src/prefs_summaries.c:669
+#: src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Megjelenítés"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Megjelenítés"


@@ -11352,7 +11883,7 @@ msgid "Fonts"
 msgstr "Betűkészletek"
 
 # src/grouplistdialog.c:243
 msgstr "Betűkészletek"
 
 # src/grouplistdialog.c:243

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "Beállítások"
 
 msgid "Preferences"
 msgstr "Beállítások"
 


@@ -11379,244 +11910,236 @@ msgstr "Képek megjelenítése soron belül"
 msgid "Image Viewer"
 msgstr "Képmegjelenítő"
 
 msgid "Image Viewer"
 msgstr "Képmegjelenítő"
 

-#: src/prefs_logging.c:117
-#: src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "A napló méret-határolása"
+#: src/prefs_logging.c:119
+#: src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "A napló méretének maximuma"

 
 

-#: src/prefs_logging.c:122
-#: src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "Napló ablak hossza"
-
-#: src/prefs_logging.c:139
-#: src/prefs_logging.c:258
+#: src/prefs_logging.c:133
+#: src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0 esetén naplózás leállitása a naplóablakban"
 
 # src/prefs_common.c:950
 msgid "0 to stop logging in the log window"
 msgstr "0 esetén naplózás leállitása a naplóablakban"
 
 # src/prefs_common.c:950

-#: src/prefs_logging.c:142
-#: src/prefs_logging.c:261
+#: src/prefs_logging.c:136
+#: src/prefs_logging.c:254

 msgid "lines"
 msgstr "sor"
 
 msgid "lines"
 msgstr "sor"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
-msgstr "Szűrési/feldolgozási szabályok hibakeresésének engedélyezése"
+# src/mainwindow.c:666
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "Szűrési/feldolgozási napló"
+
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr "Szűrési/feldolgozási szabályok naplózásának engedélyezése"

 
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
+"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."
 msgstr ""
 "Caution: enabling this option will slow down the filtering/processing, this might be critical when applying many rules upon thousands of messages."
 msgstr ""

-"Ha bejelölt, a szűrési és feldolgozási szabályok hibakeresése aktív.\n"
-"A hibakeresési napló az 'Eszközök/Szűrési hibakeresési ablak' menüben érhető el.\n"
+"Ha bejelölt, a szűrési és feldolgozási szabályok naplózása aktív.\n"
+"A napló az 'Eszközök/Szűrési napló' menüben érhető el.\n"

 "Fontos: az opció engedélyezése le fogja lassítani a szűrést/feldolgozást, ez kritikus lehet sok szabály több száz üzeneten alkalmazása esetén."
 
 "Fontos: az opció engedélyezése le fogja lassítani a szűrést/feldolgozást, ez kritikus lehet sok szabály több száz üzeneten alkalmazása esetén."
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
-msgstr "Szűrési/feldolgozási szabályok hibakeresése:"
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."
+msgstr "Szűrési/feldolgozási szabályok naplózása:"

 
 # src/mainwindow.c:666
 
 # src/mainwindow.c:666

-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgid "filtering at incorporation"

-msgstr "szűrés létrehozáskor"
+msgstr "szűrő létrehozásakor"

 
 # src/summaryview.c:3150
 
 # src/summaryview.c:3150

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgid "manually filtering"

-msgstr "kézi szűrés"
+msgstr "kézi szűréskor"

 
 # src/summaryview.c:371
 
 # src/summaryview.c:371

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgid "processing folders"

-msgstr "mappák feldolgozása"
+msgstr "mappák feldolgozásakor"

 
 # src/summaryview.c:371
 
 # src/summaryview.c:371

-#: src/prefs_logging.c:190
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgid "pre-processing folders"

-msgstr "mappák előfeldolgozása"
+msgstr "mappák előfeldolgozásakor"

 
 # src/summaryview.c:371
 
 # src/summaryview.c:371

-#: src/prefs_logging.c:196
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgid "post-processing folders"

-msgstr "mappák utófeldolgozása"
+msgstr "mappák utófeldolgozásakor"

 
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
-msgstr "Hibakeresési szint"
+# src/prefs_common.c:1226
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr "Naplózás szintje"

 
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "Alacsony"
 
 msgid "Low"
 msgstr "Alacsony"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "Közepes"
 
 msgid "Medium"
 msgstr "Közepes"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "Magas"
 
 msgid "High"
 msgstr "Magas"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
+"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"
+"Caution: the higher the level, the greater the impact on performance."

 msgstr ""
 msgstr ""

-"Válaszd ki a megjelenített részletek szintjét engedélyezett hibakeresésnél.\n"
+"Válaszd ki a naplózás részleteinek szintjét.\n"

 "Alacsony szint: a szabályok alkalmazásakor mely feltételek egyeznek vagy nem egyeznek, és mely műveletek lettek végrehajtva.\n"
 "Közepes szint:Több adat a feldolgozott üzenetről, és miért lettek kihagyva a szabályok.\n"
 "Magas szint: explicit módon megmutatja az összes szabály kihagyásának vagy végrehajtásának okát, és miért egyeznek vagy nem egyeznek a szabályok.\n"
 "Minél magasabb szintet választasz, annál jobban befolyásolja a teljesítményt."
 
 "Alacsony szint: a szabályok alkalmazásakor mely feltételek egyeznek vagy nem egyeznek, és mely műveletek lettek végrehajtva.\n"
 "Közepes szint:Több adat a feldolgozott üzenetről, és miért lettek kihagyva a szabályok.\n"
 "Magas szint: explicit módon megmutatja az összes szabály kihagyásának vagy végrehajtásának okát, és miért egyeznek vagy nem egyeznek a szabályok.\n"
 "Minél magasabb szintet választasz, annál jobban befolyásolja a teljesítményt."
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "Naplózás"
 
 # src/grouplistdialog.c:216
 msgid "Logging"
 msgstr "Naplózás"
 
 # src/grouplistdialog.c:216

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "Összes üzenet"
 
 msgid "All messages"
 msgstr "Összes üzenet"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr "Címzett vagy másolat"
-
-# src/summaryview.c:342
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "\"Válasz alábbinak\"-ban"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "Kora nagyobb mint"
 
 msgid "Age greater than"
 msgstr "Kora nagyobb mint"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "Kora kisebb mint"
 
 # src/prefs_display_header.c:222
 msgid "Age lower than"
 msgstr "Kora kisebb mint"
 
 # src/prefs_display_header.c:222

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "Fejléc rész"
 
 msgid "Headers part"
 msgstr "Fejléc rész"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "Szöveg rész"
 
 # src/compose.c:3922
 msgid "Body part"
 msgstr "Szöveg rész"
 
 # src/compose.c:3922

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "Teljes üzenet"
 
 # src/folderview.c:284 src/prefs_summary_column.c:68
 msgid "Whole message"
 msgstr "Teljes üzenet"
 
 # src/folderview.c:284 src/prefs_summary_column.c:68

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "Olvasatlan jelző"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
 msgid "Unread flag"
 msgstr "Olvasatlan jelző"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "Új jelző"
 
 msgid "New flag"
 msgstr "Új jelző"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "Kijelölt jelző"
 
 # src/folderview.c:1695
 msgid "Marked flag"
 msgstr "Kijelölt jelző"
 
 # src/folderview.c:1695

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "Törölt jelző"
 
 msgid "Deleted flag"
 msgstr "Törölt jelző"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "Megválaszolt jelző"
 
 # src/prefs_common.c:1375
 msgid "Replied flag"
 msgstr "Megválaszolt jelző"
 
 # src/prefs_common.c:1375

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "Továbbított jelző"
 
 msgid "Forwarded flag"
 msgstr "Továbbított jelző"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "Zárolt jelző"
 
 # src/send.c:391
 msgid "Locked flag"
 msgstr "Zárolt jelző"
 
 # src/send.c:391

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "Spam jelző"
 
 # src/summaryview.c:367
 msgid "Spam flag"
 msgstr "Spam jelző"
 
 # src/summaryview.c:367

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Szín címke"
 
 # src/summaryview.c:364
 msgid "Color label"
 msgstr "Szín címke"
 
 # src/summaryview.c:364

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "Figyelmen kívül hagyott téma"
 
 msgid "Ignored thread"
 msgstr "Figyelmen kívül hagyott téma"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "Pontozás nagyobb mint"
 
 msgid "Score greater than"
 msgstr "Pontozás nagyobb mint"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "Pontozás kissebb mint"
 
 msgid "Score lower than"
 msgstr "Pontozás kissebb mint"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "Pontozás egyenlő"
 
 # src/mimeview.c:158 src/prefs_common.c:1471
 msgid "Score equal to"
 msgstr "Pontozás egyenlő"
 
 # src/mimeview.c:158 src/prefs_common.c:1471

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "Teszt"
 
 msgid "Test"
 msgstr "Teszt"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "Méret nagyobb mint"
 
 msgid "Size greater than"
 msgstr "Méret nagyobb mint"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "Méret kisebb mint"
 
 msgid "Size smaller than"
 msgstr "Méret kisebb mint"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "Méret pontosan"
 
 msgid "Size exactly"
 msgstr "Méret pontosan"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "Részben letöltve"
 
 # src/editbook.c:168 src/editbook.c:278
 msgid "Partially downloaded"
 msgstr "Részben letöltve"
 
 # src/editbook.c:168 src/editbook.c:278

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "Találat a címjegyzékben"
 
 # src/editldap.c:316 src/editldap_basedn.c:171
 msgid "Found in addressbook"
 msgstr "Találat a címjegyzékben"
 
 # src/editldap.c:316 src/editldap_basedn.c:171

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "vagy"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046
 msgid "or"
 msgstr "vagy"
 
 # src/prefs_common.c:883 src/prefs_common.c:1046

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "és"
 
 # src/prefs_filter.c:302 src/prefs_filter.c:313 src/prefs_filter.c:700
 # src/prefs_filter.c:703 src/prefs_filter.c:858 src/prefs_filter.c:861
 msgid "and"
 msgstr "és"
 
 # src/prefs_filter.c:302 src/prefs_filter.c:313 src/prefs_filter.c:700
 # src/prefs_filter.c:703 src/prefs_filter.c:858 src/prefs_filter.c:861

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "tartalmazza"
 
 # src/prefs_filter.c:302 src/prefs_filter.c:313 src/prefs_filter.c:858
 # src/prefs_filter.c:861
 msgid "contains"
 msgstr "tartalmazza"
 
 # src/prefs_filter.c:302 src/prefs_filter.c:313 src/prefs_filter.c:858
 # src/prefs_filter.c:861

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "nem tartalmazza"
 
 msgid "does not contain"
 msgstr "nem tartalmazza"
 


@@ -11630,65 +12153,65 @@ msgstr "nem tartalmazza"
 # 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
 # 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

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "igen"
 
 # src/mainwindow.c:1062
 msgid "yes"
 msgstr "igen"
 
 # src/mainwindow.c:1062

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "nem"
 
 # src/mainwindow.c:666
 msgid "no"
 msgstr "nem"
 
 # src/mainwindow.c:666

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "Feltétel beállítások"
 
 # src/compose.c:3460 src/compose.c:4384
 msgid "Condition configuration"
 msgstr "Feltétel beállítások"
 
 # src/compose.c:3460 src/compose.c:4384

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "Keresési típus"
 
 # src/prefs_display_header.c:312
 msgid "Match type"
 msgstr "Keresési típus"
 
 # src/prefs_display_header.c:312

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "Cím fejléc"
 
 # src/prefs_filter.c:290
 msgid "Address header"
 msgstr "Cím fejléc"
 
 # src/prefs_filter.c:290

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "Állítás"
 
 # src/prefs_filter.c:353
 msgid "Predicate"
 msgstr "Állítás"
 
 # src/prefs_filter.c:353

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "Reguláris kifejezések használata"
 
 msgid "Use regexp"
 msgstr "Reguláris kifejezések használata"
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "Logikai operátor"
 
 # src/prefs_actions.c:780
 msgid "Boolean Op"
 msgstr "Logikai operátor"
 
 # src/prefs_actions.c:780

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "Érték nincs beállítva."
 
 # src/prefs_account.c:1807
 msgid "Value is not set."
 msgstr "Érték nincs beállítva."
 
 # src/prefs_account.c:1807

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "minden cím minden fejlécben"
 
 # src/prefs_account.c:1807
 msgid "all addresses in all headers"
 msgstr "minden cím minden fejlécben"
 
 # src/prefs_account.c:1807

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "bármely cím bármely fejlécben"
 
 msgid "any address in any header"
 msgstr "bármely cím bármely fejlécben"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "'%s' fejlécben szereplő cím(ek)"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "'%s' fejlécben szereplő cím(ek)"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -11699,7 +12222,7 @@ msgstr ""
 "\n"
 "Ha %s -t a teljes címjegyzékben keresni akarod, válaszd a 'Bármelyik' opciót a címjegyzék/mappa lenyíló listájában."
 
 "\n"
 "Ha %s -t a teljes címjegyzékben keresni akarod, válaszd a 'Bármelyik' opciót a címjegyzék/mappa lenyíló listájában."
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -11708,11 +12231,11 @@ msgstr ""
 "Mégis bezárod?"
 
 # src/compose.c:3460 src/compose.c:4384
 "Mégis bezárod?"
 
 # src/compose.c:3460 src/compose.c:4384

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "Illeszkedési típus: 'Teszt'"
 
 msgid "Match Type: 'Test'"
 msgstr "Illeszkedési típus: 'Teszt'"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 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"
 "\n"
 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"
 "\n"


@@ -11722,7 +12245,7 @@ msgstr ""
 "\n"
 "A következő szimbólumok használhatók:"
 
 "\n"
 "A következő szimbólumok használhatók:"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr "Jelenlegi szabályok"
 
 msgid "Current condition rules"
 msgstr "Jelenlegi szabályok"
 


@@ -11913,7 +12436,7 @@ msgstr "Aláírások"
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/prefs_msg_colors.c:365
 
 # src/folderview.c:610 src/mainwindow.c:2717 src/setup.c:86
 #: src/prefs_msg_colors.c:365

-#: src/prefs_summaries.c:346
+#: src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr "Mappalista"
 
 msgid "Folder list"
 msgstr "Mappalista"
 


@@ -12103,45 +12626,16 @@ msgstr "Megerősítés a kuka ürítése előtt"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"

-msgstr "Kérdezzen rá a fiók-specifikus szűrési szabályokra kézi szűrés esetén"
+msgstr "Rákérdezés a fiók-specifikus szűrési szabályokra kézi szűrés esetén"

 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"
 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"

-msgstr "kapcsolat nélküli mappák szinkronizálása a lehető leghamarabb"
-
-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "Válasz esetén automatikusan idéz a feladótól"
-
-# src/prefs_common.c:1336
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "Válasz formátuma"
-
-# src/prefs_common.c:1351 src/prefs_common.c:1390
-#: src/prefs_quote.c:109
-#: src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "Idézet jele"
+msgstr "Kapcsolat nélküli mappák szinkronizálása a lehető leghamarabb"

 
 

-# src/prefs_common.c:1375
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "Továbbítás formátuma"
-
-# src/prefs_common.c:1258
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "Karakterek idézet jelölésére"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "Idézet jeleként kezeli a következő karaktereket: "
-
-# src/inc.c:807
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "Idézés"
+# src/summaryview.c:954
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "Új üzenet formátuma"

 
 # src/prefs_common.c:867 src/prefs_common.c:1031
 #: src/prefs_receive.c:121
 
 # src/prefs_common.c:867 src/prefs_common.c:1031
 #: src/prefs_receive.c:121


@@ -12185,7 +12679,7 @@ msgstr "Fogadó párbeszéd-ablak mutatása"
 # src/prefs_common.c:1946
 #: src/prefs_receive.c:178
 #: src/prefs_send.c:174
 # src/prefs_common.c:1946
 #: src/prefs_receive.c:178
 #: src/prefs_send.c:174

-#: src/prefs_summaries.c:448
+#: src/prefs_summaries.c:438

 msgid "Always"
 msgstr "Mindig"
 
 msgid "Always"
 msgstr "Mindig"
 


@@ -12500,264 +12994,237 @@ msgid "Spell Checking"
 msgstr "Helyesírás-ellenőrzés"
 
 # src/prefs_common.c:2274
 msgstr "Helyesírás-ellenőrzés"
 
 # src/prefs_common.c:2274

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
 # src/prefs_common.c:2275
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
 # src/prefs_common.c:2275

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "teljes nap név"
 
 # src/prefs_common.c:2276
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
 # src/prefs_common.c:2276

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
 # src/prefs_common.c:2277
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
 # src/prefs_common.c:2277

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "teljes hónapnév"
 
 # src/prefs_common.c:2278
 msgid "the full month name"
 msgstr "teljes hónapnév"
 
 # src/prefs_common.c:2278

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és Időformátum a helyi beállításhoz"
 
 # src/prefs_common.c:2279
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és Időformátum a helyi beállításhoz"
 
 # src/prefs_common.c:2279

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgid "the century number (year/100)"

-msgstr "Ã\89vszázad (év/100)"
+msgstr "évszázad (év/100)"

 
 # src/prefs_common.c:2280
 
 # src/prefs_common.c:2280

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgid "the day of the month as a decimal number"

-msgstr "Hónap napja számként"
+msgstr "hónap napja számként"

 
 # src/prefs_common.c:2281
 
 # src/prefs_common.c:2281

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgid "the hour as a decimal number using a 24-hour clock"

-msgstr "Ã\93ra számként (24 órás kijelzés)"
+msgstr "óra számként (24 órás kijelzés)"

 
 # src/prefs_common.c:2282
 
 # src/prefs_common.c:2282

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgid "the hour as a decimal number using a 12-hour clock"

-msgstr "Ã\93ra számként (12 órás kijelzés)"
+msgstr "óra számként (12 órás kijelzés)"

 
 # src/prefs_common.c:2283
 
 # src/prefs_common.c:2283

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgid "the day of the year as a decimal number"

-msgstr "Az év napja számként"
+msgstr "az év napja számként"

 
 # src/prefs_common.c:2284
 
 # src/prefs_common.c:2284

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgid "the month as a decimal number"

-msgstr "A hónap számként"
+msgstr "a hónap számként"

 
 # src/prefs_common.c:2285
 
 # src/prefs_common.c:2285

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgid "the minute as a decimal number"

-msgstr "A perc számként"
+msgstr "a perc számként"

 
 # src/prefs_common.c:2286
 
 # src/prefs_common.c:2286

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
 # src/prefs_common.c:2287
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
 # src/prefs_common.c:2287

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgid "the second as a decimal number"

-msgstr "A másodperc számként"
+msgstr "a másodperc számként"

 
 # src/prefs_common.c:2288
 
 # src/prefs_common.c:2288

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgid "the day of the week as a decimal number"

-msgstr "A hét napja számként"
+msgstr "a hét napja számként"

 
 # src/prefs_common.c:2289
 
 # src/prefs_common.c:2289

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális helyi beállításhoz"
 
 # src/prefs_common.c:2290
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális helyi beállításhoz"
 
 # src/prefs_common.c:2290

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két karaktere"
 
 # src/prefs_common.c:2291
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két karaktere"
 
 # src/prefs_common.c:2291

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgid "the year as a decimal number"

-msgstr "Az év számként"
+msgstr "az év számként"

 
 # src/prefs_common.c:2292
 
 # src/prefs_common.c:2292

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgid "the time zone or name or abbreviation"

-msgstr "Időzóna vagy neve vagy rövidítése"
+msgstr "időzóna vagy neve vagy rövidítése"

 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336
 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336

-#: src/prefs_summaries.c:181
-#: src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "Dátumformátum"
 
 # src/prefs_common.c:2313
 msgid "Date format"
 msgstr "Dátumformátum"
 
 # src/prefs_common.c:2313

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "Vezérlőjel"
 
 # src/prefs_common.c:2353
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
 # src/prefs_common.c:2353

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "Példa"
 
 # src/prefs_common.c:1497
 msgid "Example"
 msgstr "Példa"
 
 # src/prefs_common.c:1497

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgstr "Olvasatlan levelek számának kijelzése a mappanév mellett"
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506
 msgid "Display message number next to folder name"
 msgstr "Olvasatlan levelek számának kijelzése a mappanév mellett"
 
 # src/colorlabel.c:281 src/prefs_folder_item.c:256 src/summaryview.c:3506

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "Nincs"
 
 # src/summaryview.c:898
 msgid "No"
 msgstr "Nincs"
 
 # src/summaryview.c:898

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgstr "Olvasatlan üzenet"
 
 # src/summaryview.c:898
 msgid "Unread messages"
 msgstr "Olvasatlan üzenet"
 
 # src/summaryview.c:898

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgstr "Olvasatlan és összes üzenet"
 
 msgid "Unread and Total messages"
 msgstr "Olvasatlan és összes üzenet"
 

+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "Utoljára megnyitott mappa megnyitása induláskor"
+

 # src/prefs_common.c:1506
 # src/prefs_common.c:1506

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Az ennél hosszabb hírcsoport-nevek rövidítése"
 
 # src/prefs_common.c:1521
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Az ennél hosszabb hírcsoport-nevek rövidítése"
 
 # src/prefs_common.c:1521

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "betű"
 
 # src/prefs_common.c:1065
 msgid "letters"
 msgstr "betű"
 
 # src/prefs_common.c:1065

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr "Üzenetlista"
 
 # src/folderview.c:1695
 msgid "Message list"
 msgstr "Üzenetlista"
 
 # src/folderview.c:1695

-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "Mappába belépéskor"
-
-# src/send.c:375
-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "Semmi"
-
-# src/inc.c:523
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "Az első nem olvasott (vagy új vagy megjelölt) üzenet kiválasztása"
-
-# src/inc.c:523
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "Az első nem olvasott (vagy megjelölt vagy új) üzenet kiválasztása"
-
-# src/summaryview.c:888 src/summaryview.c:912
-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "Az első új (vagy nem olvasott vagy megjelölt) üzenet kiválasztása"
-
-# src/summaryview.c:888 src/summaryview.c:912
-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "Az első új (vagy megjelölt vagy nem olvasott) üzenet kiválasztása"
-
-# src/summaryview.c:888 src/summaryview.c:912
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "Az első megjelölt (vagy új vagy nem olvasott) üzenet kiválasztása"
-
-# src/inc.c:523
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "Az első megjelölt (vagy nem olvasott vagy új) üzenet kiválasztása"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"
+msgstr "Alapértelmezett kijelölés beállítása mappába belépéskor"

 
 # src/prefs_common.c:1936
 
 # src/prefs_common.c:1936

-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Nincs olvasatlan (vagy új) üzenet' ablak mutatása"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Nincs olvasatlan (vagy új) üzenet' ablak mutatása"
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "'Igen'-nel elfogad"
 
 msgid "Assume 'Yes'"
 msgstr "'Igen'-nel elfogad"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "'Nem'-mel elfogad"
 
 # src/prefs_account.c:965
 msgid "Assume 'No'"
 msgstr "'Nem'-mel elfogad"
 
 # src/prefs_account.c:965

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr "Üzenet megnyitása kiválasztáskor (mindig)"
 
 msgid "Always open message when selected"
 msgstr "Üzenet megnyitása kiválasztáskor (mindig)"
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "A téma használja a tárgyat is a standard fejlécek mellett"
 
 # src/prefs_common.c:1917
 msgid "Thread using subject in addition to standard headers"
 msgstr "A téma használja a tárgyat is a standard fejlécek mellett"
 
 # src/prefs_common.c:1917

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Üzenet áthelyezésének vagy törlésének azonnali végrehajtása"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Üzenet áthelyezésének vagy törlésének azonnali végrehajtása"
 

-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:460

 msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
 msgstr "Az üzenetek áthelyzését, másolását és törlését csak az 'Eszközök/Futtatás' hajtja végre"
 
 # src/prefs_common.c:1905
 msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
 msgstr "Az üzenetek áthelyzését, másolását és törlését csak az 'Eszközök/Futtatás' hajtja végre"
 
 # src/prefs_common.c:1905

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
-msgstr "Csak akkor jelöl meg olvasottként, ha az üzenet új ablakban lett megnyitva"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"
+msgstr ""
+"Csak akkor jelöl meg olvasottként, ha az üzenet \n"
+"új ablakban lett megnyitva, vagy megválaszolt"

 
 # src/summaryview.c:364
 
 # src/summaryview.c:364

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "Összes megjelölése olvasottként"
 
 # src/summaryview.c:369
 msgid "Mark messages as read after"
 msgstr "Összes megjelölése olvasottként"
 
 # src/summaryview.c:369

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgid "Display sender using address book"

-msgstr "A feladó kijelzése a cimjegyzék alapján"
+msgstr "A feladó kijelzése a címjegyzék alapján"

 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336
 
 # src/prefs_common.c:1551 src/prefs_common.c:2298 src/prefs_common.c:2336

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgid "Date format help"

-msgstr "Dátum formátum segítség"
+msgstr "Dátumformátum segítség"

 
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Megerősítés minden üzenet olvasottként megjelölése előtt a mappában"
 
 # src/prefs_display_header.c:222
 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Megerősítés minden üzenet olvasottként megjelölése előtt a mappában"
 
 # src/prefs_display_header.c:222

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "Fejléc nevek fordítása"
 
 msgid "Translate header names"
 msgstr "Fejléc nevek fordítása"
 

-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:544

 msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
 msgstr "A standard fejlécek (mint pl. 'From:', 'Subject:') lefordítva fognak megjelenni."
 
 # src/prefs_common.c:1527
 msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
 msgstr "A standard fejlécek (mint pl. 'From:', 'Subject:') lefordítva fognak megjelenni."
 
 # src/prefs_common.c:1527

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr "Összegzések"
 
 # src/prefs_summary_column.c:69
 #: src/prefs_summary_column.c:81
 msgid "Summaries"
 msgstr "Összegzések"
 
 # src/prefs_summary_column.c:69
 #: src/prefs_summary_column.c:81

-#: src/summaryview.c:2442
+#: src/summaryview.c:2460

 msgid "Attachment"
 msgstr "Csatolás"
 
 msgid "Attachment"
 msgstr "Csatolás"
 


@@ -12780,43 +13247,80 @@ msgstr ""
 "Válaszd ki az üzenetlistában megjelenítendő oszlopokat\n"
 "A sorrendjüket a Fel/Le gombokkal vagy egérrel változtathatod meg."
 
 "Válaszd ki az üzenetlistában megjelenítendő oszlopokat\n"
 "A sorrendjüket a Fel/Le gombokkal vagy egérrel változtathatod meg."
 

+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "Ugrás az első megjelölt e-mailre"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "Ugrás az első új e-mailre"
+
+# src/mainwindow.c:494
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "Ugrás az első olvasatlan e-mailre"
+
+# src/summaryview.c:2351
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "Ugrás az utoljára megnyitott e-mailre"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "Ugrás a lista utolsó e-mailjére"
+
+# src/send.c:375
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "Semmi"
+
+#: src/prefs_summary_open.c:187
+#: src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "Művelet mappa megnyitásakor"
+
+# src/prefs_actions.c:875
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "Lehetséges műveletek"
+

 # src/prefs_display_header.c:537
 # src/prefs_display_header.c:537

-#: src/prefs_template.c:186
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "Ez a név már használatban van, mint menüelem"
 
 # src/prefs_template.c:230
 msgid "This name is used as the Menu item"
 msgstr "Ez a név már használatban van, mint menüelem"
 
 # src/prefs_template.c:230

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " Szimbólumok..."
 
 msgid " Symbols... "
 msgstr " Szimbólumok..."
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "Sablon beállításai"
 
 # src/prefs_customheader.c:485 src/prefs_display_header.c:527
 # src/prefs_filter.c:674
 msgid "Template configuration"
 msgstr "Sablon beállításai"
 
 # src/prefs_customheader.c:485 src/prefs_display_header.c:527
 # src/prefs_filter.c:674

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "A sablonnak nincs név megadva."
 
 # src/prefs_template.c:513
 msgid "Template name is not set."
 msgstr "A sablonnak nincs név megadva."
 
 # src/prefs_template.c:513

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "Sablon törlése"
 
 # src/prefs_template.c:514
 msgid "Delete template"
 msgstr "Sablon törlése"
 
 # src/prefs_template.c:514

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "Tényleg töröljem ezt a sablont?"
 
 # src/prefs_template.c:513
 msgid "Do you really want to delete this template?"
 msgstr "Tényleg töröljem ezt a sablont?"
 
 # src/prefs_template.c:513

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "Jelenlegi sablonok"
 
 # src/prefs_template.c:373
 msgid "Current templates"
 msgstr "Jelenlegi sablonok"
 
 # src/prefs_template.c:373

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "Sablon"
 
 msgid "Template"
 msgstr "Sablon"
 


@@ -12930,7 +13434,7 @@ msgstr "%d téma érhető el (%d felhasználói, %d rendszer, 1 belső)"
 #: src/prefs_themes.c:709
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:709
 #, c-format
 msgid "Internal theme has %d icons"

-msgstr "A belső téma ikonjainak száma %d"
+msgstr "A belső téma ikonjainak száma: %d"

 
 #: src/prefs_themes.c:715
 msgid "No info file available for this theme"
 
 #: src/prefs_themes.c:715
 msgid "No info file available for this theme"


@@ -12968,11 +13472,6 @@ msgstr "Szerző:"
 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-# src/progressdialog.c:53
-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "Állapot:"
-

 # src/folderview.c:1753
 #: src/prefs_themes.c:937
 msgid "Preview"
 # src/folderview.c:1753
 #: src/prefs_themes.c:937
 msgid "Preview"


@@ -13099,12 +13598,12 @@ msgid "No information available"
 msgstr "Nincs elérhető információ"
 
 # src/prefs_actions.c:689
 msgstr "Nincs elérhető információ"
 
 # src/prefs_actions.c:689

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr "Nincs definiált elfogadókulcs."
 
 msgid "No recipient keys defined."
 msgstr "Nincs definiált elfogadókulcs."
 

+#: src/procmime.c:339

 #: src/procmime.c:341
 #: src/procmime.c:341

-#: src/procmime.c:343

 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64 dekódolási hiba]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64 dekódolási hiba]\n"
 


@@ -13159,190 +13658,274 @@ msgid "Error occurred while posting the message to %s."
 msgstr "Hiba lépett fel az üzenet küldése közben: %s"
 
 # src/summaryview.c:2611
 msgstr "Hiba lépett fel az üzenet küldése közben: %s"
 
 # src/summaryview.c:2611

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "Üzenetek szűrése...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Üzenetek szűrése...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">szimbólumok:</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgid "customized date format (see 'man strftime')"

-msgstr "egyéni dátumformátum (lásd az strftime útmutatót)"
+msgstr "Egyéni dátumformátum (lásd az strftime útmutatót)"

 
 # src/prefs_account.c:1807
 
 # src/prefs_account.c:1807

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgid "email address of sender"

-msgstr "feladó e-mail címe"
+msgstr "Feladó e-mail címe"

 
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgid "full name of sender"

-msgstr "feladó teljes neve"
+msgstr "Feladó teljes neve"

 
 # src/editaddress.c:741 src/editaddress.c:743
 
 # src/editaddress.c:741 src/editaddress.c:743

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgid "first name of sender"

-msgstr "feladó keresztneve"
+msgstr "Feladó keresztneve"

 
 # src/editaddress.c:740 src/editaddress.c:744
 
 # src/editaddress.c:740 src/editaddress.c:744

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgid "last name of sender"

-msgstr "feladó vezetékneve"
+msgstr "Feladó vezetékneve"

 
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgid "initials of sender"

-msgstr "feladó aláírása"
+msgstr "Feladó aláírása"

 
 # src/prefs_common.c:818
 
 # src/prefs_common.c:818

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgid "message body"

-msgstr "üzenet szövege"
+msgstr "Ã\9czenet szövege"

 
 # src/main.c:418
 
 # src/main.c:418

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgid "quoted message body"

-msgstr "idézett üzenet szövege"
+msgstr "Idézett üzenet szövege"

 
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgid "message body without signature"

-msgstr "üzenet szöveg aláirás nélkül"
+msgstr "Ã\9czenet szövege aláírás nélkül"

 
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgid "quoted message body without signature"

-msgstr "idézett üzenet szöveg aláirás nélkül"
+msgstr "Idézett üzenet szövege aláírás nélkül"
+
+# src/prefs_actions.c:875
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "jelenlegi szótár"

 
 # src/prefs_actions.c:875
 
 # src/prefs_actions.c:875

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgid "cursor position"

-msgstr "kurzorpozíció"
+msgstr "Kurzorpozíció"

 
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
-msgstr "Fiókbeállítás: név"
+#: src/quote_fmt.c:67
+msgid "account property: your name"
+msgstr "fiókbeállítás: saját név"

 
 # src/prefs_account.c:1389
 
 # src/prefs_account.c:1389

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
-msgstr "Fiókbeállítás: e-mail cím"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"
+msgstr "fiókbeállítás: saját e-mail cím"

 
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
-msgstr "Fiókbeállítás: felhasználónév"
+#: src/quote_fmt.c:69
+msgid "account property: account name"
+msgstr "fiókbeállítás: fiók neve"

 
 # src/prefs_account.c:768
 
 # src/prefs_account.c:768

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
-msgstr "Fiók adat: szervezet"
+#: src/quote_fmt.c:70
+msgid "account property: organization"
+msgstr "fiókbeállítás: saját szervezet"

 
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "fiókbeállítás: alapértelmezett szótár"
+
+# src/addressbook.c:2391
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "címjegyzék <span style=\"oblique\">kiegészítés</span>: másolatot kap"
+
+# src/addressbook.c:2391
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "címjegyzék <span style=\"oblique\">kiegészítés</span>: feladó"
+
+# src/addressbook.c:2391
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "címjegyzék <span style=\"oblique\">kiegészítés</span>: címzett"
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "\\ jel"
 
 # src/prefs_common.c:1351 src/prefs_common.c:1390
 msgid "literal backslash"
 msgstr "\\ jel"
 
 # src/prefs_common.c:1351 src/prefs_common.c:1390

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "? jel"
 
 # src/prefs_common.c:1351 src/prefs_common.c:1390
 msgid "literal question mark"
 msgstr "? jel"
 
 # src/prefs_common.c:1351 src/prefs_common.c:1390

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "! jel"
 
 # src/compose.c:3982
 msgid "literal exclamation mark"
 msgstr "! jel"
 
 # src/compose.c:3982

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "| jel"
 
 msgid "literal pipe"
 msgstr "| jel"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr "{ jel"
 
 msgid "literal opening curly brace"
 msgstr "{ jel"
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr "} jel"
 
 # src/inc.c:210 src/inc.c:289 src/send.c:367
 msgid "literal closing curly brace"
 msgstr "} jel"
 
 # src/inc.c:210 src/inc.c:289 src/send.c:367

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgid "tab"

-msgstr "fül"
+msgstr "Fül"

 
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "soremelés"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">parancsok:</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"kifejezés beszúrása, ha x beállítva\n"
-"(ahol x a 'dfNFLIstcnri' karakterek egyike, vagy af, ao)"
+"<span style=\"oblique\">kifejezés</span> beszúrása, ha x beállítva\n"
+"x a [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] szimbólumok\n"
+"(vagy hosszú megfelelőjük) egyike"

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"kifejezés beszúrása, ha x nincs beállítva\n"
-"(ahol x a 'dfNFLIstcnri' karakterek egyike, vagy af, ao)"
+"<span style=\"oblique\">kifejezés</span> beszúrása, ha x nincs beállítva\n"
+"x a [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt] szimbólumok\n"
+"(vagy hosszú megfelelőjük) egyike"

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to insert"

 msgstr ""
 "fájl beszúrása:\n"
 msgstr ""
 "fájl beszúrása:\n"

-"sub_expr a beszúrandó fájl nevével helyettesítődik"
+"<span style=\"oblique\">sub_expr</span> a beszúrandó fájl elérési útjával helyettesítődik"

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 "program kimenetének beszúrása:\n"
 "the output from"
 msgstr ""
 "program kimenetének beszúrása:\n"

-"sub_expr parancssorral helyettesítődik\n"
-"a kimenethez"
+"<span style=\"oblique\">sub_expr</span> a kimenetet adó\n"
+"parancssorral helyettesítődik"

 
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "felhasználói bevitel beszúrása:\n"
 "user-entered text"
 msgstr ""
 "felhasználói bevitel beszúrása:\n"

-"sub_expr a felhasználó által megadott szöveget\n"
+"<span style=\"oblique\">sub_expr</span> a felhasználó által megadott szöveget\n"

 "tartalmazó változó"
 
 "tartalmazó változó"
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "szabálydefiníciók:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">szabálydefiníciók:</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "a következő szimbólumok valamelyikét tartalmazó szöveg"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"a következő szimbólumok vagy parancsok\n"
+"valamelyikét tartalmazó szöveg"

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94
+msgid ""
+"text that can contain any of the symbols (no\n"
+"commands) above"
+msgstr ""
+"a következő szimbólumok (nem parancsok)\n"
+"valamelyikét tartalmazó szöveg"
+
+#: src/quote_fmt.c:95

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"

 msgstr ""
 msgstr ""

-"a következő szimbólumok valamelyikét tartalmazó szöveg\n"
-"kivéve ?x{}, !x{}, |f{}, |p{} és |i{}"
+"a kiegészítés a címjegyzékből csak a fejléc\n"
+"első címénél működik, és a partner teljes nevét\n"
+"adja vissza, ha a cím pontosan egyezik\n"
+"egy partnerével a címjegyzékben"

 
 # src/prefs_common.c:2711
 
 # src/prefs_common.c:2711

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "A következő szimbólumok használhatók:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "A következő szimbólumok és parancsok használhatók:"
+
+# src/inc.c:312
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr "Új üzenetek szerkesztési formátuma"
+
+# src/prefs_common.c:1336
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "Válasz formátuma"
+
+# src/prefs_common.c:1351 src/prefs_common.c:1390
+#: src/quote_fmt.c:248
+#: src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "Idézet jele"
+
+# src/prefs_common.c:1375
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "Továbbítás formátuma"
+
+# src/prefs_common.c:1419
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "Szimbólumok leírása..."
+
+# src/compose.c:1157
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr "Idézés formátum hiba válaszüzenetnél."
+
+# src/compose.c:1157
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "Idézés formátum hiba továbbított üzenetnél."

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Add meg, mire cseréled '%s' szöveget"
 
 # src/prefs_common.c:2353
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Add meg, mire cseréled '%s' szöveget"
 
 # src/prefs_common.c:2353

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "Változó megadása"
 
 msgid "Enter variable"
 msgstr "Változó megadása"
 


@@ -13516,11 +14099,6 @@ msgstr "Bármely egyezik a következőkből"
 msgid "Match all of the following"
 msgstr "Illeszkedés a következők mindegyikéhez"
 
 msgid "Match all of the following"
 msgstr "Illeszkedés a következők mindegyikéhez"
 

-# src/compose.c:3512 src/headerview.c:54 src/summary_search.c:148
-#: src/summary_search.c:356
-msgid "From:"
-msgstr "Feladó:"
-

 # src/summary_search.c:169
 #: src/summary_search.c:377
 msgid "Body:"
 # src/summary_search.c:169
 #: src/summary_search.c:377
 msgid "Body:"


@@ -13536,470 +14114,480 @@ msgid "Find _all"
 msgstr "Összes keresése"
 
 # src/summary_search.c:306
 msgstr "Összes keresése"
 
 # src/summary_search.c:306

-#: src/summary_search.c:669
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "A lista elejére értem. Tovább a végétől?"
 
 # src/summary_search.c:308
 msgid "Beginning of list reached; continue from end?"
 msgstr "A lista elejére értem. Tovább a végétől?"
 
 # src/summary_search.c:308

-#: src/summary_search.c:671
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "A lista végére értem. Tovább az elejétől?"
 
 # src/summaryview.c:341
 msgid "End of list reached; continue from beginning?"
 msgstr "A lista végére értem. Tovább az elejétől?"
 
 # src/summaryview.c:341

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/_Válasz"
 
 # src/summaryview.c:342
 msgid "/_Reply"
 msgstr "/_Válasz"
 
 # src/summaryview.c:342

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/Válasz _alábbiaknak:"
 
 # src/summaryview.c:343
 msgid "/Repl_y to"
 msgstr "/Válasz _alábbiaknak:"
 
 # src/summaryview.c:343

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/Válasz _alábbiaknak:/_mindenkinek"
 
 # src/summaryview.c:344
 msgid "/Repl_y to/_all"
 msgstr "/Válasz _alábbiaknak:/_mindenkinek"
 
 # src/summaryview.c:344

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/Válasz _alábbiaknak:/a _feladónak"
 
 # src/summaryview.c:345
 msgid "/Repl_y to/_sender"
 msgstr "/Válasz _alábbiaknak:/a _feladónak"
 
 # src/summaryview.c:345

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/Válasz _alábbiaknak:/_levelező listára"
 
 # src/summaryview.c:348
 msgid "/Repl_y to/mailing _list"
 msgstr "/Válasz _alábbiaknak:/_levelező listára"
 
 # src/summaryview.c:348

-#: src/summaryview.c:429
-#: src/toolbar.c:247
+#: src/summaryview.c:435
+#: src/toolbar.c:248

 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
 # src/summaryview.c:349
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
 # src/summaryview.c:349

-#: src/summaryview.c:430
-#: src/toolbar.c:248
+#: src/summaryview.c:436
+#: src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/Csatolásként továbbít"
 
 # src/summaryview.c:350
 msgid "/For_ward as attachment"
 msgstr "/Csatolásként továbbít"
 
 # src/summaryview.c:350

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/Átirányítás"
 
 # src/summaryview.c:354
 msgid "/Redirect"
 msgstr "/Átirányítás"
 
 # src/summaryview.c:354

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/_Áthelyezés..."
 
 # src/summaryview.c:355
 msgid "/M_ove..."
 msgstr "/_Áthelyezés..."
 
 # src/summaryview.c:355

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/_Másolás..."
 
 msgid "/_Copy..."
 msgstr "/_Másolás..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/Áthelyezés a kukába"
 
 # src/addressbook.c:383 src/addressbook.c:393 src/summaryview.c:356
 msgid "/Move to _trash"
 msgstr "/Áthelyezés a kukába"
 
 # src/addressbook.c:383 src/addressbook.c:393 src/summaryview.c:356

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/_Törlés..."
 
 # src/summaryview.c:359
 msgid "/_Delete..."
 msgstr "/_Törlés..."
 
 # src/summaryview.c:359

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/_Megjelöl"
 
 # src/summaryview.c:360
 msgid "/_Mark"
 msgstr "/_Megjelöl"
 
 # src/summaryview.c:360

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/_Megjelöl/_Megjelöl"
 
 # src/summaryview.c:361
 msgid "/_Mark/_Mark"
 msgstr "/_Megjelöl/_Megjelöl"
 
 # src/summaryview.c:361

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/_Megjelöl/Megjelölés visszavonása"
 
 # src/summaryview.c:362
 msgid "/_Mark/_Unmark"
 msgstr "/_Megjelöl/Megjelölés visszavonása"
 
 # src/summaryview.c:362

-#: src/summaryview.c:441

 #: src/summaryview.c:447
 #: src/summaryview.c:447

-#: src/summaryview.c:450
+#: src/summaryview.c:453
+#: src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/_Megjelöl/---"
 
 # src/summaryview.c:363
 msgid "/_Mark/---"
 msgstr "/_Megjelöl/---"
 
 # src/summaryview.c:363

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Megjelöl/mint olvasatla_n"
 
 # src/summaryview.c:364
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Megjelöl/mint olvasatla_n"
 
 # src/summaryview.c:364

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Megjelöl/mint olvaso_tt"
 
 # src/summaryview.c:366
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Megjelöl/mint olvaso_tt"
 
 # src/summaryview.c:366

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/_Megjelöl/_mind mint olvasott"
 
 # src/summaryview.c:364
 msgid "/_Mark/Mark all read"
 msgstr "/_Megjelöl/_mind mint olvasott"
 
 # src/summaryview.c:364

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/_Megjelöl/Téma figyelmen kívül hagyása"
 
 # src/summaryview.c:364
 msgid "/_Mark/Ignore thread"
 msgstr "/_Megjelöl/Téma figyelmen kívül hagyása"
 
 # src/summaryview.c:364

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/_Megjelöl/Téma újrafigyelése"
 
 # src/summaryview.c:363
 msgid "/_Mark/Unignore thread"
 msgstr "/_Megjelöl/Téma újrafigyelése"
 
 # src/summaryview.c:363

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/_Megjelöl/Mint _spam"
 
 # src/summaryview.c:363
 msgid "/_Mark/Mark as _spam"
 msgstr "/_Megjelöl/Mint _spam"
 
 # src/summaryview.c:363

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgid "/_Mark/Mark as _ham"

-msgstr "/_Megjelöl/Mint _nem spam"
+msgstr "/_Megjelöl/Mint nem s_pam"

 
 # src/summaryview.c:359
 
 # src/summaryview.c:359

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/_Megjelöl/Zárolt"
 
 # src/summaryview.c:361
 msgid "/_Mark/Lock"
 msgstr "/_Megjelöl/Zárolt"
 
 # src/summaryview.c:361

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "_Megjelöl/Megnyitott"
 
 # src/summaryview.c:367
 msgid "/_Mark/Unlock"
 msgstr "_Megjelöl/Megnyitott"
 
 # src/summaryview.c:367

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/_Színes címke"
 
 # src/summaryview.c:369
 msgid "/Color la_bel"
 msgstr "/_Színes címke"
 
 # src/summaryview.c:369

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "/_Feladó címét a címlistába"
 
 # src/summaryview.c:371
 msgid "/Add sender to address boo_k"
 msgstr "/_Feladó címét a címlistába"
 
 # src/summaryview.c:371

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/_Szűrési szabályok létrehozása"
 
 # src/summaryview.c:372
 msgid "/Create f_ilter rule"
 msgstr "/_Szűrési szabályok létrehozása"
 
 # src/summaryview.c:372

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Szűrési szabályok létrehozása/_Automatikusan"
 
 # src/summaryview.c:374
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Szűrési szabályok létrehozása/_Automatikusan"
 
 # src/summaryview.c:374

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Szűrési szabályok létrehozása/_Feladó szerint"
 
 # src/summaryview.c:376
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Szűrési szabályok létrehozása/_Feladó szerint"
 
 # src/summaryview.c:376

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Szűrési szabályok létrehozása/_Címzett szerint"
 
 # src/summaryview.c:378
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Szűrési szabályok létrehozása/_Címzett szerint"
 
 # src/summaryview.c:378

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Szűrési szabályok létrehozása/_Tárgy szerint"
 
 # src/summaryview.c:371
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Szűrési szabályok létrehozása/_Tárgy szerint"
 
 # src/summaryview.c:371

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/Feldolgozási szabályok létrehozása"
 
 # src/summaryview.c:372
 msgid "/Create processing rule"
 msgstr "/Feldolgozási szabályok létrehozása"
 
 # src/summaryview.c:372

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/Feldolgozási szabályok létrehozása/_Automatikusan"
 
 # src/summaryview.c:374
 msgid "/Create processing rule/_Automatically"
 msgstr "/Feldolgozási szabályok létrehozása/_Automatikusan"
 
 # src/summaryview.c:374

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/Feldolgozási szabályok létrehozása/_Feladó szerint"
 
 # src/summaryview.c:376
 msgid "/Create processing rule/by _From"
 msgstr "/Feldolgozási szabályok létrehozása/_Feladó szerint"
 
 # src/summaryview.c:376

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/Feldolgozási szabályok létrehozása/_Címzett szerint"
 
 # src/summaryview.c:378
 msgid "/Create processing rule/by _To"
 msgstr "/Feldolgozási szabályok létrehozása/_Címzett szerint"
 
 # src/summaryview.c:378

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/Feldolgozási szabályok létrehozása/_Tárgy szerint"
 
 # src/mainwindow.c:599
 msgid "/Create processing rule/by _Subject"
 msgstr "/Feldolgozási szabályok létrehozása/_Tárgy szerint"
 
 # src/mainwindow.c:599

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/_Nézet/Üze_net forrása"
 
 # src/summaryview.c:385
 msgid "/_View/Message _source"
 msgstr "/_Nézet/Üze_net forrása"
 
 # src/summaryview.c:385

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Teljes fejléc"
 
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Teljes fejléc"
 

+# src/mimeview.c:117 src/summaryview.c:387
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/Mentés másként..."
+

 # src/summaryview.c:388
 # src/summaryview.c:388

-#: src/summaryview.c:484
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/_Nyomtat..."
 
 msgid "/_Print..."
 msgstr "/_Nyomtat..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgid "Toggle quick search bar"

-msgstr "Gyorskereső sáv bezárása"
+msgstr "Gyorskereső sáv váltása"
+
+# src/prefs_common.c:2829
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr "Többszörös kijelölés váltása"

 
 # src/summaryview.c:586
 
 # src/summaryview.c:586

-#: src/summaryview.c:1065
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
 # src/summaryview.c:587
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
 # src/summaryview.c:587

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "Maradt még néhány kijelölt. Feldolgozzam?"
 
 # src/summaryview.c:635
 msgid "Some marks are left. Process them?"
 msgstr "Maradt még néhány kijelölt. Feldolgozzam?"
 
 # src/summaryview.c:635

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) Mappa átvizsgálása..."
 
 # src/summaryview.c:888 src/summaryview.c:912
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) Mappa átvizsgálása..."
 
 # src/summaryview.c:888 src/summaryview.c:912

-#: src/summaryview.c:1591
-#: src/summaryview.c:1643
+#: src/summaryview.c:1609
+#: src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "Nincsenek további olvasatlan hírek"
 
 # src/summaryview.c:889
 msgid "No more unread messages"
 msgstr "Nincsenek további olvasatlan hírek"
 
 # src/summaryview.c:889

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "Nem találtam olvasatlan hírt. Keresés a végétől?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Nem találtam olvasatlan hírt. Keresés a végétől?"
 

-#: src/summaryview.c:1604
-#: src/summaryview.c:1656
-#: src/summaryview.c:1703
-#: src/summaryview.c:1755
-#: src/summaryview.c:1834
+#: src/summaryview.c:1622
+#: src/summaryview.c:1674
+#: src/summaryview.c:1721
+#: src/summaryview.c:1773
+#: src/summaryview.c:1852

 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Belső hiba: rossz érték a prefs_common.next_unread_msg_dialog-hoz\n"
 
 # src/summaryview.c:898
 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Belső hiba: rossz érték a prefs_common.next_unread_msg_dialog-hoz\n"
 
 # src/summaryview.c:898

-#: src/summaryview.c:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "Nincs olvasatlan hír."
 
 # src/summaryview.c:913
 msgid "No unread messages."
 msgstr "Nincs olvasatlan hír."
 
 # src/summaryview.c:913

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr "Nem találtam olvasatlan üzenetet. Ugrás a következő mappára?"
 
 # src/summaryview.c:944 src/summaryview.c:968
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem találtam olvasatlan üzenetet. Ugrás a következő mappára?"
 
 # src/summaryview.c:944 src/summaryview.c:968

-#: src/summaryview.c:1690
-#: src/summaryview.c:1742
+#: src/summaryview.c:1708
+#: src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "Nincsenek további új üzenetek"
 
 # src/summaryview.c:945
 msgid "No more new messages"
 msgstr "Nincsenek további új üzenetek"
 
 # src/summaryview.c:945

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "Nincs új üzenet. Keresés a végétől?"
 
 # src/summaryview.c:954
 msgid "No new message found. Search from the end?"
 msgstr "Nincs új üzenet. Keresés a végétől?"
 
 # src/summaryview.c:954

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
 # src/summaryview.c:969
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
 # src/summaryview.c:969

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr "Nincs új üzenet. Ugrás a következő mappára?"
 
 # src/summaryview.c:1000 src/summaryview.c:1025
 msgid "No new message found. Go to next folder?"
 msgstr "Nincs új üzenet. Ugrás a következő mappára?"
 
 # src/summaryview.c:1000 src/summaryview.c:1025

-#: src/summaryview.c:1780
-#: src/summaryview.c:1821
+#: src/summaryview.c:1798
+#: src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "Nincs több olvasatlan üzenet"
 
 # src/summaryview.c:1001
 msgid "No more marked messages"
 msgstr "Nincs több olvasatlan üzenet"
 
 # src/summaryview.c:1001

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "Nem találtam kijelölt üzenetet. Keresés a végéről?"
 
 # src/summaryview.c:1010 src/summaryview.c:1035
 msgid "No marked message found. Search from the end?"
 msgstr "Nem találtam kijelölt üzenetet. Keresés a végéről?"
 
 # src/summaryview.c:1010 src/summaryview.c:1035

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
 # src/summaryview.c:913
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
 # src/summaryview.c:913

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr "Nem találtam megjelölt üzenetet. Ugrás a következő mappára?"
 
 # src/summaryview.c:1050 src/summaryview.c:1075
 msgid "No marked message found. Go to next folder?"
 msgstr "Nem találtam megjelölt üzenetet. Ugrás a következő mappára?"
 
 # src/summaryview.c:1050 src/summaryview.c:1075

-#: src/summaryview.c:1859
-#: src/summaryview.c:1884
+#: src/summaryview.c:1877
+#: src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "Nincs több címkézett üzenet"
 
 # src/summaryview.c:1051
 msgid "No more labeled messages"
 msgstr "Nincs több címkézett üzenet"
 
 # src/summaryview.c:1051

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "Nem találtam címkézett üzenetet. Keresés a végéről?"
 
 # src/summaryview.c:1060 src/summaryview.c:1085
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem találtam címkézett üzenetet. Keresés a végéről?"
 
 # src/summaryview.c:1060 src/summaryview.c:1085

-#: src/summaryview.c:1869
-#: src/summaryview.c:1894
+#: src/summaryview.c:1887
+#: src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
 # src/summaryview.c:1076
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
 # src/summaryview.c:1076

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem találtam címkézett üzenetet. Keresés az elejéről?"
 
 # src/summaryview.c:1283 src/summaryview.c:1285
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem találtam címkézett üzenetet. Keresés az elejéről?"
 
 # src/summaryview.c:1283 src/summaryview.c:1285

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
 # src/summaryview.c:1434
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
 # src/summaryview.c:1434

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
 # src/summaryview.c:1438
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
 # src/summaryview.c:1438

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d áthelyezve"
 
 # src/summaryview.c:1439 src/summaryview.c:1446
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d áthelyezve"
 
 # src/summaryview.c:1439 src/summaryview.c:1446

-#: src/summaryview.c:2339
-#: src/summaryview.c:2346
+#: src/summaryview.c:2357
+#: src/summaryview.c:2364

 msgid ", "
 msgstr ", "
 
 # src/summaryview.c:1444
 msgid ", "
 msgstr ", "
 
 # src/summaryview.c:1444

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
 # src/summaryview.c:1461
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
 # src/summaryview.c:1461

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgid " item selected"

-msgstr " elem kiválasztva"
+msgstr " üzenet kiválasztva"

 
 # src/summaryview.c:1461
 
 # src/summaryview.c:1461

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgid " items selected"

-msgstr " elem kiválasztva"
+msgstr " üzenet kiválasztva"

 
 # src/summaryview.c:1471
 
 # src/summaryview.c:1471

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
 # src/summaryview.c:1625 src/summaryview.c:1626
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
 # src/summaryview.c:1625 src/summaryview.c:1626

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "Összegzés rendezése..."
 
 # src/summaryview.c:1697
 msgid "Sorting summary..."
 msgstr "Összegzés rendezése..."
 
 # src/summaryview.c:1697

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "Összegzés készítése az üzenetek adataiból..."
 
 # src/summaryview.c:1853
 msgid "Setting summary from message data..."
 msgstr "Összegzés készítése az üzenetek adataiból..."
 
 # src/summaryview.c:1853

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
 # src/prefs_account.c:670 src/prefs_common.c:808
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
 # src/prefs_account.c:670 src/prefs_common.c:808

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(Nincs címzett)"
 
 msgid "(No Recipient)"
 msgstr "(Nincs címzett)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "Nem vagy a cikk szerzője.\n"
 
 # src/prefs_template.c:514
 msgid "You're not the author of the article.\n"
 msgstr "Nem vagy a cikk szerzője.\n"
 
 # src/prefs_template.c:514

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgstr "Valóban törölni szeretnéd a kijelölt üzenetet?"
 
 # src/prefs_template.c:514
 msgid "Do you really want to delete the selected message?"
 msgstr "Valóban törölni szeretnéd a kijelölt üzenetet?"
 
 # src/prefs_template.c:514

-#: src/summaryview.c:3817
+#: src/summaryview.c:3835

 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Valóban törölni szeretnéd a kijelölt %d üzenetet?"
 
 # src/summaryview.c:2351
 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Valóban törölni szeretnéd a kijelölt %d üzenetet?"
 
 # src/summaryview.c:2351

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
 # src/summaryview.c:2497
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
 # src/summaryview.c:2497

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
 # src/summaryview.c:2564
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
 # src/summaryview.c:2564

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
 # src/mimeview.c:803 src/summaryview.c:2669
 msgid "Destination to copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
 # src/mimeview.c:803 src/summaryview.c:2669

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "Hozzáfűz vagy felülír"
 
 # src/mimeview.c:804 src/summaryview.c:2670
 msgid "Append or Overwrite"
 msgstr "Hozzáfűz vagy felülír"
 
 # src/mimeview.c:804 src/summaryview.c:2670

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr "Hozzáfűzés a meglévő fájlhoz, vagy felülírás?"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810
 msgid "Append or overwrite existing file?"
 msgstr "Hozzáfűzés a meglévő fájlhoz, vagy felülírás?"
 
 # src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
 # src/prefs_account.c:672 src/prefs_common.c:810

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "_Hozzáfűzés"
 
 # src/mimeview.c:803 src/summaryview.c:2669
 msgid "_Append"
 msgstr "_Hozzáfűzés"
 
 # src/mimeview.c:803 src/summaryview.c:2669

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "_Felülírás"
 
 # src/summaryview.c:2940 src/summaryview.c:2941
 msgid "_Overwrite"
 msgstr "_Felülírás"
 
 # src/summaryview.c:2940 src/summaryview.c:2941

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "Témák felépítése"
 
 msgid "Building threads..."
 msgstr "Témák felépítése"
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "Szabályok kihagyása"
 
 msgid "Skip these rules"
 msgstr "Szabályok kihagyása"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "E szabályok alkalmazása tekintet nélkül arra, melyik fiókhoz tartoznak"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "E szabályok alkalmazása tekintet nélkül arra, melyik fiókhoz tartoznak"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "E szabályok alkalmazása, ha alkalmazhatók a jelenlegi fiókra"
 
 # src/summaryview.c:3150
 msgid "Apply these rules if they apply to the current account"
 msgstr "E szabályok alkalmazása, ha alkalmazhatók a jelenlegi fiókra"
 
 # src/summaryview.c:3150

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "Szűrés"
 
 msgid "Filtering"
 msgstr "Szűrés"
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -14008,21 +14596,21 @@ msgstr ""
 "Válaszd ki, mi a teendő e szabályokkal:"
 
 # src/addressbook.c:334 src/compose.c:450 src/mainwindow.c:417
 "Válaszd ki, mi a teendő e szabályokkal:"
 
 # src/addressbook.c:334 src/compose.c:450 src/mainwindow.c:417

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "_Szűrő"
 
 # src/summaryview.c:3150
 msgid "_Filter"
 msgstr "_Szűrő"
 
 # src/summaryview.c:3150

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "Szűrés..."
 
 # src/mainwindow.c:666
 msgid "Filtering..."
 msgstr "Szűrés..."
 
 # src/mainwindow.c:666

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "Feldolgozási beállítások"
 
 msgid "Processing configuration"
 msgstr "Feldolgozási beállítások"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -14031,50 +14619,50 @@ msgstr ""
 "Reguláris kifejezés (regexp) hiba:\n"
 "%s"
 
 "Reguláris kifejezés (regexp) hiba:\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Vissza a mappalistához (olvasatlan leveleid vannak)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Vissza a mappalistához (olvasatlan leveleid vannak)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "Vissza a mappalistához"
 
 # src/mainwindow.c:612
 msgid "Go back to the folder list"
 msgstr "Vissza a mappalistához"
 
 # src/mainwindow.c:612

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/Új üze_net írása"
 
 # src/summaryview.c:369
 msgid "/Compose _new message"
 msgstr "/Új üze_net írása"
 
 # src/summaryview.c:369

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "/_Felvétel a címjegyzékbe"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105
 msgid "/Add to _address book"
 msgstr "/_Felvétel a címjegyzékbe"
 
 # src/addrindex.c:94 src/addrindex.c:98 src/addrindex.c:105

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/_Cím másolása"
 
 # src/mimeview.c:116
 msgid "/Copy this add_ress"
 msgstr "/_Cím másolása"
 
 # src/mimeview.c:116

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/_Kép megnyitása"
 
 # src/mimeview.c:117 src/summaryview.c:387
 msgid "/_Open image"
 msgstr "/_Kép megnyitása"
 
 # src/mimeview.c:117 src/summaryview.c:387

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/Kép _mentése..."
 
 msgid "/_Save image..."
 msgstr "/Kép _mentése..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d byte)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d byte)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d byte)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d byte)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -14089,86 +14677,86 @@ msgstr ""
 "  Használd a(z)"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786
 "  Használd a(z)"
 
 # src/editgroup.c:509 src/folderview.c:1542 src/folderview.c:1786

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "'Napló megtekintése'"
 
 msgid "'View Log'"
 msgstr "'Napló megtekintése'"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr " -t az Eszközök menüben bővebb információért."
 
 msgid " in the Tools menu for more information."
 msgstr " -t az Eszközök menüben bővebb információért."
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr "  Az üzenet e részével a következőket teheted\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Az üzenet e részével a következőket teheted\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  jobb egérgombbal kattintva az ikonon vagy a lista tételén:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  jobb egérgombbal kattintva az ikonon vagy a lista tételén:\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - Mentés: "
 
 # src/mimeview.c:117 src/summaryview.c:387
 msgid "     - To save, select "
 msgstr "     - Mentés: "
 
 # src/mimeview.c:117 src/summaryview.c:387

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "'Mentés másként...'"
 
 msgid "'Save as...'"
 msgstr "'Mentés másként...'"
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Gyorsbillentyű: 'y')\n"
 
 # src/textview.c:532
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Gyorsbillentyű: 'y')\n"
 
 # src/textview.c:532

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - Megjelenítés szövegként: "
 
 # src/mimeview.c:116
 msgid "     - To display as text, select "
 msgstr "     - Megjelenítés szövegként: "
 
 # src/mimeview.c:116

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "'Megjelenítés szövegként'"
 
 msgid "'Display as text'"
 msgstr "'Megjelenítés szövegként'"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " (Gyorsbillentyű: 't')\n"
 
 # src/textview.c:535
 msgid " (Shortcut key: 't')\n"
 msgstr " (Gyorsbillentyű: 't')\n"
 
 # src/textview.c:535

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr "     - Megnyitás külső programmal: "
 
 # src/mimeview.c:114
 msgid "     - To open with an external program, select "
 msgstr "     - Megnyitás külső programmal: "
 
 # src/mimeview.c:114

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "'Megnyitás'"
 
 msgid "'Open'"
 msgstr "'Megnyitás'"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Gyorsbillentyű: 'l')\n"
 
 # src/textview.c:537
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Gyorsbillentyű: 'l')\n"
 
 # src/textview.c:537

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (vagy dupla klikk, vagy középső "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (vagy dupla klikk, vagy középső "
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "egérgomb)\n"
 
 msgid "mouse button)\n"
 msgstr "egérgomb)\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr "     - Vagy "
 
 # src/mimeview.c:115
 msgid "     - Or use "
 msgstr "     - Vagy "
 
 # src/mimeview.c:115

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "'Megnyitás...'"
 
 msgid "'Open with...'"
 msgstr "'Megnyitás...'"
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Gyorsbillentyű: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Gyorsbillentyű: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -14179,7 +14767,7 @@ msgstr ""
 "    %s\n"
 "Kilépési kód: %d\n"
 
 "    %s\n"
 "Kilépési kód: %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -14198,335 +14786,331 @@ msgstr ""
 "\n"
 "Így is megnyitod?"
 
 "\n"
 "Így is megnyitod?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "Adathalászati kísérlet figyelmeztetés"
 
 # src/mimeview.c:114
 msgid "Phishing attempt warning"
 msgstr "Adathalászati kísérlet figyelmeztetés"
 
 # src/mimeview.c:114

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "URL _megnyitása"
 
 # src/mainwindow.c:1811
 msgid "_Open URL"
 msgstr "URL _megnyitása"
 
 # src/mainwindow.c:1811

-#: src/toolbar.c:171
-#: src/toolbar.c:1637
+#: src/toolbar.c:172
+#: src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "Új üzenetek fogadása minden fiókról"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Új üzenetek fogadása minden fiókról"
 

-#: src/toolbar.c:172
-#: src/toolbar.c:1651
+#: src/toolbar.c:173
+#: src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "Új üzenetek fogadása az aktuális fiókról"
 
 # src/mainwindow.c:1822
 msgid "Receive Mail on current Account"
 msgstr "Új üzenetek fogadása az aktuális fiókról"
 
 # src/mainwindow.c:1822

-#: src/toolbar.c:173
-#: src/toolbar.c:1657
+#: src/toolbar.c:174
+#: src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
 msgid "Send Queued Messages"
 msgstr "Várakozó üzenet(ek) küldése"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134

-#: src/toolbar.c:174
-#: src/toolbar.c:1682
+#: src/toolbar.c:175
+#: src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "E-mail írása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
 msgid "Compose Email"
 msgstr "E-mail írása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134

-#: src/toolbar.c:175
-#: src/toolbar.c:1686
+#: src/toolbar.c:176
+#: src/toolbar.c:1695

 msgid "Compose News"
 msgstr "Hír írása"
 
 # src/mainwindow.c:1841
 msgid "Compose News"
 msgstr "Hír írása"
 
 # src/mainwindow.c:1841

-#: src/toolbar.c:176
-#: src/toolbar.c:1728
-#: src/toolbar.c:1738
+#: src/toolbar.c:177
+#: src/toolbar.c:1737
+#: src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "Válasz az üzenetre"
 
 # src/summaryview.c:344
 msgid "Reply to Message"
 msgstr "Válasz az üzenetre"
 
 # src/summaryview.c:344

-#: src/toolbar.c:177
-#: src/toolbar.c:1745
-#: src/toolbar.c:1755
+#: src/toolbar.c:178
+#: src/toolbar.c:1754
+#: src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "Válasz a feladónak"
 
 # src/mainwindow.c:1850
 msgid "Reply to Sender"
 msgstr "Válasz a feladónak"
 
 # src/mainwindow.c:1850

-#: src/toolbar.c:178
-#: src/toolbar.c:1762
-#: src/toolbar.c:1772
+#: src/toolbar.c:179
+#: src/toolbar.c:1771
+#: src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "Válasz mindenkinek"
 
 # src/summaryview.c:345
 msgid "Reply to All"
 msgstr "Válasz mindenkinek"
 
 # src/summaryview.c:345

-#: src/toolbar.c:179
-#: src/toolbar.c:1779
-#: src/toolbar.c:1789
+#: src/toolbar.c:180
+#: src/toolbar.c:1788
+#: src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "Válasz a levelezőlistára"
 
 # src/send.c:536
 msgid "Reply to Mailing-list"
 msgstr "Válasz a levelezőlistára"
 
 # src/send.c:536

-#: src/toolbar.c:180
-#: src/toolbar.c:1669
+#: src/toolbar.c:181
+#: src/toolbar.c:1678

 msgid "Open email"
 msgstr "E-mail megnyitása"
 
 # src/mainwindow.c:1858
 msgid "Open email"
 msgstr "E-mail megnyitása"
 
 # src/mainwindow.c:1858

-#: src/toolbar.c:181
-#: src/toolbar.c:1796
-#: src/toolbar.c:1806
+#: src/toolbar.c:182
+#: src/toolbar.c:1805
+#: src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "Üzenet továbbítása"
 
 # src/mainwindow.c:1858
 msgid "Forward Message"
 msgstr "Üzenet továbbítása"
 
 # src/mainwindow.c:1858

-#: src/toolbar.c:182
-#: src/toolbar.c:1813
+#: src/toolbar.c:183
+#: src/toolbar.c:1822

 msgid "Trash Message"
 msgstr "Üzenet a kukába"
 
 # src/summaryview.c:2351
 msgid "Trash Message"
 msgstr "Üzenet a kukába"
 
 # src/summaryview.c:2351

-#: src/toolbar.c:183
-#: src/toolbar.c:1819
+#: src/toolbar.c:184
+#: src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "Üzenet törlése"
 
 # src/mainwindow.c:496
 msgid "Delete Message"
 msgstr "Üzenet törlése"
 
 # src/mainwindow.c:496

-#: src/toolbar.c:185
-#: src/toolbar.c:1831
+#: src/toolbar.c:186
+#: src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "Ugrás az előző olvasatlan üzenethez"
 
 # src/mainwindow.c:494
 msgid "Go to Previous Unread Message"
 msgstr "Ugrás az előző olvasatlan üzenethez"
 
 # src/mainwindow.c:494

-#: src/toolbar.c:186
-#: src/toolbar.c:1838
+#: src/toolbar.c:187
+#: src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "Ugrás a következő olvasatlan üzenethez"
 
 msgid "Go to Next Unread Message"
 msgstr "Ugrás a következő olvasatlan üzenethez"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "Spam vagy nem spam tanulása"
 
 msgid "Learn Spam or Ham"
 msgstr "Spam vagy nem spam tanulása"
 

-#: src/toolbar.c:190
-#: src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "Ugrás a mappalistához"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "Mappa megnyitása/Ugrás a mappalistához"

 
 # src/compose.c:3922
 
 # src/compose.c:3922

-#: src/toolbar.c:192
-#: src/toolbar.c:1847
+#: src/toolbar.c:193
+#: src/toolbar.c:1856

 msgid "Send Message"
 msgstr "Üzenet küldése"
 
 # src/compose.c:3929
 msgid "Send Message"
 msgstr "Üzenet küldése"
 
 # src/compose.c:3929

-#: src/toolbar.c:193
-#: src/toolbar.c:1853
+#: src/toolbar.c:194
+#: src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr "Küldés később"
 
 # src/compose.c:3937
 msgid "Put into queue folder and send later"
 msgstr "Küldés később"
 
 # src/compose.c:3937

-#: src/toolbar.c:194
-#: src/toolbar.c:1859
+#: src/toolbar.c:195
+#: src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr "Mentés a vázlatok mappába"
 
 # src/compose.c:3947
 msgid "Save to draft folder"
 msgstr "Mentés a vázlatok mappába"
 
 # src/compose.c:3947

-#: src/toolbar.c:195
-#: src/toolbar.c:1865
+#: src/toolbar.c:196
+#: src/toolbar.c:1874

 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
 # src/compose.c:3955
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
 # src/compose.c:3955

-#: src/toolbar.c:196
-#: src/toolbar.c:1871
+#: src/toolbar.c:197
+#: src/toolbar.c:1880

 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 # src/compose.c:3965
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 # src/compose.c:3965

-#: src/toolbar.c:197
-#: src/toolbar.c:1877
+#: src/toolbar.c:198
+#: src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
 # src/compose.c:3974
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
 # src/compose.c:3974

-#: src/toolbar.c:198
-#: src/toolbar.c:1883
+#: src/toolbar.c:199
+#: src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
 # src/compose.c:539
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
 # src/compose.c:539

-#: src/toolbar.c:199
-#: src/toolbar.c:1889
+#: src/toolbar.c:200
+#: src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "Aktuális bekezdés hosszú sorainak törése"
 
 # src/compose.c:3983
 msgid "Wrap long lines of current paragraph"
 msgstr "Aktuális bekezdés hosszú sorainak törése"
 
 # src/compose.c:3983

-#: src/toolbar.c:200
-#: src/toolbar.c:1895
+#: src/toolbar.c:201
+#: src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "Hoszzú sorok törése"
 
 # src/editbook.c:197 src/editjpilot.c:302 src/editvcard.c:217
 msgid "Wrap all long lines"
 msgstr "Hoszzú sorok törése"
 
 # src/editbook.c:197 src/editjpilot.c:302 src/editvcard.c:217

-#: src/toolbar.c:203
-#: src/toolbar.c:1908
+#: src/toolbar.c:204
+#: src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "Helyesírás-ellenőrzés"
 
 msgid "Check spelling"
 msgstr "Helyesírás-ellenőrzés"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail műveletek lehetőségei"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail műveletek lehetőségei"
 

-#: src/toolbar.c:206
-#: src/toolbar.c:1931
+#: src/toolbar.c:207
+#: src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "Fogadás megszakítása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
 msgid "Cancel receiving"
 msgstr "Fogadás megszakítása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134

-#: src/toolbar.c:207
-#: src/toolbar.c:1663
+#: src/toolbar.c:208
+#: src/toolbar.c:1672

 msgid "Close window"
 msgstr "Ablak bezárása"
 
 # src/summaryview.c:342
 msgid "Close window"
 msgstr "Ablak bezárása"
 
 # src/summaryview.c:342

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/Válasz idézettel"
 
 msgid "/Reply with _quote"
 msgstr "/Válasz idézettel"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/Válasz idézet nélkül"
 
 # src/mainwindow.c:1850
 msgid "/_Reply without quote"
 msgstr "/Válasz idézet nélkül"
 
 # src/mainwindow.c:1850

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/Válasz mindenkinek idézettel"
 
 # src/mainwindow.c:1850
 msgid "/Reply to all with _quote"
 msgstr "/Válasz mindenkinek idézettel"
 
 # src/mainwindow.c:1850

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/Válasz mindenkinek idézet nélkül"
 
 msgid "/_Reply to all without quote"
 msgstr "/Válasz mindenkinek idézet nélkül"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/Válasz a listára idézettel"
 
 msgid "/Reply to list with _quote"
 msgstr "/Válasz a listára idézettel"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/Válasz a listára idézet nélkül"
 
 # src/summaryview.c:344
 msgid "/_Reply to list without quote"
 msgstr "/Válasz a listára idézet nélkül"
 
 # src/summaryview.c:344

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgid "/Reply to sender with _quote"

-msgstr "/Válasz a feladónakk idézettel"
+msgstr "/Válasz a feladónak idézettel"

 
 # src/summaryview.c:344
 
 # src/summaryview.c:344

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/Válasz a feladónak idézet nélkül"
 
 # src/summaryview.c:350
 msgid "/_Reply to sender without quote"
 msgstr "/Válasz a feladónak idézet nélkül"
 
 # src/summaryview.c:350

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/Átirányí_tás"
 
 # src/mimeview.c:798 src/summaryview.c:2664
 msgid "/Redirec_t"
 msgstr "/Átirányí_tás"
 
 # src/mimeview.c:798 src/summaryview.c:2664

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "/Megjegyez, mint spam"
 
 # src/prefs_display_header.c:222
 msgid "/Learn as _Spam"
 msgstr "/Megjegyez, mint spam"
 
 # src/prefs_display_header.c:222

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "/Megjegyez, mint nem spam"
 
 # src/mainwindow.c:1810
 msgid "/Learn as _Ham"
 msgstr "/Megjegyez, mint nem spam"
 
 # src/mainwindow.c:1810

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr "E-mail fogadása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134
 msgid "Get Mail"
 msgstr "E-mail fogadása"
 
 # src/mainwindow.c:1832 src/prefs_account.c:674 src/prefs_common.c:812
 # src/prefs_folder_item.c:134

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr "Új üzenet"
 
 # src/mimeview.c:114
 msgid "Toolbar|Compose"
 msgstr "Új üzenet"
 
 # src/mimeview.c:114

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "Megnyitás"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278
 msgid "Open"
 msgstr "Megnyitás"
 
 # src/mainwindow.c:1840 src/prefs_common.c:1278

-#: src/toolbar.c:421
-#: src/toolbar.c:521
+#: src/toolbar.c:422
+#: src/toolbar.c:522

 msgid "Reply"
 msgstr "Válasz"
 
 msgid "Reply"
 msgstr "Válasz"
 

-#: src/toolbar.c:423
-#: src/toolbar.c:522
-msgid "All"
-msgstr "Válasz mindenkinek"
-
-# src/compose.c:2241 src/compose.c:3921 src/mainwindow.c:1821
-# src/prefs_account.c:672 src/prefs_common.c:810

 #: src/toolbar.c:424
 #: src/toolbar.c:523
 #: src/toolbar.c:424
 #: src/toolbar.c:523

-msgid "Sender"
-msgstr "Válasz a feladónak"
+msgid "All"
+msgstr "Válasz mindenkinek"

 
 # src/mimeview.c:798 src/summaryview.c:2664
 
 # src/mimeview.c:798 src/summaryview.c:2664

-#: src/toolbar.c:430
-#: src/toolbar.c:528
+#: src/toolbar.c:431
+#: src/toolbar.c:529

 msgid "Spam"
 msgstr "Spam"
 
 # src/importldif.c:761 src/mainwindow.c:1886
 msgid "Spam"
 msgstr "Spam"
 
 # src/importldif.c:761 src/mainwindow.c:1886

-#: src/toolbar.c:433
-#: src/toolbar.c:530
+#: src/toolbar.c:434
+#: src/toolbar.c:531

 msgid "Next"
 msgstr "Következő"
 
 # src/compose.c:3928
 msgid "Next"
 msgstr "Következő"
 
 # src/compose.c:3928

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "Küldés később"
 
 # src/compose.c:3936
 msgid "Send later"
 msgstr "Küldés később"
 
 # src/compose.c:3936

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "Vázlat"
 
 msgid "Draft"
 msgstr "Vázlat"
 

+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "Ugrás a mappalistához"
+

 # src/mainwindow.c:1811
 # src/mainwindow.c:1811

-#: src/toolbar.c:1644
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "Üzenetek fogadása a kiválasztott fiókról"
 
 # src/mainwindow.c:1811
 msgid "Receive Mail on selected Account"
 msgstr "Üzenetek fogadása a kiválasztott fiókról"
 
 # src/mainwindow.c:1811

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "Új üzenet írása a kiválasztott fiók használatával"
 
 msgid "Compose with selected Account"
 msgstr "Új üzenet írása a kiválasztott fiók használatával"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "Nem spam"
 
 # src/mimeview.c:798 src/summaryview.c:2664
 msgid "Ham"
 msgstr "Nem spam"
 
 # src/mimeview.c:798 src/summaryview.c:2664

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "Megjegyez, mint spamet"
 
 # src/prefs_display_header.c:222
 msgid "Learn Spam"
 msgstr "Megjegyez, mint spamet"
 
 # src/prefs_display_header.c:222

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "Megjegyez, mint nem spamet"
 
 # src/prefs_display_header.c:222
 msgid "Learn Ham"
 msgstr "Megjegyez, mint nem spamet"
 
 # src/prefs_display_header.c:222

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "Megjegyez, mint..."
 
 # src/prefs_display_header.c:222
 msgid "Learn as..."
 msgstr "Megjegyez, mint..."
 
 # src/prefs_display_header.c:222

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "Megjegyez"
 
 msgid "Learn"
 msgstr "Megjegyez"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index a63b0d11108d64bd4985548db0386cd5894b3f18..883761e0cb76fb8e5c33471b736e249210881e35 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,6 @@
-# translation of pt_BR.po to Português do Brasil
+# translation of pt_BR.po to Brazilian Portuguese

 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2006, 2007.
 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2006, 2007.

+# Frederico Goncalves Guimaraes <fgguimaraes@teia.bio.br>, 2007.

 # Tradução de Sylpheed-Claws para Português Brasileiro
 # Brazilian Portuguese translation of Sylpheed-Claws
 # Updated 2006-02-11 by : Frederico Goncalves Guimaraes <frederico@teia.bio.br>
 # Tradução de Sylpheed-Claws para Português Brasileiro
 # Brazilian Portuguese translation of Sylpheed-Claws
 # Updated 2006-02-11 by : Frederico Goncalves Guimaraes <frederico@teia.bio.br>


@@ -7,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-04-02 11:14+0200\n"
-"PO-Revision-Date: 2007-04-15 17:36-0300\n"
-"Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
-"Language-Team: Português do Brasil\n"
+"POT-Creation-Date: 2007-06-18 11:20+0200\n"
+"PO-Revision-Date: 2007-07-01 21:15-0300\n"
+"Last-Translator: Frederico Goncalves Guimaraes <fgguimaraes@teia.bio.br>\n"
+"Language-Team: Brazilian Portuguese\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: KBabel 1.11.4\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: KBabel 1.11.4\n"
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -25,91 +26,81 @@ msgstr ""
 "Algumas janelas de composição estão abertas.\n"
 "Por favor, feche todas essas janelas antes de editar as contas."
 
 "Algumas janelas de composição estão abertas.\n"
 "Por favor, feche todas essas janelas antes de editar as contas."
 

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgstr "Não foi possível criar a pasta."
 
 msgid "Can't create folder."
 msgstr "Não foi possível criar a pasta."
 

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "Editar contas"
 
 msgid "Edit accounts"
 msgstr "Editar contas"
 

-#: src/account.c:701
-msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox in the 'G' column indicates which accounts will be included."
-msgstr "Ao usar a opção 'Receber mensagens' as mensagens serão recuperadas das suas contas, na ordem fornecida. As contas que possuam uma marca na coluna 'G' serão verificadas."
+#: src/account.c:715
+msgid ""
+"Using 'Get Mail' will retrieve messages from your Accounts in the order "
+"given, the checkbox in the 'G' column indicates which accounts will be "
+"included."
+msgstr ""
+"Ao usar a opção 'Receber mensagens' as mensagens serão recuperadas das suas "
+"contas, na ordem fornecida. As contas que possuam uma marca na coluna 'G' "
+"serão verificadas."

 
 

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 
 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Contas com pastas remotas não podem ser copiadas."
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Contas com pastas remotas não podem ser copiadas."
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente apagar a conta '%s'?"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente apagar a conta '%s'?"
 

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(Sem título)"
 
 msgid "(Untitled)"
 msgstr "(Sem título)"
 

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "Excluir conta"
 
 msgid "Delete account"
 msgstr "Excluir conta"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "P"
 
 msgid "Accounts List Default Column Name|D"
 msgstr "P"
 

-#: src/account.c:1472
-#: src/prefs_folder_item.c:740
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "Conta padrão"
 
 msgid "Default account"
 msgstr "Conta padrão"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "R"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 

-#: src/account.c:1493
-#: src/addressadd.c:196
-#: src/addressbook.c:132
-#: src/compose.c:5870
-#: src/compose.c:6181
-#: src/editaddress.c:1043
-#: src/editaddress.c:1092
-#: src/editbook.c:175
-#: src/editgroup.c:287
-#: src/editjpilot.c:270
-#: src/editldap.c:424
-#: src/editvcard.c:183
-#: src/importmutt.c:226
-#: src/importpine.c:226
-#: src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404
-#: src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480
-#: src/prefs_template.c:185
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6031 src/compose.c:6344 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287
+#: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr "Nome"
 
 msgid "Name"
 msgstr "Nome"
 

-#: src/account.c:1500
-#: src/prefs_account.c:1258
-#: src/prefs_account.c:2849
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "Protocolo"
 
 msgid "Protocol"
 msgstr "Protocolo"
 

-#: src/account.c:1507
-#: src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Servidor"
 
 msgid "Server"
 msgstr "Servidor"
 


@@ -169,26 +160,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1153
-#: src/action.c:1303
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr "Completado"
 
 msgid "Completed"
 msgstr "Completado"
 

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executando: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executando: %s\n"
 

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 
 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -199,11 +189,11 @@ msgstr ""
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 
 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -214,412 +204,356 @@ msgstr ""
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 
 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 

-#: src/addr_compl.c:597
-#: src/addressbook.c:4403
+#: src/addr_compl.c:597 src/addressbook.c:4596

 msgid "Group"
 msgstr "Grupo"
 
 msgid "Group"
 msgstr "Grupo"
 

-#: src/addressadd.c:174
-#: src/prefs_filtering_action.c:179
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 
 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 

-#: src/addressadd.c:208
-#: src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:479
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "Endereço"
 
 msgid "Address"
 msgstr "Endereço"
 

-#: src/addressadd.c:218
-#: src/addressbook.c:134
-#: src/editaddress.c:851
-#: src/editaddress.c:915
-#: src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Notas"
 
 msgid "Remarks"
 msgstr "Notas"
 

-#: src/addressadd.c:240
-#: src/addressbook_foldersel.c:164
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 

-#: src/addressbook.c:133
-#: src/editaddress.c:849
-#: src/editaddress.c:897
-#: src/editgroup.c:288
-#: src/expldifdlg.c:521
-#: src/exporthtml.c:591
-#: src/exporthtml.c:755
-#: src/ldif.c:779
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "Adicionar endereço(s)"
+
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "Não foi possível adicionar o endereço especificado"
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898
+#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/_Livro"
 
 msgid "/_Book"
 msgstr "/_Livro"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/_Livro/Novo _livro"
 
 msgid "/_Book/New _Book"
 msgstr "/_Livro/Novo _livro"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgstr "/_Livro/Nova _pasta"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Livro/Nova _pasta"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/_Livro/Novo _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Livro/Novo _vCard"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/_Livro/Novo _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Livro/Novo _JPilot"
 

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Livro/_Novo servidor LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Livro/_Novo servidor LDAP"
 

-#: src/addressbook.c:436
-#: src/addressbook.c:439
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/_Livro/---"
 
 msgid "/_Book/---"
 msgstr "/_Livro/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/_Livro/_Editar livro"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Livro/_Editar livro"
 

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/_Livro/E_xcluir livro"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Livro/E_xcluir livro"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/_Livro/_Salvar"
 
 msgid "/_Book/_Save"
 msgstr "/_Livro/_Salvar"
 

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/_Livro/_Fechar"
 
 msgid "/_Book/_Close"
 msgstr "/_Livro/_Fechar"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/_Endereço"
 
 msgid "/_Address"
 msgstr "/_Endereço"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/_Endereço/Selecionar _todos"
 
 msgid "/_Address/_Select all"
 msgstr "/_Endereço/Selecionar _todos"
 

-#: src/addressbook.c:444
-#: src/addressbook.c:448
-#: src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/_Endereço/_Recortar"
 
 msgid "/_Address/C_ut"
 msgstr "/_Endereço/_Recortar"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/_Endereço/_Copiar"
 
 msgid "/_Address/_Copy"
 msgstr "/_Endereço/_Copiar"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/_Endereço/Co_lar"
 
 msgid "/_Address/_Paste"
 msgstr "/_Endereço/Co_lar"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _endereço"
 
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _endereço"
 

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _grupo"
 
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _grupo"
 

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr "/_Endereço/Enviar _mensagem para"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Endereço/Enviar _mensagem para"
 

-#: src/addressbook.c:456
-#: src/compose.c:790
-#: src/mainwindow.c:814
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814

 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Ferramentas/Importar arquivo _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Ferramentas/Importar arquivo _LDIF..."
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Ferramentas/Importar arquivo do _Mutt..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Ferramentas/Importar arquivo do _Mutt..."
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Ferramentas/Importar arquivo do _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Ferramentas/Importar arquivo do _Pine..."
 

-#: src/addressbook.c:460
-#: src/mainwindow.c:823
-#: src/mainwindow.c:846
-#: src/mainwindow.c:848
-#: src/mainwindow.c:850
-#: src/mainwindow.c:859
-#: src/mainwindow.c:862
-#: src/mainwindow.c:866
-#: src/messageview.c:310
-#: src/messageview.c:331
-#: src/messageview.c:333
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
+#: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
+#: src/messageview.c:331 src/messageview.c:333

 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Ferramentas/Exportar _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Ferramentas/Exportar _HTML..."
 

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Ferramentas/Exportar L_DIF..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Ferramentas/Exportar L_DIF..."
 

-#: src/addressbook.c:463
-#: src/compose.c:795
-#: src/mainwindow.c:892
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892

 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Ajuda"
 
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/_Ajuda"
 

-#: src/addressbook.c:464
-#: src/compose.c:796
-#: src/mainwindow.c:898
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898

 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 

-#: src/addressbook.c:469
-#: src/addressbook.c:485
-#: src/compose.c:563
-#: src/mainwindow.c:530
-#: src/messageview.c:168
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574
+#: src/mainwindow.c:530 src/messageview.c:168

 msgid "/_Edit"
 msgstr "/_Editar"
 
 msgid "/_Edit"
 msgstr "/_Editar"
 

-#: src/addressbook.c:470
-#: src/addressbook.c:486
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/E_xcluir"
 
 msgid "/_Delete"
 msgstr "/E_xcluir"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/Novo li_vro"
 
 msgid "/New _Book"
 msgstr "/Novo li_vro"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgstr "/Nova _pasta"
 
 msgid "/New _Folder"
 msgstr "/Nova _pasta"
 

-#: src/addressbook.c:474
-#: src/addressbook.c:489
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 

-#: src/addressbook.c:476
-#: src/addressbook.c:491
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/_Recortar"
 
 msgid "/C_ut"
 msgstr "/_Recortar"
 

-#: src/addressbook.c:477
-#: src/addressbook.c:492
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/_Copiar"
 
 msgid "/_Copy"
 msgstr "/_Copiar"
 

-#: src/addressbook.c:478
-#: src/addressbook.c:493
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/Co_lar"
 
 msgid "/_Paste"
 msgstr "/Co_lar"
 

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "/Selecionar _todos"
 
 msgid "/_Select all"
 msgstr "/Selecionar _todos"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/Novo e_ndereço"
 
 msgid "/New _Address"
 msgstr "/Novo e_ndereço"
 

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/Enviar _mensagem para"
 
 msgid "/_Mail To"
 msgstr "/Enviar _mensagem para"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/Percorrer a entra_da"
 
 msgid "/_Browse Entry"
 msgstr "/Percorrer a entra_da"
 

-#: src/addressbook.c:511
-#: src/crash.c:451
-#: src/crash.c:470
-#: src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:138
-#: src/prefs_themes.c:684
-#: src/prefs_themes.c:716
-#: src/prefs_themes.c:717
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120
+#: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
+#: src/prefs_themes.c:716 src/prefs_themes.c:717

 msgid "Unknown"
 msgstr "Desconhecido"
 
 msgid "Unknown"
 msgstr "Desconhecido"
 

-#: src/addressbook.c:518
-#: src/addressbook.c:537
-#: src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr "Sucesso"
 
 msgid "Success"
 msgstr "Sucesso"
 

-#: src/addressbook.c:519
-#: src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 
 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 

-#: src/addressbook.c:520
-#: src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr "Arquivo não especificado"
 
 msgid "File not specified"
 msgstr "Arquivo não especificado"
 

-#: src/addressbook.c:521
-#: src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 
 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 

-#: src/addressbook.c:522
-#: src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 
 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 

-#: src/addressbook.c:523
-#: src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 
 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 

-#: src/addressbook.c:524
-#: src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 
 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 

-#: src/addressbook.c:525
-#: src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 
 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 

-#: src/addressbook.c:526
-#: src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 
 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 

-#: src/addressbook.c:527
-#: src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 
 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 

-#: src/addressbook.c:528
-#: src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 
 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a procura no banco de dados LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a procura no banco de dados LDAP"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de procura no LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de procura no LDAP"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da procura"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da procura"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "A procura no LDAP foi terminada sob solicitação"
 
 msgid "LDAP search terminated on request"
 msgstr "A procura no LDAP foi terminada sob solicitação"
 

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "Erro ao iniciar a conexão TSL"
 
 msgid "Error starting TLS connection"
 msgstr "Erro ao iniciar a conexão TSL"
 

-#: src/addressbook.c:920
+#: src/addressbook.c:548
+msgid "Distinguised Name (dn) is missing"
+msgstr "Nome distinto (dn) não especificado"
+
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "Faltam informações necessárias"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "Já existe outro contato com essa chave"
+
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "Foi requerida uma autenticação (mais) forte"
+
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "Fontes"
 
 msgid "Sources"
 msgstr "Fontes"
 

-#: src/addressbook.c:924
-#: src/prefs_other.c:513
-#: src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "Livro de endereços"
 
 msgid "Address book"
 msgstr "Livro de endereços"
 

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "Nome de referência:"
 
 msgid "Lookup name:"
 msgstr "Nome de referência:"
 

-#: src/addressbook.c:1129
-#: src/compose.c:2131
-#: src/compose.c:4481
-#: src/compose.c:5705
-#: src/compose.c:6519
-#: src/compose.c:9648
-#: src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "Para:"
-
-#: src/addressbook.c:1133
-#: src/compose.c:2115
-#: src/compose.c:4217
-#: src/compose.c:4480
-#: src/compose.c:9657
-#: src/matcher.c:770
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1137
-#: src/compose.c:2118
-#: src/compose.c:4248
-msgid "Bcc:"
-msgstr "Cco:"
-
-#: src/addressbook.c:1387
-#: src/addressbook.c:1433
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgid "This address data is readonly and cannot be deleted."

-msgstr "Os dados deste endereço são \"somente para leitura\" e não podem ser apagados."
+msgstr ""
+"Os dados deste endereço são \"somente para leitura\" e não podem ser "
+"apagados."

 
 

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "Excluir grupo"
 
 msgid "Delete group"
 msgstr "Excluir grupo"
 

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -627,50 +561,52 @@ msgstr ""
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 
 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgid "Cannot paste. Target address book is readonly."

-msgstr "Não é possível colar. O livro de endereços de destino é \"somente para leitura\"."
+msgstr ""
+"Não é possível colar. O livro de endereços de destino é \"somente para "
+"leitura\"."

 
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 
 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Deseja apagar os resultados da consulta e endereços em '%s'?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Deseja apagar os resultados da consulta e endereços em '%s'?"
 

-#: src/addressbook.c:2735
-#: src/addressbook.c:2761
-#: src/addressbook.c:2768
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Excluir"
 
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "Excluir"
 

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, 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 "Deseja excluir '%s'? Se você apagar somente a pasta, os endereços nela contidos serão movidos para a pasta superior."
+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 ""
+"Deseja excluir '%s'? Se você apagar somente a pasta, os endereços nela "
+"contidos serão movidos para a pasta superior."

 
 

-#: src/addressbook.c:2747
-#: src/imap_gtk.c:302
-#: src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+Excluir somente a _pasta"
 
 msgid "+Delete _folder only"
 msgstr "+Excluir somente a _pasta"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 
 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -679,7 +615,7 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -688,19 +624,28 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 

-#: src/addressbook.c:3638
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr "Procurar '%s'"
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "Novos contatos"
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 
 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 
 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -708,7 +653,7 @@ msgstr ""
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -716,7 +661,7 @@ msgstr ""
 "Não foi possível converter o livro de\n"
 "endereços, mas foi criado um novo, em branco."
 
 "Não foi possível converter o livro de\n"
 "endereços, mas foi criado um novo, em branco."
 

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -724,7 +669,7 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -732,88 +677,66 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 

-#: src/addressbook.c:3688
-#: src/addressbook.c:3694
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 
 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 
 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "Ocupado procurando..."
 
 msgid "Busy searching..."
 msgstr "Ocupado procurando..."
 

-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr "Procurar '%s'"
-
-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "Interface"
 
 msgid "Interface"
 msgstr "Interface"
 

-#: src/addressbook.c:4355
-#: src/addressbook_foldersel.c:192
-#: src/exphtmldlg.c:375
-#: src/expldifdlg.c:394
-#: src/exporthtml.c:973
-#: src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr "Livro de Endereços"
 
 msgid "Address Book"
 msgstr "Livro de Endereços"
 

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "Pessoa"
 
 msgid "Person"
 msgstr "Pessoa"
 

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 

-#: src/addressbook.c:4419
-#: src/exporthtml.c:875
-#: src/folderview.c:469
-#: src/prefs_account.c:2542
-#: src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Pasta"
 
 msgid "Folder"
 msgstr "Pasta"
 

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4451
-#: src/addressbook.c:4467
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr "JPllot"
 
 msgid "JPilot"
 msgstr "JPllot"
 

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 

-#: src/addressbook.c:4822
-#: src/addressbook_foldersel.c:389
-#: src/matcher.c:312
-#: src/matcher.c:1097
-#: src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67
-#: src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527
-#: src/prefs_matcher.c:1347
-#: src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366
-#: src/prefs_matcher.c:2119
-#: src/prefs_matcher.c:2123
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "Qualquer"
 
 msgid "Any"
 msgstr "Qualquer"
 


@@ -851,10 +774,8 @@ msgstr ""
 msgid "Folder :"
 msgstr "Pasta:"
 
 msgid "Folder :"
 msgstr "Pasta:"
 

-#: src/addrgather.c:365
-#: src/exphtmldlg.c:543
-#: src/expldifdlg.c:626
-#: src/importldif.c:909
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr "Livro de endereços:"
 
 msgid "Address Book :"
 msgstr "Livro de endereços:"
 


@@ -878,12 +799,8 @@ msgstr "Nome do cabeçalho"
 msgid "Address Count"
 msgstr "Contagem de endereços"
 
 msgid "Address Count"
 msgstr "Contagem de endereços"
 

-#: src/addrgather.c:537
-#: src/alertpanel.c:155
-#: src/compose.c:4832
-#: src/compose.c:9569
-#: src/messageview.c:589
-#: src/messageview.c:602
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4905
+#: src/compose.c:9835 src/messageview.c:589 src/messageview.c:602

 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Aviso"
 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "Aviso"


@@ -892,10 +809,8 @@ msgstr "Aviso"
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 

-#: src/addrgather.c:539
-#: src/exphtmldlg.c:663
-#: src/expldifdlg.c:737
-#: src/importldif.c:1029
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "Finalizar"
 
 msgid "Finish"
 msgstr "Finalizar"
 


@@ -907,41 +822,44 @@ msgstr "Coletar endereços de e-mail - a partir das mensagens selecionadas"
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Coletar endereços de e-mail - a partir da pasta"
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Coletar endereços de e-mail - a partir da pasta"
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "Endereços comuns"
 
 msgid "Common addresses"
 msgstr "Endereços comuns"
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "Endereços pessoais"
 
 msgid "Personal addresses"
 msgstr "Endereços pessoais"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "Endereço comum"
 
 msgid "Common address"
 msgstr "Endereço comum"
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "Endereço pessoal"
 
 msgid "Personal address"
 msgstr "Endereço pessoal"
 

-#: src/alertpanel.c:142
-#: src/compose.c:7673
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "Atualização de endereço(s)"
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr "Não foi possível atualizar. As mudanças não foram escritas no diretório."
+
+#: src/alertpanel.c:145 src/compose.c:7897

 msgid "Notice"
 msgstr "Nota"
 
 msgid "Notice"
 msgstr "Nota"
 

-#: src/alertpanel.c:168
-#: src/alertpanel.c:191
-#: src/compose.c:4772
-#: src/inc.c:619
-#: src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:241
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4845 src/inc.c:619
+#: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241

 msgid "Error"
 msgstr "Erro"
 
 msgid "Error"
 msgstr "Erro"
 

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "_Ver relatório"
 
 msgid "_View log"
 msgstr "_Ver relatório"
 

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "Exibir essa mensagem da próxima vez"
 
 msgid "Show this message next time"
 msgstr "Exibir essa mensagem da próxima vez"
 


@@ -970,20 +888,16 @@ msgstr "Atribuir valor"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor NNTP: %s:%d\n"
 

-#: src/common/nntp.c:80
-#: src/common/session.c:166
-#: src/imap.c:848
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL\n"
 
 msgid "SSL handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do SSL\n"
 

-#: src/common/nntp.c:182
-#: src/common/nntp.c:245
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "erro do protocolo: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "erro do protocolo: %s\n"
 

-#: src/common/nntp.c:205
-#: src/common/nntp.c:251
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "erro do protocolo\n"
 
 msgid "protocol error\n"
 msgstr "erro do protocolo\n"
 


@@ -1050,12 +964,20 @@ msgstr "Esse módulo é para o Claws Mail GTK1."
 
 #: src/common/plugin.c:555
 #, c-format
 
 #: src/common/plugin.c:555
 #, c-format

-msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
-msgstr "A sua versão do Claws Mail é mais recente do que a utilizada para construir o plugin '%s'."
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"A sua versão do Claws Mail é mais recente do que a utilizada para construir "
+"o plugin '%s'."

 
 #: src/common/plugin.c:558
 
 #: src/common/plugin.c:558

-msgid "Your version of Claws Mail is newer than the version the plugin was built with."
-msgstr "A sua versão do Claws Mail é mais recente do que a utilizada para construir o plugin."
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"A sua versão do Claws Mail é mais recente do que a utilizada para construir "
+"o plugin."

 
 #: src/common/plugin.c:567
 #, c-format
 
 #: src/common/plugin.c:567
 #, c-format


@@ -1070,19 +992,15 @@ msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não está disponível\n"
 
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não está disponível\n"
 

-#: src/common/smtp.c:518
-#: src/common/smtp.c:568
+#: src/common/smtp.c:518 src/common/smtp.c:568

 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 
 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 

-#: src/common/smtp.c:539
-#: src/common/smtp.c:557
-#: src/common/smtp.c:676
+#: src/common/smtp.c:539 src/common/smtp.c:557 src/common/smtp.c:676

 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 

-#: src/common/smtp.c:548
-#: src/pop.c:872
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 


@@ -1091,12 +1009,11 @@ msgstr "ocorreu um erro na autenticação\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 

-#: src/common/smtp.c:635
-#: src/pop.c:865
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "não foi possível iniciar a sessão TLS\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "não foi possível iniciar a sessão TLS\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrever em fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrever em fd%d: %s\n"


@@ -1110,18 +1027,12 @@ msgstr "Ocorreu um erro na criação do contexto SSL\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "Não foi possível estabelecer uma conexão SSL (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "Não foi possível estabelecer uma conexão SSL (%s)\n"
 

-#: src/common/ssl_certificate.c:203
-#: src/common/ssl_certificate.c:214
-#: src/common/ssl_certificate.c:220
-#: src/common/ssl_certificate.c:227
-#: src/common/ssl_certificate.c:238
-#: src/common/ssl_certificate.c:244
-#: src/gtk/sslcertwindow.c:68
-#: src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103
-#: src/gtk/sslcertwindow.c:109
+#: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
+#: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
+#: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<não está no certificado>"
 
 msgid "<not in certificate>"
 msgstr "<não está no certificado>"
 


@@ -1146,753 +1057,730 @@ msgstr "Não foi possível carregar os caminhos padrão do X509"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assunto eliminado pela expressão regular)"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assunto eliminado pela expressão regular)"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKb"
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKb"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMb"
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMb"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGb"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGb"
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Domingo"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "Domingo"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "Segunda-feira"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "Segunda-feira"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Terça-feira"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "Terça-feira"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Quarta-feira"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "Quarta-feira"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Quinta-feira"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "Quinta-feira"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "Sexta-feira"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "Sexta-feira"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Sábado"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "Sábado"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "Janeiro"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "Janeiro"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "Fevereiro"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "Fevereiro"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "Março"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "Março"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "Abril"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "Abril"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "Maio"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "Maio"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "Junho"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "Junho"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "Julho"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "Julho"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "Agosto"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "Agosto"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "Setembro"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "Setembro"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "Outubro"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "Outubro"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "Novembro"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "Novembro"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "Dezembro"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "Dezembro"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dom"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "Dom"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Seg"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "Seg"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Ter"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "Ter"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Qua"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "Qua"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Qui"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "Qui"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Sex"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "Sex"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sáb"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "Sáb"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "Jan"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Fev"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "Fev"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "Mar"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Abr"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "Abr"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "Mai"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "Jun"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "Jul"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Ago"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "Ago"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Set"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "Set"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Out"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "Out"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "Nov"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dez"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "Dez"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "AM"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "PM"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a-%d/%m/%y %H:%M:%S"
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr "%a-%d/%m/%y %H:%M:%S"
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%m/%d/%y"
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr "%m/%d/%y"
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr "%H:%M:%S"
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/_Adicionar..."
 
 msgid "/_Add..."
 msgstr "/_Adicionar..."
 

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/_Remover"
 
 msgid "/_Remove"
 msgstr "/_Remover"
 

-#: src/compose.c:543
-#: src/folderview.c:293
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 

-#: src/compose.c:548
-#: src/mainwindow.c:755
-#: src/messageview.c:289
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr "/_Mensagem"
 
 msgid "/_Message"
 msgstr "/_Mensagem"
 

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/_Mensagem/_Enviar"
 
 msgid "/_Message/S_end"
 msgstr "/_Mensagem/_Enviar"
 

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/_Mensagem/Enviar _mais tarde"
 
 msgid "/_Message/Send _later"
 msgstr "/_Mensagem/Enviar _mais tarde"
 

-#: src/compose.c:553
-#: src/compose.c:557
-#: src/compose.c:560
-#: src/mainwindow.c:765
-#: src/mainwindow.c:775
-#: src/mainwindow.c:788
-#: src/mainwindow.c:794
-#: src/mainwindow.c:811
-#: src/messageview.c:292
-#: src/messageview.c:300
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765
+#: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
+#: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300

 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/_Mensagem/_Anexar arquivo"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Mensagem/_Anexar arquivo"
 

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/_Mensagem/_Inserir arquivo"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Mensagem/_Inserir arquivo"
 

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensagem/Inserir assina_tura"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensagem/Inserir assina_tura"
 

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/_Mensagem/_Salvar"
 
 msgid "/_Message/_Save"
 msgstr "/_Mensagem/_Salvar"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/_Mensagem/_Fechar"
 
 msgid "/_Message/_Close"
 msgstr "/_Mensagem/_Fechar"
 

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/_Editar/Re_fazer"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/Re_fazer"
 

-#: src/compose.c:566
-#: src/compose.c:654
-#: src/compose.c:657
-#: src/compose.c:663
-#: src/mainwindow.c:535
-#: src/messageview.c:171
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674
+#: src/mainwindow.c:535 src/messageview.c:171

 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Recortar"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Recortar"
 

-#: src/compose.c:568
-#: src/mainwindow.c:531
-#: src/messageview.c:169
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Colar especial"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Colar especial"
 

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Colar especial/como _citação"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Colar especial/como _citação"
 

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Colar especial/_ajustado"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Colar especial/_ajustado"
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Colar especial/_não ajustado"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Colar especial/_não ajustado"
 

-#: src/compose.c:577
-#: src/mainwindow.c:532
-#: src/messageview.c:170
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para trás"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para trás"
 

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o final da linha"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o final da linha"
 

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar a linha"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar a linha"
 

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/_Avançado/Apagar a linha inteira"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/_Avançado/Apagar a linha inteira"
 

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o final da linha"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o final da linha"
 

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/_Editar/Locali_zar"
 
 msgid "/_Edit/_Find"
 msgstr "/_Editar/Locali_zar"
 

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as l_inhas longas"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as l_inhas longas"
 

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Quebra auto_mática"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Quebra auto_mática"
 

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com um programa e_xterno"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com um programa e_xterno"
 

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/Orto_grafia"
 
 msgid "/_Spelling"
 msgstr "/Orto_grafia"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orto_grafia/_Verificar tudo ou somente a seleção"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orto_grafia/_Verificar tudo ou somente a seleção"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orto_grafia/_Destacar todas as palavras erradas"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orto_grafia/_Destacar todas as palavras erradas"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orto_grafia/Verificar palavras erradas _anteriores"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orto_grafia/Verificar palavras erradas _anteriores"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orto_grafia/Avançar para a _próxima palavra errada"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orto_grafia/Avançar para a _próxima palavra errada"
 

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/Orto_grafia/---"
 
 msgid "/_Spelling/---"
 msgstr "/Orto_grafia/---"
 

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/Orto_grafia/Opções"
 
 msgid "/_Spelling/Options"
 msgstr "/Orto_grafia/Opções"
 

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/_Opções"
 
 msgid "/_Options"
 msgstr "/_Opções"
 

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/_Opções/Modo da _resposta"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Opções/Modo da _resposta"
 

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opções/Modo da _resposta/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opções/Modo da _resposta/_Normal"
 

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opções/Modo da _resposta/_Todos"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opções/Modo da _resposta/_Todos"
 

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opções/Modo da _resposta/_Remetente"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opções/Modo da _resposta/_Remetente"
 

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opções/Modo da _resposta/_Lista de discussão"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opções/Modo da _resposta/_Lista de discussão"
 

-#: src/compose.c:686
-#: src/compose.c:691
-#: src/compose.c:698
-#: src/compose.c:700
-#: src/compose.c:702
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/_Opções/---"
 
 msgid "/_Options/---"
 msgstr "/_Opções/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/_Opções/Sistema de _privacidade"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Opções/Sistema de _privacidade"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opções/Sistema de _privacidade/Nenhum"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opções/Sistema de _privacidade/Nenhum"
 

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/_Opções/_Assinar"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Opções/_Assinar"
 

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/_Opções/_Criptografar"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opções/_Criptografar"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/_Opções/_Prioridade"
 
 msgid "/_Options/_Priority"
 msgstr "/_Opções/_Prioridade"
 

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opções/Prioridade/_Altíssima"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opções/Prioridade/_Altíssima"
 

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opções/Prioridade/A_lta"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opções/Prioridade/A_lta"
 

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opções/Prioridade/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opções/Prioridade/_Normal"
 

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opções/Prioridade/Bai_xa"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opções/Prioridade/Bai_xa"
 

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opções/Prioridade/_Baixíssima"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opções/Prioridade/_Baixíssima"
 

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opções/_Solicitar confirmação de recebimento"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opções/_Solicitar confirmação de recebimento"
 

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opções/_Remover referências"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opções/_Remover referências"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/_Opções/Codi_ficação dos caracteres"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opções/Codi_ficação dos caracteres"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Automática"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Automática"
 

-#: src/compose.c:711
-#: src/compose.c:717
-#: src/compose.c:725
-#: src/compose.c:729
-#: src/compose.c:735
-#: src/compose.c:739
-#: src/compose.c:745
-#: src/compose.c:751
-#: src/compose.c:755
-#: src/compose.c:765
-#: src/compose.c:769
-#: src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opções/Codi_ficação dos caracteres/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opções/Codi_ficação dos caracteres/---"
 

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opções/Codi_ficação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opções/Codi_ficação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/U_nicode (UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/U_nicode (UTF-8)"
 

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (Windows-1252)"
 

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Central (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Central (ISO-8859-_2)"
 

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-1_3)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-1_3)"
 

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-_4)"
 

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Grego (ISO-8859-7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Grego (ISO-8859-7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/He_bráico (ISO-8859-8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/He_bráico (ISO-8859-8)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Hebráico (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Hebráico (Windows-1255)"
 

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (ISO-8859-_6)"
 

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (_Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (_Windows-1256)"
 

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Turco (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Turco (ISO-8859-_9)"
 

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Cirílico (ISO-8859-5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Cirílico (ISO-8859-5)"
 

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_R)"
 

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_U)"
 

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (_Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (_Windows-1251)"
 

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Japonês (ISO-2022-JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Japonês (ISO-2022-JP)"
 

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _simplificado (GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _simplificado (GB2312)"
 

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês simplificado (GB_K)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês simplificado (GB_K)"
 

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês tra_dicional (Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês tra_dicional (Big5)"
 

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _tradicional (EUC-TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _tradicional (EUC-TW)"
 

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opções/Codi_ficação dos caracteres/C_oreano (EUC-KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opções/Codi_ficação dos caracteres/C_oreano (EUC-KR)"
 

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (TIS-_620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (TIS-_620)"
 

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (Windows-_874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (Windows-_874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/_Ferramentas/Exibir _régua"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Ferramentas/Exibir _régua"
 

-#: src/compose.c:792
-#: src/messageview.c:307
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/_Modelo"
 
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/_Modelo"
 

-#: src/compose.c:794
-#: src/mainwindow.c:849
-#: src/messageview.c:334
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 

-#: src/compose.c:1049
-#: src/prefs_compose_writing.c:369
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "Erro no formato do assunto da mensagem."
 
 msgid "New message subject format error."
 msgstr "Erro no formato do assunto da mensagem."
 

-#: src/compose.c:1078
-#: src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "Erro no formato do corpo da mensagem."
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "Erro no formato do corpo da nova mensagem, na linha %d."

 
 

-#: src/compose.c:1440
-#: src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "Erro no formato da mensagem de resposta."
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "Erro no formato da mensagem de resposta, na linha %d."

 
 

-#: src/compose.c:1557
-#: src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "Erro no formato da mensagem de encaminhamento."
+#: src/compose.c:1613 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "Erro no formato da mensagem de encaminhamento, na linha %d."

 
 

-#: src/compose.c:1677
+#: src/compose.c:1733

 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 
 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "Erro no formato da mensagem de redirecionamento."
+#: src/compose.c:2108
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "Erro no formato da mensagem de redirecionamento na linha %d."
+
+#: src/compose.c:2171 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/compose.c:2174 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Cco:"

 
 

-#: src/compose.c:2121
+#: src/compose.c:2177 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr "Responder para:"
 
 msgid "Reply-To:"
 msgstr "Responder para:"
 

-#: src/compose.c:2124
-#: src/compose.c:5702
-#: src/compose.c:6521
-#: src/compose.c:9667
+#: src/compose.c:2180 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 

-#: src/compose.c:2127
+#: src/compose.c:2183 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr "Seguir a:"
 
 msgid "Followup-To:"
 msgstr "Seguir a:"
 

-#: src/compose.c:2306
+#: src/compose.c:2187 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "Para:"
+
+#: src/compose.c:2362

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "O arquivo '%s' foi anexado."
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "O arquivo '%s' foi anexado."
 

-#: src/compose.c:2310
+#: src/compose.c:2366

 msgid "Couldn't attach a file (charset conversion failed)."
 msgid "Couldn't attach a file (charset conversion failed)."

-msgstr "Não foi possível anexar o arquivo (erro na conversão do conjunto de caracteres)."
+msgstr ""
+"Não foi possível anexar o arquivo (erro na conversão do conjunto de "
+"caracteres)."

 
 

-#: src/compose.c:2541
+#: src/compose.c:2602

 msgid "Quote mark format error."
 msgstr "Erro no formato da marca de citação."
 
 msgid "Quote mark format error."
 msgstr "Erro no formato da marca de citação."
 

-#: src/compose.c:3146
+#: src/compose.c:3215

 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 

-#: src/compose.c:3150
+#: src/compose.c:3219

 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 

-#: src/compose.c:3177
+#: src/compose.c:3246

 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 

-#: src/compose.c:3998
+#: src/compose.c:4068

 msgid " [Edited]"
 msgstr " [Editada]"
 
 msgid " [Edited]"
 msgstr " [Editada]"
 

-#: src/compose.c:4005
+#: src/compose.c:4075

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compor mensagem%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compor mensagem%s"
 

-#: src/compose.c:4008
+#: src/compose.c:4078

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Compor mensagem%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Compor mensagem%s"
 

-#: src/compose.c:4010
+#: src/compose.c:4080

 msgid "Compose message"
 msgstr "Escrever nova mensagem"
 
 msgid "Compose message"
 msgstr "Escrever nova mensagem"
 

-#: src/compose.c:4037
-#: src/messageview.c:624
+#: src/compose.c:4107 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1900,39 +1788,32 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 

-#: src/compose.c:4230
-#: src/compose.c:4261
-#: src/compose.c:4293
-#: src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4300 src/compose.c:4331 src/compose.c:4363
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr "Enviar"
 
 msgid "Send"
 msgstr "Enviar"
 

-#: src/compose.c:4231
+#: src/compose.c:4301

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 

-#: src/compose.c:4232
-#: src/compose.c:4263
-#: src/compose.c:4295
-#: src/compose.c:4772
+#: src/compose.c:4302 src/compose.c:4333 src/compose.c:4365 src/compose.c:4845

 msgid "+_Send"
 msgstr "+_Enviar"
 
 msgid "+_Send"
 msgstr "+_Enviar"
 

-#: src/compose.c:4262
+#: src/compose.c:4332

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 

-#: src/compose.c:4279
+#: src/compose.c:4349

 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 

-#: src/compose.c:4294
+#: src/compose.c:4364

 msgid "Subject is empty. Send it anyway?"
 msgstr "A mensagem está sem assunto. Enviar mesmo assim?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "A mensagem está sem assunto. Enviar mesmo assim?"
 

-#: src/compose.c:4341
-#: src/compose.c:8026
+#: src/compose.c:4411 src/compose.c:8250

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1942,8 +1823,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 

-#: src/compose.c:4344
-#: src/compose.c:8029
+#: src/compose.c:4414 src/compose.c:8253

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1953,8 +1833,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 

-#: src/compose.c:4348
-#: src/compose.c:8023
+#: src/compose.c:4420 src/compose.c:8247

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1965,7 +1844,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
 "\n"
 "Falha na assinatura: %s"
 

-#: src/compose.c:4351
+#: src/compose.c:4423

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1976,29 +1855,30 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4353
+#: src/compose.c:4425

 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 
 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 

-#: src/compose.c:4368
-#: src/compose.c:4429
+#: src/compose.c:4440 src/compose.c:4502

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "A mensagem está na Fila de Saída, mas não foi possível enviá-la.\n"
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "A mensagem está na Fila de Saída, mas não foi possível enviá-la.\n"

-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para tentar novamente."
+"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
+"tentar novamente."

 
 

-#: src/compose.c:4423
+#: src/compose.c:4496

 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"

-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para tentar novamente."
+"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
+"tentar novamente."

 
 

-#: src/compose.c:4769
+#: src/compose.c:4842

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -2009,7 +1889,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 

-#: src/compose.c:4828
+#: src/compose.c:4901

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -2022,74 +1902,74 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
 "\n"
 "Enviar mesmo assim?"
 

-#: src/compose.c:5016
+#: src/compose.c:5060
+msgid "Encryption warning"
+msgstr "Aviso de criptografia"
+
+#: src/compose.c:5061
+msgid "+C_ontinue"
+msgstr "+C_ontinuar"
+
+#: src/compose.c:5115

 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 

-#: src/compose.c:5026
+#: src/compose.c:5125

 msgid "No account for posting news available!"
 msgstr "Não existem contas para publicar o artigo!"
 
 msgid "No account for posting news available!"
 msgstr "Não existem contas para publicar o artigo!"
 

-#: src/compose.c:5719
+#: src/compose.c:5795
+msgid "Add to address _book"
+msgstr "Adicionar ao _Livro de Endereços"
+
+#: src/compose.c:5871

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 

-#: src/compose.c:5858
+#: src/compose.c:6019

 msgid "Mime type"
 msgstr "Tipo MIME"
 
 msgid "Mime type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:5864
-#: src/compose.c:6180
-#: src/mimeview.c:212
-#: src/plugins/pgpcore/select-keys.c:402
-#: src/prefs_summary_column.c:86
-#: src/summaryview.c:495
+#: src/compose.c:6025 src/compose.c:6343 src/mimeview.c:214
+#: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "Tamanho"
 
 msgid "Size"
 msgstr "Tamanho"
 

-#: src/compose.c:5934
+#: src/compose.c:6095

 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 

-#: src/compose.c:5956
-#: src/editjpilot.c:289
-#: src/editldap.c:526
-#: src/editvcard.c:202
-#: src/export.c:172
-#: src/import.c:171
-#: src/importmutt.c:242
-#: src/importpine.c:242
-#: src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/compose.c:6117 src/editjpilot.c:289 src/editldap.c:526
+#: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383
-#: src/prefs_spelling.c:207
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Explorar"
 
 msgid "_Browse"
 msgstr "_Explorar"
 

-#: src/compose.c:6179
-#: src/compose.c:7433
+#: src/compose.c:6342 src/compose.c:7657

 msgid "MIME type"
 msgstr "Tipo MIME"
 
 msgid "MIME type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:6253
+#: src/compose.c:6417

 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 

-#: src/compose.c:6257
+#: src/compose.c:6421

 msgid "_Attachments"
 msgstr "_Anexos"
 
 msgid "_Attachments"
 msgstr "_Anexos"
 

-#: src/compose.c:6261
+#: src/compose.c:6425

 msgid "Othe_rs"
 msgstr "_Outros"
 
 msgid "Othe_rs"
 msgstr "_Outros"
 

-#: src/compose.c:6276
-#: src/summary_search.c:370
+#: src/compose.c:6440 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr "Assunto:"
 
 msgid "Subject:"
 msgstr "Assunto:"
 

-#: src/compose.c:6483
+#: src/compose.c:6647

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -2098,75 +1978,74 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6765

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6799

 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 

-#: src/compose.c:6632
+#: src/compose.c:6801

 msgid "Sender address to be used"
 msgstr "Endereço do rementente a ser usado"
 
 msgid "Sender address to be used"
 msgstr "Endereço do rementente a ser usado"
 

-#: src/compose.c:6793
+#: src/compose.c:6962

 #, c-format
 #, c-format

-msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
-msgstr "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá assinar ou criptografar essa mensagem."
+msgid ""
+"The privacy system '%s' cannot be loaded. You will not be able to sign or "
+"encrypt this message."
+msgstr ""
+"Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
+"assinar ou criptografar essa mensagem."

 
 

-#: src/compose.c:6955
-#: src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "Erro no formato do corpo do modelo."
+#: src/compose.c:7162 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "Erro no formato do corpo do modelo, na linha %d."

 
 

-#: src/compose.c:7063
-#: src/prefs_template.c:587
+#: src/compose.c:7272 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "Erro no formato do Para do modelo."
 
 msgid "Template To format error."
 msgstr "Erro no formato do Para do modelo."
 

-#: src/compose.c:7076
-#: src/prefs_template.c:592
+#: src/compose.c:7290 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "Erro no formato do Cc do modelo."
 
 msgid "Template Cc format error."
 msgstr "Erro no formato do Cc do modelo."
 

-#: src/compose.c:7089
-#: src/prefs_template.c:597
+#: src/compose.c:7308 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "Erro no formato do Cco do modelo."
 
 msgid "Template Bcc format error."
 msgstr "Erro no formato do Cco do modelo."
 

-#: src/compose.c:7103
-#: src/prefs_template.c:602
+#: src/compose.c:7327 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 
 msgid "Template subject format error."
 msgstr "Erro no formato do assunto do modelo."
 

-#: src/compose.c:7327
+#: src/compose.c:7551

 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 

-#: src/compose.c:7342
+#: src/compose.c:7566

 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 

-#: src/compose.c:7415
+#: src/compose.c:7639

 msgid "Properties"
 msgstr "Propriedades"
 
 msgid "Properties"
 msgstr "Propriedades"
 

-#: src/compose.c:7466
+#: src/compose.c:7690

 msgid "Encoding"
 msgstr "Codificação"
 
 msgid "Encoding"
 msgstr "Codificação"
 

-#: src/compose.c:7486
+#: src/compose.c:7710

 msgid "Path"
 msgstr "Caminho"
 
 msgid "Path"
 msgstr "Caminho"
 

-#: src/compose.c:7487
-#: src/prefs_toolbar.c:1069
+#: src/compose.c:7711 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr "Nome do arquivo"
 
 msgid "File name"
 msgstr "Nome do arquivo"
 

-#: src/compose.c:7670
+#: src/compose.c:7894

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -2177,20 +2056,19 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7936

 msgid "Compose: input from monitoring process\n"
 msgstr "Composição: entrada do processo monitorado\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Composição: entrada do processo monitorado\n"
 

-#: src/compose.c:7993
-#: src/messageview.c:729
+#: src/compose.c:8217 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 

-#: src/compose.c:8018
+#: src/compose.c:8242

 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 

-#: src/compose.c:8020
+#: src/compose.c:8244

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2201,21 +2079,40 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:8193
+#: src/compose.c:8381

 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 

-#: src/compose.c:8271
-#: src/compose.c:8294
+#: src/compose.c:8385
+msgid "Could not save draft"
+msgstr "Não foi possível salvar o rascunho."
+
+#: src/compose.c:8386
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"Não foi possível salvar o rascunho.\n"
+"Deseja cancelar a saída ou descartar essa mensagem?"
+
+#: src/compose.c:8388
+msgid "_Cancel exit"
+msgstr "_Cancelar a saída"
+
+#: src/compose.c:8388
+msgid "_Discard email"
+msgstr "_Descartar a mensagem"
+
+#: src/compose.c:8522 src/compose.c:8545

 msgid "Select file"
 msgstr "Selecione o arquivo"
 
 msgid "Select file"
 msgstr "Selecione o arquivo"
 

-#: src/compose.c:8307
+#: src/compose.c:8558

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 

-#: src/compose.c:8309
+#: src/compose.c:8560

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2224,63 +2121,72 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 

-#: src/compose.c:8362
+#: src/compose.c:8613

 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 

-#: src/compose.c:8363
+#: src/compose.c:8614

 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 

-#: src/compose.c:8364
+#: src/compose.c:8615

 msgid "_Discard"
 msgstr "_Descartar"
 
 msgid "_Discard"
 msgstr "_Descartar"
 

-#: src/compose.c:8364
+#: src/compose.c:8615

 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 

-#: src/compose.c:8408
+#: src/compose.c:8659

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Deseja aplicar o modelo '%s'?"
 

-#: src/compose.c:8410
+#: src/compose.c:8661

 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 

-#: src/compose.c:8411
+#: src/compose.c:8662

 msgid "_Replace"
 msgstr "_Substituir"
 
 msgid "_Replace"
 msgstr "_Substituir"
 

-#: src/compose.c:8411
+#: src/compose.c:8662

 msgid "_Insert"
 msgstr "_Inserir"
 
 msgid "_Insert"
 msgstr "_Inserir"
 

-#: src/compose.c:9142
+#: src/compose.c:9411

 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 

-#: src/compose.c:9143
-msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
-msgstr "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou anexá-lo ao e-mail?"
+#: src/compose.c:9412
+msgid ""
+"Do you want to insert the contents of the file(s) into the message body, or "
+"attach it to the email?"
+msgstr ""
+"Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
+"anexá-lo ao e-mail?"

 
 

-#: src/compose.c:9145
+#: src/compose.c:9414

 msgid "+_Insert"
 msgstr "+_Inserir"
 
 msgid "+_Insert"
 msgstr "+_Inserir"
 

-#: src/compose.c:9145
+#: src/compose.c:9414

 msgid "_Attach"
 msgstr "_Anexar"
 
 msgid "_Attach"
 msgstr "_Anexar"
 

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "Erro no formato da citação."
+#: src/compose.c:9607
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "Erro no formato da citação, na linha %d."

 
 

-#: src/compose.c:9563
+#: src/compose.c:9829

 #, c-format
 #, c-format

-msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
-msgstr "Você esta prestes a responder %d mensagens. Abrir as janelas de composição pode demorar algum tempo. Deseja realmente continuar?"
+msgid ""
+"You are about to reply to %d messages. Opening the windows could take some "
+"time. Do you want to continue?"
+msgstr ""
+"Você esta prestes a responder %d mensagens. Abrir as janelas de composição "
+"pode demorar algum tempo. Deseja realmente continuar?"

 
 #: src/crash.c:140
 #, c-format
 
 #: src/crash.c:140
 #, c-format


@@ -2304,9 +2210,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Relatório de debug"
 
 msgid "Debug log"
 msgstr "Relatório de debug"
 

-#: src/crash.c:251
-#: src/toolbar.c:483
-#: src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr "Fechar"
 
 msgid "Close"
 msgstr "Fechar"
 


@@ -2318,83 +2222,73 @@ msgstr "Salvar..."
 msgid "Create bug report"
 msgstr "Criar relatório de erros"
 
 msgid "Create bug report"
 msgstr "Criar relatório de erros"
 

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 
 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "Adicionar uma nova pessoa"
 
 msgid "Add New Person"
 msgstr "Adicionar uma nova pessoa"
 

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "Editar os detalhes da pessoa"
 
 msgid "Edit Person Details"
 msgstr "Editar os detalhes da pessoa"
 

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "Você deve informar um endereço de e-mail."
 
 msgid "An Email address must be supplied."
 msgstr "Você deve informar um endereço de e-mail."
 

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "Você deve informar um nome e um valor."
 
 msgid "A Name and Value must be supplied."
 msgstr "Você deve informar um nome e um valor."
 

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "Descartar"
 
 msgid "Discard"
 msgstr "Descartar"
 

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "Aplicar"
 
 msgid "Apply"
 msgstr "Aplicar"
 

-#: src/editaddress.c:651
-#: src/editaddress.c:700
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 
 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 

-#: src/editaddress.c:761
-#: src/expldifdlg.c:508
-#: src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "Nome exibido"
 
 msgid "Display Name"
 msgstr "Nome exibido"
 

-#: src/editaddress.c:767
-#: src/editaddress.c:771
-#: src/ldif.c:771
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr "Sobrenome"
 
 msgid "Last Name"
 msgstr "Sobrenome"
 

-#: src/editaddress.c:768
-#: src/editaddress.c:770
-#: src/ldif.c:767
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr "Primeiro Nome"
 
 msgid "First Name"
 msgstr "Primeiro Nome"
 

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "Apelido"
 
 msgid "Nickname"
 msgstr "Apelido"
 

-#: src/editaddress.c:850
-#: src/editaddress.c:906
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr "Pseudônimo"
 
 msgid "Alias"
 msgstr "Pseudônimo"
 

-#: src/editaddress.c:1044
-#: src/editaddress.c:1101
-#: src/prefs_customheader.c:222
-#: src/prefs_matcher.c:536
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "Valor"
 
 msgid "Value"
 msgstr "Valor"
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "Dados do _usuário"
 
 msgid "_User Data"
 msgstr "Dados do _usuário"
 

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "Endereços de _e-mail"
 
 msgid "_Email Addresses"
 msgstr "Endereços de _e-mail"
 

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 
 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 


@@ -2406,29 +2300,20 @@ msgstr "O arquivo parece estar ok."
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido."
 
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido."
 

-#: src/editbook.c:119
-#: src/editjpilot.c:203
-#: src/editvcard.c:107
+#: src/editbook.c:119 src/editjpilot.c:203 src/editvcard.c:107

 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 

-#: src/editbook.c:153
-#: src/editbook.c:266
+#: src/editbook.c:153 src/editbook.c:266

 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 
 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 

-#: src/editbook.c:182
-#: src/editjpilot.c:277
-#: src/editvcard.c:190
+#: src/editbook.c:182 src/editjpilot.c:277 src/editvcard.c:190

 msgid " Check File "
 msgstr " Verificar o arquivo "
 
 msgid " Check File "
 msgstr " Verificar o arquivo "
 

-#: src/editbook.c:187
-#: src/editjpilot.c:282
-#: src/editvcard.c:195
-#: src/importmutt.c:235
-#: src/importpine.c:235
-#: src/prefs_account.c:2004
+#: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr "Arquivo"
 
 msgid "File"
 msgstr "Arquivo"
 


@@ -2444,8 +2329,7 @@ msgstr "Você deve informar um nome para o grupo."
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 

-#: src/editgroup.c:323
-#: src/exporthtml.c:588
+#: src/editgroup.c:323 src/exporthtml.c:588

 msgid "Group Name"
 msgstr "Nome do grupo"
 
 msgid "Group Name"
 msgstr "Nome do grupo"
 


@@ -2477,16 +2361,11 @@ msgstr "Editar a pasta"
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 

-#: src/editgroup.c:549
-#: src/foldersel.c:539
-#: src/imap_gtk.c:155
-#: src/mh_gtk.c:130
+#: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Nova pasta"
 
 msgid "New folder"
 msgstr "Nova pasta"
 

-#: src/editgroup.c:550
-#: src/foldersel.c:540
-#: src/mh_gtk.c:131
+#: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 


@@ -2498,8 +2377,7 @@ msgstr "O arquivo não parece estar no formato JPilot."
 msgid "Select JPilot File"
 msgstr "Selecione o arquivo JPilot"
 
 msgid "Select JPilot File"
 msgstr "Selecione o arquivo JPilot"
 

-#: src/editjpilot.c:248
-#: src/editjpilot.c:378
+#: src/editjpilot.c:248 src/editjpilot.c:378

 msgid "Edit JPilot Entry"
 msgstr "Editar a entrada JPilot"
 
 msgid "Edit JPilot Entry"
 msgstr "Editar a entrada JPilot"
 


@@ -2515,19 +2393,15 @@ msgstr "Adicionar uma nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de procura"
 
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de procura"
 

-#: src/editldap_basedn.c:163
-#: src/editldap.c:439
+#: src/editldap_basedn.c:163 src/editldap.c:439

 msgid "Hostname"
 msgstr "Nome do Host"
 
 msgid "Hostname"
 msgstr "Nome do Host"
 

-#: src/editldap_basedn.c:173
-#: src/editldap.c:458
-#: src/ssl_manager.c:110
+#: src/editldap_basedn.c:173 src/editldap.c:458 src/ssl_manager.c:110

 msgid "Port"
 msgstr "Porta"
 
 msgid "Port"
 msgstr "Porta"
 

-#: src/editldap_basedn.c:183
-#: src/editldap.c:508
+#: src/editldap_basedn.c:183 src/editldap.c:508

 msgid "Search Base"
 msgstr "Base de procura"
 
 msgid "Search Base"
 msgstr "Base de procura"
 


@@ -2537,10 +2411,11 @@ msgstr "Base(s) de procura disponíveis"
 
 #: src/editldap_basedn.c:294
 msgid "Could not read Search Base(s) from server - please set manually"
 
 #: src/editldap_basedn.c:294
 msgid "Could not read Search Base(s) from server - please set manually"

-msgstr "Não foi possível ler a(s) base(s) de procura do servidor - por favor, defina manualmente"
+msgstr ""
+"Não foi possível ler a(s) base(s) de procura do servidor - por favor, defina "
+"manualmente"

 
 

-#: src/editldap_basedn.c:298
-#: src/editldap.c:278
+#: src/editldap_basedn.c:298 src/editldap.c:278

 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 


@@ -2560,8 +2435,7 @@ msgstr "Você deve informar ao menos um atributo de procura no LDAP."
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 

-#: src/editldap.c:331
-#: src/editldap.c:999
+#: src/editldap.c:331 src/editldap.c:999

 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 
 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 


@@ -2570,24 +2444,44 @@ msgid "A name that you wish to call the server."
 msgstr "O nome pelo qual você deseja chamar o servidor."
 
 #: src/editldap.c:449
 msgstr "O nome pelo qual você deseja chamar o servidor."
 
 #: src/editldap.c:449

-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."
-msgstr "Este é o nome de host do servidor. Por exemplo, \"ldap.meudominio.com\" pode ser apropriado para a organização \"meudominio.com\". Você também pode usar um endereço IP. Você deve especificar \"localhost\" se estiver executando um servidor LDAP no mesmo computador que o Claws Mail."
+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."
+msgstr ""
+"Este é o nome de host do servidor. Por exemplo, \"ldap.meudominio.com\" pode "
+"ser apropriado para a organização \"meudominio.com\". Você também pode usar "
+"um endereço IP. Você deve especificar \"localhost\" se estiver executando um "
+"servidor LDAP no mesmo computador que o Claws Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 
 
 #: src/editldap.c:470
 msgid "TLS"
 msgstr "TLS"
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 #: src/editldap.c:475
 msgid "SSL"
 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)."
-msgstr "Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexão não se efetue, certifique-se de verificar a configuração correta em ldap.conf (campos TLS_CACERTDIR e TLS_REQCERT)."
+msgid ""
+"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 ""
+"Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexão não se "
+"efetue, certifique-se de verificar a configuração correta em ldap.conf "
+"(campos TLS_CACERTDIR e TLS_REQCERT)."

 
 #: src/editldap.c:480
 
 #: src/editldap.c:480

-msgid "Enable secure connection to the LDAP server via SSL.If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)."
-msgstr "Habilitar conexão segura com o servidor LDAP via SSL. Caso a conexão não se efetue, certifique-se de verificar a configuração correta em ldap.conf (campos TLS_CACERTDIR e TLS_REQCERT)."
+msgid ""
+"Enable secure connection to the LDAP server via SSL.If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
+msgstr ""
+"Habilitar conexão segura com o servidor LDAP via SSL. Caso a conexão não se "
+"efetue, certifique-se de verificar a configuração correta em ldap.conf "
+"(campos TLS_CACERTDIR e TLS_REQCERT)."

 
 #: src/editldap.c:494
 msgid "The port number that the server listens on. Port 389 is the default."
 
 #: src/editldap.c:494
 msgid "The port number that the server listens on. Port 389 is the default."


@@ -2603,67 +2497,125 @@ msgstr "Pressione esse botão para testar a conexão com o servidor."
 
 #: src/editldap.c:518
 msgid ""
 
 #: src/editldap.c:518
 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 ""
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Isso especifica o nome do diretório a ser procurado no servidor. Por exemplo:\n"
+"Isso especifica o nome do diretório a ser procurado no servidor. Por "
+"exemplo:\n"

 "  dc=claws-mail,dc=org\n"
 "  ou=pessoas,dc=domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
 #: src/editldap.c:531
 "  dc=claws-mail,dc=org\n"
 "  ou=pessoas,dc=domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
 #: src/editldap.c:531

-msgid "Press this button to lookup the name of available directory names on the server."
-msgstr "Pressione esse botão para procurar pelos nomes dos diretórios disponíveis no servidor."
+msgid ""
+"Press this button to lookup the name of available directory names on the "
+"server."
+msgstr ""
+"Pressione esse botão para procurar pelos nomes dos diretórios disponíveis no "
+"servidor."

 
 #: src/editldap.c:589
 msgid "Search Attributes"
 msgstr "Atributos da procura"
 
 #: src/editldap.c:599
 
 #: src/editldap.c:589
 msgid "Search Attributes"
 msgstr "Atributos da procura"
 
 #: src/editldap.c:599

-msgid "A list of LDAP attribute names that should be searched when attempting to find a name or address."
-msgstr "Uma lista dos nomes dos atributos LDAP que devem ser procurados ao se tentar encontrar um nome ou endereço."
+msgid ""
+"A list of LDAP attribute names that should be searched when attempting to "
+"find a name or address."
+msgstr ""
+"Uma lista dos nomes dos atributos LDAP que devem ser procurados ao se tentar "
+"encontrar um nome ou endereço."

 
 #: src/editldap.c:603
 msgid " Defaults "
 msgstr " Padrões"
 
 #: src/editldap.c:608
 
 #: src/editldap.c:603
 msgid " Defaults "
 msgstr " Padrões"
 
 #: src/editldap.c:608

-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 "Isso restaura os nomes dos atributos para um valor padrão que possibilita encontrar mais nomes e endereços durante o processo de procura do nome ou endereço."
-
+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 ""
+"Isso restaura os nomes dos atributos para um valor padrão que possibilita "
+"encontrar mais nomes e endereços durante o processo de procura do nome ou "
+"endereço."
+

 #: src/editldap.c:615
 msgid "Max Query Age (secs)"
 msgstr "Duração máxima da consulta (seg)"
 
 #: src/editldap.c:631
 #: src/editldap.c:615
 msgid "Max Query Age (secs)"
 msgstr "Duração máxima da consulta (seg)"
 
 #: src/editldap.c:631

-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 more memory to cache results."
-msgstr "Isso define o período máximo de tempo (em segundos) que um resultado de procura de endereço tem validade para completar endereços. Resultados da procura são armazenadas em um cache até que esse período de tempo tenha passado quando, então são retirados. Isso melhora o tempo de resposta durante as tentativas de procurar pelo mesmo nome ou endereço em requisições de complemento de endereço subseqüentes. A procura ocorre preferencialmente no cache nas novas requisições de procura no servidor. O valor padrão de 600 segundos (10 minutos) normalmente é suficiente na maioria dos servidores. Um valor mais alto reduz o tempo gasto em procuras subseqüentes. Esse é um recurso útil em servidores que possuem tempo de resposta lentos, mas, em compensação, consome mais memória para armazenar os resultados."
+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 "
+"more memory to cache results."
+msgstr ""
+"Isso define o período máximo de tempo (em segundos) que um resultado de "
+"procura de endereço tem validade para completar endereços. Resultados da "
+"procura são armazenadas em um cache até que esse período de tempo tenha "
+"passado quando, então são retirados. Isso melhora o tempo de resposta "
+"durante as tentativas de procurar pelo mesmo nome ou endereço em requisições "
+"de complemento de endereço subseqüentes. A procura ocorre preferencialmente "
+"no cache nas novas requisições de procura no servidor. O valor padrão de 600 "
+"segundos (10 minutos) normalmente é suficiente na maioria dos servidores. Um "
+"valor mais alto reduz o tempo gasto em procuras subseqüentes. Esse é um "
+"recurso útil em servidores que possuem tempo de resposta lentos, mas, em "
+"compensação, consome mais memória para armazenar os resultados."

 
 #: src/editldap.c:649
 msgid "Include server in dynamic search"
 msgstr "Incluir o servidor na procura dinâmica"
 
 #: src/editldap.c:655
 
 #: src/editldap.c:649
 msgid "Include server in dynamic search"
 msgstr "Incluir o servidor na procura dinâmica"
 
 #: src/editldap.c:655

-msgid "Check this option to include this server for dynamic searches when using address completion."
-msgstr "Selecione essa opção para incluir esse servidor nas procuras dinâmicas, quando estiver usando a complementação do endereço."
+msgid ""
+"Check this option to include this server for dynamic searches when using "
+"address completion."
+msgstr ""
+"Selecione essa opção para incluir esse servidor nas procuras dinâmicas, "
+"quando estiver usando a complementação do endereço."

 
 #: src/editldap.c:662
 msgid "Match names 'containing' search term"
 msgstr "Encontrar nomes que 'contenham' o termo da procura"
 
 #: src/editldap.c:668
 
 #: src/editldap.c:662
 msgid "Match names 'containing' search term"
 msgstr "Encontrar nomes que 'contenham' o termo da procura"
 
 #: src/editldap.c:668

-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."
-msgstr "As procuras por nomes e endereços podem ser realizadas com os critérios \"começar com \" ou \"contém\". Marque essa opção para efetuar uma procura do tipo \"contém\"; esse tipo de procura geralmente demora mais tempo. Note que, por motivos de performance, a complementação de endereço usa \"começar com\" para todas as procuras, ao contrário das outras interfaces de endereço."
+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."
+msgstr ""
+"As procuras por nomes e endereços podem ser realizadas com os critérios "
+"\"começar com \" ou \"contém\". Marque essa opção para efetuar uma procura "
+"do tipo \"contém\"; esse tipo de procura geralmente demora mais tempo. Note "
+"que, por motivos de performance, a complementação de endereço usa \"começar "
+"com\" para todas as procuras, ao contrário das outras interfaces de endereço."

 
 #: src/editldap.c:723
 msgid "Bind DN"
 msgstr "DN associado"
 
 #: src/editldap.c:733
 
 #: src/editldap.c:723
 msgid "Bind DN"
 msgstr "DN associado"
 
 #: src/editldap.c:733

-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."
-msgstr "A conta do usuário LDAP a ser utilizado na conexão com o servidor. Isso normalmente só é utilizado em servidores protegidos. O formato típico desse nome é: \"cn=usuário,dc=claws-mail,dc=com\". Isso normalmente é deixado em branco durante as procuras."
+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."
+msgstr ""
+"A conta do usuário LDAP a ser utilizado na conexão com o servidor. Isso "
+"normalmente só é utilizado em servidores protegidos. O formato típico desse "
+"nome é: \"cn=usuário,dc=claws-mail,dc=com\". Isso normalmente é deixado em "
+"branco durante as procuras."

 
 #: src/editldap.c:741
 msgid "Bind Password"
 
 #: src/editldap.c:741
 msgid "Bind Password"


@@ -2687,9 +2639,11 @@ msgstr "Número máximo de entradas"
 
 #: src/editldap.c:792
 msgid "The maximum number of entries that should be returned in the search result."
 
 #: src/editldap.c:792
 msgid "The maximum number of entries that should be returned in the search result."

-msgstr "O número máximo de entradas que devem ser apresentadas como resultado da procura."
+msgstr ""
+"O número máximo de entradas que devem ser apresentadas como resultado da "
+"procura."

 
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr "Básico"
 
 msgid "Basic"
 msgstr "Básico"
 


@@ -2697,8 +2651,7 @@ msgstr "Básico"
 msgid "Search"
 msgstr "Procurar"
 
 msgid "Search"
 msgstr "Procurar"
 

-#: src/editldap.c:810
-#: src/gtk/quicksearch.c:496
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "Extendido"
 
 msgid "Extended"
 msgstr "Extendido"
 


@@ -2714,8 +2667,7 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 

-#: src/editvcard.c:161
-#: src/editvcard.c:266
+#: src/editvcard.c:161 src/editvcard.c:266

 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 
 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 


@@ -2725,14 +2677,15 @@ msgstr "Adicionar uma nova entrada vCard"
 
 #: src/exphtmldlg.c:110
 msgid "Please specify output directory and file to create."
 
 #: src/exphtmldlg.c:110
 msgid "Please specify output directory and file to create."

-msgstr "Por favor, especifique o nome do diretório de saída e do arquivo a ser criado."
+msgstr ""
+"Por favor, especifique o nome do diretório de saída e do arquivo a ser "
+"criado."

 
 #: src/exphtmldlg.c:113
 msgid "Select stylesheet and formatting."
 msgstr "Selecione a folha de estilo e a formatação."
 
 
 #: src/exphtmldlg.c:113
 msgid "Select stylesheet and formatting."
 msgstr "Selecione a folha de estilo e a formatação."
 

-#: src/exphtmldlg.c:116
-#: src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "O arquivo foi exportado com sucesso."
 
 msgid "File exported successfully."
 msgstr "O arquivo foi exportado com sucesso."
 


@@ -2745,8 +2698,7 @@ msgstr ""
 "O diretório de saída HTML '%s'\n"
 "não existe. Deseja criá-lo?"
 
 "O diretório de saída HTML '%s'\n"
 "não existe. Deseja criá-lo?"
 

-#: src/exphtmldlg.c:184
-#: src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Criar diretório"
 
 msgid "Create Directory"
 msgstr "Criar diretório"
 


@@ -2759,8 +2711,7 @@ msgstr ""
 "Não foi possível criar o diretório de saída para o arquivo HTML:\n"
 "%s"
 
 "Não foi possível criar o diretório de saída para o arquivo HTML:\n"
 "%s"
 

-#: src/exphtmldlg.c:195
-#: src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Não foi possível criar o diretório"
 
 msgid "Failed to Create Directory"
 msgstr "Não foi possível criar o diretório"
 


@@ -2776,11 +2727,8 @@ msgstr "Selecione o arquivo HTML de saída"
 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 
 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 

-#: src/exphtmldlg.c:396
-#: src/expldifdlg.c:415
-#: src/export.c:179
-#: src/import.c:178
-#: src/importldif.c:682
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "Explo_rar"
 
 msgid "B_rowse"
 msgstr "Explo_rar"
 


@@ -2788,24 +2736,17 @@ msgstr "Explo_rar"
 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 

-#: src/exphtmldlg.c:457
-#: src/gtk/colorlabel.c:380
-#: src/gtk/gtkaspell.c:1661
-#: src/gtk/gtkaspell.c:2394
-#: src/mainwindow.c:1022
-#: src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "Nenhum"
 
 msgid "None"
 msgstr "Nenhum"
 

-#: src/exphtmldlg.c:458
-#: src/prefs_other.c:112
-#: src/prefs_other.c:453
+#: src/exphtmldlg.c:458 src/prefs_other.c:112 src/prefs_other.c:453

 msgid "Default"
 msgstr "Padrão"
 
 msgid "Default"
 msgstr "Padrão"
 

-#: src/exphtmldlg.c:459
-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:146

 msgid "Full"
 msgstr "Completo"
 
 msgid "Full"
 msgstr "Completo"
 


@@ -2849,9 +2790,7 @@ msgstr "Formatar os links do e-mail"
 msgid "Format User Attributes"
 msgstr "Formatar os atributos do usuário"
 
 msgid "Format User Attributes"
 msgstr "Formatar os atributos do usuário"
 

-#: src/exphtmldlg.c:553
-#: src/expldifdlg.c:636
-#: src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr "Nome do arquivo:"
 
 msgid "File Name :"
 msgstr "Nome do arquivo:"
 


@@ -2863,9 +2802,7 @@ msgstr "Abrir com o navegador Web"
 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 

-#: src/exphtmldlg.c:661
-#: src/expldifdlg.c:735
-#: src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr "Informações do arquivo"
 
 msgid "File Info"
 msgstr "Informações do arquivo"
 


@@ -2875,11 +2812,15 @@ msgstr "Formato"
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."

-msgstr "Por favor, especifique o diretório de destino e o nome do arquivo LDIF a ser criado."
+msgstr ""
+"Por favor, especifique o diretório de destino e o nome do arquivo LDIF a ser "
+"criado."

 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."
 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."

-msgstr "Especifique os parâmetros para formatar o nome distinto ('distinguished name')."
+msgstr ""
+"Especifique os parâmetros para formatar o nome distinto ('distinguished "
+"name')."

 
 #: src/expldifdlg.c:190
 #, c-format
 
 #: src/expldifdlg.c:190
 #, c-format


@@ -2904,8 +2845,12 @@ msgid "Suffix was not supplied"
 msgstr "Não foi fornecido o sufixo"
 
 #: src/expldifdlg.c:249
 msgstr "Não foi fornecido o sufixo"
 
 #: src/expldifdlg.c:249

-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 "É  necessário um sufixo caso os dados sejam usados para um servidor LDAP. Você tem certeza que deseja prosseguir sem um sufixo?"
+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 ""
+"É  necessário um sufixo caso os dados sejam usados para um servidor LDAP. "
+"Você tem certeza que deseja prosseguir sem um sufixo?"

 
 #: src/expldifdlg.c:267
 msgid "Error creating LDIF file"
 
 #: src/expldifdlg.c:267
 msgid "Error creating LDIF file"


@@ -2925,12 +2870,14 @@ msgstr "Sufixo"
 
 #: src/expldifdlg.c:479
 msgid ""
 
 #: src/expldifdlg.c:479
 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 ""
 "  dc=claws-mail,dc=org\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"O sufixo é usado para criar um \"Nome Distinto\" (\"Distinguished Name\" ou, simplesmente, DN) para uma entrada LDAP. Como exemplos, temos:\n"
+"O sufixo é usado para criar um \"Nome Distinto\" (\"Distinguished Name\" ou, "
+"simplesmente, DN) para uma entrada LDAP. Como exemplos, temos:\n"

 "  dc=claws-mail,dc=org\n"
 "  ou=pessoas,dc=nome do domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 "  dc=claws-mail,dc=org\n"
 "  ou=pessoas,dc=nome do domínio,dc=com\n"
 "  o=nome da organização,c=país\n"


@@ -2945,47 +2892,77 @@ msgstr "ID única"
 
 #: src/expldifdlg.c:503
 msgid ""
 
 #: src/expldifdlg.c:503
 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 ""
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""

-"O campo ID Única do Livro de Endereços é usado para criar um DN que tem um formato similar a:\n"
+"O campo ID Única do Livro de Endereços é usado para criar um DN que tem um "
+"formato similar a:\n"

 "  uid=102376,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:516
 msgid ""
 "  uid=102376,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:516
 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 ""
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""

-"O campo Nome Exibido do Livro de Endereços é usado para criar um DN que tem um formato similar a:\n"
+"O campo Nome Exibido do Livro de Endereços é usado para criar um DN que tem "
+"um formato similar a:\n"

 "  cn=Fulano de Tal,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:529
 msgid ""
 "  cn=Fulano de Tal,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:529
 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@domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
 "  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""

-"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar um DN que tem um formato similar a:\n"
+"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar "
+"um DN que tem um formato similar a:\n"

 "  mail=fulano.tal@dominio.com,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:543
 "  mail=fulano.tal@dominio.com,ou=pessoas,dc=claws-mail,dc=org"
 
 #: src/expldifdlg.c:543

-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."
-msgstr "O arquivo LDIF contém vários registros que são geralmente carregados em um servidor LDAP. Cada registro no arquivo LDIF é identificado com exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis que serão utilizadas para criar o DN."
+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."
+msgstr ""
+"O arquivo LDIF contém vários registros que são geralmente carregados em um "
+"servidor LDAP. Cada registro no arquivo LDIF é identificado com "
+"exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo "
+"é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou "
+"RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis "
+"que serão utilizadas para criar o DN."

 
 #: src/expldifdlg.c:556
 msgid "Use DN attribute if present in data"
 msgstr "Utilize o atributo do DN caso ele esteja presente nos dados"
 
 #: src/expldifdlg.c:563
 
 #: src/expldifdlg.c:556
 msgid "Use DN attribute if present in data"
 msgstr "Utilize o atributo do DN caso ele esteja presente nos dados"
 
 #: src/expldifdlg.c:563

-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."
-msgstr "O Livro de Endereços pode conter entradas importadas previamente de um arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF exportado. O RDN selecionado acima será usado se o atributo de usuário DN não for encontrado."
+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."
+msgstr ""
+"O Livro de Endereços pode conter entradas importadas previamente de um "
+"arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja "
+"presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF "
+"exportado. O RDN selecionado acima será usado se o atributo de usuário DN "
+"não for encontrado."

 
 #: src/expldifdlg.c:574
 msgid "Exclude record if no Email Address"
 msgstr "Excluir os registros que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:581
 
 #: src/expldifdlg.c:574
 msgid "Exclude record if no Email Address"
 msgstr "Excluir os registros que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:581

-msgid "An addressbook may contain entries without Email Addresses. Check this option to ignore these records."
-msgstr "Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque essa opção para ignorar esses registros."
+msgid ""
+"An addressbook may contain entries without Email Addresses. Check this "
+"option to ignore these records."
+msgstr ""
+"Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque "
+"essa opção para ignorar esses registros."

 
 #: src/expldifdlg.c:669
 msgid "Export Address Book to LDIF File"
 
 #: src/expldifdlg.c:669
 msgid "Export Address Book to LDIF File"


@@ -2995,8 +2972,7 @@ msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 msgid "Distguished Name"
 msgstr "Nome Distinto"
 
 msgid "Distguished Name"
 msgstr "Nome Distinto"
 

-#: src/export.c:120
-#: src/summaryview.c:6586
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 


@@ -3008,8 +2984,7 @@ msgstr "Localize a pasta a ser exportada e especifique o arquivo mbox."
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 

-#: src/export.c:156
-#: src/import.c:150
+#: src/export.c:156 src/import.c:150

 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 
 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 


@@ -3033,97 +3008,81 @@ msgstr "Selecione arquivo de exportação"
 msgid "Full Name"
 msgstr "Nome completo"
 
 msgid "Full Name"
 msgstr "Nome completo"
 

-#: src/exporthtml.c:762
-#: src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr "Atributos"
 
 msgid "Attributes"
 msgstr "Atributos"
 

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Livro de Endereços do Claws Mail"
 
 msgid "Claws Mail Address Book"
 msgstr "Livro de Endereços do Claws Mail"
 

-#: src/exporthtml.c:1077
-#: src/exportldif.c:551
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr "O nome já existe, mas não é um diretório."
 
 msgid "Name already exists but is not a directory."
 msgstr "O nome já existe, mas não é um diretório."
 

-#: src/exporthtml.c:1080
-#: src/exportldif.c:554
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr "Sem permissão para criar diretório."
 
 msgid "No permissions to create directory."
 msgstr "Sem permissão para criar diretório."
 

-#: src/exporthtml.c:1083
-#: src/exportldif.c:557
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr "O nome é muito longo."
 
 msgid "Name is too long."
 msgstr "O nome é muito longo."
 

-#: src/exporthtml.c:1086
-#: src/exportldif.c:560
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr "Não especificado."
 
 msgid "Not specified."
 msgstr "Não especificado."
 

-#: src/folder.c:1334
-#: src/foldersel.c:370
-#: src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 

-#: src/folder.c:1338
-#: src/foldersel.c:374
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr "Enviadas"
 
 msgid "Sent"
 msgstr "Enviadas"
 

-#: src/folder.c:1342
-#: src/foldersel.c:378
-#: src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "Fila de Saída"
 
 msgid "Queue"
 msgstr "Fila de Saída"
 

-#: src/folder.c:1346
-#: src/foldersel.c:382
-#: src/prefs_folder_item.c:243
-#: src/toolbar.c:385
-#: src/toolbar.c:428
-#: src/toolbar.c:526
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgstr "Lixeira"
 
 msgid "Trash"
 msgstr "Lixeira"
 

-#: src/folder.c:1350
-#: src/foldersel.c:386
-#: src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "Rascunhos"
 
 msgid "Drafts"
 msgstr "Rascunhos"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Buscando todas as mensagens de %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Buscando todas as mensagens de %s ...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 

-#: src/folder.c:3859
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 

-#: src/folder.c:3988
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"


@@ -3132,34 +3091,23 @@ msgstr "Sincronizando %s para uso desconectado...\n"
 msgid "Select folder"
 msgstr "Selecione a pasta"
 
 msgid "Select folder"
 msgstr "Selecione a pasta"
 

-#: src/foldersel.c:541
-#: src/imap_gtk.c:159
-#: src/mh_gtk.c:132
+#: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "NovaPasta"
 
 msgid "NewFolder"
 msgstr "NovaPasta"
 

-#: src/foldersel.c:549
-#: src/imap_gtk.c:167
-#: src/imap_gtk.c:173
-#: src/imap_gtk.c:225
-#: src/mh_gtk.c:138
-#: src/mh_gtk.c:241
+#: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
+#: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 

-#: src/foldersel.c:559
-#: src/imap_gtk.c:183
-#: src/imap_gtk.c:237
-#: src/mh_gtk.c:148
+#: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148

 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 

-#: src/foldersel.c:566
-#: src/imap_gtk.c:189
-#: src/mh_gtk.c:154
+#: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."


@@ -3184,26 +3132,20 @@ msgstr "/Esvaziar _Lixeira..."
 msgid "/Send _queue..."
 msgstr "/Enviar mensagens da _fila..."
 
 msgid "/Send _queue..."
 msgstr "/Enviar mensagens da _fila..."
 

-#: src/folderview.c:423
-#: src/folderview.c:470
-#: src/prefs_folder_column.c:80
+#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Nova"
 
 msgid "New"
 msgstr "Nova"
 

-#: src/folderview.c:424
-#: src/folderview.c:471
-#: src/prefs_folder_column.c:81
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Não lida"
 
 msgid "Unread"
 msgstr "Não lida"
 

-#: src/folderview.c:425
-#: src/prefs_folder_column.c:82
+#: src/folderview.c:425 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:473
-#: src/summaryview.c:496
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 


@@ -3211,28 +3153,20 @@ msgstr "#"
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 

-#: src/folderview.c:816
-#: src/summaryview.c:3555
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 

-#: src/folderview.c:817
-#: src/summaryview.c:3556
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 

-#: src/folderview.c:1034
-#: src/imap.c:3420
-#: src/mainwindow.c:3897
-#: src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Vasculhando a pasta %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Vasculhando a pasta %s%c%s ..."
 

-#: src/folderview.c:1038
-#: src/imap.c:3425
-#: src/mainwindow.c:3902
-#: src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Vasculhando a pasta %s ..."
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Vasculhando a pasta %s ..."


@@ -3243,14 +3177,15 @@ msgstr "Reconstruir a árvore de pastas"
 
 #: src/folderview.c:1070
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 
 #: src/folderview.c:1070
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"

-msgstr "A reconstrução da árvore de pastas irá remover os caches locais. Deseja continuar?"
+msgstr ""
+"A reconstrução da árvore de pastas irá remover os caches locais. Deseja "
+"continuar?"

 
 #: src/folderview.c:1080
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 
 
 #: src/folderview.c:1080
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 

-#: src/folderview.c:1082
-#: src/folderview.c:1122
+#: src/folderview.c:1082 src/folderview.c:1122

 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 
 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 


@@ -3259,74 +3194,62 @@ msgstr "Vasculhando a árvore de pastas..."
 msgid "Couldn't scan folder %s\n"
 msgstr "Não foi possível vasculhar a pasta %s\n"
 
 msgid "Couldn't scan folder %s\n"
 msgstr "Não foi possível vasculhar a pasta %s\n"
 

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 

-#: src/folderview.c:2059
+#: src/folderview.c:2073

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fechando a pasta %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fechando a pasta %s..."
 

-#: src/folderview.c:2149
+#: src/folderview.c:2163

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abrindo a pasta %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abrindo a pasta %s..."
 

-#: src/folderview.c:2162
+#: src/folderview.c:2176

 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 

-#: src/folderview.c:2324
-#: src/mainwindow.c:2121
+#: src/folderview.c:2338 src/mainwindow.c:2121

 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 

-#: src/folderview.c:2325
+#: src/folderview.c:2339

 msgid "Delete all messages in trash?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 
 msgid "Delete all messages in trash?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 

-#: src/folderview.c:2326
+#: src/folderview.c:2340

 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 
 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 

-#: src/folderview.c:2370
-#: src/inc.c:1478
-#: src/toolbar.c:2320
+#: src/folderview.c:2384 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 

-#: src/folderview.c:2371
-#: src/toolbar.c:2321
+#: src/folderview.c:2385 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 

-#: src/folderview.c:2382
-#: src/toolbar.c:2340
+#: src/folderview.c:2396 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 

-#: src/folderview.c:2383
-#: src/toolbar.c:2341
+#: src/folderview.c:2397 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 

-#: src/folderview.c:2384
-#: src/messageview.c:590
-#: src/messageview.c:607
-#: src/prefs_account.c:1122
-#: src/toolbar.c:2342
+#: src/folderview.c:2398 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "_Enviar"
 
 msgid "_Send"
 msgstr "_Enviar"
 

-#: src/folderview.c:2392
-#: src/toolbar.c:2360
+#: src/folderview.c:2406 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 

-#: src/folderview.c:2395
-#: src/main.c:1755
-#: src/toolbar.c:2363
+#: src/folderview.c:2409 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3335,67 +3258,65 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 

-#: src/folderview.c:2462
+#: src/folderview.c:2476

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 

-#: src/folderview.c:2463
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2479

 msgid "Copy folder"
 msgstr "Copiar a pasta"
 
 msgid "Copy folder"
 msgstr "Copiar a pasta"
 

-#: src/folderview.c:2465
+#: src/folderview.c:2479

 msgid "Move folder"
 msgstr "Mover a pasta"
 
 msgid "Move folder"
 msgstr "Mover a pasta"
 

-#: src/folderview.c:2476
+#: src/folderview.c:2490

 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 

-#: src/folderview.c:2476
+#: src/folderview.c:2490

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2521

 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 

-#: src/folderview.c:2510
+#: src/folderview.c:2524

 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 
 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 

-#: src/folderview.c:2511
+#: src/folderview.c:2525

 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 

-#: src/folderview.c:2514
+#: src/folderview.c:2528

 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 

-#: src/folderview.c:2517
+#: src/folderview.c:2531

 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 
 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 

-#: src/folderview.c:2517
+#: src/folderview.c:2531

 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 

-#: src/folderview.c:2568
+#: src/folderview.c:2582

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 

-#: src/gedit-print.c:147
-#: src/messageview.c:1544
-#: src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "Imprimir"
 
 msgid "Print"
 msgstr "Imprimir"
 


@@ -3421,67 +3342,64 @@ msgstr "Visualização da impressão"
 msgid "Page %N of %Q"
 msgstr "Página %N de %Q"
 
 msgid "Page %N of %Q"
 msgstr "Página %N de %Q"
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "Inscrição em newsgroup"
 
 msgid "Newsgroup subscription"
 msgstr "Inscrição em newsgroup"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "Selecione os newsgroups para inscrição:"
 
 msgid "Select newsgroups for subscription:"
 msgstr "Selecione os newsgroups para inscrição:"
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "Localizar grupos:"
 
 msgid "Find groups:"
 msgstr "Localizar grupos:"
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " Procurar "
 
 msgid " Search "
 msgstr " Procurar "
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr "Nome do newsgroup"
 
 msgid "Newsgroup name"
 msgstr "Nome do newsgroup"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "Mensagens"
 
 msgid "Messages"
 msgstr "Mensagens"
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "Tipo"
 
 msgid "Type"
 msgstr "Tipo"
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "moderado"
 
 msgid "moderated"
 msgstr "moderado"
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "somente leitura"
 
 msgid "readonly"
 msgstr "somente leitura"
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "desconhecido"
 
 msgid "unknown"
 msgstr "desconhecido"
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 

-#: src/grouplistdialog.c:447
-#: src/summaryview.c:1367
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr "Pronto."
 
 msgid "Done."
 msgstr "Pronto."
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
 

-#: src/gtk/about.c:79
-#: src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "/Abrir com o navegador _Web"
 
 msgid "/_Open with Web browser"
 msgstr "/Abrir com o navegador _Web"
 

-#: src/gtk/about.c:80
-#: src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/Copiar esse _link"
 
 msgid "/Copy this _link"
 msgstr "/Copiar esse _link"
 


@@ -3499,11 +3417,13 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"

-"Claws Mail is free software released under the GPL license. 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 license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"

-"O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja fazer doações para o projeto do Claws Mail, você pode fazê-lo em:\n"
+"O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja "
+"fazer doações para o projeto do Claws Mail, você pode fazê-lo em:\n"

 
 #: src/gtk/about.c:159
 msgid ""
 
 #: src/gtk/about.c:159
 msgid ""


@@ -3548,9 +3468,7 @@ msgstr ""
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 

-#: src/gtk/about.c:240
-#: src/prefs_themes.c:707
-#: src/wizard.c:475
+#: src/gtk/about.c:240 src/prefs_themes.c:707 src/wizard.c:475

 msgid "The Claws Mail Team"
 msgstr "A equipe do Claws Mail"
 
 msgid "The Claws Mail Team"
 msgstr "A equipe do Claws Mail"
 


@@ -3584,7 +3502,9 @@ msgstr "Características compiladas\n"
 
 #: src/gtk/about.c:418
 msgid "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
 
 #: src/gtk/about.c:418
 msgid "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"

-msgstr "adiciona suporte a endereços IPv6, o novo protocolo de endereçamento da Internet\n"
+msgstr ""
+"adiciona suporte a endereços IPv6, o novo protocolo de endereçamento da "
+"Internet\n"

 
 #: src/gtk/about.c:429
 msgid "iconv|allows converting to and from different character sets\n"
 
 #: src/gtk/about.c:429
 msgid "iconv|allows converting to and from different character sets\n"


@@ -3624,31 +3544,51 @@ msgstr "adiciona suporte a gerenciamento de seção\n"
 
 #: src/gtk/about.c:541
 msgid ""
 
 #: src/gtk/about.c:541
 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 2, 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 2, or (at your option) any later "
+"version.\n"

 "\n"
 msgstr ""
 "\n"
 msgstr ""

-"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo de acordo com os termos da GNU General Public License tal como publicada pela Free Software Foundation; tanto a versão 2, ou (opcionalmente) qualquer versão posterior.\n"
+"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo "
+"de acordo com os termos da GNU General Public License tal como publicada "
+"pela Free Software Foundation; tanto a versão 2, ou (opcionalmente) qualquer "
+"versão posterior.\n"

 "\n"
 
 #: src/gtk/about.c:547
 msgid ""
 "\n"
 
 #: src/gtk/about.c:547
 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 ""
 "\n"
 msgstr ""

-"Este programa é distribuido com a esperança de que seja útil, mas SEM NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou ADEQUAÇÃO PARA ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para maiores detalhes.\n"
+"Este programa é distribuido com a esperança de que seja útil, mas SEM "
+"NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou "
+"ADEQUAÇÃO PARA ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License "
+"para maiores detalhes.\n"

 "\n"
 
 #: src/gtk/about.c:553
 msgid ""
 "\n"
 
 #: src/gtk/about.c:553
 msgid ""

-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"

 "\n"
 msgstr ""
 "\n"
 msgstr ""

-"Você deve ter recebido uma cópia da GNU General Public License juntamente com este programa; caso não, escreva para Free Software Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.\n"
+"Você deve ter recebido uma cópia da GNU General Public License juntamente "
+"com este programa; caso não, escreva para Free Software Foundation, Inc., 51 "
+"Franklin Street, Boston, MA 02110-1301, USA.\n"

 "\n"
 
 #: src/gtk/about.c:571
 "\n"
 
 #: src/gtk/about.c:571

-msgid "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit ("
-msgstr "Esse produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenSSL Toolkit ("
+msgid ""
+"This product includes software developed by the OpenSSL Project for use in "
+"the OpenSSL Toolkit ("
+msgstr ""
+"Esse produto inclui software desenvolvido pelo Projeto OpenSSL para uso no "
+"OpenSSL Toolkit ("

 
 #: src/gtk/about.c:575
 msgid ").\n"
 
 #: src/gtk/about.c:575
 msgid ").\n"


@@ -3688,78 +3628,63 @@ msgstr "_Licença"
 msgid "_Release Notes"
 msgstr "_Notas do lançamento"
 
 msgid "_Release Notes"
 msgstr "_Notas do lançamento"
 

-#: src/gtk/colorlabel.c:48
-#: src/prefs_common.c:329
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:329

 msgid "Orange"
 msgstr "Laranja"
 
 msgid "Orange"
 msgstr "Laranja"
 

-#: src/gtk/colorlabel.c:49
-#: src/prefs_common.c:333
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:333

 msgid "Red"
 msgstr "Vermelho"
 
 msgid "Red"
 msgstr "Vermelho"
 

-#: src/gtk/colorlabel.c:50
-#: src/prefs_common.c:337
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:337

 msgid "Pink"
 msgstr "Rosa"
 
 msgid "Pink"
 msgstr "Rosa"
 

-#: src/gtk/colorlabel.c:51
-#: src/prefs_common.c:341
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:341

 msgid "Sky blue"
 msgstr "Azul celeste"
 
 msgid "Sky blue"
 msgstr "Azul celeste"
 

-#: src/gtk/colorlabel.c:52
-#: src/prefs_common.c:345
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:345

 msgid "Blue"
 msgstr "Azul"
 
 msgid "Blue"
 msgstr "Azul"
 

-#: src/gtk/colorlabel.c:53
-#: src/prefs_common.c:349
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:349

 msgid "Green"
 msgstr "Verde"
 
 msgid "Green"
 msgstr "Verde"
 

-#: src/gtk/colorlabel.c:54
-#: src/prefs_common.c:353
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:353

 msgid "Brown"
 msgstr "Marrom"
 
 msgid "Brown"
 msgstr "Marrom"
 

-#: src/gtk/colorlabel.c:55
-#: src/prefs_common.c:357
+#: src/gtk/colorlabel.c:55 src/prefs_common.c:357

 msgid "Grey"
 msgstr "Cinza"
 
 msgid "Grey"
 msgstr "Cinza"
 

-#: src/gtk/colorlabel.c:56
-#: src/prefs_common.c:361
+#: src/gtk/colorlabel.c:56 src/prefs_common.c:361

 msgid "Light brown"
 msgstr "Marrom claro"
 
 msgid "Light brown"
 msgstr "Marrom claro"
 

-#: src/gtk/colorlabel.c:57
-#: src/prefs_common.c:365
+#: src/gtk/colorlabel.c:57 src/prefs_common.c:365

 msgid "Dark red"
 msgstr "Vermelho escuro"
 
 msgid "Dark red"
 msgstr "Vermelho escuro"
 

-#: src/gtk/colorlabel.c:58
-#: src/prefs_common.c:369
+#: src/gtk/colorlabel.c:58 src/prefs_common.c:369

 msgid "Dark pink"
 msgstr "Rosa escuro"
 
 msgid "Dark pink"
 msgstr "Rosa escuro"
 

-#: src/gtk/colorlabel.c:59
-#: src/prefs_common.c:373
+#: src/gtk/colorlabel.c:59 src/prefs_common.c:373

 msgid "Steel blue"
 msgstr "Azul metálico"
 
 msgid "Steel blue"
 msgstr "Azul metálico"
 

-#: src/gtk/colorlabel.c:60
-#: src/prefs_common.c:377
+#: src/gtk/colorlabel.c:60 src/prefs_common.c:377

 msgid "Gold"
 msgstr "Dourado"
 
 msgid "Gold"
 msgstr "Dourado"
 

-#: src/gtk/colorlabel.c:61
-#: src/prefs_common.c:381
+#: src/gtk/colorlabel.c:61 src/prefs_common.c:381

 msgid "Bright green"
 msgstr "Verde brilhante"
 
 msgid "Bright green"
 msgstr "Verde brilhante"
 

-#: src/gtk/colorlabel.c:62
-#: src/prefs_common.c:385
+#: src/gtk/colorlabel.c:62 src/prefs_common.c:385

 msgid "Magenta"
 msgstr "Magenta"
 
 msgid "Magenta"
 msgstr "Magenta"
 


@@ -3771,8 +3696,7 @@ msgstr "Configure a ordem da pasta"
 msgid "Move folders up or down to change the sort order in the folder list."
 msgstr "Mova as pastas para cima ou para baixo para mudar a ordem na lista de pastas."
 
 msgid "Move folders up or down to change the sort order in the folder list."
 msgstr "Mova as pastas para cima ou para baixo para mudar a ordem na lista de pastas."
 

-#: src/gtk/foldersort.c:214
-#: src/toolbar.c:409
+#: src/gtk/foldersort.c:214 src/toolbar.c:410

 msgid "Folders"
 msgstr "Pastas"
 
 msgid "Folders"
 msgstr "Pastas"
 


@@ -3780,15 +3704,11 @@ msgstr "Pastas"
 msgid "No dictionary selected."
 msgstr "Nenhum dicionário selecionado."
 
 msgid "No dictionary selected."
 msgstr "Nenhum dicionário selecionado."
 

-#: src/gtk/gtkaspell.c:851
-#: src/gtk/gtkaspell.c:1852
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:851 src/gtk/gtkaspell.c:1852 src/gtk/gtkaspell.c:2147

 msgid "Normal Mode"
 msgstr "Modo Normal"
 
 msgid "Normal Mode"
 msgstr "Modo Normal"
 

-#: src/gtk/gtkaspell.c:853
-#: src/gtk/gtkaspell.c:1858
-#: src/gtk/gtkaspell.c:2159
+#: src/gtk/gtkaspell.c:853 src/gtk/gtkaspell.c:1858 src/gtk/gtkaspell.c:2159

 msgid "Bad Spellers Mode"
 msgstr "Modo de verificação ortográfica com problema"
 
 msgid "Bad Spellers Mode"
 msgstr "Modo de verificação ortográfica com problema"
 


@@ -3817,8 +3737,7 @@ msgstr ""
 "Pressione a tecla Control junto com Enter para\n"
 "o verificador aprender com os erros.\n"
 
 "Pressione a tecla Control junto com Enter para\n"
 "o verificador aprender com os erros.\n"
 

-#: src/gtk/gtkaspell.c:1846
-#: src/gtk/gtkaspell.c:2135
+#: src/gtk/gtkaspell.c:1846 src/gtk/gtkaspell.c:2135

 msgid "Fast Mode"
 msgstr "Modo Rápido"
 
 msgid "Fast Mode"
 msgstr "Modo Rápido"
 


@@ -3848,8 +3767,7 @@ msgstr "Verificar com %s"
 msgid "(no suggestions)"
 msgstr "(sem sugestões)"
 
 msgid "(no suggestions)"
 msgstr "(sem sugestões)"
 

-#: src/gtk/gtkaspell.c:2033
-#: src/gtk/gtkaspell.c:2212
+#: src/gtk/gtkaspell.c:2033 src/gtk/gtkaspell.c:2212

 msgid "More..."
 msgstr "Mais..."
 
 msgid "More..."
 msgstr "Mais..."
 


@@ -3867,8 +3785,7 @@ msgstr "Utilizar alternativo (%s)"
 msgid "Use both dictionaries"
 msgstr "Usar ambos os dicionários"
 
 msgid "Use both dictionaries"
 msgstr "Usar ambos os dicionários"
 

-#: src/gtk/gtkaspell.c:2175
-#: src/prefs_spelling.c:214
+#: src/gtk/gtkaspell.c:2175 src/prefs_spelling.c:214

 msgid "Check while typing"
 msgstr "Verificar durante a digitação"
 
 msgid "Check while typing"
 msgstr "Verificar durante a digitação"
 


@@ -3950,8 +3867,7 @@ msgstr "Descrição da fonte"
 msgid "Font to use for the document text (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para o texto do documento (ex. \"Monospace 10\")"
 
 msgid "Font to use for the document text (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para o texto do documento (ex. \"Monospace 10\")"
 

-#: src/gtk/gtksourceprintjob.c:328
-#: src/gtk/gtksourceprintjob.c:336
+#: src/gtk/gtksourceprintjob.c:328 src/gtk/gtksourceprintjob.c:336

 msgid "Numbers Font"
 msgstr "Fonte dos números"
 
 msgid "Numbers Font"
 msgstr "Fonte dos números"
 


@@ -3969,7 +3885,9 @@ msgstr "Imprimir numeração das linhas"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"

-msgstr "Intervalo dos números na impressão de numeração das linhas (0 significa sem números)"
+msgstr ""
+"Intervalo dos números na impressão de numeração das linhas (0 significa sem "
+"números)"

 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"
 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"


@@ -4003,6 +3921,403 @@ msgstr "Descrição da fonte dos cabeçalho e rodapé"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para os cabeçalhos e rodapés (ex. \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para os cabeçalhos e rodapés (ex. \"Monospace 10\")"
 

+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "Data"
+
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "Data:"
+
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"
+msgstr "De"
+
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "De:"
+
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"
+msgstr "Remetente"
+
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "Remetente:"
+
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "Responder para"
+
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "Para"
+
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "Cc"
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr "Cco"
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr "ID da Mensagem"
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr "ID da Mensagem:"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr "Respondendo a"
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr "Respondendo a:"
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr "Referências"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr "Referências:"
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr "Assunto"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr "Comentários"
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr "Comentários:"
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr "Palavras-chave"
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr "Palavras-chave:"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr "Data de reenvio"
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr "Data de reenvio:"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr "Quem está reenviando"
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr "Quem está reenviando:"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr "Origem do reenvio"
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr "Origem do reenvio:"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr "Destinatário do reenvio"
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr "Destinatário do reenvio:"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr "Cc do reenvio"
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr "Cc do reenvio:"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr "Cco do reenvio"
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr "Cco do reenvio:"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr "ID da mensagem reenviada"
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr "ID da mensagem reenviada:"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr "Caminho de retorno"
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr "Caminho de retorno:"
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr "Recebido"
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr "Recebido:"
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr "Encaminhar para"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr "Entregar para"
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr "Entregar para:"
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr "Visualizado"
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr "Visualizado:"
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "Situação"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "Situação:"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr "Face"
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr "Face:"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr "Destinatário da notificação de disposição"
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr "Destinatário da notificação de disposição:"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr "Destinatário da confirmação de recebimento"
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr "Destinatário da confirmação de recebimento:"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr "Cliente de e-mail do remetente"
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr "Cliente de e-mail do remetente:"
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr "Formato do conteúdo"
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr "Formato do conteúdo:"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding"
+msgstr "Método de codificação do conteúdo"
+
+#: src/gtk/headers.h:42
+msgid "Content-Transfer-Encoding:"
+msgstr "Método de codificação do conteúdo"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr "Versão do MIME"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr "Versão do MIME:"
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr "Precedência"
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr "Precedência:"
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "Organização"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "Organização:"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "Lista de discussão"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "Lista de discussão:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr "Envio para a lista"
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr "Envio para a lista:"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr "Assinar a lista"
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr "Assinar a lista:"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr "Cancelar a assinatura da lista"
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr "Cancelar a assinatura da lista:"
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr "Informações sobre a lista"
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr "Informações sobre a lista:"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr "Arquivo de mensagens da lista"
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr "Arquivo de mensagens da lista:"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr "Proprietário da lista"
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr "Proprietário da lista:"
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr "Rótulo definido pelo usuário"
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr "Rótulo definido pelo usuário:"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr "Cliente de e-mail do rementente"
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr "Cliente de e-mail do rementente:"
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr "Situação definida pelo usuário"
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr "Situação definida pelo usuário:"
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr "Imagem definida pelo usuário"
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr "Imagem definida pelo usuário:"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr "Não arquivamento público da mensagem"
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr "Não arquivamento público da mensagem:"
+
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr "Em resposta à"
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr "Em resposta à:"
+
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr "Para ou Cc"
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr "Para ou Cc:"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr "De, Para ou Assunto"
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr "De, Para ou Assunto:"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nova mensagem"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nova mensagem"


@@ -4084,8 +4399,12 @@ msgid "Icon Legend"
 msgstr "Texto do ícone"
 
 #: src/gtk/icon_legend.c:140
 msgstr "Texto do ícone"
 
 #: 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\">Os seguintes ícones são usados para mostrar a situação das mensagens e pastas:</span>"
+msgid ""
+"<span weight=\"bold\">The following icons are used to show the status of "
+"messages and folders:</span>"
+msgstr ""
+"<span weight=\"bold\">Os seguintes ícones são usados para mostrar a situação "
+"das mensagens e pastas:</span>"

 
 #: src/gtk/inputdialog.c:189
 #, c-format
 
 #: src/gtk/inputdialog.c:189
 #, c-format


@@ -4100,12 +4419,11 @@ msgstr "Digite a senha"
 msgid "Remember this"
 msgstr "Lembrar disso"
 
 msgid "Remember this"
 msgstr "Lembrar disso"
 

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 
 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 

-#: src/gtk/pluginwindow.c:151
-#: src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4115,19 +4433,19 @@ msgstr ""
 "\n"
 "Versão: "
 
 "\n"
 "Versão: "
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "Erro: "
 
 msgid "Error: "
 msgstr "Erro: "
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "O plugin não está funcionando."
 
 msgid "Plugin is not functional."
 msgstr "O plugin não está funcionando."
 

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "Selecione os plugins a serem carregados"
 
 msgid "Select the Plugins to load"
 msgstr "Selecione os plugins a serem carregados"
 

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -4138,380 +4456,336 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287
-#: src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Plugins"
 
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "Plugins"
 

-#: src/gtk/pluginwindow.c:321
-#: src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr "Descrição"
 
 msgid "Description"
 msgstr "Descrição"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr "Existem mais plugins disponíveis no site do Claws Mail."
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr "Existem mais plugins disponíveis no site do Claws Mail."
 

-#: src/gtk/pluginwindow.c:344
-#: src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr "Obter mais..."
 
 msgid "Get more..."
 msgstr "Obter mais..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "Carregar plugin..."
 
 msgid "Load Plugin..."
 msgstr "Carregar plugin..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "Descarregar Plugin"
 
 msgid "Unload Plugin"
 msgstr "Descarregar Plugin"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "Clique aqui para transferir um ou mais plugins"
 
 msgid "Click here to load one or more plugins"
 msgstr "Clique aqui para transferir um ou mais plugins"
 

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "Descarregar o plugin selecionado"
 
 msgid "Unload the selected plugin"
 msgstr "Descarregar o plugin selecionado"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "Plugins carregados"
 
 msgid "Loaded plugins"
 msgstr "Plugins carregados"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "Índice da Página"
 
 msgid "Page Index"
 msgstr "Índice da Página"
 

-#: src/gtk/progressdialog.c:140
-#: src/prefs_account.c:842
-#: src/prefs_filtering_action.c:399
-#: src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "Conta"
 
 msgid "Account"
 msgstr "Conta"
 

-#: src/gtk/progressdialog.c:148
-#: src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80
-#: src/summaryview.c:2458
-msgid "Status"
-msgstr "Situação"
-
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "todas as mensagens"
 
 msgid "all messages"
 msgstr "todas as mensagens"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "mensagens com mais de # dias"
 
 msgid "messages whose age is greater than #"
 msgstr "mensagens com mais de # dias"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "mensagens com menos de # dias"
 
 msgid "messages whose age is less than #"
 msgstr "mensagens com menos de # dias"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 
 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 
 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 
 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 
 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "mensagens apagadas"
 
 msgid "deleted messages"
 msgstr "mensagens apagadas"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 
 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 
 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 
 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "mensagens que contenham o cabeçalho S"
 
 msgid "messages which contain header S"
 msgstr "mensagens que contenham o cabeçalho S"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "mensagens que estão marcadas com a cor #"
 
 msgid "messages which are marked with color #"
 msgstr "mensagens que estão marcadas com a cor #"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "mensagens travadas"
 
 msgid "locked messages"
 msgstr "mensagens travadas"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "mensagens que estão no newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "mensagens que estão no newsgroup S"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "novas mensagens"
 
 msgid "new messages"
 msgstr "novas mensagens"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "mensagens antigas"
 
 msgid "old messages"
 msgstr "mensagens antigas"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "mensagens que foram respondidas"
 
 msgid "messages which have been replied to"
 msgstr "mensagens que foram respondidas"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "mensagens lidas"
 
 msgid "read messages"
 msgstr "mensagens lidas"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "mensagens que contenham S no assunto"
 
 msgid "messages which contain S in subject"
 msgstr "mensagens que contenham S no assunto"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "mensagens com pontuação igual a #"
 
 msgid "messages whose score is equal to #"
 msgstr "mensagens com pontuação igual a #"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "mensagens com pontuação maior que #"
 
 msgid "messages whose score is greater than #"
 msgstr "mensagens com pontuação maior que #"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "mensagens com pontuação menor que #"
 
 msgid "messages whose score is lower than #"
 msgstr "mensagens com pontuação menor que #"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "mensagens com tamanho igual a #"
 
 msgid "messages whose size is equal to #"
 msgstr "mensagens com tamanho igual a #"
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "mensagens com tamanho maior que #"
 
 msgid "messages whose size is greater than #"
 msgstr "mensagens com tamanho maior que #"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "mensagens com tamanho menor que #"
 
 msgid "messages whose size is smaller than #"
 msgstr "mensagens com tamanho menor que #"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "mensagens que foram enviadas para S"
 
 msgid "messages which have been sent to S"
 msgstr "mensagens que foram enviadas para S"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "mensagens marcadas"
 
 msgid "marked messages"
 msgstr "mensagens marcadas"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "mensagens não lidas"
 
 msgid "unread messages"
 msgstr "mensagens não lidas"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "mensagens que contém S no cabeçalho 'References'"
 
 msgid "messages which contain S in References header"
 msgstr "mensagens que contém S no cabeçalho 'References'"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"

-msgstr "mensagens que retornaram 0 quando foram passadas para o comando - %F é um arquivo de mensagem"
+msgstr ""
+"mensagens que retornaram 0 quando foram passadas para o comando - %F é um "
+"arquivo de mensagem"

 
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "mensagens que contém S no cabeçalho 'X-Label'"
 
 msgid "messages which contain S in X-Label header"
 msgstr "mensagens que contém S no cabeçalho 'X-Label'"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
 
 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "operador lógico 'OU'"
 
 msgid "logical OR operator"
 msgstr "operador lógico 'OU'"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "operador lógico 'NÃO'"
 
 msgid "logical NOT operator"
 msgstr "operador lógico 'NÃO'"
 

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "a procura diferencia maiúsc./minúsc."
 
 msgid "case sensitive search"
 msgstr "a procura diferencia maiúsc./minúsc."
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "são permitidas todas as expressões de filtragem"
 
 msgid "all filtering expressions are allowed"
 msgstr "são permitidas todas as expressões de filtragem"
 

-#: src/gtk/quicksearch.c:387
-#: src/summary_search.c:401
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr "Procura Extendida"
 
 msgid "Extended Search"
 msgstr "Procura Extendida"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 msgid ""
 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"

 "\n"
 "The following symbols can be used:"
 msgstr ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"A Procura Extendida permite que o usuário defina os critérios de correspondência que as mensagens devam ter para serem exibidas na lista de mensagens.\n"
+"A Procura Extendida permite que o usuário defina os critérios de "
+"correspondência que as mensagens devam ter para serem exibidas na lista de "
+"mensagens.\n"

 "\n"
 "Os seguintes símbolos podem ser usados:"
 
 "\n"
 "Os seguintes símbolos podem ser usados:"
 

-#: src/gtk/quicksearch.c:484
-#: src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160
-#: src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882
-#: src/prefs_summary_column.c:82
-#: src/prefs_template.c:190
-#: src/quote_fmt.c:48
-#: src/summaryview.c:491
-msgid "Subject"
-msgstr "Assunto"
-
-#: src/gtk/quicksearch.c:488
-#: src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83
-#: src/quote_fmt.c:42
-#: src/summaryview.c:492
-msgid "From"
-msgstr "De"
-
-#: src/gtk/quicksearch.c:492
-#: src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84
-#: src/prefs_template.c:187
-#: src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "Para"
-
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgstr "Recursivo"
 
 msgid "Recursive"
 msgstr "Recursivo"
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgstr "Manter filtro"
 
 msgid "Sticky"
 msgstr "Manter filtro"
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "Procurar enquanto digita"
 
 msgid "Type-ahead"
 msgstr "Procurar enquanto digita"
 

-#: src/gtk/quicksearch.c:554
-#: src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr "Executar na seleção"
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr " Limpar "
 
 msgid " Clear "
 msgstr " Limpar "
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "Limpar a procura atual"
 
 msgid "Clear the current search"
 msgstr "Limpar a procura atual"
 

-#: src/gtk/quicksearch.c:577
-#: src/summary_search.c:354
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr "Editar os critérios da busca"
 
 msgid "Edit search criteria"
 msgstr "Editar os critérios da busca"
 

-#: src/gtk/quicksearch.c:583
-#: src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 
 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr "Informação sobre os símbolos extendidos"
 
 msgid "Information about extended symbols"
 msgstr "Informação sobre os símbolos extendidos"
 

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "Informação"
 
 msgid "Info"
 msgstr "Informação"
 

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "Limpar"
 
 msgid "Clear"
 msgstr "Limpar"
 

-#: src/gtk/quicksearch.c:1090
-#: src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Procurando em %s... \n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Procurando em %s... \n"
 

-#: src/gtk/sslcertwindow.c:129
-#: src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322
-#: src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "correto"
 
 msgid "correct"
 msgstr "correto"
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "Proprietário"
 
 msgid "Owner"
 msgstr "Proprietário"
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "Assinante"
 
 msgid "Signer"
 msgstr "Assinante"
 

-#: src/gtk/sslcertwindow.c:142
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nome: "
 
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "Nome: "
 

-#: src/gtk/sslcertwindow.c:149
-#: src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "Organização: "
 
 msgid "Organization: "
 msgstr "Organização: "
 

-#: src/gtk/sslcertwindow.c:156
-#: src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "Localização: "
 
 msgid "Location: "
 msgstr "Localização: "
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "Fingerprint: "
 
 msgid "Fingerprint: "
 msgstr "Fingerprint: "
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "Situação da assinatura: "
 
 msgid "Signature status: "
 msgstr "Situação da assinatura: "
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "Expira em: "
 
 msgid "Expires on: "
 msgstr "Expira em: "
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificado SSL para %s"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "Certificado SSL para %s"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -4520,34 +4794,30 @@ msgstr ""
 "O certificado para %s é desconhecido.\n"
 "Deseja aceitá-lo?"
 
 "O certificado para %s é desconhecido.\n"
 "Deseja aceitá-lo?"
 

-#: src/gtk/sslcertwindow.c:284
-#: src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "Situação da assinatura: %s"
 
 #, c-format
 msgid "Signature status: %s"
 msgstr "Situação da assinatura: %s"
 

-#: src/gtk/sslcertwindow.c:291
-#: src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "_Ver certificado"
 
 msgid "_View certificate"
 msgstr "_Ver certificado"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconhecido"
 
 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconhecido"
 

-#: src/gtk/sslcertwindow.c:297
-#: src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "_Cancelar a conexão"
 
 msgid "_Cancel connection"
 msgstr "_Cancelar a conexão"
 

-#: src/gtk/sslcertwindow.c:297
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "_Aceitar e salvar"
 
 msgid "_Accept and save"
 msgstr "_Aceitar e salvar"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -4556,44 +4826,40 @@ msgstr ""
 "O certificado para %s expirou.\n"
 "Deseja continuar?"
 
 "O certificado para %s expirou.\n"
 "Deseja continuar?"
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "Certificado SSL expirado"
 
 msgid "Expired SSL Certificate"
 msgstr "Certificado SSL expirado"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "_Aceitar"
 
 msgid "_Accept"
 msgstr "_Aceitar"
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "Certificado novo:"
 
 msgid "New certificate:"
 msgstr "Certificado novo:"
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "Certificado conhecido:"
 
 msgid "Known certificate:"
 msgstr "Certificado conhecido:"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "O certificado para %s foi alterado. Deseja aceitá-lo?"
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "O certificado para %s foi alterado. Deseja aceitá-lo?"
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "_Ver certificados"
 
 msgid "_View certificates"
 msgstr "_Ver certificados"
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "O certificado SSL foi alterado"
 
 msgid "Changed SSL Certificate"
 msgstr "O certificado SSL foi alterado"
 

-#: src/headerview.c:195
-#: src/summaryview.c:2866
-#: src/summaryview.c:2877
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(Sem remetente)"
 
 msgid "(No From)"
 msgstr "(Sem remetente)"
 

-#: src/headerview.c:210
-#: src/summaryview.c:2901
-#: src/summaryview.c:2904
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 


@@ -4609,238 +4875,224 @@ msgstr "Tamanho do arquivo:"
 msgid "Load Image"
 msgstr "Carregar imagem"
 
 msgid "Load Image"
 msgstr "Carregar imagem"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr "Content-Type:"
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\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"
 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 CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
+"suporte a SASL e o plugin CRAM-MD5 SASL instalado."

 
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 

-#: src/imap.c:666
-#: src/imap.c:669
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 

-#: src/imap.c:718
-#: src/imap.c:2447
-#: src/imap.c:2956
-#: src/imap.c:3041
-#: src/imap.c:3386
-#: src/imap.c:4143
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 

-#: src/imap.c:797
-#: src/inc.c:773
-#: src/news.c:295
-#: src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 

-#: src/imap.c:798
-#: src/inc.c:774
-#: src/news.c:296
-#: src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 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"
 "\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 ""
 msgstr ""

-"Essa conexão está configurada para ser segura usando SSL, mas o SSL não está disponível nessa compilação do Claws Mail. \n"
+"Essa conexão está configurada para ser segura usando SSL, mas o SSL não está "
+"disponível nessa compilação do Claws Mail. \n"

 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 

-#: src/imap.c:804
-#: src/inc.c:780
-#: src/news.c:302
-#: src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando com o servidor IMAP4: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando com o servidor IMAP4: %s..."
 

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 

-#: src/imap.c:884
-#: src/imap.c:2764
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando com o servidor IMAP4: %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando com o servidor IMAP4: %s...\n"
 

-#: src/imap.c:932
-#: src/imap.c:935
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 

-#: src/imap.c:1305
-#: src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 

-#: src/imap.c:1487
-#: src/imap.c:3894
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não subscritas em %s..."
 
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não subscritas em %s..."
 

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 #, c-format

-msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL 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"
+msgid ""
+"Connection to %s failed: server requires TLS, but Claws Mail has been "
+"compiled without OpenSSL 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"

 
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv não pode converter de UTF-7 para %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv não pode converter de UTF-7 para %s\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv não pode converter %s para UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv não pode converter %s para UTF-7\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv não pode converter de UTF-8 para UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv não pode converter de UTF-8 para UTF-7\n"
 

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 msgid ""
 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 ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""

-"Você possui uma ou mais contas IMAP definidas. Entretanto, essa versão do Claws Mail foi compilada sem suporte ao IMAP; assim, essa(s) conta(s) está(ão) desabilitada(s).\n"
+"Você possui uma ou mais contas IMAP definidas. Entretanto, essa versão do "
+"Claws Mail foi compilada sem suporte ao IMAP; assim, essa(s) conta(s) está"
+"(ão) desabilitada(s).\n"

 "\n"
 "Você provavelmente precisa instalar o libetpan e recompilar o Claws Mail."
 
 "\n"
 "Você provavelmente precisa instalar o libetpan e recompilar o Claws Mail."
 

-#: src/imap_gtk.c:58
-#: src/mh_gtk.c:50
+#: src/imap_gtk.c:58 src/mh_gtk.c:50

 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 

-#: src/imap_gtk.c:60
-#: src/mh_gtk.c:52
+#: src/imap_gtk.c:60 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 

-#: src/imap_gtk.c:61
-#: src/mh_gtk.c:53
+#: src/imap_gtk.c:61 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/_Mover pasta..."
 
 msgid "/M_ove folder..."
 msgstr "/_Mover pasta..."
 

-#: src/imap_gtk.c:62
-#: src/mh_gtk.c:54
+#: src/imap_gtk.c:62 src/mh_gtk.c:54

 msgid "/Cop_y folder..."
 msgstr "/_Copiar pasta..."
 
 msgid "/Cop_y folder..."
 msgstr "/_Copiar pasta..."
 

-#: src/imap_gtk.c:64
-#: src/mh_gtk.c:56
+#: src/imap_gtk.c:64 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/E_xcluir pasta..."
 
 msgid "/_Delete folder..."
 msgstr "/E_xcluir pasta..."
 


@@ -4848,8 +5100,7 @@ msgstr "/E_xcluir pasta..."
 msgid "/_Synchronise"
 msgstr "/_Sincronizar"
 
 msgid "/_Synchronise"
 msgstr "/_Sincronizar"
 

-#: src/imap_gtk.c:67
-#: src/news_gtk.c:56
+#: src/imap_gtk.c:67 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/_Obter mensagens"
 
 msgid "/Down_load messages"
 msgstr "/_Obter mensagens"
 


@@ -4873,19 +5124,15 @@ msgstr "/S_ubscrições/_Subscrever..."
 msgid "/Subscriptions/_Unsubscribe..."
 msgstr "/S_ubscrições/_Cancelar subscrição..."
 
 msgid "/Subscriptions/_Unsubscribe..."
 msgstr "/S_ubscrições/_Cancelar subscrição..."
 

-#: src/imap_gtk.c:77
-#: src/mh_gtk.c:58
-#: src/news_gtk.c:58
+#: src/imap_gtk.c:77 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/_Verificar se há novas mensagens"
 
 msgid "/_Check for new messages"
 msgstr "/_Verificar se há novas mensagens"
 

-#: src/imap_gtk.c:78
-#: src/mh_gtk.c:59
+#: src/imap_gtk.c:78 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgid "/C_heck for new folders"

-msgstr "/Verificar por novas _pastas"
+msgstr "/Verificar novas _pastas"

 
 

-#: src/imap_gtk.c:79
-#: src/mh_gtk.c:60
+#: src/imap_gtk.c:79 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/Recons_truir a árvore de pastas"
 
 msgid "/R_ebuild folder tree"
 msgstr "/Recons_truir a árvore de pastas"
 


@@ -4899,14 +5146,12 @@ msgstr ""
 "(se deseja criar uma pasta para armazenar sub-pastas,\n"
 "e não mensagens, adicione '/' ao final do nome)"
 
 "(se deseja criar uma pasta para armazenar sub-pastas,\n"
 "e não mensagens, adicione '/' ao final do nome)"
 

-#: src/imap_gtk.c:214
-#: src/mh_gtk.c:231
+#: src/imap_gtk.c:214 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 

-#: src/imap_gtk.c:216
-#: src/mh_gtk.c:233
+#: src/imap_gtk.c:216 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 


@@ -4915,8 +5160,7 @@ msgstr "Renomear a pasta"
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser incluído no nome da pasta."
 
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser incluído no nome da pasta."
 

-#: src/imap_gtk.c:247
-#: src/mh_gtk.c:258
+#: src/imap_gtk.c:247 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4924,21 +5168,20 @@ msgstr ""
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 

-#: src/imap_gtk.c:299
-#: src/mh_gtk.c:179
+#: src/imap_gtk.c:299 src/mh_gtk.c:179

 #, c-format
 msgid ""
 #, 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 ""
 "\n"
 "Do you really want to delete?"
 msgstr ""

-"Todas as pastas e mensagens dentro de '%s' serão apagadas. Não será possível recuperá-las.\n"
+"Todas as pastas e mensagens dentro de '%s' serão apagadas. Não será possível "
+"recuperá-las.\n"

 "\n"
 "Confirma a exclusão?"
 
 "\n"
 "Confirma a exclusão?"
 

-#: src/imap_gtk.c:321
-#: src/mh_gtk.c:201
-#: src/news_gtk.c:241
+#: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:241

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."


@@ -4952,8 +5195,7 @@ msgstr "Deseja procurar por sub-pastas não subscritas de '%s'?"
 msgid "Search recursively"
 msgstr "Procurar recursivamente"
 
 msgid "Search recursively"
 msgstr "Procurar recursivamente"
 

-#: src/imap_gtk.c:453
-#: src/imap_gtk.c:496
+#: src/imap_gtk.c:453 src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "Subscrições"
 
 msgid "Subscriptions"
 msgstr "Subscrições"
 


@@ -4970,42 +5212,48 @@ msgstr "Selecione uma sub-pasta de %s para subscrever: "
 msgid "Subscribe"
 msgstr "Subscrever"
 
 msgid "Subscribe"
 msgstr "Subscrever"
 

-#: src/imap_gtk.c:467
-#: src/imap_gtk.c:469
+#: src/imap_gtk.c:467 src/imap_gtk.c:469

 msgid "All of them"
 msgstr "Todas"
 
 #: src/imap_gtk.c:481
 msgid "All of them"
 msgstr "Todas"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
-msgstr "Essa pasta já foi subscrita e não possui nenhuma sub-pasta não subscrita."
+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."
+msgstr ""
+"Essa pasta já foi subscrita e não possui nenhuma sub-pasta não-subscrita.\n"
+"\n"
+"Se existirem novas pastas, criadas ou subscritas a partir de outro cliente, "
+"utilize \"Verificar novas pastas\" na pasta raiz."

 
 

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Deseja '%s' a '%s' pasta?"
 
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Deseja '%s' a '%s' pasta?"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "subscrever"
 
 msgid "subscribe"
 msgstr "subscrever"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "cancelar subscrição"
 
 msgid "unsubscribe"
 msgstr "cancelar subscrição"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgstr "Aplicar às sub-pastas"
 
 msgid "Apply to subfolders"
 msgstr "Aplicar às sub-pastas"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+_Subscrever"
 
 msgid "+_Subscribe"
 msgstr "+_Subscrever"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+_Cancelar subscrição"
 
 msgid "+_Unsubscribe"
 msgstr "+_Cancelar subscrição"
 

-#: src/import.c:120
-#: src/import.c:215
+#: src/import.c:120 src/import.c:215

 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 
 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 


@@ -5037,119 +5285,128 @@ msgstr "Não foi possível encontrar a pasta de destino."
 msgid "Select importing file"
 msgstr "Selecione o arquivo a importar"
 
 msgid "Select importing file"
 msgstr "Selecione o arquivo a importar"
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr "Por favor, especifique o nome do livro de endereços e o arquivo a importar."
 
 msgid "Please specify address book name and file to import."
 msgstr "Por favor, especifique o nome do livro de endereços e o arquivo a importar."
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "Selecione e renomeie os campos LDIF a importar."
 
 msgid "Select and rename LDIF field names to import."
 msgstr "Selecione e renomeie os campos LDIF a importar."
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "Arquivo importado."
 
 msgid "File imported."
 msgstr "Arquivo importado."
 

-#: src/importldif.c:451
-#: src/importmutt.c:125
-#: src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr "Por favor, selecione um arquivo."
 
 msgid "Please select a file."
 msgstr "Por favor, selecione um arquivo."
 

-#: src/importldif.c:457
-#: src/importmutt.c:130
-#: src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "O nome do livro de endereços deve ser fornecido."
 
 msgid "Address book name must be supplied."
 msgstr "O nome do livro de endereços deve ser fornecido."
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "Ocorreu um erro ao ler os campos LDIF."
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "A importação do LDIF foi concluída com sucesso."
 
 msgid "LDIF file imported successfully."
 msgstr "A importação do LDIF foi concluída com sucesso."
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "Selecione o arquivo LDIF"
 
 msgid "Select LDIF File"
 msgstr "Selecione o arquivo LDIF"
 

-#: src/importldif.c:662
-msgid "Specify the name for the address book that will be created from the LDIF file data."
-msgstr "Especifique o nome para o livro de endereços que será criado a partir dos dados do arquivo LDIF."
+#: src/importldif.c:671
+msgid ""
+"Specify the name for the address book that will be created from the LDIF "
+"file data."
+msgstr ""
+"Especifique o nome para o livro de endereços que será criado a partir dos "
+"dados do arquivo LDIF."

 
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "Nome do arquivo"
 
 msgid "File Name"
 msgstr "Nome do arquivo"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "A especificação completa de arquivo do arquivo LDIF a ser importado."
 
 msgid "The full file specification of the LDIF file to import."
 msgstr "A especificação completa de arquivo do arquivo LDIF a ser importado."
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "Selecione o arquivo LDIF a ser importado."
 
 msgid "Select the LDIF file to import."
 msgstr "Selecione o arquivo LDIF a ser importado."
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:726
-#: src/summaryview.c:489
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "Nome do campo LDIF"
 
 msgid "LDIF Field Name"
 msgstr "Nome do campo LDIF"
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "Nome do atributo"
 
 msgid "Attribute Name"
 msgstr "Nome do atributo"
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "Atributo"
 
 msgid "Attribute"
 msgstr "Atributo"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "O campo LDIF pode ser renomeado para o nome do atributo do usuário."
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "O campo LDIF pode ser renomeado para o nome do atributo do usuário."
 

-#: src/importldif.c:811
-msgid "???"
-msgstr "???"
-
-#: src/importldif.c:829
-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 "Escolha o campo LDIF que será renomeado ou selecionado para importação na lista acima. Os campos Reservados (que possuem uma marca na coluna \"R\"), são automaticamente importados e não podem ser renomeados. Um clique na coluna Selecionado (\"S\") irá selecionar o campo para importação. Um clique em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, na área de entrada abaixo da lista. Um duplo clique em qualquer lugar da linha também irá selecionar o campo para ser importado."
-
-#: src/importldif.c:841
+#: src/importldif.c:832
+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 ""
+"Escolha o campo LDIF que será renomeado ou selecionado para importação na "
+"lista acima. Os campos Reservados (que possuem uma marca na coluna \"R\"), "
+"são automaticamente importados e não podem ser renomeados. Um clique na "
+"coluna Selecionado (\"S\") irá selecionar o campo para importação. Um clique "
+"em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, "
+"na área de entrada abaixo da lista. Um duplo clique em qualquer lugar da "
+"linha também irá selecionar o campo para ser importado."
+
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "Selecionar para importação"
 
 msgid "Select for Import"
 msgstr "Selecionar para importação"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "Selecione o campo LDIF a ser importado para o livro de endereços."
 
 msgid "Select the LDIF field for import into the address book."
 msgstr "Selecione o campo LDIF a ser importado para o livro de endereços."
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " Modificar"
 
 msgid " Modify "
 msgstr " Modificar"
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr "Esse botão irá atualizar a lista acima com os dados fornecidos."
 
 msgid "This button will update the list above with the data supplied."
 msgstr "Esse botão irá atualizar a lista acima com os dados fornecidos."
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "Registros importados:"
 
 msgid "Records Imported :"
 msgstr "Registros importados:"
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "Incorporar o arquivo LDIF ao Livro de Endereços"
 
 msgid "Import LDIF file into Address Book"
 msgstr "Incorporar o arquivo LDIF ao Livro de Endereços"
 

+#: src/importldif.c:1002
+msgid "Proceed"
+msgstr "Prosseguir"
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Erro ao importar o arquivo do MUTT."
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "Erro ao importar o arquivo do MUTT."


@@ -5162,8 +5419,7 @@ msgstr "Selecione o arquivo do MUTT"
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 

-#: src/importmutt.c:291
-#: src/importpine.c:292
+#: src/importmutt.c:291 src/importpine.c:292

 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 
 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 


@@ -5179,9 +5435,7 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 

-#: src/inc.c:176
-#: src/inc.c:281
-#: src/inc.c:307
+#: src/inc.c:176 src/inc.c:281 src/inc.c:307

 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 


@@ -5193,8 +5447,7 @@ msgstr "Recebendo novas mensagens"
 msgid "Standby"
 msgstr "Aguardando"
 
 msgid "Standby"
 msgstr "Aguardando"
 

-#: src/inc.c:575
-#: src/inc.c:625
+#: src/inc.c:575 src/inc.c:625

 msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Cancelled"
 msgstr "Cancelado"
 


@@ -5221,14 +5474,11 @@ msgstr "Ocorreu uma falha na conexão"
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 

-#: src/inc.c:612
-#: src/prefs_summary_column.c:89
-#: src/summaryview.c:2454
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr "Travada"
 
 msgid "Locked"
 msgstr "Travada"
 

-#: src/inc.c:622
-#: src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Tempo esgotado"
 
 msgid "Timeout"
 msgstr "Tempo esgotado"
 


@@ -5263,8 +5513,7 @@ msgstr "Não foi possível conectar ao servidor POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 

-#: src/inc.c:890
-#: src/send_message.c:472
+#: src/inc.c:890 src/send_message.c:472

 msgid "Authenticating..."
 msgstr "Autenticando..."
 
 msgid "Authenticating..."
 msgstr "Autenticando..."
 


@@ -5289,8 +5538,7 @@ msgstr "Obtendo o número de novas mensagens (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 

-#: src/inc.c:917
-#: src/send_message.c:490
+#: src/inc.c:917 src/send_message.c:490

 msgid "Quitting"
 msgstr "Saindo"
 
 msgid "Quitting"
 msgstr "Saindo"
 


@@ -5345,9 +5593,7 @@ msgstr "Erro de socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 

-#: src/inc.c:1156
-#: src/send_message.c:400
-#: src/send_message.c:637
+#: src/inc.c:1156 src/send_message.c:400 src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 


@@ -5369,13 +5615,11 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
 "A caixa postal está travada:\n"
 "%s"
 

-#: src/inc.c:1174
-#: src/send_message.c:622
+#: src/inc.c:1174 src/send_message.c:622

 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 

-#: src/inc.c:1180
-#: src/send_message.c:625
+#: src/inc.c:1180 src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -5384,8 +5628,7 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 

-#: src/inc.c:1185
-#: src/send_message.c:641
+#: src/inc.c:1185 src/send_message.c:641

 msgid "Session timed out."
 msgstr "Tempo da sessão esgotado."
 
 msgid "Session timed out."
 msgstr "Tempo da sessão esgotado."
 


@@ -5398,21 +5641,21 @@ msgstr "Tempo esgotado na conexão com %s:%d."
 msgid "Incorporation cancelled\n"
 msgstr "A incorporação foi cancelada\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "A incorporação foi cancelada\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir por %d minutos?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir por %d minutos?"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 
 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "Apelido"
 
 msgid "Nick Name"
 msgstr "Apelido"
 


@@ -5429,77 +5672,136 @@ msgstr ""
 msgid "Exiting..."
 msgstr "Saindo..."
 
 msgid "Exiting..."
 msgstr "Saindo..."
 

-#: src/main.c:322
+#: src/main.c:329

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Foi encontrada uma configuração para %s.\n"
 "Deseja migrar essa configuração?"
 
 "Do you want to migrate this configuration?"
 msgstr ""
 "Foi encontrada uma configuração para %s.\n"
 "Deseja migrar essa configuração?"
 

-#: src/main.c:330
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"As suas regras de filtragem do Sylpheed podem ser\n"
+"convertidas por um script disponível em %s."
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "Manter a configuração antiga"
 
 msgid "Keep old configuration"
 msgstr "Manter a configuração antiga"
 

-#: src/main.c:333
-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."
-msgstr "Manter um backup permite que você retroceda a uma versão anterior, mas pode consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar um espaço extra no seu disco."
+#: src/main.c:347
+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."
+msgstr ""
+"Manter um backup permite que você retroceda a uma versão anterior, mas pode "
+"consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar "
+"um espaço extra no seu disco."

 
 

-#: src/main.c:342
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 
 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 

-#: src/main.c:353
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando a configuração... Isso pode demorar um pouco..."
 
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando a configuração... Isso pode demorar um pouco..."
 

-#: src/main.c:362
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "Falha na migração!"
 
 msgid "Migration failed!"
 msgstr "Falha na migração!"
 

-#: src/main.c:371
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "Migrando a configuração..."
 
 msgid "Migrating configuration..."
 msgstr "Migrando a configuração..."
 

-#: src/main.c:688
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 

-#: src/main.c:694
-msgid "Claws Mail has been compiled with a more recent GTK+ library than is currently available. This will cause crashes. You need to upgrade GTK+ or recompile Claws Mail."
-msgstr "O Claws Mail foi compilado com uma biblioteca GTK+ mais recente do que a disponível atualmente. Isso irá provocar erros. É necessário atualizar a GTK+ ou recompilar o Claws Mail."
+#: src/main.c:713
+msgid ""
+"Claws Mail has been compiled with a more recent GTK+ library than is "
+"currently available. This will cause crashes. You need to upgrade GTK+ or "
+"recompile Claws Mail."
+msgstr ""
+"O Claws Mail foi compilado com uma biblioteca GTK+ mais recente do que a "
+"disponível atualmente. Isso irá provocar erros. É necessário atualizar a GTK"
+"+ ou recompilar o Claws Mail."
+
+#: src/main.c:722
+msgid ""
+"Claws Mail has been compiled with an older GTK+ library than is currently "
+"available. This will cause crashes. You need to recompile Claws Mail."
+msgstr ""
+"O Claws Mail foi compilado com uma biblioteca GTK+ mais antiga do que a "
+"disponível atualmente. Isso irá provocar erros. É necessário recompilar o "
+"Claws Mail."

 
 

-#: src/main.c:703
-msgid "Claws Mail has been compiled with an older GTK+ library than is currently available. This will cause crashes. You need to recompile Claws Mail."
-msgstr "O Claws Mail foi compilado com uma biblioteca GTK+ mais antiga do que a disponível atualmente. Isso irá provocar erros. É necessário recompilar o Claws Mail."
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0 (ou mais antigo)"

 
 

-#: src/main.c:988
-msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."
-msgstr "Não foi possível carregar algum(ns) plugin(s). Verifique a configuração dos plugins para maiores informações."
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15 (ou mais antigo)"

 
 

-#: src/main.c:1007
-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."
-msgstr "O Claws Mail detectou uma caixa postal configurada, mas ela está incompleta. Isso pode decorrer de uma conta IMAP defeituosa. Use \"Reconstruir a árvore de pastas\" no menu de contexto da pasta raiz da pasta da caixa postal para tentar consertá-la."
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5 (ou mais antigo)"

 
 #: src/main.c:1013
 
 #: src/main.c:1013

-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."
-msgstr "O Claws Mail detectou uma caixa postal configurada, mas não conseguiu carregá-la. Ela provavelmente foi fornecida por um plugin externo desatualizado. Por favor, reinstale o plugin e tente novamente."
+msgid ""
+"Some plugin(s) failed to load. Check the Plugins configuration for more "
+"information."
+msgstr ""
+"Não foi possível carregar algum(ns) plugin(s). Verifique a configuração dos "
+"plugins para maiores informações."
+
+#: src/main.c:1032
+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."
+msgstr ""
+"O Claws Mail detectou uma caixa postal configurada, mas ela está incompleta. "
+"Isso pode decorrer de uma conta IMAP defeituosa. Use \"Reconstruir a árvore "
+"de pastas\" no menu de contexto da pasta raiz da pasta da caixa postal para "
+"tentar consertá-la."

 
 

-#: src/main.c:1274
+#: src/main.c:1038
+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."
+msgstr ""
+"O Claws Mail detectou uma caixa postal configurada, mas não conseguiu "
+"carregá-la. Ela provavelmente foi fornecida por um plugin externo "
+"desatualizado. Por favor, reinstale o plugin e tente novamente."
+
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 

-#: src/main.c:1276
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 

-#: src/main.c:1277
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      inscrever-se à URI fornecida, caso seja possível"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      inscrever-se à URI fornecida, caso seja possível"
 

-#: src/main.c:1278
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -5509,23 +5811,23 @@ msgstr ""
 "                         abre uma janela de composição com os arquivos\n"
 "                         especificados anexados"
 
 "                         abre uma janela de composição com os arquivos\n"
 "                         especificados anexados"
 

-#: src/main.c:1281
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 

-#: src/main.c:1282
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 

-#: src/main.c:1283
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 

-#: src/main.c:1284
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 

-#: src/main.c:1285
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -5533,7 +5835,7 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         mostra a situação de cada pasta"
 
 "  --status-full [pasta]...\n"
 "                         mostra a situação de cada pasta"
 

-#: src/main.c:1287
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"


@@ -5541,57 +5843,58 @@ msgstr ""
 "  --select pasta[/msg]  vai para a pasta/mensagem especificada\n"
 "                        pasta é uma id de pasta, como 'pasta/sub_pasta'"
 
 "  --select pasta[/msg]  vai para a pasta/mensagem especificada\n"
 "                        pasta é uma id de pasta, como 'pasta/sub_pasta'"
 

-#: src/main.c:1289
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 

-#: src/main.c:1290
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 

-#: src/main.c:1291
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sai do Claws Mail"
 
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sai do Claws Mail"
 

-#: src/main.c:1292
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de debug"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de debug"
 

-#: src/main.c:1293
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              exibe essa tela de ajuda e finaliza"
 
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              exibe essa tela de ajuda e finaliza"
 

-#: src/main.c:1294
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           exibe a versão do programa e finaliza"
 
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           exibe a versão do programa e finaliza"
 

-#: src/main.c:1295
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configuração"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configuração"
 

-#: src/main.c:1335
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr "Opção desconhecida\n"
 
 msgid "Unknown option\n"
 msgstr "Opção desconhecida\n"
 

-#: src/main.c:1353
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 

-#: src/main.c:1356
+#: src/main.c:1389

 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 
 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 

-#: src/main.c:1425
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 
 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 

-#: src/main.c:1426
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgid "Some unsent messages are queued. Exit now?"

-msgstr "Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar agora?"
+msgstr ""
+"Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
+"agora?"

 
 

-#: src/mainwindow.c:508
-#: src/messageview.c:162
+#: src/mainwindow.c:508 src/messageview.c:162

 msgid "/_File"
 msgstr "/_Arquivo"
 
 msgid "/_File"
 msgstr "/_Arquivo"
 


@@ -5603,12 +5906,8 @@ msgstr "/_Arquivo/Adicionar caixa _postal"
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arquivo/Adicionar caixa _postal/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arquivo/Adicionar caixa _postal/MH..."
 

-#: src/mainwindow.c:511
-#: src/mainwindow.c:513
-#: src/mainwindow.c:518
-#: src/mainwindow.c:520
-#: src/mainwindow.c:523
-#: src/mainwindow.c:526
+#: src/mainwindow.c:511 src/mainwindow.c:513 src/mainwindow.c:518
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:526

 #: src/messageview.c:165
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 #: src/messageview.c:165
 msgid "/_File/---"
 msgstr "/_Arquivo/---"


@@ -5633,13 +5932,11 @@ msgstr "/_Arquivo/Exportar o selecionado para um _arquivo mbox..."
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arquivo/Esvaziar todas as _Lixeiras"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arquivo/Esvaziar todas as _Lixeiras"
 

-#: src/mainwindow.c:521
-#: src/messageview.c:163
+#: src/mainwindow.c:521 src/messageview.c:163

 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/Salvar _como..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/Salvar _como..."
 

-#: src/mainwindow.c:522
-#: src/messageview.c:164
+#: src/mainwindow.c:522 src/messageview.c:164

 msgid "/_File/_Print..."
 msgstr "/_Arquivo/_Imprimir..."
 
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/_Imprimir..."
 


@@ -5663,8 +5960,7 @@ msgstr "/_Editar/Selecionar _agrupamento"
 msgid "/_Edit/_Delete thread"
 msgstr "/_Editar/_Excluir agrupamento"
 
 msgid "/_Edit/_Delete thread"
 msgstr "/_Editar/_Excluir agrupamento"
 

-#: src/mainwindow.c:536
-#: src/messageview.c:172
+#: src/mainwindow.c:536 src/messageview.c:172

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Localizar na mensagem atual..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Localizar na mensagem atual..."
 


@@ -5676,9 +5972,7 @@ msgstr "/_Editar/_Procurar na pasta..."
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Procura _rápida"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Procura _rápida"
 

-#: src/mainwindow.c:540
-#: src/messageview.c:175
-#: src/summaryview.c:477
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr "/E_xibir"
 
 msgid "/_View"
 msgstr "/E_xibir"
 


@@ -5730,12 +6024,8 @@ msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _pastas..."
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _mensagens"
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _mensagens"
 

-#: src/mainwindow.c:562
-#: src/mainwindow.c:569
-#: src/mainwindow.c:597
-#: src/mainwindow.c:627
-#: src/mainwindow.c:744
-#: src/mainwindow.c:752
+#: src/mainwindow.c:562 src/mainwindow.c:569 src/mainwindow.c:597
+#: src/mainwindow.c:627 src/mainwindow.c:744 src/mainwindow.c:752

 #: src/messageview.c:281
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 #: src/messageview.c:281
 msgid "/_View/---"
 msgstr "/E_xibir/---"


@@ -5820,8 +6110,7 @@ msgstr "/E_xibir/_Ordenar/pelo tra_vamento"
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/Não _ordenar"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/Não _ordenar"
 

-#: src/mainwindow.c:586
-#: src/mainwindow.c:589
+#: src/mainwindow.c:586 src/mainwindow.c:589

 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 


@@ -5865,12 +6154,8 @@ msgstr "/E_xibir/_Ir para/Mensagem _anterior"
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/_Ir para/_Próxima mensagem"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/_Ir para/_Próxima mensagem"
 

-#: src/mainwindow.c:601
-#: src/mainwindow.c:606
-#: src/mainwindow.c:609
-#: src/mainwindow.c:614
-#: src/mainwindow.c:619
-#: src/mainwindow.c:624
+#: src/mainwindow.c:601 src/mainwindow.c:606 src/mainwindow.c:609
+#: src/mainwindow.c:614 src/mainwindow.c:619 src/mainwindow.c:624

 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/_Ir para/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/_Ir para/---"
 


@@ -5922,221 +6207,176 @@ msgstr "/E_xibir/_Ir para/Próxima pa_sta não lida"
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/E_xibir/_Ir para/_Outra pasta..."
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/E_xibir/_Ir para/_Outra pasta..."
 

-#: src/mainwindow.c:630
-#: src/mainwindow.c:637
-#: src/messageview.c:178
+#: src/mainwindow.c:630 src/mainwindow.c:637 src/messageview.c:178

 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação dos caracteres/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação dos caracteres/---"
 

-#: src/mainwindow.c:634
-#: src/messageview.c:182
+#: src/mainwindow.c:634 src/messageview.c:182

 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação dos caracteres"
 
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação dos caracteres"
 

-#: src/mainwindow.c:635
-#: src/messageview.c:183
+#: src/mainwindow.c:635 src/messageview.c:183

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação dos caracteres/_Autodetectar"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação dos caracteres/_Autodetectar"
 

-#: src/mainwindow.c:638
-#: src/messageview.c:186
+#: src/mainwindow.c:638 src/messageview.c:186

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 

-#: src/mainwindow.c:640
-#: src/messageview.c:189
+#: src/mainwindow.c:640 src/messageview.c:189

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação dos caracteres/Unicode (UT_F-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação dos caracteres/Unicode (UT_F-8)"
 

-#: src/mainwindow.c:644
-#: src/messageview.c:192
+#: src/mainwindow.c:644 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 

-#: src/mainwindow.c:646
-#: src/messageview.c:194
+#: src/mainwindow.c:646 src/messageview.c:194

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 

-#: src/mainwindow.c:648
-#: src/messageview.c:196
+#: src/mainwindow.c:648 src/messageview.c:196

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (Windows-1252)"
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (Windows-1252)"
 

-#: src/mainwindow.c:652
-#: src/messageview.c:199
+#: src/mainwindow.c:652 src/messageview.c:199

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Central (ISO-8859-_2)"
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Central (ISO-8859-_2)"
 

-#: src/mainwindow.c:656
-#: src/messageview.c:202
+#: src/mainwindow.c:656 src/messageview.c:202

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-1_3)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-1_3)"
 

-#: src/mainwindow.c:658
-#: src/messageview.c:204
+#: src/mainwindow.c:658 src/messageview.c:204

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-_4)"
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-_4)"
 

-#: src/mainwindow.c:662
-#: src/messageview.c:207
+#: src/mainwindow.c:662 src/messageview.c:207

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Grego (ISO-8859-7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Grego (ISO-8859-7)"
 

-#: src/mainwindow.c:666
-#: src/messageview.c:210
+#: src/mainwindow.c:666 src/messageview.c:210

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação dos caracteres/He_bráico (ISO-8859-8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação dos caracteres/He_bráico (ISO-8859-8)"
 

-#: src/mainwindow.c:668
-#: src/messageview.c:212
+#: src/mainwindow.c:668 src/messageview.c:212

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Hebráico (Windows-1255)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Hebráico (Windows-1255)"
 

-#: src/mainwindow.c:672
-#: src/messageview.c:215
+#: src/mainwindow.c:672 src/messageview.c:215

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (ISO-8859-_6)"
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (ISO-8859-_6)"
 

-#: src/mainwindow.c:674
-#: src/messageview.c:217
+#: src/mainwindow.c:674 src/messageview.c:217

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (_Windows-1256)"
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (_Windows-1256)"
 

-#: src/mainwindow.c:678
-#: src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:220

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação dos caracteres/Turco (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação dos caracteres/Turco (ISO-8859-_9)"
 

-#: src/mainwindow.c:682
-#: src/messageview.c:223
+#: src/mainwindow.c:682 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Cirílico (ISO-8859-5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Cirílico (ISO-8859-5)"
 

-#: src/mainwindow.c:684
-#: src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_R)"
 

-#: src/mainwindow.c:686
-#: src/messageview.c:227
+#: src/mainwindow.c:686 src/messageview.c:227

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_U)"
 

-#: src/mainwindow.c:688
-#: src/messageview.c:229
+#: src/mainwindow.c:688 src/messageview.c:229

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (_Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (_Windows-1251)"
 

-#: src/mainwindow.c:692
-#: src/messageview.c:232
+#: src/mainwindow.c:692 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Japonês (ISO-2022-JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Japonês (ISO-2022-JP)"
 

-#: src/mainwindow.c:694
-#: src/messageview.c:234
+#: src/mainwindow.c:694 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (ISO-2022-J_P-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (ISO-2022-J_P-2)"
 

-#: src/mainwindow.c:696
-#: src/messageview.c:236
+#: src/mainwindow.c:696 src/messageview.c:236

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_EUC-JP)"
 

-#: src/mainwindow.c:698
-#: src/messageview.c:238
+#: src/mainwindow.c:698 src/messageview.c:238

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_Shift__JIS)"
 

-#: src/mainwindow.c:702
-#: src/messageview.c:241
+#: src/mainwindow.c:702 src/messageview.c:241

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB2312)"
 

-#: src/mainwindow.c:704
-#: src/messageview.c:243
+#: src/mainwindow.c:704 src/messageview.c:243

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB_K)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB_K)"
 

-#: src/mainwindow.c:706
-#: src/messageview.c:245
+#: src/mainwindow.c:706 src/messageview.c:245

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (_Big5)"
 

-#: src/mainwindow.c:708
-#: src/messageview.c:247
+#: src/mainwindow.c:708 src/messageview.c:247

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (EUC-_TW)"
 

-#: src/mainwindow.c:710
-#: src/messageview.c:249
+#: src/mainwindow.c:710 src/messageview.c:249

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês (ISO-2022-C_N)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês (ISO-2022-C_N)"
 

-#: src/mainwindow.c:714
-#: src/messageview.c:252
+#: src/mainwindow.c:714 src/messageview.c:252

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (EUC-_KR)"
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (EUC-_KR)"
 

-#: src/mainwindow.c:716
-#: src/messageview.c:254
+#: src/mainwindow.c:716 src/messageview.c:254

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (ISO-2_022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (ISO-2_022-KR)"
 

-#: src/mainwindow.c:720
-#: src/messageview.c:257
+#: src/mainwindow.c:720 src/messageview.c:257

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (TIS-_620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (TIS-_620)"
 

-#: src/mainwindow.c:722
-#: src/messageview.c:259
+#: src/mainwindow.c:722 src/messageview.c:259

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (Windows-_874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (Windows-_874)"
 

-#: src/mainwindow.c:729
-#: src/mainwindow.c:735
-#: src/messageview.c:266
+#: src/mainwindow.c:729 src/mainwindow.c:735 src/messageview.c:266

 #: src/messageview.c:272
 msgid "/_View/Decode/---"
 msgstr "/E_xibir/_Decodificação/---"
 
 #: src/messageview.c:272
 msgid "/_View/Decode/---"
 msgstr "/E_xibir/_Decodificação/---"
 

-#: src/mainwindow.c:732
-#: src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269

 msgid "/_View/Decode"
 msgstr "/E_xibir/_Decodificação"
 
 msgid "/_View/Decode"
 msgstr "/E_xibir/_Decodificação"
 

-#: src/mainwindow.c:733
-#: src/messageview.c:270
+#: src/mainwindow.c:733 src/messageview.c:270

 msgid "/_View/Decode/_Auto detect"
 msgstr "/E_xibir/_Decodificação/_Autodetectar"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/E_xibir/_Decodificação/_Autodetectar"
 

-#: src/mainwindow.c:736
-#: src/messageview.c:273
+#: src/mainwindow.c:736 src/messageview.c:273

 msgid "/_View/Decode/_8bit"
 msgstr "/E_xibir/_Decodificação/_8bit"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/E_xibir/_Decodificação/_8bit"
 

-#: src/mainwindow.c:737
-#: src/messageview.c:274
+#: src/mainwindow.c:737 src/messageview.c:274

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/E_xibir/_Decodificar/Imprimível com _citação"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/E_xibir/_Decodificar/Imprimível com _citação"
 

-#: src/mainwindow.c:738
-#: src/messageview.c:275
+#: src/mainwindow.c:738 src/messageview.c:275

 msgid "/_View/Decode/_Base64"
 msgstr "/E_xibir/_Decodificação/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/E_xibir/_Decodificação/_Base64"
 

-#: src/mainwindow.c:739
-#: src/messageview.c:276
+#: src/mainwindow.c:739 src/messageview.c:276

 msgid "/_View/Decode/_Uuencode"
 msgstr "/E_xibir/_Decodificação/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/E_xibir/_Decodificação/_Uuencode"
 

-#: src/mainwindow.c:745
-#: src/summaryview.c:478
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma nova _janela"
 
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma nova _janela"
 

-#: src/mainwindow.c:746
-#: src/messageview.c:282
+#: src/mainwindow.c:746 src/messageview.c:282

 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Código-_fonte da mensagem"
 
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Código-_fonte da mensagem"
 


@@ -6144,23 +6384,19 @@ msgstr "/E_xibir/Código-_fonte da mensagem"
 msgid "/_View/All headers"
 msgstr "/E_xibir/Todos os cabeçal_hos"
 
 msgid "/_View/All headers"
 msgstr "/E_xibir/Todos os cabeçal_hos"
 

-#: src/mainwindow.c:748
-#: src/messageview.c:284
+#: src/mainwindow.c:748 src/messageview.c:284

 msgid "/_View/Quotes"
 msgstr "/E_xibir/Ci_tações"
 
 msgid "/_View/Quotes"
 msgstr "/E_xibir/Ci_tações"
 

-#: src/mainwindow.c:749
-#: src/messageview.c:285
+#: src/mainwindow.c:749 src/messageview.c:285

 msgid "/_View/Quotes/_Fold all"
 msgstr "/E_xibir/Ci_tações/Esconder _todas"
 
 msgid "/_View/Quotes/_Fold all"
 msgstr "/E_xibir/Ci_tações/Esconder _todas"
 

-#: src/mainwindow.c:750
-#: src/messageview.c:286
+#: src/mainwindow.c:750 src/messageview.c:286

 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/E_xibir/Ci_tações/Esconder a partir do nível _2"
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/E_xibir/Ci_tações/Esconder a partir do nível _2"
 

-#: src/mainwindow.c:751
-#: src/messageview.c:287
+#: src/mainwindow.c:751 src/messageview.c:287

 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/E_xibir/Ci_tações/Esconder a partir do nível _3"
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/E_xibir/Ci_tações/Esconder a partir do nível _3"
 


@@ -6200,8 +6436,7 @@ msgstr "/_Mensagem/Escrever uma mensa_gem de e-mail"
 msgid "/_Message/Compose a news message"
 msgstr "/_Mensagem/Escrever um artigo de _newsgroup"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Mensagem/Escrever um artigo de _newsgroup"
 

-#: src/mainwindow.c:768
-#: src/messageview.c:293
+#: src/mainwindow.c:768 src/messageview.c:293

 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/Re_sponder"
 
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/Re_sponder"
 


@@ -6209,18 +6444,15 @@ msgstr "/_Mensagem/Re_sponder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 

-#: src/mainwindow.c:770
-#: src/messageview.c:294
+#: src/mainwindow.c:770 src/messageview.c:294

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensagem/Responder _para/_todos"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensagem/Responder _para/_todos"
 

-#: src/mainwindow.c:771
-#: src/messageview.c:296
+#: src/mainwindow.c:771 src/messageview.c:296

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 

-#: src/mainwindow.c:772
-#: src/messageview.c:298
+#: src/mainwindow.c:772 src/messageview.c:298

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensagem/Responder _para/_lista de discussão"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensagem/Responder _para/_lista de discussão"
 


@@ -6228,13 +6460,11 @@ msgstr "/_Mensagem/Responder _para/_lista de discussão"
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensagem/_Acompanhar o assunto e responder"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensagem/_Acompanhar o assunto e responder"
 

-#: src/mainwindow.c:776
-#: src/messageview.c:301
+#: src/mainwindow.c:776 src/messageview.c:301

 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encamin_har"
 
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encamin_har"
 

-#: src/mainwindow.c:777
-#: src/messageview.c:302
+#: src/mainwindow.c:777 src/messageview.c:302

 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encam_inhar como anexo"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encam_inhar como anexo"
 


@@ -6302,9 +6532,7 @@ msgstr "/_Mensagem/_Marcar/_Marcar"
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 

-#: src/mainwindow.c:798
-#: src/mainwindow.c:804
-#: src/mainwindow.c:807
+#: src/mainwindow.c:798 src/mainwindow.c:804 src/mainwindow.c:807

 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 


@@ -6356,8 +6584,7 @@ msgstr "/_Mensagem/Re-edi_tar"
 msgid "/_Tools/_Address book..."
 msgstr "/_Ferramentas/_Livro de endereços..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Ferramentas/_Livro de endereços..."
 

-#: src/mainwindow.c:816
-#: src/messageview.c:308
+#: src/mainwindow.c:816 src/messageview.c:308

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar o _remetente ao Livro de Endereços"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar o _remetente ao Livro de Endereços"
 


@@ -6381,28 +6608,23 @@ msgstr "/_Ferramentas/Filtrar _todas as mensagens da pasta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/Filtrar as mensagens _selecionadas"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/Filtrar as mensagens _selecionadas"
 

-#: src/mainwindow.c:828
-#: src/messageview.c:311
+#: src/mainwindow.c:828 src/messageview.c:311

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de _filtragem"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de _filtragem"
 

-#: src/mainwindow.c:829
-#: src/messageview.c:313
+#: src/mainwindow.c:829 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtragem/_Automaticamente"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtragem/_Automaticamente"
 

-#: src/mainwindow.c:831
-#: src/messageview.c:315
+#: src/mainwindow.c:831 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _remetente (De:)"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _remetente (De:)"
 

-#: src/mainwindow.c:833
-#: src/messageview.c:317
+#: src/mainwindow.c:833 src/messageview.c:317

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _destinatário (Para:)"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _destinatário (Para:)"
 

-#: src/mainwindow.c:835
-#: src/messageview.c:319
+#: src/mainwindow.c:835 src/messageview.c:319

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo a_ssunto"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo a_ssunto"
 


@@ -6426,8 +6648,7 @@ msgstr "/_Ferramentas/Criar regra de _processamento/Pelo _destinatário (Para:)"
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _processamento/Pelo as_sunto"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _processamento/Pelo as_sunto"
 

-#: src/mainwindow.c:847
-#: src/messageview.c:332
+#: src/mainwindow.c:847 src/messageview.c:332

 msgid "/_Tools/List _URLs..."
 msgstr "/_Ferramentas/Listar _URLs..."
 
 msgid "/_Tools/List _URLs..."
 msgstr "/_Ferramentas/Listar _URLs..."
 


@@ -6456,12 +6677,12 @@ msgid "/_Tools/SSL cer_tificates..."
 msgstr "/_Ferramentas/Cert_ificados SSL..."
 
 #: src/mainwindow.c:867
 msgstr "/_Ferramentas/Cert_ificados SSL..."
 
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/_Ferramentas/Janela de debug da _filtragem"
+msgid "/_Tools/Filtering Log"
+msgstr "/_Ferramentas/Relatório de _filtragem"

 
 #: src/mainwindow.c:868
 
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/_Ferramentas/_Janela de relatório"
+msgid "/_Tools/Network _Log"
+msgstr "/_Ferramentas/Relatório da _rede"

 
 #: src/mainwindow.c:870
 msgid "/_Configuration"
 
 #: src/mainwindow.c:870
 msgid "/_Configuration"


@@ -6547,33 +6768,25 @@ msgstr "Você está desconectado. Clique no ícone para conectar."
 msgid "Select account"
 msgstr "Selecione a conta"
 
 msgid "Select account"
 msgstr "Selecione a conta"
 

-#: src/mainwindow.c:1300
-#: src/prefs_logging.c:114
-msgid "Protocol log"
-msgstr "Relatório do protocolo"
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"
+msgstr "Relatório da rede"

 
 #: src/mainwindow.c:1304
 
 #: src/mainwindow.c:1304

-#: src/prefs_logging.c:152

 msgid "Filtering/processing debug log"
 msgstr "Relatório de debug da filtragem/processamento"
 
 msgid "Filtering/processing debug log"
 msgstr "Relatório de debug da filtragem/processamento"
 

-#: src/mainwindow.c:1323
-#: src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
-msgstr "debug da filtragem habilitado\n"
-
-#: src/mainwindow.c:1325
-#: src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
-msgstr "debug da filtragem desabilitado\n"
-
-#: src/mainwindow.c:1715
-#: src/mainwindow.c:1756
-#: src/mainwindow.c:1792
-#: src/mainwindow.c:1828
-#: src/mainwindow.c:1871
-#: src/plugins/trayicon/trayicon.c:147
-#: src/prefs_folder_item.c:765
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr "relatório de filtragem habilitado\n"
+
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr "relatório de filtragem desabilitado\n"
+
+#: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
+#: src/mainwindow.c:1828 src/mainwindow.c:1871
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "Sem título"
 
 msgid "Untitled"
 msgstr "Sem título"
 


@@ -6592,10 +6805,10 @@ msgstr "Adicionar caixa postal"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "scanned automatically."
 msgstr ""

-"Informe a localização de sua caixa postal (mailbox).\n"
+"Informe a localização da caixa postal.\n"

 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 


@@ -6604,175 +6817,122 @@ msgstr ""
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 

-#: src/mainwindow.c:2153
-#: src/setup.c:51
-#: src/wizard.c:691
+#: src/mainwindow.c:2153 src/setup.c:51 src/wizard.c:691

 msgid "Mailbox"
 msgstr "Caixa postal"
 
 msgid "Mailbox"
 msgstr "Caixa postal"
 

-#: src/mainwindow.c:2158
-#: src/setup.c:54
+#: src/mainwindow.c:2158 src/setup.c:54

 msgid ""
 "Creation of the mailbox failed.\n"
 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 ""
 "Não foi possível criar a caixa postal.\n"
 msgstr ""
 "Não foi possível criar a caixa postal.\n"

-"Talvez já existam arquivos, ou você não possui permissão para escrita nesta pasta."
+"Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
+"pasta."

 
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 

-#: src/mainwindow.c:3053
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 

-#: src/mainwindow.c:3085
-#: src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:543

 msgid "Exit"
 msgstr "Sair"
 
 msgid "Exit"
 msgstr "Sair"
 

-#: src/mainwindow.c:3085
-#: src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:543

 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi apagada %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram apagadas %d mensagens duplicadas em %d pastas.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi apagada %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram apagadas %d mensagens duplicadas em %d pastas.\n"
 

-#: src/mainwindow.c:3774
-#: src/summaryview.c:4907
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 

-#: src/mainwindow.c:3792
-#: src/summaryview.c:4918
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 

-#: src/matcher.c:750
-#: src/matcher.c:752
-msgid "subject"
-msgstr "assunto"
-
-#: src/matcher.c:754
-#: src/matcher.c:756
-msgid "From: header"
-msgstr "Cabeçalho De:"
-
-#: src/matcher.c:758
-#: src/matcher.c:760
-#: src/matcher.c:766
-msgid "To: header"
-msgstr "Cabeçalho Para:"
-
-#: src/matcher.c:762
-#: src/matcher.c:764
-#: src/matcher.c:767
-msgid "Cc: header"
-msgstr "Cabeçalho CC:"
-
-#: src/matcher.c:975
-#: src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "Cabeçalho Newsgroups:"
-
-#: src/matcher.c:979
-#: src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "Cabeçalho InReplyTo:"
-
-#: src/matcher.c:985
-#: src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr "Cabeçalho InReplyTo: (referências)"
-
-#: src/matcher.c:1071
-#: src/matcher.c:1073
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "cabeçalho %s"
+
+#: src/matcher.c:1157 src/matcher.c:1159

 msgid "header"
 msgstr "cabeçalho"
 
 msgid "header"
 msgstr "cabeçalho"
 

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 msgid "header line"
 msgstr "linha do cabeçalho"
 
 msgid "header line"
 msgstr "linha do cabeçalho"
 

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 msgid "headers line"
 msgstr "linha do cabeçalho"
 
 msgid "headers line"
 msgstr "linha do cabeçalho"
 

-#: src/matcher.c:1086
-#: src/matcher.c:1088
+#: src/matcher.c:1172 src/matcher.c:1174

 msgid "message line"
 msgstr "linha da mensagem"
 
 msgid "message line"
 msgstr "linha da mensagem"
 

-#: src/matcher.c:1099
-#: src/matcher.c:1232
-#: src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344
-#: src/prefs_matcher.c:1361
-#: src/prefs_matcher.c:2116
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "Todas"
 
 msgid "Filtering Matcher Menu|All"
 msgstr "Todas"
 

-#: src/matcher.c:1306
-#: src/matcher.c:1309
+#: src/matcher.c:1392 src/matcher.c:1395

 msgid "body line"
 msgstr "linha do corpo"
 
 msgid "body line"
 msgstr "linha do corpo"
 

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "verificando se as mensagens correspondem [ %s ]\n"
 
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "verificando se as mensagens correspondem [ %s ]\n"
 

-#: src/matcher.c:1542
-#: src/matcher.c:1561
-#: src/matcher.c:1574
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660

 msgid "message matches\n"
 msgstr "a mensagem corresponde\n"
 
 msgid "message matches\n"
 msgstr "a mensagem corresponde\n"
 

-#: src/matcher.c:1549
-#: src/matcher.c:1567
-#: src/matcher.c:1576
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662

 msgid "message does not match\n"
 msgstr "a mensagem não corresponde\n"
 
 msgid "message does not match\n"
 msgstr "a mensagem não corresponde\n"
 

-#: src/matcher.c:1829
-#: src/matcher.c:1830
-#: src/matcher.c:1831
-#: src/matcher.c:1832
-#: src/matcher.c:1833
-#: src/matcher.c:1834
-#: src/matcher.c:1835
-#: src/matcher.c:1836
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr "(nenhuma)"
 
 msgid "(none)"
 msgstr "(nenhuma)"
 


@@ -6798,10 +6958,8 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 

-#: src/mbox.c:531
-#: src/messageview.c:1180
-#: src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "Sobrescrever"
 
 msgid "Overwrite"
 msgstr "Sobrescrever"
 


@@ -6826,32 +6984,27 @@ msgstr "Localizar na mensagem atual"
 msgid "Find text:"
 msgstr "Localizar texto:"
 
 msgid "Find text:"
 msgstr "Localizar texto:"
 

-#: src/message_search.c:210
-#: src/prefs_matcher.c:655
-#: src/summary_search.c:396
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 

-#: src/message_search.c:323
-#: src/summary_search.c:644
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr "Ocorreu um erro na procura"
 
 msgid "Search failed"
 msgstr "Ocorreu um erro na procura"
 

-#: src/message_search.c:324
-#: src/summary_search.c:645
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr "A seqüência procurada não foi localizada."
 
 msgid "Search string not found."
 msgstr "A seqüência procurada não foi localizada."
 

-#: src/message_search.c:333
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 

-#: src/message_search.c:336
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 

-#: src/message_search.c:339
-#: src/summary_search.c:656
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr "Procura concluída"
 
 msgid "Search finished"
 msgstr "Procura concluída"
 


@@ -6891,8 +7044,7 @@ msgstr "/Ferramen_tas/Criar regra de processamento/Por _destinatário (Para:)"
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/Ferramen_tas/Criar regra de processamento/Por as_sunto"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/Ferramen_tas/Criar regra de processamento/Por as_sunto"
 

-#: src/messageview.c:455
-#: src/messageview.c:864
+#: src/messageview.c:455 src/messageview.c:864

 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Visualização das mensagens"
 
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Visualização das mensagens"
 


@@ -6915,8 +7067,7 @@ msgstr ""
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 

-#: src/messageview.c:590
-#: src/messageview.c:607
+#: src/messageview.c:590 src/messageview.c:607

 msgid "_Don't Send"
 msgstr "_Não enviar"
 
 msgid "_Don't Send"
 msgstr "_Não enviar"
 


@@ -6932,45 +7083,39 @@ msgstr ""
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 

-#: src/messageview.c:817
-#: src/procmime.c:883
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 

-#: src/messageview.c:1175
-#: src/mimeview.c:1606
-#: src/summaryview.c:4187
-#: src/summaryview.c:4190
-#: src/textview.c:2648
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr "Salvar como"
 
 msgid "Save as"
 msgstr "Salvar como"
 

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 

-#: src/messageview.c:1189
-#: src/summaryview.c:4207
-#: src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "Você solicitou uma confirmação de recebimento nessa mensagem."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Você solicitou uma confirmação de recebimento nessa mensagem."
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "O remetente solicitou uma confirmação de recebimento."
 
 msgid "This message asks for a return receipt."
 msgstr "O remetente solicitou uma confirmação de recebimento."
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "Enviar a confirmação de recebimento"
 
 msgid "Send receipt"
 msgstr "Enviar a confirmação de recebimento"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6978,7 +7123,7 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente,\n"
 "e foi apagada no servidor."
 
 "Essa mensagem foi recebida parcialmente,\n"
 "e foi apagada no servidor."
 

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6987,17 +7132,15 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 

-#: src/messageview.c:1308
-#: src/messageview.c:1330
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr "Marcar para receber"
 
 msgid "Mark for download"
 msgstr "Marcar para receber"
 

-#: src/messageview.c:1309
-#: src/messageview.c:1321
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 
 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -7006,13 +7149,12 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 

-#: src/messageview.c:1319
-#: src/messageview.c:1332
+#: src/messageview.c:1331 src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Desmarcar"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "Desmarcar"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -7021,32 +7163,33 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será apagada."
 
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será apagada."
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "Confirmação de recebimento"
 
 msgid "Return Receipt Notification"
 msgstr "Confirmação de recebimento"
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 msgid ""
 "The message was sent to several of your accounts.\n"

-"Please choose which account do you want to use for sending the receipt notification:"
+"Please choose which account do you want to use for sending the receipt "
+"notification:"

 msgstr ""
 "A mensagem foi enviada para várias de suas contas de email.\n"
 msgstr ""
 "A mensagem foi enviada para várias de suas contas de email.\n"

-"Por favor, selecione qual a conta que você deseja utilizar para enviar a confirmação:"
+"Por favor, selecione qual a conta que você deseja utilizar para enviar a "
+"confirmação:"

 
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "_Cancelar"
 
 msgid "_Cancel"
 msgstr "_Cancelar"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "_Enviar confirmação"
 
 msgid "_Send Notification"
 msgstr "_Enviar confirmação"
 

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 

-#: src/messageview.c:1545
-#: src/summaryview.c:4247
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -7055,8 +7198,7 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
 "Digite o comando de impressão:\n"
 "('%s' será substituído pelo nome do arquivo)"
 

-#: src/messageview.c:1551
-#: src/summaryview.c:4253
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -7065,10 +7207,8 @@ msgstr ""
 "O comando de impressão é inválido:\n"
 "'%s'"
 
 "O comando de impressão é inválido:\n"
 "'%s'"
 

-#: src/messageview.c:1829
-#: src/messageview.c:1835
-#: src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 


@@ -7106,94 +7246,89 @@ msgstr "Remover a caixa postal"
 msgid "_Remove"
 msgstr "_Remover"
 
 msgid "_Remove"
 msgstr "_Remover"
 

-#: src/mimeview.c:168
-msgid "/_Open"
-msgstr "/_Abrir"
-

 #: src/mimeview.c:169
 #: src/mimeview.c:169

-msgid "/Open _with..."
-msgstr "/Abrir _com..."
+msgid "/_Open (l)"
+msgstr "/_Abrir (l)"

 
 #: src/mimeview.c:170
 
 #: src/mimeview.c:170

-msgid "/_Display as text"
-msgstr "/_Exibir como texto"
+msgid "/Open _with (o)..."
+msgstr "/Abrir _com (o)..."

 
 #: src/mimeview.c:171
 
 #: src/mimeview.c:171

-#: src/summaryview.c:483
-msgid "/_Save as..."
-msgstr "/_Salvar como..."
+msgid "/_Display as text (t)"
+msgstr "/_Exibir como texto (t)"

 
 #: src/mimeview.c:172
 
 #: src/mimeview.c:172

+msgid "/_Save as (y)..."
+msgstr "/_Salvar como (y)..."
+
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/Salvar _todos..."
 
 msgid "/Save _all..."
 msgstr "/Salvar _todos..."
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr "/Próxima parte (a)"
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "Tipo MIME"
 
 msgid "MIME Type"
 msgstr "Tipo MIME"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "Verificar assinatura"
 
 msgid "Check signature"
 msgstr "Verificar assinatura"
 

-#: src/mimeview.c:764
-#: src/mimeview.c:769
-#: src/mimeview.c:774
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr "Exibir informações completas"
 
 msgid "View full information"
 msgstr "Exibir informações completas"
 

-#: src/mimeview.c:779
-#: src/mimeview.c:783
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr "Verificar novamente"
 
 msgid "Check again"
 msgstr "Verificar novamente"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Clique no ícone ou pressione 'C' para verificá-la."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Clique no ícone ou pressione 'C' para verificá-la."
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."

-msgstr "Tempo esgotado durate a checagem da assinatura. Clique no ícone ou pressione 'C' para tentar novamente."
+msgstr ""
+"Tempo esgotado durate a checagem da assinatura. Clique no ícone ou pressione "
+"'C' para tentar novamente."

 
 

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 
 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 

-#: src/mimeview.c:1388
-#: src/mimeview.c:1472
-#: src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 

-#: src/mimeview.c:1461
-#: src/textview.c:2658
+#: src/mimeview.c:1511 src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 

-#: src/mimeview.c:1734
-#: src/mimeview.c:1742
-#: src/textview.c:2589
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600

 msgid "Open with"
 msgstr "Abrir com"
 
 msgid "Open with"
 msgstr "Abrir com"
 

-#: src/mimeview.c:1735
-#: src/mimeview.c:1743
-#: src/textview.c:2590
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -7254,33 +7389,24 @@ msgstr "ocorreu um erro ao obter %s.\n"
 msgid "getting xover %d in %s...\n"
 msgstr "obtendo xover %d em %s...\n"
 
 msgid "getting xover %d in %s...\n"
 msgstr "obtendo xover %d em %s...\n"
 

-#: src/news.c:962
-#: src/news.c:1056
+#: src/news.c:962 src/news.c:1056

 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 
 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 

-#: src/news.c:972
-#: src/news.c:1068
+#: src/news.c:972 src/news.c:1068

 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 

-#: src/news.c:979
-#: src/news.c:1082
+#: src/news.c:979 src/news.c:1082

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 

-#: src/news.c:997
-#: src/news.c:1018
-#: src/news.c:1101
-#: src/news.c:1133
+#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133

 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 
 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 

-#: src/news.c:1007
-#: src/news.c:1028
-#: src/news.c:1114
-#: src/news.c:1146
+#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146

 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xhdr.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xhdr.\n"
 


@@ -7320,46 +7446,54 @@ msgid "Error occurred while downloading messages in '%s'."
 msgstr "Ocorreu um erro durante a recepção das mensagens em '%s' ."
 
 #: src/plugins/bogofilter/bogofilter.c:77
 msgstr "Ocorreu um erro durante a recepção das mensagens em '%s' ."
 
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 msgid "Bogofilter"
 msgstr "Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: obtendo conteúdo..."
 
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: obtendo conteúdo..."
 

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando as mensagens..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando as mensagens..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 msgid ""
 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 ""
 msgstr ""

-"O plugin Bogofilter não conseguiu filtrar uma mensagem. A causa provável desse erro é que ele ainda não aprendeu nenhuma mensagem.\n"
-"Use \"/Marcar/Marcar como spam\" e \"Marcar/Marcar como não-spam\" para treinar o Bogofilter com algumas centenas de mensagens de spam e legítimas."
+"O plugin Bogofilter não conseguiu filtrar uma mensagem. A causa provável "
+"desse erro é que ele ainda não aprendeu nenhuma mensagem.\n"
+"Use \"/Marcar/Marcar como spam\" e \"Marcar/Marcar como não-spam\" para "
+"treinar o Bogofilter com algumas centenas de mensagens de spam e legítimas."

 
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 #, c-format

-msgid "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` couldn't be run."
-msgstr "O plugin Bogofilter não conseguiu filtrar uma mensagem. Não foi possível executar o comando `%s %s %s`."
+msgid ""
+"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
+"couldn't be run."
+msgstr ""
+"O plugin Bogofilter não conseguiu filtrar uma mensagem. Não foi possível "
+"executar o comando `%s %s %s`."

 
 

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendendo com a mensagem..."
 
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendendo com a mensagem..."
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Erro no aprendizado; `%s` retornou o estado %d."
 
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Erro no aprendizado; `%s` retornou o estado %d."
 

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendendo com as mensagens..."
 
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendendo com as mensagens..."
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"


@@ -7368,120 +7502,148 @@ msgstr ""
 "Erro no aprendizado; `%s%s%s` retornou o erro:\n"
 "%s"
 
 "Erro no aprendizado; `%s%s%s` retornou o erro:\n"
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834
-#: src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61

 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:962

 msgid ""
 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"
 "\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"
 "\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 ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""

-"Esse plugin procura por spams em todas as mensagens recebidas de uma conta IMAP, LOCAL ou POP, usando o Bogofilter. É necessário ter o Bogofilter instalado localmente.\n"
+"Esse plugin procura por spams em todas as mensagens recebidas de uma conta "
+"IMAP, LOCAL ou POP, usando o Bogofilter. É necessário ter o Bogofilter "
+"instalado localmente.\n"

 "\n"
 "\n"

-"Antes que o Bogofilter possa reconhecer os spams, você deve treiná-lo, marcando algumas centenas de mensagens como spam ou legítimas, usando as opções \"/Marcar/Marcar como spam\" e \"/Marcar/Marcar como não-spam\". \n"
-"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva em uma determinada pasta.\n"
+"Antes que o Bogofilter possa reconhecer os spams, você deve treiná-lo, "
+"marcando algumas centenas de mensagens como spam ou legítimas, usando as "
+"opções \"/Marcar/Marcar como spam\" e \"/Marcar/Marcar como não-spam\". \n"
+"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva "
+"em uma determinada pasta.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Bogofilter."
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"Bogofilter."

 
 

-#: src/plugins/bogofilter/bogofilter.c:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:995
+#: src/plugins/spamassassin/spamassassin.c:592

 msgid "Spam detection"
 msgstr "Detecção de spam"
 
 msgid "Spam detection"
 msgstr "Detecção de spam"
 

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam learning"
 msgstr "Aprendizado de spam"
 
 msgid "Spam learning"
 msgstr "Aprendizado de spam"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "Processar as mensagens durante a recepção"
 
 msgid "Process messages on receiving"
 msgstr "Processar as mensagens durante a recepção"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "Tamanho máximo"
 
 msgid "Maximum size"
 msgstr "Tamanho máximo"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr "Mensagens maiores que isso não serão verificadas"
 
 msgid "Messages larger than this will not be checked"
 msgstr "Mensagens maiores que isso não serão verificadas"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "Kb"
 
 msgid "kB"
 msgstr "Kb"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "Salvar spam em"
 
 msgid "Save spam in"
 msgstr "Salvar spam em"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid "Folder for storing identified spam. Leave empty to use the trash folder."
 msgid "Folder for storing identified spam. Leave empty to use the trash folder."

-msgstr "Pasta a ser utilizada para armazenar os spams identificados. Deixe em branco para utilizar a Lixeira."
+msgstr ""
+"Pasta a ser utilizada para armazenar os spams identificados. Deixe em branco "
+"para utilizar a Lixeira."

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgstr "Clique nesse botão para selecionar uma pasta para armazenar os spams."
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Clique nesse botão para selecionar uma pasta para armazenar os spams."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgstr "Em caso de incerteza, mover para"
 
 msgid "When unsure, move to"
 msgstr "Em caso de incerteza, mover para"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
-msgid "Folder for storing mail for which spam status is Unsure. Leave empty to use the inbox folder."
-msgstr "Pasta a ser utilizada para armazenar mensagens cujo estado seja Incerto. Deixe em branco para usar a Caixa de Entrada."
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+msgid ""
+"Folder for storing mail for which spam status is Unsure. Leave empty to use "
+"the inbox folder."
+msgstr ""
+"Pasta a ser utilizada para armazenar mensagens cujo estado seja Incerto. "
+"Deixe em branco para usar a Caixa de Entrada."

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgid "Click this button to select a folder for storing Unsure mails."

-msgstr "Clique nesse botão para selecionar uma pasta para armazenar as mensagens Incertas."
+msgstr ""
+"Clique nesse botão para selecionar uma pasta para armazenar as mensagens "
+"Incertas."

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgstr "Inserir cabeçalho X-Bogosity"
 
 msgid "Insert X-Bogosity header"
 msgstr "Inserir cabeçalho X-Bogosity"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "Efetuado somente em mensagens nas pastas MH"
 
 msgid "Only done for messages in MH folders"
 msgstr "Efetuado somente em mensagens nas pastas MH"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgstr "Remetentes da lista branca presentes no Livro de Endereços/pasta"
 
 msgid "Whitelist senders found in address book/folder"
 msgstr "Remetentes da lista branca presentes no Livro de Endereços/pasta"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
-msgid "Messages coming from your address book contacts will be received in the normal folder even if detected as spam"
-msgstr "Mensagens oriundas de contatos do seu Livro de Endereços serão recebidas na pasta normal, mesmo se forem identificadas como spam"
+#: src/plugins/bogofilter/bogofilter_gtk.c:238
+msgid ""
+"Messages coming from your address book contacts will be received in the "
+"normal folder even if detected as spam"
+msgstr ""
+"Mensagens oriundas de contatos do seu Livro de Endereços serão recebidas na "
+"pasta normal, mesmo se forem identificadas como spam"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/prefs_filtering_action.c:498
-#: src/prefs_filtering_action.c:505
-#: src/prefs_matcher.c:584
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "Selecionar ..."
 
 msgid "Select ..."
 msgstr "Selecionar ..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgid "Click this button to select a book or folder in the address book"

-msgstr "Clique nesse botão para selecionar um livro ou uma pasta no Livro de Endereços"
+msgstr ""
+"Clique nesse botão para selecionar um livro ou uma pasta no Livro de "
+"Endereços"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr "Chamada do Bogofilter"
 
 msgid "Bogofilter call"
 msgstr "Chamada do Bogofilter"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "Caminho para o programa Bogofilter"
 
 msgid "Path to bogofilter executable"
 msgstr "Caminho para o programa Bogofilter"
 

+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "Marcar spam como lido"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -7497,17 +7659,22 @@ msgstr "Não foi possível registrar o gancho de filtragem da mensagem"
 
 #: src/plugins/clamav/clamav_plugin.c:303
 msgid ""
 
 #: src/plugins/clamav/clamav_plugin.c:303
 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"
 "\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"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""

-"Esse plugin utiliza o Clam AntiVirus para escanear todas as mensagens recebidas de uma conta IMAP, LOCAL ou POP.\n"
+"Esse plugin utiliza o Clam AntiVirus para escanear todas as mensagens "
+"recebidas de uma conta IMAP, LOCAL ou POP.\n"

 "\n"
 "\n"

-"Quando um anexo contendo um vírus é encontrado, ele pode ser apagado ou salvo em uma pasta própria.\n"
+"Quando um anexo contendo um vírus é encontrado, ele pode ser apagado ou "
+"salvo em uma pasta própria.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Clam AntiVirus"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Clam "
+"AntiVirus"

 
 #: src/plugins/clamav/clamav_plugin.c:330
 msgid "Virus detection"
 
 #: src/plugins/clamav/clamav_plugin.c:330
 msgid "Virus detection"


@@ -7543,14 +7710,17 @@ msgstr "Salvar mensagens que contenham vírus"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid "Folder for storing infected mail. Leave empty to use the default trash folder"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid "Folder for storing infected mail. Leave empty to use the default trash folder"

-msgstr "Pasta para armazenar as mensgens infectadas. Deixe em branco para utilizar a pasta padrão da Lixeira"
+msgstr ""
+"Pasta para armazenar as mensgens infectadas. Deixe em branco para utilizar a "
+"pasta padrão da Lixeira"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"

-msgstr "Clique nesse botão para selecionar uma pasta para armazenar as mensagens infectadas"
+msgstr ""
+"Clique nesse botão para selecionar uma pasta para armazenar as mensagens "
+"infectadas"

 
 

-#: src/plugins/demo/demo.c:31
-#: src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99

 msgid "Demo"
 msgstr "Demonstração"
 
 msgid "Demo"
 msgstr "Demonstração"
 


@@ -7560,11 +7730,14 @@ msgstr "Não foi possível registrar o gancho de relatório"
 
 #: src/plugins/demo/demo.c:75
 msgid ""
 
 #: src/plugins/demo/demo.c:75
 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 ""
 "\n"
 "It is not really useful."
 msgstr ""

-"Esse plugin é somente uma demonstração de como escrever plugins para o Claws Mail. Ele instala um gancho para uma saída nova de relatório e a escreve na stdout.\n"
+"Esse plugin é somente uma demonstração de como escrever plugins para o Claws "
+"Mail. Ele instala um gancho para uma saída nova de relatório e a escreve na "
+"stdout.\n"

 "\n"
 "Ele definitivamente não é muito útil."
 
 "\n"
 "Ele definitivamente não é muito útil."
 


@@ -7604,14 +7777,14 @@ msgid ""
 msgstr ""
 "Esse plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
 "\n"
 msgstr ""
 "Esse plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Navegador Dillo"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"Navegador Dillo"

 
 #: src/plugins/dillo_viewer/dillo_viewer.c:219
 msgid "text/html"
 msgstr "texto/html"
 
 
 #: src/plugins/dillo_viewer/dillo_viewer.c:219
 msgid "text/html"
 msgstr "texto/html"
 

-#: src/plugins/pgpcore/passphrase.c:97
-#: src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "Frase-senha"
 
 msgid "Passphrase"
 msgstr "Frase-senha"
 


@@ -7622,11 +7795,13 @@ msgstr "[sem id do usuário]"
 #: src/plugins/pgpcore/passphrase.c:274
 #, c-format
 msgid ""
 #: src/plugins/pgpcore/passphrase.c:274
 #, 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 ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a nova chave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a "
+"nova chave:</span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -7637,22 +7812,26 @@ msgstr "As senhas não conferem.\n"
 #: src/plugins/pgpcore/passphrase.c:280
 #, c-format
 msgid ""
 #: src/plugins/pgpcore/passphrase.c:280
 #, 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 ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">Por favor, digite novamente a senha para a nova chave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Por favor, digite novamente a senha "
+"para a nova chave:</span>\n"

 "\n"
 "%.*s\n"
 
 #: src/plugins/pgpcore/passphrase.c:284
 #, c-format
 msgid ""
 "\n"
 "%.*s\n"
 
 #: src/plugins/pgpcore/passphrase.c:284
 #, 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 ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</"
+"span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -7665,11 +7844,14 @@ msgid "Key import"
 msgstr "Importação de chaves"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgstr "Importação de chaves"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119

-msgid "This key is not in your keyring. Do you want Claws Mail to try and import it from a keyserver?"
-msgstr "Essa chave não está no seu chaveiro. Deseja que o Claws Mail verifique-a e importe-a de um servidor de chaves?"
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Essa chave não está no seu chaveiro. Deseja que o Claws Mail verifique-a e "
+"importe-a de um servidor de chaves?"

 
 

-#: src/plugins/pgpcore/pgp_viewer.c:126
-#: src/plugins/pgpcore/pgp_viewer.c:193
+#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193

 msgid ""
 "\n"
 "  Key ID "
 msgid ""
 "\n"
 "  Key ID "


@@ -7677,8 +7859,7 @@ msgstr ""
 "\n"
 "  ID da chave "
 
 "\n"
 "  ID da chave "
 

-#: src/plugins/pgpcore/pgp_viewer.c:129
-#: src/plugins/pgpcore/pgp_viewer.c:186
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186

 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 
 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 


@@ -7744,17 +7925,21 @@ msgstr "PGP/Core"
 
 #: src/plugins/pgpcore/plugin.c:64
 msgid ""
 
 #: src/plugins/pgpcore/plugin.c:64
 msgid ""

-"This plugin handles PGP core operations, it is used by other plugins, like PGP/Mime.\n"
+"This plugin handles PGP core operations, it is used by other plugins, like "
+"PGP/Mime.\n"

 "\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@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin gerencia as operações básicas do PGP e é usado por outros plugins, como o PGP/Mime.\n"
+"Esse plugin gerencia as operações básicas do PGP e é usado por outros "
+"plugins, como o PGP/Mime.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG e /Configurações/[Preferências da conta]/Plugins/GPG\n"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG "
+"e /Configurações/[Preferências da conta]/Plugins/GPG\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"


@@ -7764,75 +7949,76 @@ msgstr ""
 msgid "Core operations"
 msgstr "Operações do núcleo"
 
 msgid "Core operations"
 msgstr "Operações do núcleo"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "Verificar as assinaturas automaticamente"
 
 msgid "Automatically check signatures"
 msgstr "Verificar as assinaturas automaticamente"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar o gpg-agent para gerenciar senhas"
 
 msgid "Use gpg-agent to manage passwords"
 msgstr "Usar o gpg-agent para gerenciar senhas"
 

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "Armazenar a senha na memória"
 
 msgid "Store passphrase in memory"
 msgstr "Armazenar a senha na memória"
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "Expira após"
 
 msgid "Expire after"
 msgstr "Expira após"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Se for definida como '0', a senha será armazenada durante toda a sessão"
 

-#: src/plugins/pgpcore/prefs_gpg.c:142
-#: src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr "minuto(s)"
 
 msgid "minute(s)"
 msgstr "minuto(s)"
 

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada ao informar senha"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada ao informar senha"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Exibir advertência, ao iniciar, se o GnuPG não estiver funcionando"
 
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "Exibir advertência, ao iniciar, se o GnuPG não estiver funcionando"
 

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr "Chave de assinatura"
 
 msgid "Sign key"
 msgstr "Chave de assinatura"
 

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "Utilizar chave padrão do GnuPG"
 
 msgid "Use default GnuPG key"
 msgstr "Utilizar chave padrão do GnuPG"
 

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "Selecionar chave pelo seu endereço de email"
 
 msgid "Select key by your email address"
 msgstr "Selecionar chave pelo seu endereço de email"
 

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "Especificar a chave manualmente"
 
 msgid "Specify key manually"
 msgstr "Especificar a chave manualmente"
 

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "Usuário ou ID da chave:"
 
 msgid "User or key ID:"
 msgstr "Usuário ou ID da chave:"
 

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "Não foi encontrada nenhuma chave secreta"
 
 msgid "No secret key found."
 msgstr "Não foi encontrada nenhuma chave secreta"
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "Gerar um novo par de chaves"
 
 msgid "Generate a new key pair"
 msgstr "Gerar um novo par de chaves"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format
 msgid "No exact match for '%s'; please select the key."

-msgstr "Não foi encontrada nenhuma equivalência para '%s'; por favor, selecione a chave."
+msgstr ""
+"Não foi encontrada nenhuma equivalência para '%s'; por favor, selecione a "
+"chave."

 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format
 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format


@@ -7855,8 +8041,7 @@ msgstr "Val"
 msgid "Select"
 msgstr "Selecionar"
 
 msgid "Select"
 msgstr "Selecionar"
 

-#: src/plugins/pgpcore/select-keys.c:428
-#: src/prefs_logging.c:372
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Outro"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "Outro"


@@ -7890,11 +8075,8 @@ msgstr ""
 msgid "Trust key"
 msgstr "Chave confiável"
 
 msgid "Trust key"
 msgstr "Chave confiável"
 

-#: src/plugins/pgpcore/sgpgme.c:78
-#: src/privacy.c:211
-#: src/privacy.c:215
-#: src/privacy.c:232
-#: src/privacy.c:236
+#: src/plugins/pgpcore/sgpgme.c:78 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236

 msgid "No signature found"
 msgstr "Não foi encontrada nenhuma assinatura"
 
 msgid "No signature found"
 msgstr "Não foi encontrada nenhuma assinatura"
 


@@ -7902,8 +8084,7 @@ msgstr "Não foi encontrada nenhuma assinatura"
 msgid "Undefined"
 msgstr "Indefinido"
 
 msgid "Undefined"
 msgstr "Indefinido"
 

-#: src/plugins/pgpcore/sgpgme.c:142
-#: src/prefs_receive.c:181
+#: src/plugins/pgpcore/sgpgme.c:142 src/prefs_receive.c:181

 #: src/prefs_send.c:175
 msgid "Never"
 msgstr "Nunca"
 #: src/prefs_send.c:175
 msgid "Never"
 msgstr "Nunca"


@@ -7921,14 +8102,12 @@ msgstr "Máximo"
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:186
-#: src/plugins/pgpcore/sgpgme.c:190
+#: src/plugins/pgpcore/sgpgme.c:186 src/plugins/pgpcore/sgpgme.c:190

 #: src/plugins/pgpcore/sgpgme.c:237
 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 
 #: src/plugins/pgpcore/sgpgme.c:237
 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 

-#: src/plugins/pgpcore/sgpgme.c:196
-#: src/plugins/pgpcore/sgpgme.c:198
+#: src/plugins/pgpcore/sgpgme.c:196 src/plugins/pgpcore/sgpgme.c:198

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
 


@@ -8029,12 +8208,18 @@ msgstr "Ocorreu um erro ao configurar a chave secreta: %s"
 #: src/plugins/pgpcore/sgpgme.c:550
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 #: src/plugins/pgpcore/sgpgme.c:550
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."

-msgstr "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado corretamente."
+msgstr ""
+"O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado "
+"corretamente."

 
 #: src/plugins/pgpcore/sgpgme.c:556
 #, c-format
 
 #: src/plugins/pgpcore/sgpgme.c:556
 #, c-format

-msgid "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but version %s is required.\n"
-msgstr "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está instalado, mas é necessária a versão %s.\n"
+msgid ""
+"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
+"version %s is required.\n"
+msgstr ""
+"O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está "
+"instalado, mas é necessária a versão %s.\n"

 
 #: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 
 #: src/plugins/pgpcore/sgpgme.c:564
 #, c-format


@@ -8050,8 +8235,12 @@ msgstr ""
 "O suporte ao OpenPGP estará desativado."
 
 #: src/plugins/pgpcore/sgpgme.c:614
 "O suporte ao OpenPGP estará desativado."
 
 #: src/plugins/pgpcore/sgpgme.c:614

-msgid "You have to save the account's information with \"OK\" before being able to generate a key pair.\n"
-msgstr "Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as informações da conta, pressionando o \"Ok\".\n"
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as "
+"informações da conta, pressionando o \"Ok\".\n"

 
 #: src/plugins/pgpcore/sgpgme.c:619
 msgid "No PGP key found"
 
 #: src/plugins/pgpcore/sgpgme.c:619
 msgid "No PGP key found"


@@ -8059,21 +8248,26 @@ msgstr "Não foi encontrada nenhuma chave PGP"
 
 #: src/plugins/pgpcore/sgpgme.c:620
 msgid ""
 
 #: src/plugins/pgpcore/sgpgme.c:620
 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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"O Claws Mail não encontrou nenhuma chave PGP secreta, o que significa que você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"
+"O Claws Mail não encontrou nenhuma chave PGP secreta, o que significa que "
+"você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"

 "Deseja criar um novo par de chaves agora?"
 
 "Deseja criar um novo par de chaves agora?"
 

-#: src/plugins/pgpcore/sgpgme.c:690
-#: src/plugins/pgpcore/sgpgme.c:706
+#: src/plugins/pgpcore/sgpgme.c:690 src/plugins/pgpcore/sgpgme.c:706

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:697
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
 #: src/plugins/pgpcore/sgpgme.c:697

-msgid "Generating your new key pair... Please move the mouse around to help generate entropy..."
-msgstr "Gerando seu novo par de chaves... Por favor, movimente o mouse aleatoriamente para ajudar a gerar entropia..."
+msgid ""
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
+msgstr ""
+"Gerando seu novo par de chaves... Por favor, movimente o mouse "
+"aleatoriamente para ajudar a gerar entropia..."

 
 #: src/plugins/pgpcore/sgpgme.c:712
 msgid "Couldn't generate a new key pair: unknown error"
 
 #: src/plugins/pgpcore/sgpgme.c:712
 msgid "Couldn't generate a new key pair: unknown error"


@@ -8108,24 +8302,21 @@ msgstr "Não foi possível exportar as chaves."
 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 
 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 

-#: src/plugins/pgpinline/pgpinline.c:249
-#: src/plugins/pgpinline/pgpinline.c:405
+#: src/plugins/pgpinline/pgpinline.c:249 src/plugins/pgpinline/pgpinline.c:405

 msgid "Couldn't get text data."
 msgstr "Não foi possível obter os dados do texto."
 
 #: src/plugins/pgpinline/pgpinline.c:267
 msgid "Couldn't convert text data to any sane charset."
 msgid "Couldn't get text data."
 msgstr "Não foi possível obter os dados do texto."
 
 #: src/plugins/pgpinline/pgpinline.c:267
 msgid "Couldn't convert text data to any sane charset."

-msgstr "Não foi possível converter os dados de texto para nenhum caractere apropriado."
-
-#: src/plugins/pgpinline/pgpinline.c:275
-#: src/plugins/pgpinline/pgpinline.c:554
-#: src/plugins/pgpinline/pgpinline.c:676
-#: src/plugins/pgpinline/pgpinline.c:723
-#: src/plugins/pgpmime/pgpmime.c:72
-#: src/plugins/pgpmime/pgpmime.c:181
-#: src/plugins/pgpmime/pgpmime.c:320
-#: src/plugins/pgpmime/pgpmime.c:468
-#: src/plugins/pgpmime/pgpmime.c:594
+msgstr ""
+"Não foi possível converter os dados de texto para nenhum caractere "
+"apropriado."
+
+#: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Não foi possível inicializar o contexto GPG, %s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "Não foi possível inicializar o contexto GPG, %s"


@@ -8134,14 +8325,12 @@ msgstr "Não foi possível inicializar o contexto GPG, %s"
 msgid "Couldn't parse mime part."
 msgstr "Não foi possível traduzir a parte mime."
 
 msgid "Couldn't parse mime part."
 msgstr "Não foi possível traduzir a parte mime."
 

-#: src/plugins/pgpinline/pgpinline.c:428
-#: src/plugins/pgpmime/pgpmime.c:343
+#: src/plugins/pgpinline/pgpinline.c:428 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Não foi possível abrir o arquivo descriptografado %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Não foi possível abrir o arquivo descriptografado %s"
 

-#: src/plugins/pgpinline/pgpinline.c:451
-#: src/plugins/pgpinline/pgpinline.c:452
+#: src/plugins/pgpinline/pgpinline.c:451 src/plugins/pgpinline/pgpinline.c:452

 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"


@@ -8149,8 +8338,7 @@ msgstr ""
 "\n"
 "--- Início dos dados criptografados via PGP/Inline ---\n"
 
 "\n"
 "--- Início dos dados criptografados via PGP/Inline ---\n"
 

-#: src/plugins/pgpinline/pgpinline.c:459
-#: src/plugins/pgpinline/pgpinline.c:460
+#: src/plugins/pgpinline/pgpinline.c:459 src/plugins/pgpinline/pgpinline.c:460

 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fim dos dados criptografados via PGP/Inline ---\n"
 
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- Fim dos dados criptografados via PGP/Inline ---\n"
 


@@ -8166,47 +8354,48 @@ msgstr "Não foi possível examinar as partes do arquivo descriptografado."
 msgid "Couldn't create temporary file."
 msgstr "Não foi possível criar o arquivo temporário."
 
 msgid "Couldn't create temporary file."
 msgstr "Não foi possível criar o arquivo temporário."
 

-#: src/plugins/pgpinline/pgpinline.c:578
-#: src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpinline/pgpinline.c:578 src/plugins/pgpmime/pgpmime.c:495

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Erro na assinatura dos dados, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Erro na assinatura dos dados, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:596
-#: src/plugins/pgpmime/pgpmime.c:520
+#: src/plugins/pgpinline/pgpinline.c:596 src/plugins/pgpmime/pgpmime.c:520

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Erro na assinatura dos dados devido a um assinante ser inválido: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Erro na assinatura dos dados devido a um assinante ser inválido: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:605
-#: src/plugins/pgpmime/pgpmime.c:529
+#: src/plugins/pgpinline/pgpinline.c:605 src/plugins/pgpmime/pgpmime.c:529

 msgid "Data signing failed, no results."
 msgstr "Erro na assinatura dos dados, sem resultados."
 
 msgid "Data signing failed, no results."
 msgstr "Erro na assinatura dos dados, sem resultados."
 

-#: src/plugins/pgpinline/pgpinline.c:615
-#: src/plugins/pgpmime/pgpmime.c:540
+#: src/plugins/pgpinline/pgpinline.c:615 src/plugins/pgpmime/pgpmime.c:540

 msgid "Data signing failed, no contents."
 msgstr "Erro na assinatura dos dados, sem conteúdo."
 
 msgid "Data signing failed, no contents."
 msgstr "Erro na assinatura dos dados, sem conteúdo."
 

-#: src/plugins/pgpinline/pgpinline.c:685
-#: src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr ""
+"Por favor, perceba que os anexos e os cabeçalhos do e-mail (como o Assunto) "
+"não são criptografados pelo sistema PGP/Inline."
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:706
-#: src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:734
-#: src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 


@@ -8216,17 +8405,25 @@ msgstr "PGP/inline"
 
 #: src/plugins/pgpinline/plugin.c:58
 msgid ""
 
 #: src/plugins/pgpinline/plugin.c:58
 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"
 "\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@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin manipula o ultrapassado método inline de assinatura e/ou criptografia de mensagens. Você pode descriptografar mensagens, verificar assinaturas ou assinar e criptografar suas próprias mensagens.\n"
+"Esse plugin manipula o ultrapassado método inline de assinatura e/ou "
+"criptografia de mensagens. Você pode descriptografar mensagens, verificar "
+"assinaturas ou assinar e criptografar suas próprias mensagens.\n"

 "\n"
 "\n"

-"Ele pode ser selecionado como Sistema de Privacidade Padrão em /Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem em /Opções/Privacidade/Sistema\n"
+"Ele pode ser selecionado como Sistema de Privacidade Padrão em /"
+"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
+"em /Opções/Privacidade/Sistema\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"


@@ -8244,13 +8441,20 @@ msgstr "Não foi possível traduzir o arquivo descriptografado."
 msgid "Couldn't parse decrypted file parts."
 msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 

-#: src/plugins/pgpmime/pgpmime.c:414
-#: src/plugins/pgpmime/pgpmime.c:453
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr ""
+"Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
+"criptografados pelo sistema PGP/Mime."
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 


@@ -8260,132 +8464,159 @@ msgstr "PGP/MIME"
 
 #: src/plugins/pgpmime/plugin.c:58
 msgid ""
 
 #: src/plugins/pgpmime/plugin.c:58
 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"
 "\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@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin manipula mensagens assinadas e/ou criptografadas com PGP/MIME. Você pode descriptografar mensagens, verificar assinaturas ou assinar e criptografar suas próprias mensagens.\n"
+"Esse plugin manipula mensagens assinadas e/ou criptografadas com PGP/MIME. "
+"Você pode descriptografar mensagens, verificar assinaturas ou assinar e "
+"criptografar suas próprias mensagens.\n"

 "\n"
 "\n"

-"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem em /Opções/Privacidade/Sistema\n"
+"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
+"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
+"em /Opções/Privacidade/Sistema\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "O plugin SpamAssassin não conseguiu efetuar a filtragem.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "O plugin SpamAssassin não conseguiu efetuar a filtragem.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "O plugin SpamAssassin está desabilitado por suas preferências.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "O plugin SpamAssassin está desabilitado por suas preferências.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando as mensagens..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando as mensagens..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
-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."
-msgstr "O plugin SpamAssassin não conseguiu filtrar uma mensagem. A causa provável desse erro é um servidor spamd inalcançável. Por favor, certifique-se de que o spamd está em execução e acessível."
+#: src/plugins/spamassassin/spamassassin.c:314
+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."
+msgstr ""
+"O plugin SpamAssassin não conseguiu filtrar uma mensagem. A causa provável "
+"desse erro é um servidor spamd inalcançável. Por favor, certifique-se de que "
+"o spamd está em execução e acessível."

 
 

-#: src/plugins/spamassassin/spamassassin.c:370
-msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
-msgstr "O Claws Mail necessita de acesso à rede para enviar essa(s) mensagem(ns) ao servidor de aprendizado remoto."
+#: src/plugins/spamassassin/spamassassin.c:373
+msgid ""
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."
+msgstr ""
+"O Claws Mail necessita de acesso à rede para enviar essa(s) mensagem(ns) ao "
+"servidor de aprendizado remoto."

 
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "Não foi possível obter o nome de usuário"
 
 msgid "Failed to get username"
 msgstr "Não foi possível obter o nome de usuário"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"

-msgstr "O plugin SpamAssassin foi carregado, mas está desabilitado por suas preferências.\n"
+msgstr ""
+"O plugin SpamAssassin foi carregado, mas está desabilitado por suas "
+"preferências.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:561

 msgid ""
 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"
 "\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 ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""

-"Esse plugin procura por spams em todas as mensagens recebidas de uma conta IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um servidor SpamAssassin (spamd) funcionando em algum lugar.\n"
+"Esse plugin procura por spams em todas as mensagens recebidas de uma conta "
+"IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um "
+"servidor SpamAssassin (spamd) funcionando em algum lugar.\n"

 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"
 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"

-"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva em uma pasta especial.\n"
+"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva "
+"em uma pasta especial.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/SpamAssassin"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
+"SpamAssassin"

 
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "Localhost"
 
 msgid "Localhost"
 msgstr "Localhost"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr "TCP"
 
 msgid "TCP"
 msgstr "TCP"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr "Socket Unix"
 
 msgid "Unix Socket"
 msgstr "Socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar o plugin do SpamAssassin"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "Habilitar o plugin do SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "Transportar"
 
 msgid "Transport"
 msgstr "Transportar"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "Tipo de transporte"
 
 msgid "Type of transport"
 msgstr "Tipo de transporte"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "Usuário"
 
 msgid "User"
 msgstr "Usuário"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "Usuário a ser utilizado para o servidor spamd"
 
 msgid "User to use with spamd server"
 msgstr "Usuário a ser utilizado para o servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr "spamd"
 
 msgid "spamd"
 msgstr "spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "Nome do host ou endereço IP do servidor spamd"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "Nome do host ou endereço IP do servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "Porta do servidor spamd"
 
 msgid "Port of spamd server"
 msgstr "Porta do servidor spamd"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "Caminho do socket Unix"
 
 msgid "Path of Unix socket"
 msgstr "Caminho do socket Unix"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
-msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
+msgid ""
+"Maximum time allowed for checking. If the check takes longer it will be "
+"aborted."

 msgstr "Duração máxima da checagem. Se ela durar mais que isso, será cancelada."
 
 msgstr "Duração máxima da checagem. Se ela durar mais que isso, será cancelada."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355
-#: src/prefs_other.c:575
-#: src/prefs_summaries.c:493
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "segundos"
 
 msgid "seconds"
 msgstr "segundos"
 


@@ -8397,8 +8628,7 @@ msgstr "Orientação"
 msgid "The orientation of the tray."
 msgstr "A orientação do ícone."
 
 msgid "The orientation of the tray."
 msgstr "A orientação do ícone."
 

-#: src/plugins/trayicon/trayicon.c:61
-#: src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:566

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Trayicon"
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr "Trayicon"


@@ -8466,13 +8696,18 @@ msgstr "Não foi possível registrar o gancho de iconificação"
 
 #: src/plugins/trayicon/trayicon.c:484
 msgid ""
 
 #: src/plugins/trayicon/trayicon.c:484
 msgid ""

-"This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"
+"This plugin places a mailbox icon in the system tray that indicates if you "
+"have new or unread mail.\n"

 "\n"
 "\n"

-"The mailbox is empty if you have no unread mail, otherwise it contains a letter. A tooltip shows new, unread and total number of messages."
+"The mailbox is empty if you have no unread mail, otherwise it contains a "
+"letter. A tooltip shows new, unread and total number of messages."

 msgstr ""
 msgstr ""

-"Esse plugin mostra um ícone de caixa postal na barra de ícones do sistema, que indica se você tem mensagens novas ou não lidas.\n"
+"Esse plugin mostra um ícone de caixa postal na barra de ícones do sistema, "
+"que indica se você tem mensagens novas ou não lidas.\n"

 "\n"
 "\n"

-"A caixa fica vazia quando não existem mensagens não lidas, caso contrário ela contém uma carta. Ao passar o mouse sobre o ícone aparece uma indicação do número de mensagens lidas, não lidas e do total."
+"A caixa fica vazia quando não existem mensagens não lidas, caso contrário "
+"ela contém uma carta. Ao passar o mouse sobre o ícone aparece uma indicação "
+"do número de mensagens lidas, não lidas e do total."

 
 #: src/plugins/trayicon/trayicon_prefs.c:111
 msgid "Hide at start-up"
 
 #: src/plugins/trayicon/trayicon_prefs.c:111
 msgid "Hide at start-up"


@@ -8510,140 +8745,95 @@ msgstr "Marca de hora do APOP não encontrado na saudação\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 

-#: src/pop.c:183
-#: src/pop.c:210
+#: src/pop.c:164
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "Erro de sintaxe na marca de hora durante a saudação (não é ascii)\n"
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 

-#: src/pop.c:808
+#: src/pop.c:822

 #, c-format
 #, c-format

-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Apagando mensagem expirada %d\n"
+msgid "POP3: Deleting expired message %d [%s]\n"
+msgstr "POP3: Apagando a mensagem expirada %d [%s]\n"

 
 

-#: src/pop.c:824
+#: src/pop.c:838

 #, c-format
 #, c-format

-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Ignorando mensagem %d (%d bytes)\n"
+msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
+msgstr "POP3: Ignorando mensagem %d [%s] (%d bytes)\n"

 
 

-#: src/pop.c:856
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "a caixa postal está travada\n"
 
 msgid "mailbox is locked\n"
 msgstr "a caixa postal está travada\n"
 

-#: src/pop.c:859
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "Tempo da sessão esgotado\n"
 
 msgid "Session timeout\n"
 msgstr "Tempo da sessão esgotado\n"
 

-#: src/pop.c:878
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 

-#: src/pop.c:883
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "ocorreu um erro na sessão POP3\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "ocorreu um erro na sessão POP3\n"
 

-#: src/pop.c:1077
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 

-#: src/prefs_account.c:242
-#: src/prefs_account.c:1553
-#: src/prefs_account.c:2286
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:245
-#: src/prefs_account.c:1668
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:247
-#: src/wizard.c:1154
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 

-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "Conta%d"
-
-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "Preferências da nova conta"
-
-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - Preferências da conta"
-
-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "_Básico"
-
-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "_Receber"
-
-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "Co_mpor"
-
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "_Privacidade"
-
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "SS_L"
-
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "Avança_da"
-
-#: src/prefs_account.c:1190
+#: src/prefs_account.c:933

 msgid "Name of account"
 msgstr "Nome da conta"
 
 msgid "Name of account"
 msgstr "Nome da conta"
 

-#: src/prefs_account.c:1199
+#: src/prefs_account.c:942

 msgid "Set as default"
 msgstr "Definir como padrão"
 
 msgid "Set as default"
 msgstr "Definir como padrão"
 

-#: src/prefs_account.c:1207
+#: src/prefs_account.c:950

 msgid "Personal information"
 msgstr "Informações pessoais"
 
 msgid "Personal information"
 msgstr "Informações pessoais"
 

-#: src/prefs_account.c:1216
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr "Nome completo"
 
 msgid "Full name"
 msgstr "Nome completo"
 

-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 

-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "Organização"
-
-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "Informações do servidor"
 
 msgid "Server information"
 msgstr "Informações do servidor"
 

-#: src/prefs_account.c:1287
-#: src/wizard.c:1248
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -8651,408 +8841,437 @@ msgstr ""
 "<span weight=\"bold\">Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte ao IMAP.</span>"
 
 "<span weight=\"bold\">Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte ao IMAP.</span>"
 

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "Servidor de news"
 
 msgid "News server"
 msgstr "Servidor de news"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 

-#: src/prefs_account.c:1420
-#: src/prefs_account.c:1852
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr "ID do usuário"
 
 msgid "User ID"
 msgstr "ID do usuário"
 

-#: src/prefs_account.c:1426
-#: src/prefs_account.c:1872
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr "Senha"
 
 msgid "Password"
 msgstr "Senha"
 

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "Conta%d"
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

-#: src/prefs_account.c:1531
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "Caixa de Entrada padrão"
 
 msgid "Default inbox"
 msgstr "Caixa de Entrada padrão"
 

-#: src/prefs_account.c:1538
-#: src/prefs_account.c:1546
-#: src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 

-#: src/prefs_account.c:1543
-#: src/prefs_account.c:1632
-#: src/prefs_account.c:2036
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "E_xplorar"
 
 msgid "Bro_wse"
 msgstr "E_xplorar"
 

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "Remover após"
 
 msgid "Remove after"
 msgstr "Remover após"
 

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "0 dia: apaga imediatamente"
 
 msgid "0 days: remove immediately"
 msgstr "0 dia: apaga imediatamente"
 

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "dias"
 
 msgid "days"
 msgstr "dias"
 

-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "Receber todas as mensagens do servidor"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 

-#: src/prefs_account.c:1598
-msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
-msgstr "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, você poderá obtê-las por inteiro ou exclui-las."
+#: src/prefs_account.c:1382
+msgid ""
+"Messages over this limit will be partially retrieved. When selecting them "
+"you will be able to download them fully or delete them."
+msgstr ""
+"Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
+"você poderá obtê-las por inteiro ou exclui-las."

 
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "Kb"
 
 msgid "KB"
 msgstr "Kb"
 

-#: src/prefs_account.c:1642
-#: src/prefs_account.c:2312
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 

-#: src/prefs_account.c:1674
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "Método de autenticação"
 
 msgid "Authentication method"
 msgstr "Método de autenticação"
 

-#: src/prefs_account.c:1684
-#: src/prefs_account.c:1832
-#: src/prefs_send.c:278
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr "Automático"
 
 msgid "Automatic"
 msgstr "Automático"
 

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas subscritas"
 
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas subscritas"
 

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr "Modo de eficiência de banda"
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "Permite a filtragem com plug-ins, durante o recebimento"
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 

-#: src/prefs_account.c:1783
-#: src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "Cabeçalho"
 
 msgid "Header"
 msgstr "Cabeçalho"
 

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "Autenticação"
 
 msgid "Authentication"
 msgstr "Autenticação"
 

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1894
-msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
-msgstr "Deixe esses campos em branco, para utilizar os mesmos usuário e senha de recebimento."
+#: src/prefs_account.c:1711
+msgid ""
+"If you leave these entries empty, the same user ID and password as receiving "
+"will be used."
+msgstr ""
+"Deixe esses campos em branco, para utilizar os mesmos usuário e senha de "
+"recebimento."

 
 

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "minutos"
 
 msgid "minutes"
 msgstr "minutos"
 

-#: src/prefs_account.c:1982
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr "Assinatura"
 
 msgid "Signature"
 msgstr "Assinatura"
 

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "Inserir assinatura automaticamente"
 
 msgid "Insert signature automatically"
 msgstr "Inserir assinatura automaticamente"
 

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "Saída do comando"
 
 msgid "Command output"
 msgstr "Saída do comando"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 

-#: src/prefs_account.c:2057
-#: src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1885
-#: src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:2070
-#: src/prefs_template.c:189
-msgid "Bcc"
-msgstr "Cco"
-
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "Responder para"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 

-#: src/prefs_account.c:2107
-#: src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 

-#: src/prefs_account.c:2124
-#: src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+msgid "Use a specific format for new messages"
+msgstr "Usar um formato específico para novas mensagens"
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr "Usar um formato específico de citação nas respostas"
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr "Usar um formato específico de citação nos encaminhamentos"
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgid "Encrypt sent messages with your own key in addition to recipient's"

-msgstr "Criptografar as mensagens enviadas com sua própria chave além da dos destinatários"
+msgstr ""
+"Criptografar as mensagens enviadas com sua própria chave além da dos "
+"destinatários"

 
 

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 

-#: src/prefs_account.c:2290
-#: src/prefs_account.c:2303
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 
 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 

-#: src/prefs_account.c:2296
-#: src/prefs_account.c:2309
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "Porta SMTP"
 
 msgid "SMTP port"
 msgstr "Porta SMTP"
 

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "Porta POP3"
 
 msgid "POP3 port"
 msgstr "Porta POP3"
 

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "Porta NNTP"
 
 msgid "NNTP port"
 msgstr "Porta NNTP"
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "Nome do domínio"
 
 msgid "Domain name"
 msgstr "Nome do domínio"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "Explorar"
 
 msgid "Browse"
 msgstr "Explorar"
 

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 
 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 
 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
 msgid "The default inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 
 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 
 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "Receber"
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr "Compor"
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr "Modelos"
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "Privacidade"
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "Avançado"
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "Preferências da nova conta"
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - Preferências da conta"
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "Protocolo:"
 
 msgid "Protocol:"
 msgstr "Protocolo:"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"


@@ -9069,29 +9288,21 @@ msgstr "Nome do menu"
 msgid "Command line"
 msgstr "Linha de comando"
 
 msgid "Command line"
 msgstr "Linha de comando"
 

-#: src/prefs_actions.c:275
-#: src/prefs_filtering_action.c:544
-#: src/prefs_filtering.c:454
-#: src/prefs_matcher.c:679
-#: src/prefs_template.c:270
+#: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Substituir"
 
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "Substituir"
 

-#: src/prefs_actions.c:291
-#: src/prefs_filtering_action.c:515
-#: src/prefs_matcher.c:575
+#: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "Informação..."
 
 msgid "Info..."
 msgstr "Informação..."
 

-#: src/prefs_actions.c:458
-#: src/prefs_filtering_action.c:641
-#: src/prefs_filtering.c:761
-#: src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764
-#: src/prefs_filtering.c:839
-#: src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(Novo)"
 
 msgid "(New)"
 msgstr "(Novo)"
 


@@ -9138,32 +9349,21 @@ msgstr "Excluir ação"
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 

-#: src/prefs_actions.c:749
-#: src/prefs_actions.c:769
-#: src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274
-#: src/prefs_matcher.c:1838
-#: src/prefs_template.c:426
-#: src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 
 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 

-#: src/prefs_actions.c:750
-#: src/prefs_actions.c:770
-#: src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275
-#: src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar assim mesmo?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar assim mesmo?"
 

-#: src/prefs_actions.c:751
-#: src/prefs_actions.c:771
-#: src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276
-#: src/prefs_matcher.c:1840
-#: src/prefs_template.c:428
-#: src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 
 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 


@@ -9193,7 +9393,9 @@ msgstr "para enviar o texto fornecido pelo usuário para a entrada padrão do co
 
 #: src/prefs_actions.c:813
 msgid "to send user provided hidden text to command's standard input"
 
 #: src/prefs_actions.c:813
 msgid "to send user provided hidden text to command's standard input"

-msgstr "para enviar o texto escondido fornecido pelo usuário para a entrada padrão do comando"
+msgstr ""
+"para enviar o texto escondido fornecido pelo usuário para a entrada padrão "
+"do comando"

 
 #: src/prefs_actions.c:814
 msgid "<span weight=\"bold\">End with:</span>"
 
 #: src/prefs_actions.c:814
 msgid "<span weight=\"bold\">End with:</span>"


@@ -9243,14 +9445,17 @@ msgstr "para a seleção de texto"
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 

-#: src/prefs_actions.c:834
-#: src/prefs_themes.c:978
+#: src/prefs_actions.c:834 src/prefs_themes.c:978

 msgid "Actions"
 msgstr "Ações"
 
 #: src/prefs_actions.c:835
 msgid "Actions"
 msgstr "Ações"
 
 #: src/prefs_actions.c:835

-msgid "The Actions feature is a way for the user to launch external commands to process a complete message file or just one of its parts."
-msgstr "O recurso Ações é uma forma do usuário executar comandos externos para processar um arquivo completo de mensagens ou somente uma de suas partes."
+msgid ""
+"The Actions feature is a way for the user to launch external commands to "
+"process a complete message file or just one of its parts."
+msgstr ""
+"O recurso Ações é uma forma do usuário executar comandos externos para "
+"processar um arquivo completo de mensagens ou somente uma de suas partes."

 
 #: src/prefs_actions.c:921
 msgid "Current actions"
 
 #: src/prefs_actions.c:921
 msgid "Current actions"


@@ -9261,146 +9466,107 @@ msgid "Hello,\\n"
 msgstr "Olá,\\n"
 
 #: src/prefs_common.c:276
 msgstr "Olá,\\n"
 
 #: src/prefs_common.c:276

-msgid ""
-"On %d\\n"
-"%f wrote:\\n"
-"\\n"
-"%q"
-msgstr ""
-"Em %d\\n"
-"%f escreveu:\\n"
-"\\n"
-"%q"
+msgid "On %d\\n%f wrote:\\n\\n%q"
+msgstr "Em %d\\n%f escreveu:\\n\\n%q"

 
 #: src/prefs_common.c:282
 msgid ""
 
 #: src/prefs_common.c:282
 msgid ""

-"\\n"
-"\\n"
-"Begin 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 ""
 msgstr ""

-"\\n"
-"\\n"
-"Iníciando encaminhamento de mensagem:\\n"
-"\\n"
-"?d{Data: %d\\n"
-"}?f{De: %f\\n"
-"}?t{Para: %t\\n"
-"}?c{Cc: %c\\n"
-"}?n{Newsgroups: %n\\n"
-"}?s{Assunto: %s\\n"
-"}\\n"
-"\\n"
+"\\n\\nIníciando encaminhamento de mensagem:\\n\\n?d{Data: %d\\n}?f{De: %f"
+"\\n}?t{Para: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Assunto: %s\\n}\\n\\n"

 "%M"
 
 #: src/prefs_common.c:411
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 
 "%M"
 
 #: src/prefs_common.c:411
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "Seleção automática da conta"
 
 msgid "Automatic account selection"
 msgstr "Seleção automática da conta"
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "ao responder"
 
 msgid "when replying"
 msgstr "ao responder"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "ao encaminhar"
 
 msgid "when forwarding"
 msgstr "ao encaminhar"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "ao reeditar"
 
 msgid "when re-editing"
 msgstr "ao reeditar"
 

-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "Encaminhamento"
-
-#: src/prefs_compose_writing.c:141
-#: src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "Encaminhar como anexo"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "Manter o cabeçalho 'De' original ao redirecionar"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr "Edição"
 
 msgid "Editing"
 msgstr "Edição"
 

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "Iniciar automaticamente o editor externo"
 
 msgid "Automatically launch the external editor"
 msgstr "Iniciar automaticamente o editor externo"
 

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "Salvar o texto da mensagem automaticamente na pasta Rascunho a cada"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Salvar o texto da mensagem automaticamente na pasta Rascunho a cada"
 

-#: src/prefs_compose_writing.c:166
-#: src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caracteres"
 
 msgid "characters"
 msgstr "caracteres"
 

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "Níveis de desfazer"
 
 msgid "Undo level"
 msgstr "Níveis de desfazer"
 

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "Resposta"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "Responder com citação por padrão"
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr "O botão Responder deve enviar para a Lista de Discussão"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "O botão Responder deve enviar para a Lista de Discussão"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "Encaminhamento"
+
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "Encaminhar como anexo"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "Manter o cabeçalho 'De' original ao redirecionar"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr "Ao arrastar arquivos para a janela de Composição"
 
 msgid "When dropping files into the Compose window"
 msgstr "Ao arrastar arquivos para a janela de Composição"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "Perguntar"
 
 msgid "Ask"
 msgstr "Perguntar"
 

-#: src/prefs_compose_writing.c:199
-#: src/toolbar.c:475
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476

 msgid "Insert"
 msgstr "Inserir"
 
 msgid "Insert"
 msgstr "Inserir"
 

-#: src/prefs_compose_writing.c:200
-#: src/toolbar.c:477
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478

 msgid "Attach"
 msgstr "Anexo"
 
 msgid "Attach"
 msgstr "Anexo"
 

-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "Usar formatação ao compor novas mensagens"
-

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "Formato da nova mensagem"
+msgid "Quotation characters"
+msgstr "Caracteres de citação"

 
 

-#: src/prefs_compose_writing.c:267
-#: src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " Descrição dos símbolos... "
-
-#: src/prefs_compose_writing.c:387
-#: src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311
-#: src/prefs_spelling.c:441
-#: src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "Compor"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "Tratar esses caracteres como marcas de citação: "

 
 

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "Escrita"
 
 msgid "Writing"
 msgstr "Escrita"
 


@@ -9412,10 +9578,8 @@ msgstr "Configuração de cabeçalhos personalizados"
 msgid "From file..."
 msgstr "Do arquivo..."
 
 msgid "From file..."
 msgstr "Do arquivo..."
 

-#: src/prefs_customheader.c:505
-#: src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1327
-#: src/prefs_matcher.c:1337
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 


@@ -9457,7 +9621,9 @@ msgstr "A imagem não está no formato correto (XBM)."
 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."

-msgstr "Não foi possível executar o `compface`. Certifique-se que ele esteja no seu $PATH."
+msgstr ""
+"Não foi possível executar o `compface`. Certifique-se que ele esteja no seu "
+"$PATH."

 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."
 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."


@@ -9479,9 +9645,8 @@ msgstr "Cabeçalhos personalizados atuais"
 msgid "Displayed header configuration"
 msgstr "Configuração do cabeçalho exibido"
 
 msgid "Displayed header configuration"
 msgstr "Configuração do cabeçalho exibido"
 

-#: src/prefs_display_header.c:251
-#: src/prefs_filtering_action.c:435
-#: src/prefs_matcher.c:497
+#: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "Nome do cabeçalho"
 
 msgid "Header name"
 msgstr "Nome do cabeçalho"
 


@@ -9497,7 +9662,7 @@ msgstr "Cabeçalhos ocultos"
 msgid "Show all unspecified headers"
 msgstr "Mostrar todos os cabeçalhos não especificados"
 
 msgid "Show all unspecified headers"
 msgstr "Mostrar todos os cabeçalhos não especificados"
 

-#: src/prefs_display_header.c:575
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr "Esse cabeçalho já está na lista."
 
 msgid "This header is already in the list."
 msgstr "Esse cabeçalho já está na lista."
 


@@ -9519,15 +9684,18 @@ msgid "Command for 'Display as text'"
 msgstr "Comando para 'Mostrar como texto'"
 
 #: src/prefs_ext_prog.c:191
 msgstr "Comando para 'Mostrar como texto'"
 
 #: src/prefs_ext_prog.c:191

-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"
-msgstr "Essa opção habilita a exibição de partes MIME na visualização da mensagem através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"
+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"
+msgstr ""
+"Essa opção habilita a exibição de partes MIME na visualização da mensagem "
+"através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"

 
 #: src/prefs_ext_prog.c:202
 msgid "Print command"
 msgstr "Comando de impressão"
 
 
 #: src/prefs_ext_prog.c:202
 msgid "Print command"
 msgstr "Comando de impressão"
 

-#: src/prefs_ext_prog.c:258
-#: src/prefs_image_viewer.c:128
+#: src/prefs_ext_prog.c:258 src/prefs_image_viewer.c:128

 #: src/prefs_message.c:293
 msgid "Message View"
 msgstr "Visualização da mensagem"
 #: src/prefs_message.c:293
 msgid "Message View"
 msgstr "Visualização da mensagem"


@@ -9544,9 +9712,8 @@ msgstr "Mover"
 msgid "Copy"
 msgstr "Copiar"
 
 msgid "Copy"
 msgstr "Copiar"
 

-#: src/prefs_filtering_action.c:162
-#: src/prefs_summary_column.c:79
-#: src/summaryview.c:2448
+#: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "Marcar"
 
 msgid "Mark"
 msgstr "Marcar"
 


@@ -9574,9 +9741,7 @@ msgstr "Marcar como spam"
 msgid "Mark as ham"
 msgstr "Marcar como não spam"
 
 msgid "Mark as ham"
 msgstr "Marcar como não spam"
 

-#: src/prefs_filtering_action.c:170
-#: src/toolbar.c:426
-#: src/toolbar.c:524
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr "Encaminhar"
 
 msgid "Forward"
 msgstr "Encaminhar"
 


@@ -9584,15 +9749,12 @@ msgstr "Encaminhar"
 msgid "Redirect"
 msgstr "Redirecionar"
 
 msgid "Redirect"
 msgstr "Redirecionar"
 

-#: src/prefs_filtering_action.c:173
-#: src/prefs_filtering_action.c:468
-#: src/toolbar.c:184
-#: src/toolbar.c:1825
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr "Executar"
 
 msgid "Execute"
 msgstr "Executar"
 

-#: src/prefs_filtering_action.c:174
-#: src/prefs_filtering_action.c:473
+#: src/prefs_filtering_action.c:174 src/prefs_filtering_action.c:473

 msgid "Color"
 msgstr "Colorir"
 
 msgid "Color"
 msgstr "Colorir"
 


@@ -9608,8 +9770,7 @@ msgstr "Configurar a pontuação"
 msgid "Hide"
 msgstr "Esconder"
 
 msgid "Hide"
 msgstr "Esconder"
 

-#: src/prefs_filtering_action.c:178
-#: src/toolbar.c:187
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "Ignorar agrupamento"
 
 msgid "Ignore thread"
 msgstr "Ignorar agrupamento"
 


@@ -9621,8 +9782,7 @@ msgstr "Parar a filtragem"
 msgid "Filtering action configuration"
 msgstr "Configuração das ações de filtragem"
 
 msgid "Filtering action configuration"
 msgstr "Configuração das ações de filtragem"
 

-#: src/prefs_filtering_action.c:363
-#: src/prefs_filtering.c:412
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr "Ação"
 
 msgid "Action"
 msgstr "Ação"
 


@@ -9634,14 +9794,12 @@ msgstr "Destino"
 msgid "Recipient"
 msgstr "Destinatário"
 
 msgid "Recipient"
 msgstr "Destinatário"
 

-#: src/prefs_filtering_action.c:478
-#: src/prefs_summary_column.c:88
-#: src/summaryview.c:497
+#: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "Pontuação"
 
 msgid "Score"
 msgstr "Pontuação"
 

-#: src/prefs_filtering_action.c:483
-#: src/prefs_matcher.c:550
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577

 msgid "Book/folder"
 msgstr "Livro/pasta"
 
 msgid "Book/folder"
 msgstr "Livro/pasta"
 


@@ -9673,57 +9831,25 @@ msgstr "O Livro de Endereços/pasta de destino não foi definido."
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 

-#: src/prefs_filtering_action.c:1159
-#: src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "% literal"
 
 msgid "literal %"
 msgstr "% literal"
 

-#: src/prefs_filtering_action.c:1164
-#: src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85
-#: src/quote_fmt.c:41
-#: src/summaryview.c:494
-msgid "Date"
-msgstr "Data"
-
-#: src/prefs_filtering_action.c:1165
-#: src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr "ID da Mensagem"
-
-#: src/prefs_filtering_action.c:1166
-#: src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888
-#: src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: src/prefs_filtering_action.c:1167
-#: src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889
-#: src/quote_fmt.c:52
-msgid "References"
-msgstr "Referências"
-
-#: src/prefs_filtering_action.c:1168
-#: src/prefs_matcher.c:1890
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 
 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 

-#: src/prefs_filtering_action.c:1169
-#: src/prefs_matcher.c:1891
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "Nova linha"
 
 msgid "new line"
 msgstr "Nova linha"
 

-#: src/prefs_filtering_action.c:1170
-#: src/prefs_matcher.c:1892
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 
 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 

-#: src/prefs_filtering_action.c:1171
-#: src/prefs_matcher.c:1893
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "Caractere para aspas"
 
 msgid "quote character"
 msgstr "Caractere para aspas"
 


@@ -9733,11 +9859,13 @@ msgstr "Ação da filtragem: 'Executar'"
 
 #: src/prefs_filtering_action.c:1180
 msgid ""
 
 #: src/prefs_filtering_action.c:1180
 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"

 "\n"
 "The following symbols can be used:"
 msgstr ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"'Executar' permite que você envie uma mensagem ou um elemento da mensagem para um programa ou script externos.\n"
+"'Executar' permite que você envie uma mensagem ou um elemento da mensagem "
+"para um programa ou script externos.\n"

 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 


@@ -9745,57 +9873,52 @@ msgstr ""
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 

-#: src/prefs_filtering.c:187
-#: src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 

-#: src/prefs_filtering.c:249
-#: src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "Todas"
 
 msgid "Filtering Account Menu|All"
 msgstr "Todas"
 

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "Condição"
 
 msgid "Condition"
 msgstr "Condição"
 

-#: src/prefs_filtering.c:403
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr " Definir... "
 
 msgid " Define... "
 msgstr " Definir... "
 

-#: src/prefs_filtering.c:927
-#: src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 
 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 

-#: src/prefs_filtering.c:963
-#: src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 
 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "A especificação da condição está em branco."
 
 msgid "Condition string is empty."
 msgstr "A especificação da condição está em branco."
 

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "A especificação da ação está em branco."
 
 msgid "Action string is empty."
 msgstr "A especificação da ação está em branco."
 

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "Excluir regra"
 
 msgid "Delete rule"
 msgstr "Excluir regra"
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "Deseja realmente excluir essa regra?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Deseja realmente excluir essa regra?"
 

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "Habilitar"
 
 msgid "Enable"
 msgstr "Habilitar"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "Regra"
 
 msgid "Rule"
 msgstr "Regra"
 


@@ -9811,32 +9934,32 @@ msgstr ""
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 

-#: src/prefs_folder_column.c:251
-#: src/prefs_summary_column.c:265
+#: src/prefs_folder_column.c:251 src/prefs_summary_column.c:265

 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 
 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 

-#: src/prefs_folder_column.c:280
-#: src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536
-#: src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 
 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 

-#: src/prefs_folder_column.c:316
-#: src/prefs_msg_colors.c:497
-#: src/prefs_summary_column.c:330
-#: src/prefs_toolbar.c:803
+#: src/prefs_folder_column.c:316 src/prefs_msg_colors.c:497
+#: src/prefs_summary_column.c:330 src/prefs_toolbar.c:803

 msgid " Use default "
 msgstr " Utilizar o padrão "
 
 msgid " Use default "
 msgstr " Utilizar o padrão "
 

-#: src/prefs_folder_item.c:202
-#: src/prefs_folder_item.c:649
-msgid "<i>These preferences will not be saved as this folder is a top-level one. However you can use them to set them to the whole mailbox tree using \"Apply to subfolders\".</i>"
-msgstr "<i>Essas preferências não serão salvas, uma vez que essa é a pasta de nível mais alto. Entretanto você pode usá-las como definição para toda a árvore da caixa postal selecionando \"Aplicar às sub-pastas\".</i>"
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676
+msgid ""
+"<i>These preferences will not be saved as this folder is a top-level one. "
+"However you can use them to set them to the whole mailbox tree using \"Apply "
+"to subfolders\".</i>"
+msgstr ""
+"<i>Essas preferências não serão salvas, uma vez que essa é a pasta de nível "
+"mais alto. Entretanto você pode usá-las como definição para toda a árvore da "
+"caixa postal selecionando \"Aplicar às sub-pastas\".</i>"

 
 

-#: src/prefs_folder_item.c:214
-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -9844,72 +9967,71 @@ msgstr ""
 "Aplicar às\n"
 "sub-pastas"
 
 "Aplicar às\n"
 "sub-pastas"
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "Enviadas"
 
 msgid "Outbox"
 msgstr "Enviadas"
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgstr "Tipo de pasta"
 
 msgid "Folder type"
 msgstr "Tipo de pasta"
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "Expressão regular de simplificação do assunto"
 
 msgid "Simplify Subject RegExp"
 msgstr "Expressão regular de simplificação do assunto"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "Testar expressão regular"
 
 msgid "Test RegExp"
 msgstr "Testar expressão regular"
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgstr "Alterar modo (chmod) da pasta"
 
 msgid "Folder chmod"
 msgstr "Alterar modo (chmod) da pasta"
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgstr "Cor da Pasta"
 
 msgid "Folder color"
 msgstr "Cor da Pasta"
 

-#: src/prefs_folder_item.c:367
-#: src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgstr "Selecione a cor para a pasta"
 
 msgid "Pick color for folder"
 msgstr "Selecione a cor para a pasta"
 

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "Processar ao iniciar"
 
 msgid "Process at start-up"
 msgstr "Processar ao iniciar"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "Procurar por novas mensagens"
 
 msgid "Scan for new mail"
 msgstr "Procurar por novas mensagens"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso desconectado"
 
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso desconectado"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "Solicitar confirmação de recebimento"
 
 msgid "Request Return Receipt"
 msgstr "Solicitar confirmação de recebimento"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Salvar as cópias das mensagens enviadas nessa pasta ao invés da Enviadas"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Salvar as cópias das mensagens enviadas nessa pasta ao invés da Enviadas"
 

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "'Para:' padrão"
 
 msgid "Default To:"
 msgstr "'Para:' padrão"
 

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "'Para:' padrão para as respostas"
 
 msgid "Default To: for replies"
 msgstr "'Para:' padrão para as respostas"
 

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "Geral"
 
 msgid "General"
 msgstr "Geral"
 

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propriedades da pasta %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propriedades da pasta %s"


@@ -9930,9 +10052,7 @@ msgstr "Usar uma fonte diferente para imprimir"
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 

-#: src/prefs_fonts.c:197
-#: src/prefs_msg_colors.c:834
-#: src/prefs_summaries.c:669
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Exibir"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "Exibir"


@@ -9941,7 +10061,7 @@ msgstr "Exibir"
 msgid "Fonts"
 msgstr "Fontes"
 
 msgid "Fonts"
 msgstr "Fontes"
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "Preferências"
 
 msgid "Preferences"
 msgstr "Preferências"
 


@@ -9965,283 +10085,282 @@ msgstr "Exibir imagens na mensagem"
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 
 msgid "Image Viewer"
 msgstr "Visualizador de imagens"
 

-#: src/prefs_logging.c:117
-#: src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "Reduzir o tamanho do relatório"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "Restringir a janela de relatórios a"

 
 

-#: src/prefs_logging.c:122
-#: src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "Tamanho da janela de relatório"
-
-#: src/prefs_logging.c:139
-#: src/prefs_logging.c:258
+#: src/prefs_logging.c:133 src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0 para parar a atualização do relatório"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 para parar a atualização do relatório"
 

-#: src/prefs_logging.c:142
-#: src/prefs_logging.c:261
+#: src/prefs_logging.c:136 src/prefs_logging.c:254

 msgid "lines"
 msgstr "linhas"
 
 msgid "lines"
 msgstr "linhas"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
-msgstr "Habilitar debug das regras de filtragem/processamento"
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "Relatório de filtragem/processamento"
+
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr "Habilitar relatório das regras de filtragem/processamento"

 
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
-"Caution: enabling this option will slow down the filtering/processing, this might be critical when applying many rules upon thousands of messages."
+"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."

 msgstr ""
 msgstr ""

-"Se marcado, ativa o debug das regras de filtragem e processamento.\n"
-"O relatório pode ser acessado em  'Ferramentas/Janela de detalhamento da filtragem'.\n"
-"Atenção: habilitar essa opção tornará a filtragem/processamento mais lentos, isso pode se tornar crítico quando se aplicam muitas regras sobre milhares de mensagens."
+"Se marcado, ativa o relatório das regras de filtragem e processamento.\n"
+"O relatório pode ser acessado em 'Ferramentas/Relatório de filtragem'.\n"
+"Atenção: habilitar essa opção tornará a filtragem/processamento mais lentos, "
+"isso pode se tornar crítico ao se aplicar muitas regras sobre milhares de "
+"mensagens."

 
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
-msgstr "Debug das regras de filtragem/processamento durante.."
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."
+msgstr "Detalhar filtragem/processamento durante.."

 
 

-#: src/prefs_logging.c:172
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgstr "a filtragem na incorporação"
 
 msgid "filtering at incorporation"
 msgstr "a filtragem na incorporação"
 

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgstr "a filtragem manual"
 
 msgid "manually filtering"
 msgstr "a filtragem manual"
 

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgstr "o processamento das pastas"
 
 msgid "processing folders"
 msgstr "o processamento das pastas"
 

-#: src/prefs_logging.c:190
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgstr "o pré-processamento das pastas"
 
 msgid "pre-processing folders"
 msgstr "o pré-processamento das pastas"
 

-#: src/prefs_logging.c:196
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgstr "o pós-processamento das pastas"
 
 msgid "post-processing folders"
 msgstr "o pós-processamento das pastas"
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
-msgstr "Nível de debug"
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr "Nível de detalhamento"

 
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "Baixo"
 
 msgid "Low"
 msgstr "Baixo"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "Médio"
 
 msgid "Medium"
 msgstr "Médio"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "Elevado"
 
 msgid "High"
 msgstr "Elevado"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
-msgstr ""
-"Selecione o nível de detalhes exibidos quando o debug for habilitado.\n"
-"Selecione baixo para ver quando as regras são aplicadas, quais condições correspondem ou não e quais ações são efetuadas.\n"
-"Selecione médio para ver mais detalhes sobre a mensagem que está sendo processada e porque as regras foram ignoradas.\n"
-"Selecione alto para explicitar as razões de porque as regras foram ignoradas ou não e porque as condições correspondem ou não.\n"
+"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"
+"Caution: the higher the level, the greater the impact on performance."
+msgstr ""
+"Selecione o nível de detalhamento do relatório.\n"
+"Escolha Baixo para ver quando as regras são aplicadas, quais condições "
+"correspondem ou não e quais ações são efetuadas.\n"
+"Escolha Médio para ver mais detalhes sobre a mensagem que está sendo "
+"processada e porque as regras foram ignoradas.\n"
+"Escolha Alto para explicitar as razões de porque as regras foram ignoradas "
+"ou não e porque as condições correspondem ou não.\n"

 "Atenção: quanto mais alto o nível, maior o impacto na performance."
 
 "Atenção: quanto mais alto o nível, maior o impacto na performance."
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "Relatórios"
 
 msgid "Logging"
 msgstr "Relatórios"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "Todas as mensagens"
 
 msgid "All messages"
 msgstr "Todas as mensagens"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr "Para ou Cc"
-
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "Em resposta à"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "Mais antigas que"
 
 msgid "Age greater than"
 msgstr "Mais antigas que"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "Mais novas que"
 
 msgid "Age lower than"
 msgstr "Mais novas que"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "Trecho do cabeçalho"
 
 msgid "Headers part"
 msgstr "Trecho do cabeçalho"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "Trecho do texto"
 
 msgid "Body part"
 msgstr "Trecho do texto"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "Toda a mensagem"
 
 msgid "Whole message"
 msgstr "Toda a mensagem"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "Sinalizada como não lida"
 
 msgid "Unread flag"
 msgstr "Sinalizada como não lida"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "Sinalizada como nova"
 
 msgid "New flag"
 msgstr "Sinalizada como nova"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "Sinalizada como marcada"
 
 msgid "Marked flag"
 msgstr "Sinalizada como marcada"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "Sinalizada como apagada"
 
 msgid "Deleted flag"
 msgstr "Sinalizada como apagada"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "Sinalizada como respondida"
 
 msgid "Replied flag"
 msgstr "Sinalizada como respondida"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "Sinalizada como encaminhada"
 
 msgid "Forwarded flag"
 msgstr "Sinalizada como encaminhada"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "Sinalizada como travada"
 
 msgid "Locked flag"
 msgstr "Sinalizada como travada"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "Sinalizada como spam"
 
 msgid "Spam flag"
 msgstr "Sinalizada como spam"
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "Rótulo colorido"
 
 msgid "Color label"
 msgstr "Rótulo colorido"
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "Agrupamento ignorado"
 
 msgid "Ignored thread"
 msgstr "Agrupamento ignorado"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "Pontuação maior que"
 
 msgid "Score greater than"
 msgstr "Pontuação maior que"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "Pontuação menor que"
 
 msgid "Score lower than"
 msgstr "Pontuação menor que"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "Pontuação igual a"
 
 msgid "Score equal to"
 msgstr "Pontuação igual a"
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "Testar"
 
 msgid "Test"
 msgstr "Testar"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "Tamanho maior que"
 
 msgid "Size greater than"
 msgstr "Tamanho maior que"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "Tamanho menor que"
 
 msgid "Size smaller than"
 msgstr "Tamanho menor que"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "Tamanho exatamente"
 
 msgid "Size exactly"
 msgstr "Tamanho exatamente"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "Transferido parcialmente"
 
 msgid "Partially downloaded"
 msgstr "Transferido parcialmente"
 

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "Encontrado no Livro de Endereços"
 
 msgid "Found in addressbook"
 msgstr "Encontrado no Livro de Endereços"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "ou"
 
 msgid "or"
 msgstr "ou"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "e"
 
 msgid "and"
 msgstr "e"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "contém"
 
 msgid "contains"
 msgstr "contém"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "não contém"
 
 msgid "does not contain"
 msgstr "não contém"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "sim"
 
 msgid "yes"
 msgstr "sim"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "não"
 
 msgid "no"
 msgstr "não"
 

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "Configuração da condição"
 
 msgid "Condition configuration"
 msgstr "Configuração da condição"
 

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "Correspondência"
 
 msgid "Match type"
 msgstr "Correspondência"
 

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "Cabeçalho de endereço"
 
 msgid "Address header"
 msgstr "Cabeçalho de endereço"
 

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "Predicado"
 
 msgid "Predicate"
 msgstr "Predicado"
 

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "Usar expressão regular"
 
 msgid "Use regexp"
 msgstr "Usar expressão regular"
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "Operador booleano"
 
 msgid "Boolean Op"
 msgstr "Operador booleano"
 

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "Valor não definido."
 
 msgid "Value is not set."
 msgstr "Valor não definido."
 

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "todos os endereços em todos os cabeçalhos"
 
 msgid "all addresses in all headers"
 msgstr "todos os endereços em todos os cabeçalhos"
 

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "qualquer endereço em qualquer cabeçalho"
 
 msgid "any address in any header"
 msgstr "qualquer endereço em qualquer cabeçalho"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "o(s) endereço(s) no cabeçalho '%s'"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "o(s) endereço(s) no cabeçalho '%s'"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 "\n"

-"If you want to match %s against the whole address book, you have to select 'Any' from the book/folder drop-down list."
+"If you want to match %s against the whole address book, you have to select "
+"'Any' from the book/folder drop-down list."

 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"
 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"

-"Se você deseja procurar a correspondência de %s por todo o livro de endereços, deve selecionar 'Qualquer' da caixa de seleção do livro/pasta."
+"Se você deseja procurar a correspondência de %s por todo o livro de "
+"endereços, deve selecionar 'Qualquer' da caixa de seleção do livro/pasta."

 
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -10249,21 +10368,23 @@ msgstr ""
 "A entrada não foi salva.\n"
 "Fechar mesmo assim?"
 
 "A entrada não foi salva.\n"
 "Fechar mesmo assim?"
 

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "Correspondência: 'Testar'"
 
 msgid "Match Type: 'Test'"
 msgstr "Correspondência: 'Testar'"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 msgid ""
 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 ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"'Testar' permite que você teste uma mensagem ou um elemento da mensagem para um programa ou script externos. O programa irá retornar 0 ou 1.\n"
+"'Testar' permite que você teste uma mensagem ou um elemento da mensagem para "
+"um programa ou script externos. O programa irá retornar 0 ou 1.\n"

 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr "Regras de condição atuais"
 
 msgid "Current condition rules"
 msgstr "Regras de condição atuais"
 


@@ -10303,8 +10424,7 @@ msgstr "Renderizar mensagens somente em HTML com o plugin, se possível"
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 

-#: src/prefs_message.c:174
-#: src/prefs_message.c:207
+#: src/prefs_message.c:174 src/prefs_message.c:207

 msgid "pixel(s)"
 msgstr "pixel(s)"
 
 msgid "pixel(s)"
 msgstr "pixel(s)"
 


@@ -10356,8 +10476,7 @@ msgstr "Se existirem mais de 3 níveis de citações, as cores serão reutilizad
 msgid "1st Level"
 msgstr "1º nível"
 
 msgid "1st Level"
 msgstr "1º nível"
 

-#: src/prefs_msg_colors.c:188
-#: src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:214

 #: src/prefs_msg_colors.c:240
 msgid "Text"
 msgstr "Texto"
 #: src/prefs_msg_colors.c:240
 msgid "Text"
 msgstr "Texto"


@@ -10390,8 +10509,7 @@ msgstr "Habilitar coloração do fundo do texto"
 msgid "Tooltip|Pick color for 1st level text background"
 msgstr "Selecione a cor para o fundo do texto do 1º nível"
 
 msgid "Tooltip|Pick color for 1st level text background"
 msgstr "Selecione a cor para o fundo do texto do 1º nível"
 

-#: src/prefs_msg_colors.c:279
-#: src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:279 src/prefs_msg_colors.c:300

 #: src/prefs_msg_colors.c:321
 msgid "Background"
 msgstr "Fundo"
 #: src/prefs_msg_colors.c:321
 msgid "Background"
 msgstr "Fundo"


@@ -10420,14 +10538,18 @@ msgstr "Selecione a cor para as assinaturas"
 msgid "Signatures"
 msgstr "Assinaturas"
 
 msgid "Signatures"
 msgstr "Assinaturas"
 

-#: src/prefs_msg_colors.c:365
-#: src/prefs_summaries.c:346
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgstr "Lista de pastas"
 
 #: src/prefs_msg_colors.c:378
 msgid "Folder list"
 msgstr "Lista de pastas"
 
 #: src/prefs_msg_colors.c:378

-msgid "Pick color for Target folder. Target folder is used when the option 'Execute immediately when moving or deleting messages' is turned off"
-msgstr "Selecione a cor para a pasta de destino. A pasta de destino é utilizada quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está desativada"
+msgid ""
+"Pick color for Target folder. Target folder is used when the option 'Execute "
+"immediately when moving or deleting messages' is turned off"
+msgstr ""
+"Selecione a cor para a pasta de destino. A pasta de destino é utilizada "
+"quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está "
+"desativada"

 
 #: src/prefs_msg_colors.c:382
 msgid "Target folder"
 
 #: src/prefs_msg_colors.c:382
 msgid "Target folder"


@@ -10447,16 +10569,14 @@ msgstr "Rótulos coloridos"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:428
-#: src/prefs_msg_colors.c:460
+#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:460

 #, c-format
 msgid "Tooltip|Pick color for 'color %d'"
 msgstr "Selecione a cor para a 'cor %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #, c-format
 msgid "Tooltip|Pick color for 'color %d'"
 msgstr "Selecione a cor para a 'cor %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:432
-#: src/prefs_msg_colors.c:464
+#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:464

 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para a 'cor %d'"
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para a 'cor %d'"


@@ -10520,8 +10640,7 @@ msgstr "Definir associações das teclas"
 msgid "Select preset:"
 msgstr "Selecionar pré-configuração:"
 
 msgid "Select preset:"
 msgstr "Selecionar pré-configuração:"
 

-#: src/prefs_other.c:115
-#: src/prefs_other.c:462
+#: src/prefs_other.c:115 src/prefs_other.c:462

 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 


@@ -10563,10 +10682,13 @@ msgstr "Habilitar a personalização de atalhos no menu"
 
 #: src/prefs_other.c:542
 msgid ""
 
 #: src/prefs_other.c:542
 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 menu shortcuts."
 msgstr ""
 "Uncheck this option if you want to lock all existing menu shortcuts."
 msgstr ""

-"Se marcado, permite que você altere os atalhos de teclado da maioria dos itens do menu, parando o ponteiro do mouse sobre o item e pressionando a combinação de teclas desejada.\n"
+"Se marcado, permite que você altere os atalhos de teclado da maioria dos "
+"itens do menu, parando o ponteiro do mouse sobre o item e pressionando a "
+"combinação de teclas desejada.\n"

 "Desmarque essa opção caso você deseje travar todos os atalhos do menu."
 
 #: src/prefs_other.c:549
 "Desmarque essa opção caso você deseje travar todos os atalhos do menu."
 
 #: src/prefs_other.c:549


@@ -10583,44 +10705,21 @@ msgstr "Pergunte antes de esvaziar a lixeira"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"

-msgstr "Pergunte sobre regras de filtragem específicas da conta ao fazer a filtragem manual"
+msgstr ""
+"Pergunte sobre regras de filtragem específicas da conta ao fazer a filtragem "
+"manual"

 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronize as pastas off-line assim que possível"
 
 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronize as pastas off-line assim que possível"
 

-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "Responder com citação por padrão"
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "Formato da nova mensagem"

 
 

-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "Formato da resposta"
-
-#: src/prefs_quote.c:109
-#: src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "Marca de citação"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "Formato do encaminhamento"
-
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "Caracteres de citação"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "Tratar esses caracteres como marcas de citação: "
-
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "Citação"
-
-#: src/prefs_receive.c:121
-msgid "External incorporation program"
-msgstr "Programa de incorporação externo"
+#: src/prefs_receive.c:121
+msgid "External incorporation program"
+msgstr "Programa de incorporação externo"

 
 #: src/prefs_receive.c:124
 msgid "Use external program for receiving mail"
 
 #: src/prefs_receive.c:124
 msgid "Use external program for receiving mail"


@@ -10650,9 +10749,7 @@ msgstr "Janela de mensagens"
 msgid "Show receive dialog"
 msgstr "Exibir janela de mensagens do recebimento"
 
 msgid "Show receive dialog"
 msgstr "Exibir janela de mensagens do recebimento"
 

-#: src/prefs_receive.c:178
-#: src/prefs_send.c:174
-#: src/prefs_summaries.c:448
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr "Sempre"
 
 msgid "Always"
 msgstr "Sempre"
 


@@ -10701,8 +10798,7 @@ msgstr ""
 "Comando a ser executado:\n"
 "(utilize %d para o número de novas mensagens)"
 
 "Comando a ser executado:\n"
 "(utilize %d para o número de novas mensagens)"
 

-#: src/prefs_receive.c:345
-#: src/prefs_send.c:347
+#: src/prefs_receive.c:345 src/prefs_send.c:347

 msgid "Mail Handling"
 msgstr "Manipulação das mensagens"
 
 msgid "Mail Handling"
 msgstr "Manipulação das mensagens"
 


@@ -10731,8 +10827,12 @@ msgid "Outgoing encoding"
 msgstr "Codificação de saída"
 
 #: src/prefs_send.c:192
 msgstr "Codificação de saída"
 
 #: src/prefs_send.c:192

-msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
-msgstr "Se for selecionado 'Automático', será utilizada a melhor codificação para o locale atual"
+msgid ""
+"If 'Automatic' is selected, the optimal encoding for the current locale will "
+"be used"
+msgstr ""
+"Se for selecionado 'Automático', será utilizada a melhor codificação para o "
+"locale atual"

 
 #: src/prefs_send.c:206
 msgid "Automatic (Recommended)"
 
 #: src/prefs_send.c:206
 msgid "Automatic (Recommended)"


@@ -10855,12 +10955,15 @@ msgid "Transfer encoding"
 msgstr "Codificação da transferência"
 
 #: src/prefs_send.c:269
 msgstr "Codificação da transferência"
 
 #: src/prefs_send.c:269

-msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
-msgstr "Especifique a codificação de transferência de conteúdo (Content-Transfer-Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-ASCII"
+msgid ""
+"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
+"characters"
+msgstr ""
+"Especifique a codificação de transferência de conteúdo (Content-Transfer-"
+"Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
+"ASCII"

 
 

-#: src/prefs_send.c:348
-#: src/send_message.c:477
-#: src/send_message.c:481
+#: src/prefs_send.c:348 src/send_message.c:477 src/send_message.c:481

 #: src/send_message.c:486
 msgid "Sending"
 msgstr "Envio"
 #: src/send_message.c:486
 msgid "Sending"
 msgstr "Envio"


@@ -10921,218 +11024,204 @@ msgstr "Selecione uma cor para as palavra erradas. Escolha preto para sublinhar"
 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 
 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 
 msgid "the full abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 
 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "o nome completo do mês"
 
 msgid "the full month name"
 msgstr "o nome completo do mês"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 
 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr "os minutos"
 
 msgid "the minute as a decimal number"
 msgstr "os minutos"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 
 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr "os segundos"
 
 msgid "the second as a decimal number"
 msgstr "os segundos"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 
 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr "o ano"
 
 msgid "the year as a decimal number"
 msgstr "o ano"
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 
 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 

-#: src/prefs_summaries.c:181
-#: src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "Formato da data"
 
 msgid "Date format"
 msgstr "Formato da data"
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "Código"
 
 msgid "Specifier"
 msgstr "Código"
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "Exemplo"
 
 msgid "Example"
 msgstr "Exemplo"
 

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgstr "Exibir número de mensagens ao lado do nome da pasta"
 
 msgid "Display message number next to folder name"
 msgstr "Exibir número de mensagens ao lado do nome da pasta"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "Não"
 
 msgid "No"
 msgstr "Não"
 

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgstr "Mensagens não lidas"
 
 msgid "Unread messages"
 msgstr "Mensagens não lidas"
 

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgstr "Mensagens não lidas e totais"
 
 msgid "Unread and Total messages"
 msgstr "Mensagens não lidas e totais"
 

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "Ir para a última pasta aberta, ao iniciar"
+
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "letras"
 
 msgid "letters"
 msgstr "letras"
 

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgstr "Lista de mensagens"
 
 msgid "Message list"
 msgstr "Lista de mensagens"
 

-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "Ao entrar na pasta"
-
-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "Não fazer nada"
-
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "Selecionar a primeira mensagem não lida (ou nova ou marcada)"
-
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "Selecionar a primeira mensagem não lida (ou marcada ou nova)"
-
-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "Selecionar a primeira mensagem nova (ou não lida ou marcada)"
+#: src/prefs_summaries.c:417
+msgid "Set default selection when entering a folder"
+msgstr "Defina a seleção padrão ao entrar em uma pasta"

 
 

-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "Selecionar a primeira mensagem nova (ou marcada ou não lida)"
-
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "Selecionar a primeira mensagem marcada (ou nova ou não lida)"
-
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "Selecionar a primeira mensagem marcada (ou não lida ou nova)"
-
-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 
 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 
 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgstr "Sempre abrir a mensagem ao selecioná-la"
 
 msgid "Always open message when selected"
 msgstr "Sempre abrir a mensagem ao selecioná-la"
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "Agrupar utilizando o assunto além dos cabeçalhos padrão"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Agrupar utilizando o assunto além dos cabeçalhos padrão"
 

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente ao mover ou apagar mensagens"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente ao mover ou apagar mensagens"
 

-#: src/prefs_summaries.c:470
-msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
-msgstr "Adiar a movimentação, cópia ou exclusão as mensagens até que se selecione 'Ferramentas/Executar'"
+#: src/prefs_summaries.c:460
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Adiar a movimentação, cópia ou exclusão as mensagens até que se selecione "
+"'Ferramentas/Executar'"

 
 

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
-msgstr "Marcar a mensagem como lida somente ao abri-la em uma nova janela"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"
+msgstr ""
+"Somente marcar como lidas as mensagens abertas\n"
+"em uma nova janela ou respondidas"

 
 

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "Marcar mensagens como lidas após"
 
 msgid "Mark messages as read after"
 msgstr "Marcar mensagens como lidas após"
 

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr "Nomear o remetente utilizando o Livro de Endereços"
 
 msgid "Display sender using address book"
 msgstr "Nomear o remetente utilizando o Livro de Endereços"
 

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr "Ajuda do formato da data"
 
 msgid "Date format help"
 msgstr "Ajuda do formato da data"
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmar antes de marcar todas as mensagens da pasta como lidas"
 
 msgid "Confirm before marking all mails in a folder as read"
 msgstr "Confirmar antes de marcar todas as mensagens da pasta como lidas"
 

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "Traduzir os nomes do cabeçalho"
 
 msgid "Translate header names"
 msgstr "Traduzir os nomes do cabeçalho"
 

-#: src/prefs_summaries.c:553
-msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
-msgstr "A exibição dos cabeçalhos padrão (como 'From:', 'Subject:') será traduzida para o seu idioma."
+#: src/prefs_summaries.c:544
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"A exibição dos cabeçalhos padrão (como 'From:', 'Subject:') será traduzida "
+"para o seu idioma."

 
 

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgstr "Sumários"
 
 msgid "Summaries"
 msgstr "Sumários"
 

-#: src/prefs_summary_column.c:81
-#: src/summaryview.c:2442
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr "Anexos"
 
 msgid "Attachment"
 msgstr "Anexos"
 


@@ -11152,40 +11241,71 @@ msgstr ""
 "Selecione as colunas a serem exibidas na lista de mensagens. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
 "Selecione as colunas a serem exibidas na lista de mensagens. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "Ir para a primeira mensagem marcada"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "Ir para a primeira nova mensagem"
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "Ir para a primeira mensagem não lida"
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "Ir para a última mensagem aberta"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "Ir para a última mensagem na lista"
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "Não fazer nada"
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "Ação ao abrir a pasta"
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "Ações possíveis"
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "Esse nome é usado como um item do menu"
 
 msgid "This name is used as the Menu item"
 msgstr "Esse nome é usado como um item do menu"
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " Símbolos... "
 
 msgid " Symbols... "
 msgstr " Símbolos... "
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 
 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "O nome do modelo não foi definido."
 
 msgid "Template name is not set."
 msgstr "O nome do modelo não foi definido."
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "Excluir modelo"
 
 msgid "Delete template"
 msgstr "Excluir modelo"
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "Modelos atuais"
 
 msgid "Current templates"
 msgstr "Modelos atuais"
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "Modelo"
 
 msgid "Template"
 msgstr "Modelo"
 

-#: src/prefs_themes.c:340
-#: src/prefs_themes.c:706
+#: src/prefs_themes.c:340 src/prefs_themes.c:706

 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 
 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 


@@ -11321,10 +11441,6 @@ msgstr "Author: "
 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "Situação:"
-

 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Visualização"
 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "Visualização"


@@ -11377,9 +11493,7 @@ msgstr "Evento executado ao clicar"
 msgid "Displayed toolbar items"
 msgstr "Itens exibidos na barra de ferramentas"
 
 msgid "Displayed toolbar items"
 msgstr "Itens exibidos na barra de ferramentas"
 

-#: src/prefs_toolbar.c:883
-#: src/prefs_toolbar.c:897
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:883 src/prefs_toolbar.c:897 src/prefs_toolbar.c:911

 msgid "Customize Toolbars"
 msgstr "Personalizar a barra de ferramentas"
 
 msgid "Customize Toolbars"
 msgstr "Personalizar a barra de ferramentas"
 


@@ -11427,22 +11541,19 @@ msgstr "Quebrar linhas em"
 msgid "Wrapping"
 msgstr "Quebra de linhas"
 
 msgid "Wrapping"
 msgstr "Quebra de linhas"
 

-#: src/privacy.c:217
-#: src/privacy.c:238
+#: src/privacy.c:217 src/privacy.c:238

 msgid "No information available"
 msgstr "Não existe informação disponível"
 
 msgid "No information available"
 msgstr "Não existe informação disponível"
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 

-#: src/procmime.c:341
-#: src/procmime.c:343
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 

-#: src/procmsg.c:860
-#: src/procmsg.c:863
+#: src/procmsg.c:860 src/procmsg.c:863

 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 
 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 


@@ -11465,12 +11576,20 @@ msgid "An error happened during SMTP session."
 msgstr "Ocorreu um erro durante a seção SMTP."
 
 #: src/procmsg.c:1614
 msgstr "Ocorreu um erro durante a seção SMTP."
 
 #: src/procmsg.c:1614

-msgid "No specific account has been found to send, and an error happened during SMTP session."
-msgstr "Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro durante a seção SMTP."
+msgid ""
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
+msgstr ""
+"Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro "
+"durante a seção SMTP."

 
 #: src/procmsg.c:1622
 
 #: src/procmsg.c:1622

-msgid "Couldn't determine sending informations. Maybe the email hasn't been generated by Claws Mail."
-msgstr "Não foi possível determinar as informações de envio. Talvez essa mensagem não tenha sido gerada pelo Claws Mail."
+msgid ""
+"Couldn't determine sending informations. Maybe the email hasn't been "
+"generated by Claws Mail."
+msgstr ""
+"Não foi possível determinar as informações de envio. Talvez essa mensagem "
+"não tenha sido gerada pelo Claws Mail."

 
 #: src/procmsg.c:1640
 msgid "Couldn't create temporary file for news sending."
 
 #: src/procmsg.c:1640
 msgid "Couldn't create temporary file for news sending."


@@ -11485,177 +11604,251 @@ msgstr "Erro ao gravar no arquivo temporário para envio do artigo."
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">símbolos:</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgid "customized date format (see 'man strftime')"

-msgstr "formato da data personalizado (veja 'man strftime')"
+msgstr "formato de data personalizado (veja 'man strftime')"

 
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgstr "endereço de e-mail do remetente"
 
 msgid "email address of sender"
 msgstr "endereço de e-mail do remetente"
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr "nome completo do remetente"
 
 msgid "full name of sender"
 msgstr "nome completo do remetente"
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr "primeiro nome do remetente"
 
 msgid "first name of sender"
 msgstr "primeiro nome do remetente"
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr "sobrenome do remetente"
 
 msgid "last name of sender"
 msgstr "sobrenome do remetente"
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr "iniciais do remetente"
 
 msgid "initials of sender"
 msgstr "iniciais do remetente"
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr "corpo da mensagem"
 
 msgid "message body"
 msgstr "corpo da mensagem"
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr "corpo da mensagem citada"
 
 msgid "quoted message body"
 msgstr "corpo da mensagem citada"
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr "corpo da mensagem sem a assinatura"
 
 msgid "message body without signature"
 msgstr "corpo da mensagem sem a assinatura"
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgid "quoted message body without signature"

-msgstr "corpo da mensagem citada sem a assinatura"
+msgstr "corpo da mensagem citada e sem a assinatura"
+
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "dicionário atual"

 
 

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr "posição do cursor"
 
 msgid "cursor position"
 msgstr "posição do cursor"
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
-msgstr "Propriedade da conta: seu nome"
+#: src/quote_fmt.c:67
+msgid "account property: your name"
+msgstr "propriedade da conta: seu nome"

 
 

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
-msgstr "Propriedade da conta: seu endereço de e-mail"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"
+msgstr "propriedade da conta: seu endereço de e-mail"

 
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
-msgstr "Propriedade da conta: nome da conta"
+#: src/quote_fmt.c:69
+msgid "account property: account name"
+msgstr "propriedade da conta: nome da conta"

 
 

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
-msgstr "Propriedade da conta: organização"
+#: src/quote_fmt.c:70
+msgid "account property: organization"
+msgstr "propriedade da conta: organização"

 
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "propriedade da conta: dicionário padrão"
+
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: Cc"
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: De"
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: Para"
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "barra invertida literal"
 
 msgid "literal backslash"
 msgstr "barra invertida literal"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "ponto de interrogação literal"
 
 msgid "literal question mark"
 msgstr "ponto de interrogação literal"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "ponto de exclamação literal"
 
 msgid "literal exclamation mark"
 msgstr "ponto de exclamação literal"
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "pipe literal"
 
 msgid "literal pipe"
 msgstr "pipe literal"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgid "literal opening curly brace"

-msgstr "colchete esquerdo literal"
+msgstr "chave esquerda literal"

 
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgid "literal closing curly brace"

-msgstr "colchete direito literal"
+msgstr "chave direita literal"

 
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgid "tab"

-msgstr "tab"
+msgstr "tabulação"

 
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "linefeed"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">comandos:</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"inserir expr se x estiver definido\n"
-"(onde x é um dos caracteres dfNFLIstcnri ou af, ao)"
+"inserir <span style=\"oblique\">expr</span> se x estiver definido, onde\n"
+"x é um dos símbolos [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"(ou o seu equivalente extenso)"

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"inserir expr se x não estiver definido\n"
-"(onde x é um dos caracteres dfNFLIstcnri ou af, ao)"
+"inserir <span style=\"oblique\">expr</span> se x não estiver definido,\n"
+"onde x é um dos símbolos [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"(ou o seu equivalente extenso)"

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 msgstr ""

-"inserir arquivo:\n"
-"sub_expr é entendida como um nome do arquivo\n"
-"a ser inserido"
+"inserir o arquivo:\n"
+"<span style=\"oblique\">sub_expr</span> é entendido como o caminho do arquivo a ser inserido"

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 "the output from"
 msgstr ""

-"inserir saída do programa:\n"
-"sub_expr é entendida como uma linha de comando\n"
-"para obter a saída de"
+"inserir a saída do programa:\n"
+"<span style=\"oblique\">sub_expr</span> é entendido como a linha de comando para gerar\n"
+"a saída"

 
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "user-entered text"
 msgstr ""

-"inserir entrada do usuário:\n"
-"sub_expr é uma variável a ser substituída\n"
-"pelo texto digitado pelo usuário"
+"inserir a entrada do usuário:\n"
+"<span style=\"oblique\">sub_expr</span> é uma variável a ser substituída pelo texto digitado\n"
+"pelo usuário"

 
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "definição dos termos:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">definição dos termos:</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "texto que pode conter qualquer um dos símbolos acima"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr ""
+"texto que pode conter qualquer um dos símbolos\n"
+"ou comandos acima"

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"text that can contain any of the symbols (no\n"
+"commands) above"

 msgstr ""
 msgstr ""

-"texto que pode conter qualquer um dos símbolos acima\n"
-"exceto ?x{}, !x{}, |f{}, |p{} e |i{}"
+"texto que pode conter qualquer um dos símbolos\n"
+"(sem comandos) acima"

 
 

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:95
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
+msgstr ""
+"complemento a partir do Livro de Endereços funciona\n"
+"apenas com o primeiro endereço do cabeçalho, ele\n"
+"gera o nome completo do contato se aquele endereço\n"
+"corresponder exatamente a um contato do livro"
+
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "Podem ser utilizados os seguintes símbolos:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "Podem ser utilizados os seguintes símbolos e comandos:"
+
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr "Usar formatação ao compor novas mensagens"
+
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "Formato da resposta"
+
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "Marca de citação"

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "Formato do encaminhamento"
+
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "Descrição dos símbolos..."
+
+#: src/quote_fmt.c:435
+msgid "Message reply quotation mark format error."
+msgstr "Erro no formato da marca de citação da mensagem de resposta."
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "Erro no formato da marca de citação da mensagem de encaminhamento."
+
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Digite o texto para substituir '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Digite o texto para substituir '%s'"
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "Digite a variável"
 
 msgid "Enter variable"
 msgstr "Digite a variável"
 


@@ -11699,14 +11892,11 @@ msgstr "A mensagem foi enviada com sucesso."
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 

-#: src/send_message.c:463
-#: src/send_message.c:468
-#: src/send_message.c:473
+#: src/send_message.c:463 src/send_message.c:468 src/send_message.c:473

 msgid "Authenticating"
 msgstr "Autenticando"
 
 msgid "Authenticating"
 msgstr "Autenticando"
 

-#: src/send_message.c:464
-#: src/send_message.c:469
+#: src/send_message.c:464 src/send_message.c:469

 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 


@@ -11739,8 +11929,7 @@ msgstr "Enviando a mensagem (%d / %d bytes)"
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 

-#: src/send_message.c:613
-#: src/send_message.c:633
+#: src/send_message.c:613 src/send_message.c:633

 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 


@@ -11802,10 +11991,6 @@ msgstr "Correspondente a qualquer um dos seguintes"
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 

-#: src/summary_search.c:356
-msgid "From:"
-msgstr "De:"
-

 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Corpo:"
 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "Corpo:"


@@ -11818,387 +12003,382 @@ msgstr "Condição:"
 msgid "Find _all"
 msgstr "Localizar _todas"
 
 msgid "Find _all"
 msgstr "Localizar _todas"
 

-#: src/summary_search.c:652
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 

-#: src/summary_search.c:654
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/_Responder"
 
 msgid "/_Reply"
 msgstr "/_Responder"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/Responder _para"
 
 msgid "/Repl_y to"
 msgstr "/Responder _para"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/Responder _para/_todos"
 
 msgid "/Repl_y to/_all"
 msgstr "/Responder _para/_todos"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/Responder _para/o _remetente"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Responder _para/o _remetente"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/Responder _para/_lista de discussão"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Responder _para/_lista de discussão"
 

-#: src/summaryview.c:429
-#: src/toolbar.c:247
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr "/_Encaminhar"
 
 msgid "/_Forward"
 msgstr "/_Encaminhar"
 

-#: src/summaryview.c:430
-#: src/toolbar.c:248
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como _anexo"
 
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como _anexo"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/Re_direcionar"
 
 msgid "/Redirect"
 msgstr "/Re_direcionar"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/M_over..."
 
 msgid "/M_ove..."
 msgstr "/M_over..."
 

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgstr "/Mover para a _Lixeira"
 
 msgid "/Move to _trash"
 msgstr "/Mover para a _Lixeira"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/E_xcluir..."
 
 msgid "/_Delete..."
 msgstr "/E_xcluir..."
 

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/_Marcar"
 
 msgid "/_Mark"
 msgstr "/_Marcar"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 

-#: src/summaryview.c:441
-#: src/summaryview.c:447
-#: src/summaryview.c:450
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _não lida"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _não lida"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _lida"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _lida"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar _todas como lidas"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar _todas como lidas"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/Ignorar _agrupamento (thread)"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/Ignorar _agrupamento (thread)"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_Respeitar agrupamento (thread)"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_Respeitar agrupamento (thread)"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/_Marcar/Marcar como _spam"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/_Marcar/Marcar como _spam"
 

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr "/_Marcar/Marcar como _não-spam"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/_Marcar/Marcar como _não-spam"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Blo_quear"
 
 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Blo_quear"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/D_esbloquear"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/D_esbloquear"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/Ró_tulo colorido"
 
 msgid "/Color la_bel"
 msgstr "/Ró_tulo colorido"
 

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "/Adicionar remetente ao Li_vro de Endereços"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Adicionar remetente ao Li_vro de Endereços"
 

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/Criar regra de _filtragem"
 
 msgid "/Create f_ilter rule"
 msgstr "/Criar regra de _filtragem"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Criar regra de _filtragem/_Automaticamente"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Criar regra de _filtragem/_Automaticamente"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Criar regra de _filtragem/Pelo _remetente"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Criar regra de _filtragem/Pelo _remetente"
 

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Criar regra de _filtragem/Pelo _destinatário"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Criar regra de _filtragem/Pelo _destinatário"
 

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Criar regra de _filtragem/Pelo a_ssunto"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Criar regra de _filtragem/Pelo a_ssunto"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/Criar re_gra de processamento"
 
 msgid "/Create processing rule"
 msgstr "/Criar re_gra de processamento"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/Criar re_gra de processamento/_Automaticamente"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Criar re_gra de processamento/_Automaticamente"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/Criar re_gra de processamento/Pelo _remetente"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Criar re_gra de processamento/Pelo _remetente"
 

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/Criar re_gra de processamento/Pelo _destinatário"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Criar re_gra de processamento/Pelo _destinatário"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/Criar re_gra de processamento/Pelo a_ssunto"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Criar re_gra de processamento/Pelo a_ssunto"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/Exi_bir/Código-_fonte da mensagem"
 
 msgid "/_View/Message _source"
 msgstr "/Exi_bir/Código-_fonte da mensagem"
 

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/Exi_bir/_Todos os cabeçalhos"
 
 msgid "/_View/All _headers"
 msgstr "/Exi_bir/_Todos os cabeçalhos"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/_Salvar como..."
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr "Mostrar/esconder a barra de localização rápida"
 
 msgid "Toggle quick search bar"
 msgstr "Mostrar/esconder a barra de localização rápida"
 

-#: src/summaryview.c:1065
+#: src/summaryview.c:648
+msgid "Toggle multiple selection"
+msgstr "Alternar a múltipla seleção"
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "Processar marca"
 
 msgid "Process mark"
 msgstr "Processar marca"
 

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "Foram deixadas algumas marcas. Processá-las?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Foram deixadas algumas marcas. Processá-las?"
 

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 

-#: src/summaryview.c:1591
-#: src/summaryview.c:1643
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Procurar a partir do fim?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Procurar a partir do fim?"
 

-#: src/summaryview.c:1604
-#: src/summaryview.c:1656
-#: src/summaryview.c:1703
-#: src/summaryview.c:1755
-#: src/summaryview.c:1834
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Erro interno: valor não esperado para prefs_common.next_unread_msg_dialog\n"
 
 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Erro interno: valor não esperado para prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1690
-#: src/summaryview.c:1742
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "Não foram encontradas mensagens novas. Procurar a partir do fim?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Não foram encontradas mensagens novas. Procurar a partir do fim?"
 

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1780
-#: src/summaryview.c:1821
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar desde o fim?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar desde o fim?"
 

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "Não há mensagens marcadas."
 
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas."
 

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1859
-#: src/summaryview.c:1884
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o fim?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o fim?"
 

-#: src/summaryview.c:1869
-#: src/summaryview.c:1894
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 
 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o início?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o início?"
 

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens pelo assunto..."
 
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens pelo assunto..."
 

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d excluída"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d excluída"
 

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movida"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movida"
 

-#: src/summaryview.c:2339
-#: src/summaryview.c:2346
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiada"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiada"
 

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr " item selecionado"
 
 msgid " item selected"
 msgstr " item selecionado"
 

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr " itens selecionados"
 
 msgid " items selected"
 msgstr " itens selecionados"
 

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
 

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 
 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 
 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(Sem data)"
 
 msgid "(No Date)"
 msgstr "(Sem data)"
 

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 
 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "Você não é o autor do artigo.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Você não é o autor do artigo.\n"
 

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgstr "Deseja realmente excluir a mensagem selecionada?"
 
 msgid "Do you really want to delete the selected message?"
 msgstr "Deseja realmente excluir a mensagem selecionada?"
 

-#: src/summaryview.c:3817
+#: src/summaryview.c:3835

 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Deseja realmente excluir as %d mensagens selecionadas?"
 
 #, c-format
 msgid "Do you really want to delete the %d selected messages?"
 msgstr "Deseja realmente excluir as %d mensagens selecionadas?"
 

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(ns)"
 
 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(ns)"
 

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 
 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "Acrescentar ou sobrescrever"
 
 msgid "Append or Overwrite"
 msgstr "Acrescentar ou sobrescrever"
 

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr "Acrescentar ao arquivo ou sobrescrevê-lo?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Acrescentar ao arquivo ou sobrescrevê-lo?"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "_Acrescentar"
 
 msgid "_Append"
 msgstr "_Acrescentar"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "Construindo agrupamentos..."
 
 msgid "Building threads..."
 msgstr "Construindo agrupamentos..."
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "Ignorar essas regras"
 
 msgid "Skip these rules"
 msgstr "Ignorar essas regras"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar essas regras independente da conta à qual elas pertençam"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar essas regras independente da conta à qual elas pertençam"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar essas regras caso elas refiram-se à conta atual"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar essas regras caso elas refiram-se à conta atual"
 

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "Filtragem"
 
 msgid "Filtering"
 msgstr "Filtragem"
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -12206,19 +12386,19 @@ msgstr ""
 "Essas são algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com essas regras:"
 
 "Essas são algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com essas regras:"
 

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "_Filtrar"
 
 msgid "_Filter"
 msgstr "_Filtrar"
 

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "Filtrando..."
 
 msgid "Filtering..."
 msgstr "Filtrando..."
 

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 
 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -12227,45 +12407,45 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
 "Erro na expressão regular (regexp):\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/Escrever _nova mensagem"
 
 msgid "/Compose _new message"
 msgstr "/Escrever _nova mensagem"
 

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "/Adicionar ao Li_vro de Endereços"
 
 msgid "/Add to _address book"
 msgstr "/Adicionar ao Li_vro de Endereços"
 

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/Copiar esse en_dereço"
 
 msgid "/Copy this add_ress"
 msgstr "/Copiar esse en_dereço"
 

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/_Abrir imagem"
 
 msgid "/_Open image"
 msgstr "/_Abrir imagem"
 

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/_Salvar imagem..."
 
 msgid "/_Save image..."
 msgstr "/_Salvar imagem..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -12279,79 +12459,79 @@ msgstr ""
 "\n"
 "  Use "
 
 "\n"
 "  Use "
 

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "'Ver relatório'"
 
 msgid "'View Log'"
 msgstr "'Ver relatório'"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr " no menu Ferramentas para mais informações."
 
 msgid " in the Tools menu for more information."
 msgstr " no menu Ferramentas para mais informações."
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr "  Pode-se efetuar o seguinte nessa parte através de\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Pode-se efetuar o seguinte nessa parte através de\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  um clique com o botão direito no ícone ou no item da lista:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  um clique com o botão direito no ícone ou no item da lista:\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - Para salvar, selecione  "
 
 msgid "     - To save, select "
 msgstr "     - Para salvar, selecione  "
 

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 
 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Tecla de atalho: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Tecla de atalho: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - Para exibir como texto, selecione "
 
 msgid "     - To display as text, select "
 msgstr "     - Para exibir como texto, selecione "
 

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "'Mostrar como texto'"
 
 msgid "'Display as text'"
 msgstr "'Mostrar como texto'"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " (Tecla de atalho: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Tecla de atalho: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir com um programa externo, selecione "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir com um programa externo, selecione "
 

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "'Abrir'"
 
 msgid "'Open'"
 msgstr "'Abrir'"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Tecla de atalho: 'l'),\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Tecla de atalho: 'l'),\n"
 

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente, dê um duplo clique ou clique com o "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente, dê um duplo clique ou clique com o "
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "botão do meio do mouse)\n"
 
 msgid "mouse button)\n"
 msgstr "botão do meio do mouse)\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr "     - Ou use "
 
 msgid "     - Or use "
 msgstr "     - Ou use "
 

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "'Abrir com...'"
 
 msgid "'Open with...'"
 msgstr "'Abrir com...'"
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Tecla de atalho: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Tecla de atalho: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -12362,7 +12542,7 @@ msgstr ""
 "    %s\n"
 "Código de saída %d\n"
 
 "    %s\n"
 "Código de saída %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -12381,281 +12561,243 @@ msgstr ""
 "\n"
 "Deseja abrir mesmo assim?"
 
 "\n"
 "Deseja abrir mesmo assim?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 
 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "_Abrir URL"
 
 msgid "_Open URL"
 msgstr "_Abrir URL"
 

-#: src/toolbar.c:171
-#: src/toolbar.c:1637
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "Receber mensagens de todas as contas"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Receber mensagens de todas as contas"
 

-#: src/toolbar.c:172
-#: src/toolbar.c:1651
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "Receber mensagens da conta atual"
 
 msgid "Receive Mail on current Account"
 msgstr "Receber mensagens da conta atual"
 

-#: src/toolbar.c:173
-#: src/toolbar.c:1657
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
 msgid "Send Queued Messages"
 msgstr "Enviar mensagens da Fila de Saída"
 

-#: src/toolbar.c:174
-#: src/toolbar.c:1682
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "Escrever e-mail"
 
 msgid "Compose Email"
 msgstr "Escrever e-mail"
 

-#: src/toolbar.c:175
-#: src/toolbar.c:1686
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr "Escrever artigo"
 
 msgid "Compose News"
 msgstr "Escrever artigo"
 

-#: src/toolbar.c:176
-#: src/toolbar.c:1728
-#: src/toolbar.c:1738
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "Responder à mensagem"
 
 msgid "Reply to Message"
 msgstr "Responder à mensagem"
 

-#: src/toolbar.c:177
-#: src/toolbar.c:1745
-#: src/toolbar.c:1755
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "Responder ao remetente"
 
 msgid "Reply to Sender"
 msgstr "Responder ao remetente"
 

-#: src/toolbar.c:178
-#: src/toolbar.c:1762
-#: src/toolbar.c:1772
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "Responder a todos"
 
 msgid "Reply to All"
 msgstr "Responder a todos"
 

-#: src/toolbar.c:179
-#: src/toolbar.c:1779
-#: src/toolbar.c:1789
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "Responder à lista de discussão"
 
 msgid "Reply to Mailing-list"
 msgstr "Responder à lista de discussão"
 

-#: src/toolbar.c:180
-#: src/toolbar.c:1669
+#: src/toolbar.c:181 src/toolbar.c:1678

 msgid "Open email"
 msgstr "Abrir e-mail"
 
 msgid "Open email"
 msgstr "Abrir e-mail"
 

-#: src/toolbar.c:181
-#: src/toolbar.c:1796
-#: src/toolbar.c:1806
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "Encaminhar a mensagem"
 
 msgid "Forward Message"
 msgstr "Encaminhar a mensagem"
 

-#: src/toolbar.c:182
-#: src/toolbar.c:1813
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgstr "Enviar a mensagem para a Lixeira"
 
 msgid "Trash Message"
 msgstr "Enviar a mensagem para a Lixeira"
 

-#: src/toolbar.c:183
-#: src/toolbar.c:1819
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "Excluir a mensagem"
 
 msgid "Delete Message"
 msgstr "Excluir a mensagem"
 

-#: src/toolbar.c:185
-#: src/toolbar.c:1831
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "Ir para a mensagem não lida anterior"
 
 msgid "Go to Previous Unread Message"
 msgstr "Ir para a mensagem não lida anterior"
 

-#: src/toolbar.c:186
-#: src/toolbar.c:1838
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "Ir para a próxima mensagem não lida"
 
 msgid "Go to Next Unread Message"
 msgstr "Ir para a próxima mensagem não lida"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "Aprender spam ou não-spam"
 
 msgid "Learn Spam or Ham"
 msgstr "Aprender spam ou não-spam"
 

-#: src/toolbar.c:190
-#: src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "Ir para a lista de pastas"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "Abrir a pasta/Ir para a lista de pastas"

 
 

-#: src/toolbar.c:192
-#: src/toolbar.c:1847
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr "Enviar a mensagem"
 
 msgid "Send Message"
 msgstr "Enviar a mensagem"
 

-#: src/toolbar.c:193
-#: src/toolbar.c:1853
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgstr "Armazenar na Fila de Saída e enviar mais tarde"
 
 msgid "Put into queue folder and send later"
 msgstr "Armazenar na Fila de Saída e enviar mais tarde"
 

-#: src/toolbar.c:194
-#: src/toolbar.c:1859
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 

-#: src/toolbar.c:195
-#: src/toolbar.c:1865
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr "Inserir arquivo"
 
 msgid "Insert file"
 msgstr "Inserir arquivo"
 

-#: src/toolbar.c:196
-#: src/toolbar.c:1871
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 msgid "Attach file"
 msgstr "Anexar arquivo"
 

-#: src/toolbar.c:197
-#: src/toolbar.c:1877
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 

-#: src/toolbar.c:198
-#: src/toolbar.c:1883
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "Editar com um programa externo"
 
 msgid "Edit with external editor"
 msgstr "Editar com um programa externo"
 

-#: src/toolbar.c:199
-#: src/toolbar.c:1889
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "Quebrar as linhas longas do parágrafo atual"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Quebrar as linhas longas do parágrafo atual"
 

-#: src/toolbar.c:200
-#: src/toolbar.c:1895
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas longas"
 
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas longas"
 

-#: src/toolbar.c:203
-#: src/toolbar.c:1908
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "Verificar ortografia"
 
 msgid "Check spelling"
 msgstr "Verificar ortografia"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Ações do Claws Mail"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Ações do Claws Mail"
 

-#: src/toolbar.c:206
-#: src/toolbar.c:1931
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "Cancelar a recepção"
 
 msgid "Cancel receiving"
 msgstr "Cancelar a recepção"
 

-#: src/toolbar.c:207
-#: src/toolbar.c:1663
+#: src/toolbar.c:208 src/toolbar.c:1672

 msgid "Close window"
 msgstr "Fechar a janela"
 
 msgid "Close window"
 msgstr "Fechar a janela"
 

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/Responder _com citação"
 
 msgid "/Reply with _quote"
 msgstr "/Responder _com citação"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/Responder _sem citação"
 
 msgid "/_Reply without quote"
 msgstr "/Responder _sem citação"
 

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos com citação"
 
 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos com citação"
 

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sem citação"
 
 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sem citação"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/Responder à _lista com citação"
 
 msgid "/Reply to list with _quote"
 msgstr "/Responder à _lista com citação"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/Responder à l_ista sem citação"
 
 msgid "/_Reply to list without quote"
 msgstr "/Responder à l_ista sem citação"
 

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr "/Responder ao _remetente com citação"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Responder ao _remetente com citação"
 

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/Responder ao r_emetente sem citação"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Responder ao r_emetente sem citação"
 

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "/Aprender como _spam"
 
 msgid "/Learn as _Spam"
 msgstr "/Aprender como _spam"
 

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "/Aprender como _não-spam"
 
 msgid "/Learn as _Ham"
 msgstr "/Aprender como _não-spam"
 

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr "Receber mensagens"
 
 msgid "Get Mail"
 msgstr "Receber mensagens"
 

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgid "Toolbar|Compose"

-msgstr "Toolbar|Compor"
+msgstr "Compor"

 
 

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "Abrir"
 
 msgid "Open"
 msgstr "Abrir"
 

-#: src/toolbar.c:421
-#: src/toolbar.c:521
+#: src/toolbar.c:422 src/toolbar.c:522

 msgid "Reply"
 msgstr "Responder"
 
 msgid "Reply"
 msgstr "Responder"
 

-#: src/toolbar.c:423
-#: src/toolbar.c:522
+#: src/toolbar.c:424 src/toolbar.c:523

 msgid "All"
 msgstr "Todos"
 
 msgid "All"
 msgstr "Todos"
 

-#: src/toolbar.c:424
-#: src/toolbar.c:523
-msgid "Sender"
-msgstr "Remetente"
-
-#: src/toolbar.c:430
-#: src/toolbar.c:528
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:433
-#: src/toolbar.c:530
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr "Próxima"
 
 msgid "Next"
 msgstr "Próxima"
 

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "Enviar mais tarde"
 
 msgid "Send later"
 msgstr "Enviar mais tarde"
 

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "Rascunho"
 
 msgid "Draft"
 msgstr "Rascunho"
 

-#: src/toolbar.c:1644
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "Ir para a lista de pastas"
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "Receber as mensagens da conta selecionada"
 
 msgid "Receive Mail on selected Account"
 msgstr "Receber as mensagens da conta selecionada"
 

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "Compor com a conta selecionada"
 
 msgid "Compose with selected Account"
 msgstr "Compor com a conta selecionada"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "Não-spam"
 
 msgid "Ham"
 msgstr "Não-spam"
 

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "Aprender spam"
 
 msgid "Learn Spam"
 msgstr "Aprender spam"
 

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "Aprender não-spam"
 
 msgid "Learn Ham"
 msgstr "Aprender não-spam"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "Aprender como..."
 
 msgid "Learn as..."
 msgstr "Aprender como..."
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "Aprender"
 
 msgid "Learn"
 msgstr "Aprender"
 


@@ -12681,7 +12823,7 @@ msgstr "Por favor, selecione a URL a ser aberta."
 
 #: src/wizard.c:469
 msgid "Welcome Mail Subject|Welcome to Claws Mail"
 
 #: src/wizard.c:469
 msgid "Welcome Mail Subject|Welcome to Claws Mail"

-msgstr "Welcome Mail Subject|Bem-vindo(a) ao Claws Mail"
+msgstr "Bem-vindo(a) ao Claws Mail"

 
 #: src/wizard.c:492
 #, c-format
 
 #: src/wizard.c:492
 #, c-format


@@ -12733,7 +12875,7 @@ msgid ""
 msgstr ""
 "\n"
 "Bem-vindo(a) ao Claws Mail\n"
 msgstr ""
 "\n"
 "Bem-vindo(a) ao Claws Mail\n"

-"-------------------------\n"
+"--------------------------\n"

 "\n"
 "Agora que você configurou sua conta é possível obter suas\n"
 "mensagens clicando no botão 'Receber mensagens', à esquerda\n"
 "\n"
 "Agora que você configurou sua conta é possível obter suas\n"
 "mensagens clicando no botão 'Receber mensagens', à esquerda\n"


@@ -12753,12 +12895,12 @@ msgstr ""
 "acessível através do menu '/Ajuda/Manual' ou online, no sítio indicado\n"
 "abaixo.\n"
 "\n"
 "acessível através do menu '/Ajuda/Manual' ou online, no sítio indicado\n"
 "abaixo.\n"
 "\n"

-"URL's úteis\n"
+"URLs úteis\n"

 "-----------\n"
 "-----------\n"

-"Página principal:      <%s>\n"
-"Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
-"Temas:        <%s>\n"
+"Página principal:    <%s>\n"
+"Manual:              <%s>\n"
+"FAQ:                <%s>\n"
+"Temas:               <%s>\n"

 "Listas de discussão: <%s>\n"
 "\n"
 "LICENÇA\n"
 "Listas de discussão: <%s>\n"
 "\n"
 "LICENÇA\n"


@@ -12785,7 +12927,9 @@ msgstr "Por favor, digite o seu nome e endereço de e-mail."
 
 #: src/wizard.c:612
 msgid "Please enter your receiving server and username."
 
 #: src/wizard.c:612
 msgid "Please enter your receiving server and username."

-msgstr "Por favor, digite o endereço e o nome de usuário do seu servidor de recebimento."
+msgstr ""
+"Por favor, digite o endereço e o nome de usuário do seu servidor de "
+"recebimento."

 
 #: src/wizard.c:622
 msgid "Please enter your username."
 
 #: src/wizard.c:622
 msgid "Please enter your username."


@@ -12812,16 +12956,24 @@ msgid "Your organization:"
 msgstr "Sua organização:"
 
 #: src/wizard.c:931
 msgstr "Sua organização:"
 
 #: src/wizard.c:931

-msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
-msgstr "Você também pode especificar um caminho absoluto, por exemplo \"/home/fulano/Documentos/Mail\""
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Você também pode especificar um caminho absoluto, por exemplo \"/home/fulano/"
+"Documentos/Mail\""

 
 #: src/wizard.c:935
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome da caixa postal:</span>"
 
 #: src/wizard.c:972
 
 #: src/wizard.c:935
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome da caixa postal:</span>"
 
 #: src/wizard.c:972

-msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
-msgstr "Você pode especificar o número da porta adicionando-o ao final: \"mail.exemplo.com:25\""
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Você pode especificar o número da porta adicionando-o ao final: \"mail."
+"exemplo.com:25\""

 
 #: src/wizard.c:976
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 
 #: src/wizard.c:976
 msgid "<span weight=\"bold\">SMTP server address:</span>"


@@ -12851,14 +13003,11 @@ msgstr ""
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar-se ao servidor SMTP"
 
 msgid "Use SSL to connect to SMTP server"
 msgstr "Usar SSL para conectar-se ao servidor SMTP"
 

-#: src/wizard.c:1025
-#: src/wizard.c:1262
+#: src/wizard.c:1025 src/wizard.c:1262

 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL via STARTTLS"
 
 msgid "Use SSL via STARTTLS"
 msgstr "Usar SSL via STARTTLS"
 

-#: src/wizard.c:1056
-#: src/wizard.c:1076
-#: src/wizard.c:1187
+#: src/wizard.c:1056 src/wizard.c:1076 src/wizard.c:1187

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor:</span>"
 


@@ -12875,8 +13024,12 @@ msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo do servidor:</span>"
 
 #: src/wizard.c:1183
 msgstr "<span weight=\"bold\">Tipo do servidor:</span>"
 
 #: src/wizard.c:1183

-msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
-msgstr "Você pode especificar o número da porta adicionando-o ao final: \"mail.exemplo.com:110\""
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Você pode especificar o número da porta adicionando-o ao final: \"mail."
+"exemplo.com:110\""

 
 #: src/wizard.c:1198
 msgid "<span weight=\"bold\">Username:</span>"
 
 #: src/wizard.c:1198
 msgid "<span weight=\"bold\">Username:</span>"


@@ -12910,20 +13063,21 @@ msgstr "Bem-vindo(a) ao Claws Mail"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
 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 ""
 "Bem-vindo(a) ao assistente de configuração do Claws Mail.\n"
 "\n"
 msgstr ""
 "Bem-vindo(a) ao assistente de configuração do Claws Mail.\n"
 "\n"

-"Nós iremos começar definindo algumas informações básicas sobre você e suas opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do Claws Mail em menos de cinco minutos."
+"Nós iremos começar definindo algumas informações básicas sobre você e suas "
+"opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do "
+"Claws Mail em menos de cinco minutos."

 
 #: src/wizard.c:1438
 msgid "About You"
 msgstr "Sobre você"
 
 
 #: src/wizard.c:1438
 msgid "About You"
 msgstr "Sobre você"
 

-#: src/wizard.c:1440
-#: src/wizard.c:1449
-#: src/wizard.c:1458
-#: src/wizard.c:1468
+#: src/wizard.c:1440 src/wizard.c:1449 src/wizard.c:1458 src/wizard.c:1468

 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 
 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 

diff --git a/po/ru.po b/po/ru.po
index eb1915b49c8d633491c0e3a53f6789a9c0b66253..b3aa84053b2cb1d9aada40b7e5e4cd47d21b2f57 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: claws-mail-2.7.0\n"
+"Project-Id-Version: claws-mail-2.9.2\n"

 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-30 18:55+0300\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-30 18:55+0300\n"

-"PO-Revision-Date: 2006-11-16 12:55+0300\n"
+"PO-Revision-Date: 2007-03-09 20:49+0300\n"

 "Last-Translator: Pavlo Bohmat <bohm@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Pavlo Bohmat <bohm@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -41,7 +41,7 @@ msgstr "Использование 'Получить почту' извлече
 
 #: src/account.c:773
 msgid " _Set as default account "
 
 #: src/account.c:773
 msgid " _Set as default account "

-msgstr " _Сделать учётной записью по умолчанию "
+msgstr " _Сделать уч. записью по умолчанию "

 
 #: src/account.c:867
 msgid "Accounts with remote folders cannot be copied."
 
 #: src/account.c:867
 msgid "Accounts with remote folders cannot be copied."


@@ -67,7 +67,7 @@ msgstr "Удалить учётную запись"
 
 #: src/account.c:1452
 msgid "Accounts List Default Column Name|D"
 
 #: src/account.c:1452
 msgid "Accounts List Default Column Name|D"

-msgstr ""
+msgstr "D"

 
 #: src/account.c:1458
 msgid "Default account"
 
 #: src/account.c:1458
 msgid "Default account"


@@ -75,7 +75,7 @@ msgstr "Учётная запись по умолчанию"
 
 #: src/account.c:1466
 msgid "Accounts List Get Column Name|G"
 
 #: src/account.c:1466
 msgid "Accounts List Get Column Name|G"

-msgstr ""
+msgstr "G"

 
 #: src/account.c:1472
 msgid "'Get Mail' retrieves mail from the checked accounts"
 
 #: src/account.c:1472
 msgid "'Get Mail' retrieves mail from the checked accounts"


@@ -1166,7 +1166,7 @@ msgid "/_Message"
 msgstr "/_Сообщение"
 
 #: src/compose.c:521
 msgstr "/_Сообщение"
 
 #: src/compose.c:521

-msgid "/_Message/_Send"
+msgid "/_Message/S_end"

 msgstr "/_Сообщение/_Отправить"
 
 #: src/compose.c:523
 msgstr "/_Сообщение/_Отправить"
 
 #: src/compose.c:523


@@ -1832,7 +1832,7 @@ msgstr "Заголовок"
 
 #: src/compose.c:5938
 msgid "_Attachments"
 
 #: src/compose.c:5938
 msgid "_Attachments"

-msgstr "_Ð\92ложенниÑ\8f"
+msgstr "_Вложения"

 
 #: src/compose.c:5942
 msgid "Othe_rs"
 
 #: src/compose.c:5942
 msgid "Othe_rs"


@@ -1928,8 +1928,8 @@ msgstr ""
 
 #: src/compose.c:7580
 #: src/messageview.c:718
 
 #: src/compose.c:7580
 #: src/messageview.c:718

-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "Sylphed-Claws требуется доступ к сети для отправки сообщения."
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Claws Mail требуется доступ к сети для отправки сообщения."

 
 #: src/compose.c:7605
 msgid "Could not queue message."
 
 #: src/compose.c:7605
 msgid "Could not queue message."


@@ -2025,8 +2025,8 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Процесс Sylpheed-Claws (%ld) получен сигнал %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Процесс Claws Mail (%ld) получен сигнал %ld"

 
 #: src/crash.c:188
 msgid "Sylpheed-Claws has crashed"
 
 #: src/crash.c:188
 msgid "Sylpheed-Claws has crashed"


@@ -3397,6 +3397,27 @@ msgstr "Зеленый"
 msgid "Brown"
 msgstr "Коричневый"
 
 msgid "Brown"
 msgstr "Коричневый"
 

+msgid "Bright brown"
+msgstr "Светлокоричневый"
+
+msgid "Dark red"
+msgstr "Темнокрасный"
+
+msgid "Dark pink"
+msgstr "Темнорозовый"
+
+msgid "Steel blue"
+msgstr "Голубая сталь"
+
+msgid "Gold"
+msgstr "Золотой"
+
+msgid "Bright green"
+msgstr "Светлозеленый"
+
+msgid "Magenta"
+msgstr "Малиновый"
+

 #: src/gtk/foldersort.c:156
 msgid "Set folder order"
 msgstr "Порядок сортировки папок"
 #: src/gtk/foldersort.c:156
 msgid "Set folder order"
 msgstr "Порядок сортировки папок"


@@ -3423,7 +3444,7 @@ msgstr "Буфер исходного кода"
 
 #: src/gtk/gtksourceprintjob.c:281
 msgid "GtkTextBuffer object to print"
 
 #: src/gtk/gtksourceprintjob.c:281
 msgid "GtkTextBuffer object to print"

-msgstr ""
+msgstr "GtkТекстБуфер объект для печати"

 
 #: src/gtk/gtksourceprintjob.c:287
 msgid "Tabs Width"
 
 #: src/gtk/gtksourceprintjob.c:287
 msgid "Tabs Width"


@@ -3455,7 +3476,7 @@ msgstr "Шрифт"
 
 #: src/gtk/gtksourceprintjob.c:313
 msgid "GnomeFont name to use for the document text (deprecated)"
 
 #: src/gtk/gtksourceprintjob.c:313
 msgid "GnomeFont name to use for the document text (deprecated)"

-msgstr ""
+msgstr "Имя ГномШрифта используемого для текстового документа (deprecated)"

 
 #: src/gtk/gtksourceprintjob.c:320
 msgid "Font Description"
 
 #: src/gtk/gtksourceprintjob.c:320
 msgid "Font Description"


@@ -3472,11 +3493,11 @@ msgstr "Число шрифтов"
 
 #: src/gtk/gtksourceprintjob.c:329
 msgid "GnomeFont name to use for the line numbers (deprecated)"
 
 #: src/gtk/gtksourceprintjob.c:329
 msgid "GnomeFont name to use for the line numbers (deprecated)"

-msgstr ""
+msgstr "Имя ГномШрифта используемого для номеров строк (deprecated)"

 
 #: src/gtk/gtksourceprintjob.c:337
 msgid "Font description to use for the line numbers"
 
 #: src/gtk/gtksourceprintjob.c:337
 msgid "Font description to use for the line numbers"

-msgstr ""
+msgstr "Описание шрифта используемого для номеров строк"

 
 #: src/gtk/gtksourceprintjob.c:344
 msgid "Print Line Numbers"
 
 #: src/gtk/gtksourceprintjob.c:344
 msgid "Print Line Numbers"


@@ -3484,7 +3505,7 @@ msgstr "Печать номеров строк"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"

-msgstr ""
+msgstr "Интервал печати номеров строк (0 - без номеров)"

 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"
 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"


@@ -3508,7 +3529,7 @@ msgstr "Шрифт заголовков и сносок"
 
 #: src/gtk/gtksourceprintjob.c:369
 msgid "GnomeFont name to use for the header and footer (deprecated)"
 
 #: src/gtk/gtksourceprintjob.c:369
 msgid "GnomeFont name to use for the header and footer (deprecated)"

-msgstr ""
+msgstr "Имя ГномШрифта используемого для заголовков и сносок (deprecated)"

 
 #: src/gtk/gtksourceprintjob.c:376
 msgid "Header and Footer Font Description"
 
 #: src/gtk/gtksourceprintjob.c:376
 msgid "Header and Footer Font Description"


@@ -3516,7 +3537,7 @@ msgstr "Описание шрифта заголовка и сноски"
 
 #: src/gtk/gtksourceprintjob.c:377
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 
 #: src/gtk/gtksourceprintjob.c:377
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"

-msgstr ""
+msgstr "Шрифт используемый для заголовков и сносок (например: \"Monospace 10\")"

 
 #: src/gtk/gtkaspell.c:606
 msgid "No dictionary selected."
 
 #: src/gtk/gtkaspell.c:606
 msgid "No dictionary selected."


@@ -3723,6 +3744,9 @@ msgstr "Введите пароль"
 msgid "Remember this"
 msgstr "Запомнить"
 
 msgid "Remember this"
 msgstr "Запомнить"
 

+msgid "Logging"
+msgstr "Журналирование"
+

 #: src/gtk/logwindow.c:87
 msgid "Protocol log"
 msgstr "Журнал протокола"
 #: src/gtk/logwindow.c:87
 msgid "Protocol log"
 msgstr "Журнал протокола"


@@ -3778,8 +3802,8 @@ msgid "Description"
 msgstr "Описание"
 
 #: src/gtk/pluginwindow.c:336
 msgstr "Описание"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Больше модулей доступно на вебсайте Sylpheed-Claws."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Больше модулей доступно на вебсайте Claws Mail."

 
 #: src/gtk/pluginwindow.c:342
 #: src/prefs_themes.c:866
 
 #: src/gtk/pluginwindow.c:342
 #: src/prefs_themes.c:866


@@ -4529,6 +4553,8 @@ msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the inbox folder?"
 msgstr ""
 "Destination folder is not set.\n"
 "Import mbox file to the inbox folder?"
 msgstr ""

+"Папка назначения не указана.\n"
+"Импортировать mbox-файл в папку 'входящие'?"

 
 #: src/import.c:237
 msgid "Can't find the destination folder."
 
 #: src/import.c:237
 msgid "Can't find the destination folder."


@@ -4963,7 +4989,7 @@ msgstr ""
 
 #: src/main.c:536
 msgid "Claws Mail has been compiled with an older GTK+ library than is currently available. This will cause crashes. You need to recompile Claws Mail."
 
 #: src/main.c:536
 msgid "Claws Mail has been compiled with an older GTK+ library than is currently available. This will cause crashes. You need to recompile Claws Mail."

-msgstr ""
+msgstr "Claws Mail был скомпилирован с доступной старой библиотекой GTK+. Это будет вызывать крушения. Вы должны перекомпилировать Claws Mail."

 
 #: src/main.c:743
 msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."
 
 #: src/main.c:743
 msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."


@@ -5160,6 +5186,9 @@ msgstr "/_Файл/В_ыход"
 msgid "/_Edit/Select _thread"
 msgstr "/_Правка/Выделить _поток"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Правка/Выделить _поток"
 

+msgid "/_Edit/_Delete thread"
+msgstr "/_Правка/_Удалить поток"
+

 #: src/mainwindow.c:523
 #: src/messageview.c:168
 msgid "/_Edit/_Find in current message..."
 #: src/mainwindow.c:523
 #: src/messageview.c:168
 msgid "/_Edit/_Find in current message..."


@@ -5233,6 +5262,24 @@ msgstr "/_Вид/Выбрать отображаемые столбцы/в сп
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Вид/Выбрать отображаемые столбцы/в списке сообщений..."
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Вид/Выбрать отображаемые столбцы/в списке сообщений..."
 

+msgid "/_View/La_yout"
+msgstr "/_Вид/Расположение"
+
+msgid "/_View/Layout/_Standard"
+msgstr "/_Вид/Расположение/_Стандарт"
+
+msgid "/_View/Layout/_Three columns"
+msgstr "/_Вид/Расположение/_Три колонки"
+
+msgid "/_View/Layout/_Wide message"
+msgstr "/_Вид/Расположение/_Широкое сообщение"
+
+msgid "/_View/Layout/W_ide message list"
+msgstr "/_Вид/Расположение/Широкий список сообщений"
+
+msgid "/_View/Layout/S_mall screen"
+msgstr "/_Вид/Расположение/Минимальное"
+

 #: src/mainwindow.c:551
 #: src/mainwindow.c:554
 #: src/mainwindow.c:582
 #: src/mainwindow.c:551
 #: src/mainwindow.c:554
 #: src/mainwindow.c:582


@@ -5634,22 +5681,22 @@ msgstr "/_Вид/Все заголовки"
 #: src/mainwindow.c:733
 #: src/messageview.c:280
 msgid "/_View/Quotes"
 #: src/mainwindow.c:733
 #: src/messageview.c:280
 msgid "/_View/Quotes"

-msgstr "/_Вид/Цытаты"
+msgstr "/_Вид/Цитаты"

 
 #: src/mainwindow.c:734
 #: src/messageview.c:281
 msgid "/_View/Quotes/_Fold all"
 
 #: src/mainwindow.c:734
 #: src/messageview.c:281
 msgid "/_View/Quotes/_Fold all"

-msgstr "/_Вид/Цытаты/_Свернуть все"
+msgstr "/_Вид/Цитаты/_Свернуть все"

 
 #: src/mainwindow.c:735
 #: src/messageview.c:282
 msgid "/_View/Quotes/Fold from level _2"
 
 #: src/mainwindow.c:735
 #: src/messageview.c:282
 msgid "/_View/Quotes/Fold from level _2"

-msgstr "/_Вид/Цытаты/Свернуть по второму уровню"
+msgstr "/_Вид/Цитаты/Свернуть по второму уровню"

 
 #: src/mainwindow.c:736
 #: src/messageview.c:283
 msgid "/_View/Quotes/Fold from level _3"
 
 #: src/mainwindow.c:736
 #: src/messageview.c:283
 msgid "/_View/Quotes/Fold from level _3"

-msgstr "/_Вид/Цытаты/Свернуть по третьему уровню"
+msgstr "/_Вид/Цитаты/Свернуть по третьему уровню"

 
 #: src/mainwindow.c:738
 msgid "/_View/_Update summary"
 
 #: src/mainwindow.c:738
 msgid "/_View/_Update summary"


@@ -5913,6 +5960,9 @@ msgstr "/_Инструменты/Создать правило обработк
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/_Инструменты/Создать правило обработки/По теме"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/_Инструменты/Создать правило обработки/По теме"
 

+msgid "/_Tools/List _URLs..."
+msgstr "/_Инструменты/Список _URL'ов..."
+

 #: src/mainwindow.c:834
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/_Инструменты/_Проверить все папки на новые сообщения"
 #: src/mainwindow.c:834
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/_Инструменты/_Проверить все папки на новые сообщения"


@@ -5937,6 +5987,9 @@ msgstr "/_Инструменты/Выполнить"
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/_Инструменты/SSL сертификаты..."
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/_Инструменты/SSL сертификаты..."
 

+msgid "/_Tools/Filtering debug window"
+msgstr "/_Инструменты/Окно отладки фильтрации"
+

 #: src/mainwindow.c:850
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменты/Окно журнала"
 #: src/mainwindow.c:850
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменты/Окно журнала"


@@ -6936,7 +6989,7 @@ msgid "Grab input while entering a passphrase"
 msgstr "Захват ввода при введении парольной фразы"
 
 #: src/plugins/pgpcore/prefs_gpg.c:148
 msgstr "Захват ввода при введении парольной фразы"
 
 #: src/plugins/pgpcore/prefs_gpg.c:148

-msgid "Display warning on startup if GnuPG doesn't work"
+msgid "Display warning on start-up if GnuPG doesn't work"

 msgstr "Показывать предупреждение при старте, если GnuPG не работает"
 
 #: src/plugins/pgpcore/prefs_gpg.c:273
 msgstr "Показывать предупреждение при старте, если GnuPG не работает"
 
 #: src/plugins/pgpcore/prefs_gpg.c:273


@@ -7410,7 +7463,7 @@ msgstr "PGP/Mine"
 
 #: src/plugins/spamassassin/spamassassin.c:159
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:159
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"

-msgstr ""
+msgstr "Модуль SpamAssassin не может подключиться к spamd.\n"

 
 #: src/plugins/spamassassin/spamassassin.c:175
 msgid "SpamAssassin plugin filtering failed.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:175
 msgid "SpamAssassin plugin filtering failed.\n"


@@ -7476,7 +7529,6 @@ msgid "Spam detection"
 msgstr "Обнаружение спама"
 
 #: src/plugins/spamassassin/spamassassin.c:560
 msgstr "Обнаружение спама"
 
 #: src/plugins/spamassassin/spamassassin.c:560

-#, fuzzy

 msgid "Spam learning"
 msgstr "Обучить что это спам"
 
 msgid "Spam learning"
 msgstr "Обучить что это спам"
 


@@ -7574,7 +7626,7 @@ msgid "/_Email"
 msgstr "/_Сообщение"
 
 msgid "/_Email from account"
 msgstr "/_Сообщение"
 
 msgid "/_Email from account"

-msgstr "/_СообÑ\89ение длÑ\8f уч. записи"
+msgstr "/_СообÑ\89ение из уч. записи"

 
 #: src/plugins/trayicon/trayicon.c:97
 msgid "/Open A_ddressbook"
 
 #: src/plugins/trayicon/trayicon.c:97
 msgid "/Open A_ddressbook"


@@ -7622,6 +7674,15 @@ msgstr ""
 msgid "Trayicon"
 msgstr "Значок трея"
 
 msgid "Trayicon"
 msgstr "Значок трея"
 

+msgid "Hide at start-up"
+msgstr "Скрыть при запуске"
+
+msgid "Close to tray"
+msgstr "Скрыть в трее"
+
+msgid "Minimize to tray"
+msgstr "Минимизировать в трее"
+

 #: src/plugins/trayicon/trayicon.c:345
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"
 #: src/plugins/trayicon/trayicon.c:345
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"


@@ -8178,6 +8239,12 @@ msgstr "Имя меню:"
 msgid "Command line:"
 msgstr "Команда:"
 
 msgid "Command line:"
 msgstr "Команда:"
 

+msgid "Menu name"
+msgstr "Имя меню"
+
+msgid "Command line"
+msgstr "Команда"
+

 #: src/prefs_actions.c:275
 #: src/prefs_filtering_action.c:493
 #: src/prefs_filtering.c:455
 #: src/prefs_actions.c:275
 #: src/prefs_filtering_action.c:493
 #: src/prefs_filtering.c:455


@@ -8537,15 +8604,15 @@ msgstr ""
 
 #: src/prefs_customheader.c:590
 msgid "The image is too big; it must be maximum 725 bytes."
 
 #: src/prefs_customheader.c:590
 msgid "The image is too big; it must be maximum 725 bytes."

-msgstr ""
+msgstr "Изображение слишком большое: должно быть макс. 725 байт."

 
 #: src/prefs_customheader.c:595
 msgid "The image isn't in the correct format (PNG)."
 
 #: src/prefs_customheader.c:595
 msgid "The image isn't in the correct format (PNG)."

-msgstr ""
+msgstr "Неверный формат изображения (PNG)."

 
 #: src/prefs_customheader.c:604
 msgid "The image isn't in the correct format (XBM)."
 
 #: src/prefs_customheader.c:604
 msgid "The image isn't in the correct format (XBM)."

-msgstr ""
+msgstr "Неверный формат изображения (XBM)."

 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."


@@ -9438,7 +9505,7 @@ msgid "Set label for 'color %d'"
 msgstr "Выбрать цвет пометки для 'color %d'"
 
 #: src/prefs_msg_colors.c:612
 msgstr "Выбрать цвет пометки для 'color %d'"
 
 #: src/prefs_msg_colors.c:612

-#, fuzzy, c-format
+#, c-format

 msgid "Pick color for 'color %d' "
 msgstr "Выбрать цвет для 'color %d'"
 
 msgid "Pick color for 'color %d' "
 msgstr "Выбрать цвет для 'color %d'"
 


@@ -9519,13 +9586,22 @@ msgid "Empty trash on exit"
 msgstr "Очистить корзину при выходе"
 
 #: src/prefs_other.c:171
 msgstr "Очистить корзину при выходе"
 
 #: src/prefs_other.c:171

-msgid "Ask before emptying"
-msgstr "Запрос перед очисткой"
+msgid "Ask before emptying trash"
+msgstr "Запрос перед очисткой корзины"
+
+msgid "Ask about account specific filtering rules when filtering manually"
+msgstr "Запрос на определённые правила фильтрации для уч. записи при фильтарации вручную"

 
 #: src/prefs_other.c:175
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии неотправленных сообщений"
 
 
 #: src/prefs_other.c:175
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии неотправленных сообщений"
 

+msgid "Keyboard shortcuts"
+msgstr "Горячие клавиши"
+
+msgid "Enable customisable menu shortcuts"
+msgstr "Разрешить настраиваемое меню горячих клавиш"
+

 #: src/prefs_other.c:181
 msgid "Socket I/O timeout"
 msgstr "Время ожидания данных из сети"
 #: src/prefs_other.c:181
 msgid "Socket I/O timeout"
 msgstr "Время ожидания данных из сети"


@@ -9835,7 +9911,7 @@ msgid "Path to dictionaries"
 msgstr "Словарь по умолчанию"
 
 #: src/prefs_spelling.c:214
 msgstr "Словарь по умолчанию"
 
 #: src/prefs_spelling.c:214

-msgid "Automatic spelling"
+msgid "Automatic spell checking"

 msgstr "Автопроверка орфографии"
 
 #: src/prefs_spelling.c:226
 msgstr "Автопроверка орфографии"
 
 #: src/prefs_spelling.c:226


@@ -9846,6 +9922,9 @@ msgstr "Перепроверить сообщение при смене слов
 msgid "Dictionary"
 msgstr "Словарь"
 
 msgid "Dictionary"
 msgstr "Словарь"
 

+msgid "Spell check dictionaries"
+msgstr "Словари проверки орфографии"
+

 #: src/prefs_spelling.c:243
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 #: src/prefs_spelling.c:243
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"


@@ -10483,6 +10562,9 @@ msgstr "Фильтрация сообщений...\n"
 msgid "customized date format (see 'man strftime')"
 msgstr "пользовательский формат даты (см. man strftime)"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "пользовательский формат даты (см. man strftime)"
 

+msgid "email address of sender"
+msgstr "эл. адрес отправителя"
+

 #: src/quote_fmt.c:43
 msgid "full name of sender"
 msgstr "полное имя отправителя"
 #: src/quote_fmt.c:43
 msgid "full name of sender"
 msgstr "полное имя отправителя"


@@ -11568,6 +11650,15 @@ msgstr "Обучить что это спам"
 msgid "Learn Ham"
 msgstr "Обучить что это не спам"
 
 msgid "Learn Ham"
 msgstr "Обучить что это не спам"
 

+msgid "Learn as..."
+msgstr "Обучить как..."
+
+msgid "Learn as _Spam"
+msgstr "Обучить что это _спам"
+
+msgid "Learn as _Ham"
+msgstr "Обучить что это не _спам"
+

 #: src/wizard.c:459
 msgid "Welcome to Sylpheed-Claws "
 msgstr "Добро пожаловать в Sylpheed-Claws"
 #: src/wizard.c:459
 msgid "Welcome to Sylpheed-Claws "
 msgstr "Добро пожаловать в Sylpheed-Claws"


@@ -11839,4 +11930,3 @@ msgstr "Использоать X-Face по умолчанию"
 msgid "_Email from account"
 msgstr "_Сообщение для учётной записи"
 
 msgid "_Email from account"
 msgstr "_Сообщение для учётной записи"
 

-

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d67ba292599756eec3dc8a68605bbfdb16bf992..da258c865d995933e18cf3cdc37891a341e738a4 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,24 +1,23 @@
-# Chinese translation of sylpheed-claws
+# Chinese translation of claws-mail

 # Copyright (C) 2003 Tsu-Fan Cheng
 # This file is distributed under the same license as the sylpheed-claws package.
 # Tsu-Fan Cheng <tscheng@ic.sunysb.edu> 2003
 # Copyright (C) 2003 Tsu-Fan Cheng
 # This file is distributed under the same license as the sylpheed-claws package.
 # Tsu-Fan Cheng <tscheng@ic.sunysb.edu> 2003

-# Ralgh Young <bamanzi@gmail.com> 2004-2006
+# Ralgh Young <bamanzi@gmail.com> 2004-2007

 # 
 msgid ""
 msgstr ""
 # 
 msgid ""
 msgstr ""

-"Project-Id-Version: sylpheed-claw\n"
+"Project-Id-Version: claws-mail\n"

 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2007-04-10 15:37+0100\n"
-"PO-Revision-Date: 2007-04-15 00:03中國標準時間\n"
+"POT-Creation-Date: 2007-07-02 08:30+0100\n"
+"PO-Revision-Date: 2007-06-28 01:23+0800\n"

 "Last-Translator: Ralgh Young <bamanzi@gmail.com>\n"
 "Last-Translator: Ralgh Young <bamanzi@gmail.com>\n"

-"Language-Team: Sylpheed-Claws <sylpheed-claws-translators@lists.sourceforge."
-"net> \n"
+"Language-Team: Claws Mail <claws-mail-translators@dotsrc.org> \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 

-#: src/account.c:372
+#: src/account.c:383

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -26,15 +25,15 @@ msgstr ""
 "你正在撰写邮件，\n"
 "请关掉所有撰写中的邮件再进行帐号设置。"
 
 "你正在撰写邮件，\n"
 "请关掉所有撰写中的邮件再进行帐号设置。"
 

-#: src/account.c:419
+#: src/account.c:430

 msgid "Can't create folder."
 msgid "Can't create folder."

-msgstr "无法创建文件夹。"
+msgstr "无法创建目录。"

 
 

-#: src/account.c:679
+#: src/account.c:693

 msgid "Edit accounts"
 msgstr "编辑帐号设置"
 
 msgid "Edit accounts"
 msgstr "编辑帐号设置"
 

-#: src/account.c:701
+#: src/account.c:715

 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "


@@ -42,63 +41,63 @@ msgid ""
 msgstr ""
 "用'收信'收取邮件时将按以下顺序进行, 'G'栏的构选框表示要收取该账户的邮件。"
 
 msgstr ""
 "用'收信'收取邮件时将按以下顺序进行, 'G'栏的构选框表示要收取该账户的邮件。"
 

-#: src/account.c:774
+#: src/account.c:788

 msgid " _Set as default account "
 msgstr " 设为缺省帐号(_S) "
 
 msgid " _Set as default account "
 msgstr " 设为缺省帐号(_S) "
 

-#: src/account.c:871
+#: src/account.c:885

 msgid "Accounts with remote folders cannot be copied."
 msgid "Accounts with remote folders cannot be copied."

-msgstr "不能克隆有远程文件夹的帐户。"
+msgstr "不能克隆有远程目录的帐户。"

 
 

-#: src/account.c:877
+#: src/account.c:892

 #, c-format
 msgid "Copy of %s"
 msgstr "%s 副本"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "%s 副本"
 

-#: src/account.c:1016
+#: src/account.c:1030

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你确定要删除帐号 '%s' 吗？"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你确定要删除帐号 '%s' 吗？"
 

-#: src/account.c:1018
+#: src/account.c:1032

 msgid "(Untitled)"
 msgstr "(未命名)"
 
 msgid "(Untitled)"
 msgstr "(未命名)"
 

-#: src/account.c:1019
+#: src/account.c:1033

 msgid "Delete account"
 msgstr "删除帐号"
 
 msgid "Delete account"
 msgstr "删除帐号"
 

-#: src/account.c:1466
+#: src/account.c:1482

 msgid "Accounts List Default Column Name|D"
 msgstr "缺省"
 
 msgid "Accounts List Default Column Name|D"
 msgstr "缺省"
 

-#: src/account.c:1472 src/prefs_folder_item.c:740
+#: src/account.c:1488 src/prefs_folder_item.c:767

 msgid "Default account"
 msgstr "缺省帐号"
 
 msgid "Default account"
 msgstr "缺省帐号"
 

-#: src/account.c:1480
+#: src/account.c:1496

 msgid "Accounts List Get Column Name|G"
 msgstr "收取"
 
 msgid "Accounts List Get Column Name|G"
 msgstr "收取"
 

-#: src/account.c:1486
+#: src/account.c:1502

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'收信'时收取下面选中账户的邮件"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'收信'时收取下面选中账户的邮件"
 

-#: src/account.c:1493 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5870 src/compose.c:6181 src/editaddress.c:1043
-#: src/editaddress.c:1092 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1509 src/addressadd.c:199 src/addressbook.c:133
+#: src/compose.c:6036 src/compose.c:6349 src/editaddress.c:1044
+#: src/editaddress.c:1093 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:363
-#: src/prefs_filtering.c:1480 src/prefs_template.c:185
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:215
+#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:361
+#: src/prefs_filtering.c:1478 src/prefs_template.c:196

 msgid "Name"
 msgstr "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: src/account.c:1500 src/prefs_account.c:1258 src/prefs_account.c:2849
+#: src/account.c:1516 src/prefs_account.c:1001 src/prefs_account.c:3511

 msgid "Protocol"
 msgstr "通讯协议"
 
 msgid "Protocol"
 msgstr "通讯协议"
 

-#: src/account.c:1507 src/ssl_manager.c:102
+#: src/account.c:1523 src/ssl_manager.c:102

 msgid "Server"
 msgstr "服务器"
 
 msgid "Server"
 msgstr "服务器"
 


@@ -127,14 +126,15 @@ msgstr ""
 
 #: src/action.c:615
 msgid "There is no filtering action set"
 
 #: src/action.c:615
 msgid "There is no filtering action set"

-msgstr "没æ\9c\89设置过滤动作"
+msgstr "æ\9cª设置过滤动作"

 
 #: src/action.c:617
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
 
 #: src/action.c:617
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"

-msgstr "无效的过滤器:\n"
+msgstr ""
+"无效的过滤动作:\n"

 "%s"
 
 #: src/action.c:839
 "%s"
 
 #: src/action.c:839


@@ -157,25 +157,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1153 src/action.c:1303
+#: src/action.c:1154 src/action.c:1304

 msgid "Completed"
 msgstr "已完成"
 
 msgid "Completed"
 msgstr "已完成"
 

-#: src/action.c:1189
+#: src/action.c:1190

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行: %s\n"
 

-#: src/action.c:1193
+#: src/action.c:1194

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已经结束: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已经结束: %s\n"
 

-#: src/action.c:1226
+#: src/action.c:1227

 msgid "Action's input/output"
 msgstr "动作输入/输出"
 
 msgid "Action's input/output"
 msgstr "动作输入/输出"
 

-#: src/action.c:1539
+#: src/action.c:1540

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -186,11 +186,11 @@ msgstr ""
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1544
+#: src/action.c:1545

 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 
 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 

-#: src/action.c:1548
+#: src/action.c:1549

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -201,345 +201,355 @@ msgstr ""
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1553
+#: src/action.c:1554

 msgid "Action's user argument"
 msgstr "用户提供的参数"
 
 msgid "Action's user argument"
 msgstr "用户提供的参数"
 

-#: src/addr_compl.c:597 src/addressbook.c:4403
+#: src/addr_compl.c:597 src/addressbook.c:4596

 msgid "Group"
 msgstr "群组"
 
 msgid "Group"
 msgstr "群组"
 

-#: src/addressadd.c:174 src/prefs_filtering_action.c:179
+#: src/addressadd.c:177 src/prefs_filtering_action.c:179

 msgid "Add to address book"
 msgstr "将地址加入地址簿"
 
 msgid "Add to address book"
 msgstr "将地址加入地址簿"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:479
+#: src/addressadd.c:211 src/plugins/pgpcore/select-keys.c:405
+#: src/toolbar.c:480

 msgid "Address"
 msgstr "地址"
 
 msgid "Address"
 msgstr "地址"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:851
-#: src/editaddress.c:915 src/editgroup.c:289
+#: src/addressadd.c:221 src/addressbook.c:135 src/editaddress.c:852
+#: src/editaddress.c:916 src/editgroup.c:289

 msgid "Remarks"
 msgstr "备注"
 
 msgid "Remarks"
 msgstr "备注"
 

-#: src/addressadd.c:240 src/addressbook_foldersel.c:164
+#: src/addressadd.c:243 src/addressbook_foldersel.c:164

 msgid "Select Address Book Folder"
 msgid "Select Address Book Folder"

-msgstr "选择地址簿文件夹"
+msgstr "选择地址簿目录"
+
+#: src/addressadd.c:430 src/addressbook.c:3048 src/addressbook.c:3098
+msgid "Add address(es)"
+msgstr "添加邮件地址"

 
 

-#: src/addressbook.c:133 src/editaddress.c:849 src/editaddress.c:897
+#: src/addressadd.c:431
+msgid "Can't add the specified address"
+msgstr "无法添加指定的地址"
+
+#: src/addressbook.c:134 src/editaddress.c:850 src/editaddress.c:898

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591

-#: src/exporthtml.c:755 src/ldif.c:779
+#: src/exporthtml.c:755 src/ldif.c:781

 msgid "Email Address"
 msgstr "电子邮件"
 
 msgid "Email Address"
 msgstr "电子邮件"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Book"
 msgstr "/地址簿(_B)"
 
 msgid "/_Book"
 msgstr "/地址簿(_B)"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 
 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:429

 msgid "/_Book/New _Folder"
 msgid "/_Book/New _Folder"

-msgstr "/地址簿(_B)/新增文件夹(_F)"
+msgstr "/地址簿(_B)/新增目录(_F)"

 
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 

-#: src/addressbook.c:434
+#: src/addressbook.c:435

 msgid "/_Book/New LDAP _Server"
 msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
 

-#: src/addressbook.c:436 src/addressbook.c:439
+#: src/addressbook.c:437 src/addressbook.c:440

 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 
 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:438

 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 
 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 

-#: src/addressbook.c:438
+#: src/addressbook.c:439

 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 
 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:441

 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 
 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 

-#: src/addressbook.c:441
+#: src/addressbook.c:442

 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 
 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:443

 msgid "/_Address"
 msgstr "/地址(_A)"
 
 msgid "/_Address"
 msgstr "/地址(_A)"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:444

 msgid "/_Address/_Select all"
 msgstr "/地址(_A)/全选(_S)"
 
 msgid "/_Address/_Select all"
 msgstr "/地址(_A)/全选(_S)"
 

-#: src/addressbook.c:444 src/addressbook.c:448 src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:445 src/addressbook.c:449 src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:446

 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 
 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/_Address/_Copy"
 msgstr "/地址(_A)/复制(_C)"
 
 msgid "/_Address/_Copy"
 msgstr "/地址(_A)/复制(_C)"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:448

 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 
 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:450

 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 

-#: src/addressbook.c:450
+#: src/addressbook.c:451

 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:453

 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 

-#: src/addressbook.c:453
+#: src/addressbook.c:454

 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 

-#: src/addressbook.c:455
+#: src/addressbook.c:456

 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 
 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 

-#: src/addressbook.c:456 src/compose.c:790 src/mainwindow.c:814
+#: src/addressbook.c:457 src/compose.c:801 src/mainwindow.c:814

 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "工具(_T)"
 
 #: src/messageview.c:306
 msgid "/_Tools"
 msgstr "工具(_T)"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:458

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 

-#: src/addressbook.c:460 src/mainwindow.c:823 src/mainwindow.c:846
+#: src/addressbook.c:461 src/mainwindow.c:823 src/mainwindow.c:846

 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
 #: src/mainwindow.c:848 src/mainwindow.c:850 src/mainwindow.c:859
 #: src/mainwindow.c:862 src/mainwindow.c:866 src/messageview.c:310
 #: src/messageview.c:331 src/messageview.c:333
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 

-#: src/addressbook.c:461
+#: src/addressbook.c:462

 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 

-#: src/addressbook.c:462
+#: src/addressbook.c:463

 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 

-#: src/addressbook.c:463 src/compose.c:795 src/mainwindow.c:892
+#: src/addressbook.c:464 src/compose.c:806 src/mainwindow.c:892

 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
 #: src/messageview.c:336
 msgid "/_Help"
 msgstr "/帮助(_H)"
 

-#: src/addressbook.c:464 src/compose.c:796 src/mainwindow.c:898
+#: src/addressbook.c:465 src/compose.c:807 src/mainwindow.c:898

 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
 #: src/messageview.c:337
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 

-#: src/addressbook.c:469 src/addressbook.c:485 src/compose.c:563
+#: src/addressbook.c:470 src/addressbook.c:486 src/compose.c:574

 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
 #: src/mainwindow.c:530 src/messageview.c:168
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 

-#: src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:471 src/addressbook.c:487

 msgid "/_Delete"
 msgstr "/删除(_D)"
 
 msgid "/_Delete"
 msgstr "/删除(_D)"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:473

 msgid "/New _Book"
 msgstr "/新建地址簿(_B)"
 
 msgid "/New _Book"
 msgstr "/新建地址簿(_B)"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:474

 msgid "/New _Folder"
 msgid "/New _Folder"

-msgstr "/新建文件夹(_F)"
+msgstr "/新建目录(_F)"

 
 

-#: src/addressbook.c:474 src/addressbook.c:489
+#: src/addressbook.c:475 src/addressbook.c:490

 msgid "/New _Group"
 msgstr "/新建群组(_G)"
 
 msgid "/New _Group"
 msgstr "/新建群组(_G)"
 

-#: src/addressbook.c:476 src/addressbook.c:491
+#: src/addressbook.c:477 src/addressbook.c:492

 msgid "/C_ut"
 msgstr "/剪切(_u)"
 
 msgid "/C_ut"
 msgstr "/剪切(_u)"
 

-#: src/addressbook.c:477 src/addressbook.c:492
+#: src/addressbook.c:478 src/addressbook.c:493

 msgid "/_Copy"
 msgstr "/复制(_C)"
 
 msgid "/_Copy"
 msgstr "/复制(_C)"
 

-#: src/addressbook.c:478 src/addressbook.c:493
+#: src/addressbook.c:479 src/addressbook.c:494

 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 
 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 

-#: src/addressbook.c:483
+#: src/addressbook.c:484

 msgid "/_Select all"
 msgstr "/全选(_S)"
 
 msgid "/_Select all"
 msgstr "/全选(_S)"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:489

 msgid "/New _Address"
 msgstr "/新建联系地址(_A)"
 
 msgid "/New _Address"
 msgstr "/新建联系地址(_A)"
 

-#: src/addressbook.c:496
+#: src/addressbook.c:497

 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 
 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 

-#: src/addressbook.c:498
+#: src/addressbook.c:499

 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 
 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 

-#: src/addressbook.c:511 src/crash.c:451 src/crash.c:470 src/importldif.c:119
+#: src/addressbook.c:512 src/crash.c:452 src/crash.c:471 src/importldif.c:120

 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "未知"
 
 #: src/plugins/pgpcore/sgpgme.c:138 src/prefs_themes.c:684
 #: src/prefs_themes.c:716 src/prefs_themes.c:717
 msgid "Unknown"
 msgstr "未知"
 

-#: src/addressbook.c:518 src/addressbook.c:537 src/importldif.c:126
+#: src/addressbook.c:519 src/addressbook.c:538 src/importldif.c:127

 msgid "Success"
 msgstr "成功"
 
 msgid "Success"
 msgstr "成功"
 

-#: src/addressbook.c:519 src/importldif.c:127
+#: src/addressbook.c:520 src/importldif.c:128

 msgid "Bad arguments"
 msgstr "错误的参数"
 
 msgid "Bad arguments"
 msgstr "错误的参数"
 

-#: src/addressbook.c:520 src/importldif.c:128
+#: src/addressbook.c:521 src/importldif.c:129

 msgid "File not specified"
 msgstr "未指定文件"
 
 msgid "File not specified"
 msgstr "未指定文件"
 

-#: src/addressbook.c:521 src/importldif.c:129
+#: src/addressbook.c:522 src/importldif.c:130

 msgid "Error opening file"
 msgstr "打开文件错误"
 
 msgid "Error opening file"
 msgstr "打开文件错误"
 

-#: src/addressbook.c:522 src/importldif.c:130
+#: src/addressbook.c:523 src/importldif.c:131

 msgid "Error reading file"
 msgstr "读取文件错误"
 
 msgid "Error reading file"
 msgstr "读取文件错误"
 

-#: src/addressbook.c:523 src/importldif.c:131
+#: src/addressbook.c:524 src/importldif.c:132

 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 
 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 

-#: src/addressbook.c:524 src/importldif.c:132
+#: src/addressbook.c:525 src/importldif.c:133

 msgid "Error allocating memory"
 msgstr "内存分配错误"
 
 msgid "Error allocating memory"
 msgstr "内存分配错误"
 

-#: src/addressbook.c:525 src/importldif.c:133
+#: src/addressbook.c:526 src/importldif.c:134

 msgid "Bad file format"
 msgstr "文件格式错误"
 
 msgid "Bad file format"
 msgstr "文件格式错误"
 

-#: src/addressbook.c:526 src/importldif.c:134
+#: src/addressbook.c:527 src/importldif.c:135

 msgid "Error writing to file"
 msgstr "文件写入错误"
 
 msgid "Error writing to file"
 msgstr "文件写入错误"
 

-#: src/addressbook.c:527 src/importldif.c:135
+#: src/addressbook.c:528 src/importldif.c:136

 msgid "Error opening directory"
 msgstr "打开目录错误"
 
 msgid "Error opening directory"
 msgstr "打开目录错误"
 

-#: src/addressbook.c:528 src/importldif.c:136
+#: src/addressbook.c:529 src/importldif.c:137

 msgid "No path specified"
 msgstr "未指定文件路径"
 
 msgid "No path specified"
 msgstr "未指定文件路径"
 

-#: src/addressbook.c:538
+#: src/addressbook.c:539

 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 
 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 

-#: src/addressbook.c:539
+#: src/addressbook.c:540

 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 
 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 

-#: src/addressbook.c:540
+#: src/addressbook.c:541

 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 
 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 

-#: src/addressbook.c:541
+#: src/addressbook.c:542

 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 
 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 

-#: src/addressbook.c:542
+#: src/addressbook.c:543

 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 
 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 

-#: src/addressbook.c:543
+#: src/addressbook.c:544

 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻条件错误"
 
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻条件错误"
 

-#: src/addressbook.c:544
+#: src/addressbook.c:545

 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 

-#: src/addressbook.c:545
+#: src/addressbook.c:546

 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 

-#: src/addressbook.c:546
+#: src/addressbook.c:547

 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 
 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 

-#: src/addressbook.c:920
+#: src/addressbook.c:548
+#, fuzzy
+msgid "Distinguised Name (dn) is missing"
+msgstr "没有提供DN"
+
+#: src/addressbook.c:549
+msgid "Missing required information"
+msgstr "缺乏必须的信息"
+
+#: src/addressbook.c:550
+msgid "Another contact exists with that key"
+msgstr "已有另一个联系人使用了这个key"
+
+#: src/addressbook.c:551
+msgid "Strong(er) authentication required"
+msgstr "需要更强的鉴权"
+
+#: src/addressbook.c:925

 msgid "Sources"
 msgstr "来源"
 
 msgid "Sources"
 msgstr "来源"
 

-#: src/addressbook.c:924 src/prefs_other.c:513 src/toolbar.c:201
-#: src/toolbar.c:1901
+#: src/addressbook.c:929 src/prefs_other.c:513 src/toolbar.c:202
+#: src/toolbar.c:1910

 msgid "Address book"
 msgstr "地址簿"
 
 msgid "Address book"
 msgstr "地址簿"
 

-#: src/addressbook.c:1056
+#: src/addressbook.c:1061

 msgid "Lookup name:"
 msgstr "查找姓名:"
 
 msgid "Lookup name:"
 msgstr "查找姓名:"
 

-#: src/addressbook.c:1129 src/compose.c:2131 src/compose.c:4481
-#: src/compose.c:5705 src/compose.c:6519 src/compose.c:9648 src/matcher.c:769
-#: src/summary_search.c:363
-msgid "To:"
-msgstr "To:"
-
-#: src/addressbook.c:1133 src/compose.c:2115 src/compose.c:4217
-#: src/compose.c:4480 src/compose.c:9657 src/matcher.c:770
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1137 src/compose.c:2118 src/compose.c:4248
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: src/addressbook.c:1387 src/addressbook.c:1433
+#: src/addressbook.c:1392 src/addressbook.c:1438

 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 
 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 

-#: src/addressbook.c:1388
+#: src/addressbook.c:1393

 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 

-#: src/addressbook.c:1427
+#: src/addressbook.c:1432

 msgid "Delete group"
 msgstr "删除群组"
 
 msgid "Delete group"
 msgstr "删除群组"
 

-#: src/addressbook.c:1428
+#: src/addressbook.c:1433

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -547,51 +557,51 @@ msgstr ""
 "你想要删除这个群组吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除这个群组吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:1434
+#: src/addressbook.c:1439

 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 
 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 

-#: src/addressbook.c:2038
+#: src/addressbook.c:2055

 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 

-#: src/addressbook.c:2049
+#: src/addressbook.c:2066

 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format
 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format

-#: src/addressbook.c:2732
+#: src/addressbook.c:2749

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "你想要删除'%s'里面的查询结果和地址信息吗?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "你想要删除'%s'里面的查询结果和地址信息吗?"
 

-#: src/addressbook.c:2735 src/addressbook.c:2761 src/addressbook.c:2768
+#: src/addressbook.c:2752 src/addressbook.c:2778 src/addressbook.c:2785

 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "删除"
 
 #: src/prefs_filtering_action.c:161
 msgid "Delete"
 msgstr "删除"
 

-#: src/addressbook.c:2744
+#: src/addressbook.c:2761

 #, 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 ""
 #, 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 ""

-"你确定要删除'%s'这个文件夹以及里面所有的地址吗？ \n"
-"如果只删除文件夹，地址簿会被移到上一层的文件夹中。"
+"你确定要删除'%s'这个目录以及里面所有的地址吗？ \n"
+"如果只删除目录，地址簿会被移到上一层的目录中。"

 
 

-#: src/addressbook.c:2747 src/imap_gtk.c:302 src/mh_gtk.c:182
+#: src/addressbook.c:2764 src/imap_gtk.c:302 src/mh_gtk.c:182

 msgid "Delete folder"
 msgid "Delete folder"

-msgstr "删除文件夹"
+msgstr "删除目录"

 
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "+Delete _folder only"
 msgstr "+只删除目录(_f)"
 
 msgid "+Delete _folder only"
 msgstr "+只删除目录(_f)"
 

-#: src/addressbook.c:2748
+#: src/addressbook.c:2765

 msgid "Delete folder and _addresses"
 msgstr "删除目录及地址数据"
 
 msgid "Delete folder and _addresses"
 msgstr "删除目录及地址数据"
 

-#: src/addressbook.c:2759
+#: src/addressbook.c:2776

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -600,7 +610,7 @@ msgstr ""
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:2766
+#: src/addressbook.c:2783

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -609,19 +619,29 @@ msgstr ""
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:3638
+# c-format
+#: src/addressbook.c:2893
+#, c-format
+msgid "Search '%s'"
+msgstr "搜索 '%s'"
+
+#: src/addressbook.c:3031 src/addressbook.c:3080
+msgid "New Contacts"
+msgstr "添加联系人"
+
+#: src/addressbook.c:3848

 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 
 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 

-#: src/addressbook.c:3642
+#: src/addressbook.c:3852

 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 
 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 

-#: src/addressbook.c:3652
+#: src/addressbook.c:3862

 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 
 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 

-#: src/addressbook.c:3657
+#: src/addressbook.c:3867

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -629,7 +649,7 @@ msgstr ""
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3880

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -637,7 +657,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 

-#: src/addressbook.c:3676
+#: src/addressbook.c:3886

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -645,7 +665,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "无法保存新的地址簿索引文件。"
 
 "无法转换地址簿格式，\n"
 "无法保存新的地址簿索引文件。"
 

-#: src/addressbook.c:3681
+#: src/addressbook.c:3891

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -653,72 +673,66 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 

-#: src/addressbook.c:3688 src/addressbook.c:3694
+#: src/addressbook.c:3898 src/addressbook.c:3904

 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 
 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 

-#: src/addressbook.c:3732
+#: src/addressbook.c:3942

 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 
 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 

-#: src/addressbook.c:3733
+#: src/addressbook.c:3943

 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 
 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 

-#: src/addressbook.c:4060
+#: src/addressbook.c:4270

 msgid "Busy searching..."
 msgstr "正在搜索..."
 
 msgid "Busy searching..."
 msgstr "正在搜索..."
 

-# c-format
-#: src/addressbook.c:4114
-#, c-format
-msgid "Search '%s'"
-msgstr "搜索 '%s'"
-
-#: src/addressbook.c:4339
+#: src/addressbook.c:4532

 msgid "Interface"
 msgstr "界面"
 
 msgid "Interface"
 msgstr "界面"
 

-#: src/addressbook.c:4355 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:394 src/exporthtml.c:973 src/importldif.c:651
+#: src/addressbook.c:4548 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:394 src/exporthtml.c:974 src/importldif.c:660

 msgid "Address Book"
 msgstr "地址簿"
 
 msgid "Address Book"
 msgstr "地址簿"
 

-#: src/addressbook.c:4371
+#: src/addressbook.c:4564

 msgid "Person"
 msgstr "人名"
 
 msgid "Person"
 msgstr "人名"
 

-#: src/addressbook.c:4387
+#: src/addressbook.c:4580

 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 
 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 

-#: src/addressbook.c:4419 src/exporthtml.c:875 src/folderview.c:469
-#: src/prefs_account.c:2542 src/prefs_folder_column.c:79
+#: src/addressbook.c:4612 src/exporthtml.c:875 src/folderview.c:469
+#: src/prefs_account.c:2452 src/prefs_folder_column.c:79

 msgid "Folder"
 msgid "Folder"

-msgstr "文件夹"
+msgstr "目录"

 
 

-#: src/addressbook.c:4435
+#: src/addressbook.c:4628

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4451 src/addressbook.c:4467
+#: src/addressbook.c:4644 src/addressbook.c:4660

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4483
+#: src/addressbook.c:4676

 msgid "LDAP servers"
 msgstr "LDAP 服务器"
 
 msgid "LDAP servers"
 msgstr "LDAP 服务器"
 

-#: src/addressbook.c:4499
+#: src/addressbook.c:4692

 msgid "LDAP Query"
 msgstr "LDAP 查询"
 
 msgid "LDAP Query"
 msgstr "LDAP 查询"
 

-#: src/addressbook.c:4822 src/addressbook_foldersel.c:389 src/matcher.c:312
-#: src/matcher.c:1097 src/matcher.c:1230
-#: src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67 src/prefs_matcher.c:220
-#: src/prefs_matcher.c:527 src/prefs_matcher.c:1347 src/prefs_matcher.c:1364
-#: src/prefs_matcher.c:1366 src/prefs_matcher.c:2119 src/prefs_matcher.c:2123
+#: src/addressbook.c:5015 src/addressbook_foldersel.c:389 src/matcher.c:312
+#: src/matcher.c:1183 src/matcher.c:1316
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:68 src/prefs_matcher.c:243
+#: src/prefs_matcher.c:554 src/prefs_matcher.c:1374 src/prefs_matcher.c:1391
+#: src/prefs_matcher.c:1393 src/prefs_matcher.c:2146 src/prefs_matcher.c:2150

 msgid "Any"
 msgstr "任意"
 
 msgid "Any"
 msgstr "任意"
 


@@ -740,27 +754,27 @@ msgstr "成功收集到地址。"
 
 #: src/addrgather.c:294
 msgid "No folder or message was selected."
 
 #: src/addrgather.c:294
 msgid "No folder or message was selected."

-msgstr "未选取文件夹或讯息。"
+msgstr "未选取目录或讯息。"

 
 #: src/addrgather.c:302
 msgid ""
 "Please select a folder to process from the folder\n"
 "list. Alternatively, select one or messages from\n"
 "the message list."
 
 #: src/addrgather.c:302
 msgid ""
 "Please select a folder to process from the folder\n"
 "list. Alternatively, select one or messages from\n"
 "the message list."

-msgstr "请选取选择需要处理的文件夹，或者选择一封或多封邮件。"
+msgstr "请选取选择需要处理的目录，或者选择一封或多封邮件。"

 
 #: src/addrgather.c:354
 msgid "Folder :"
 
 #: src/addrgather.c:354
 msgid "Folder :"

-msgstr "文件夹 :"
+msgstr "目录 :"

 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
 
 #: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

-#: src/importldif.c:909
+#: src/importldif.c:912

 msgid "Address Book :"
 msgstr "地址簿 :"
 
 #: src/addrgather.c:375
 msgid "Folder Size :"
 msgid "Address Book :"
 msgstr "地址簿 :"
 
 #: src/addrgather.c:375
 msgid "Folder Size :"

-msgstr "文件夹大小 :"
+msgstr "目录大小 :"

 
 #: src/addrgather.c:390
 msgid "Process these mail header fields"
 
 #: src/addrgather.c:390
 msgid "Process these mail header fields"


@@ -768,7 +782,7 @@ msgstr "检索如下信头字段"
 
 #: src/addrgather.c:408
 msgid "Include sub-folders"
 
 #: src/addrgather.c:408
 msgid "Include sub-folders"

-msgstr "包括子文件夹"
+msgstr "包括子目录"

 
 #: src/addrgather.c:431
 msgid "Header Name"
 
 #: src/addrgather.c:431
 msgid "Header Name"


@@ -778,8 +792,8 @@ msgstr "信头名称"
 msgid "Address Count"
 msgstr "邮件地址数目"
 
 msgid "Address Count"
 msgstr "邮件地址数目"
 

-#: src/addrgather.c:537 src/alertpanel.c:155 src/compose.c:4832
-#: src/compose.c:9569 src/messageview.c:589 src/messageview.c:602
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:4910
+#: src/compose.c:9841 src/messageview.c:589 src/messageview.c:602

 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "警告"
 #: src/plugins/pgpcore/sgpgme.c:579
 msgid "Warning"
 msgstr "警告"


@@ -789,7 +803,7 @@ msgid "Header Fields"
 msgstr "信头字段"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
 msgstr "信头字段"
 
 #: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

-#: src/importldif.c:1029
+#: src/importldif.c:1044

 msgid "Finish"
 msgstr "完成"
 
 msgid "Finish"
 msgstr "完成"
 


@@ -799,38 +813,46 @@ msgstr "批量获取Email地址 - 选取的邮件"
 
 #: src/addrgather.c:608
 msgid "Harvest Email Addresses - from Folder"
 
 #: src/addrgather.c:608
 msgid "Harvest Email Addresses - from Folder"

-msgstr "批量获取Email地址 - 文件夹"
+msgstr "批量获取Email地址 - 目录"

 
 

-#: src/addrindex.c:116
+#: src/addrindex.c:118

 msgid "Common addresses"
 msgstr "公用邮件地址"
 
 msgid "Common addresses"
 msgstr "公用邮件地址"
 

-#: src/addrindex.c:117
+#: src/addrindex.c:119

 msgid "Personal addresses"
 msgstr "个人邮件地址"
 
 msgid "Personal addresses"
 msgstr "个人邮件地址"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:125

 msgid "Common address"
 msgstr "公用邮件地址"
 
 msgid "Common address"
 msgstr "公用邮件地址"
 

-#: src/addrindex.c:124
+#: src/addrindex.c:126

 msgid "Personal address"
 msgstr "个人邮件地址"
 
 msgid "Personal address"
 msgstr "个人邮件地址"
 

-#: src/alertpanel.c:142 src/compose.c:7673
+#: src/addrindex.c:1737
+msgid "Address(es) update"
+msgstr "地址更新"
+
+#: src/addrindex.c:1738
+msgid "Update failed. Changes not written to Directory."
+msgstr "更新失败。所做变更未能写入目录。"
+
+#: src/alertpanel.c:145 src/compose.c:7902

 msgid "Notice"
 msgstr "注意"
 
 msgid "Notice"
 msgstr "注意"
 

-#: src/alertpanel.c:168 src/alertpanel.c:191 src/compose.c:4772 src/inc.c:619
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:4850 src/inc.c:619

 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "错误"
 
 #: src/plugins/pgpcore/sgpgme.c:150 src/plugins/pgpcore/sgpgme.c:241
 msgid "Error"
 msgstr "错误"
 

-#: src/alertpanel.c:192
+#: src/alertpanel.c:195

 msgid "_View log"
 msgstr "查看日志文件(_V)"
 
 msgid "_View log"
 msgstr "查看日志文件(_V)"
 

-#: src/alertpanel.c:340
+#: src/alertpanel.c:345

 msgid "Show this message next time"
 msgstr "在显示一次讯息"
 
 msgid "Show this message next time"
 msgstr "在显示一次讯息"
 


@@ -859,7 +881,7 @@ msgstr "属性值"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "无法连接NNTP服务器: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "无法连接NNTP服务器: %s:%d\n"
 

-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:848
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:872

 msgid "SSL handshake failed\n"
 msgstr "SSL握手失败\n"
 
 msgid "SSL handshake failed\n"
 msgstr "SSL握手失败\n"
 


@@ -880,79 +902,79 @@ msgstr "发表文章时发生错误\n"
 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "Nothing"
 msgstr "无用"
 
 msgid "Nothing"
 msgstr "无用"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a viewer"
 msgstr "图片查看器"
 
 msgid "a viewer"
 msgstr "图片查看器"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "folders"
 msgid "folders"

-msgstr "文件夹"
+msgstr "目录"

 
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "filtering"
 msgstr "过滤器"
 
 msgid "filtering"
 msgstr "过滤器"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "a privacy interface"
 msgstr "隐私系统"
 
 msgid "a privacy interface"
 msgstr "隐私系统"
 

-#: src/common/plugin.c:60
+#: src/common/plugin.c:61

 msgid "a notifier"
 msgstr "通知器"
 
 msgid "a notifier"
 msgstr "通知器"
 

-#: src/common/plugin.c:61
+#: src/common/plugin.c:62

 msgid "an utility"
 msgstr "工具"
 
 msgid "an utility"
 msgstr "工具"
 

-#: src/common/plugin.c:62
+#: src/common/plugin.c:63

 msgid "things"
 msgstr "其它"
 
 msgid "things"
 msgstr "其它"
 

-#: src/common/plugin.c:260
+#: src/common/plugin.c:269

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "该账户提供%s(%s)功能，但%s插件已经提供了此功能。"
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "该账户提供%s(%s)功能，但%s插件已经提供了此功能。"
 

-#: src/common/plugin.c:295
+#: src/common/plugin.c:309

 msgid "Plugin already loaded"
 msgstr "插件已经加载"
 
 msgid "Plugin already loaded"
 msgstr "插件已经加载"
 

-#: src/common/plugin.c:305
+#: src/common/plugin.c:320

 msgid "Failed to allocate memory for Plugin"
 msgstr "为插件分配内存失败"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "为插件分配内存失败"
 

-#: src/common/plugin.c:332
+#: src/common/plugin.c:350

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
 

-#: src/common/plugin.c:339
+#: src/common/plugin.c:359

 msgid "This module is for Claws Mail GTK1."
 msgstr "该模块是为GTK1版本的Claws Mail。"
 
 msgid "This module is for Claws Mail GTK1."
 msgstr "该模块是为GTK1版本的Claws Mail。"
 

-#: src/common/plugin.c:555
+#: src/common/plugin.c:599

 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "您的Claws Mail版本比编译'%s'插件所采用的版本更新。"
 
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "您的Claws Mail版本比编译'%s'插件所采用的版本更新。"
 

-#: src/common/plugin.c:558
+#: src/common/plugin.c:602

 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "您的Claws Mail版本比编译此插件所采用的版本更新。"
 
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "您的Claws Mail版本比编译此插件所采用的版本更新。"
 

-#: src/common/plugin.c:567
+#: src/common/plugin.c:611

 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "您的Claws Mail版本太老，不能使用'%s'插件。"
 
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "您的Claws Mail版本太老，不能使用'%s'插件。"
 

-#: src/common/plugin.c:569
+#: src/common/plugin.c:613

 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "您的Claws Mail版本太老，不能使用此插件。"
 
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "您的Claws Mail版本太老，不能使用此插件。"
 


@@ -968,7 +990,7 @@ msgstr "错误的SMTP回应\n"
 msgid "error occurred on SMTP session\n"
 msgstr "连接SMTP错误\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "连接SMTP错误\n"
 

-#: src/common/smtp.c:548 src/pop.c:872
+#: src/common/smtp.c:548 src/pop.c:886

 msgid "error occurred on authentication\n"
 msgstr "认证时发生错误\n"
 
 msgid "error occurred on authentication\n"
 msgstr "认证时发生错误\n"
 


@@ -977,11 +999,11 @@ msgstr "认证时发生错误\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "邮件太大(最大允许尺寸为%s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "邮件太大(最大允许尺寸为%s)\n"
 

-#: src/common/smtp.c:635 src/pop.c:865
+#: src/common/smtp.c:635 src/pop.c:879

 msgid "couldn't start TLS session\n"
 msgstr "无法启动TLS会话\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "无法启动TLS会话\n"
 

-#: src/common/socket.c:1401
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr ""
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr ""


@@ -998,9 +1020,9 @@ msgstr "SSL连接失败 (%s)\n"
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
 #: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
 #: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
 #: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244

-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:69 src/gtk/sslcertwindow.c:80
+#: src/gtk/sslcertwindow.c:86 src/gtk/sslcertwindow.c:93
+#: src/gtk/sslcertwindow.c:104 src/gtk/sslcertwindow.c:110

 msgid "<not in certificate>"
 msgstr "<不在认证之内>"
 
 msgid "<not in certificate>"
 msgstr "<不在认证之内>"
 


@@ -1025,712 +1047,728 @@ msgstr "无法加载X509缺省路径"
 msgid "(Subject cleared by RegExp)"
 msgstr "（主题被RegExp清除了）"
 
 msgid "(Subject cleared by RegExp)"
 msgstr "（主题被RegExp清除了）"
 

-#: src/common/utils.c:353
+#: src/common/utils.c:354

 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 

-#: src/common/utils.c:354
+#: src/common/utils.c:355

 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 
 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 

-#: src/common/utils.c:355
+#: src/common/utils.c:356

 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 
 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 

-#: src/common/utils.c:356
+#: src/common/utils.c:357

 #, c-format
 msgid "%.2fGB"
 msgstr ""
 
 #, c-format
 msgid "%.2fGB"
 msgstr ""
 

-#: src/common/utils.c:4820
+#: src/common/utils.c:4858

 msgid "Complete day name for use by strftime|Sunday"
 msgstr "星期日"
 
 msgid "Complete day name for use by strftime|Sunday"
 msgstr "星期日"
 

-#: src/common/utils.c:4821
+#: src/common/utils.c:4859

 msgid "Complete day name for use by strftime|Monday"
 msgstr "星期一"
 
 msgid "Complete day name for use by strftime|Monday"
 msgstr "星期一"
 

-#: src/common/utils.c:4822
+#: src/common/utils.c:4860

 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "星期二"
 
 msgid "Complete day name for use by strftime|Tuesday"
 msgstr "星期二"
 

-#: src/common/utils.c:4823
+#: src/common/utils.c:4861

 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "星期三"
 
 msgid "Complete day name for use by strftime|Wednesday"
 msgstr "星期三"
 

-#: src/common/utils.c:4824
+#: src/common/utils.c:4862

 msgid "Complete day name for use by strftime|Thursday"
 msgstr "星期四"
 
 msgid "Complete day name for use by strftime|Thursday"
 msgstr "星期四"
 

-#: src/common/utils.c:4825
+#: src/common/utils.c:4863

 msgid "Complete day name for use by strftime|Friday"
 msgstr "星期五"
 
 msgid "Complete day name for use by strftime|Friday"
 msgstr "星期五"
 

-#: src/common/utils.c:4826
+#: src/common/utils.c:4864

 msgid "Complete day name for use by strftime|Saturday"
 msgstr "星期六"
 
 msgid "Complete day name for use by strftime|Saturday"
 msgstr "星期六"
 

-#: src/common/utils.c:4828
+#: src/common/utils.c:4866

 msgid "Complete month name for use by strftime|January"
 msgstr "一月"
 
 msgid "Complete month name for use by strftime|January"
 msgstr "一月"
 

-#: src/common/utils.c:4829
+#: src/common/utils.c:4867

 msgid "Complete month name for use by strftime|February"
 msgstr "二月"
 
 msgid "Complete month name for use by strftime|February"
 msgstr "二月"
 

-#: src/common/utils.c:4830
+#: src/common/utils.c:4868

 msgid "Complete month name for use by strftime|March"
 msgstr "三月"
 
 msgid "Complete month name for use by strftime|March"
 msgstr "三月"
 

-#: src/common/utils.c:4831
+#: src/common/utils.c:4869

 msgid "Complete month name for use by strftime|April"
 msgstr "四月"
 
 msgid "Complete month name for use by strftime|April"
 msgstr "四月"
 

-#: src/common/utils.c:4832
+#: src/common/utils.c:4870

 msgid "Complete month name for use by strftime|May"
 msgstr "五月"
 
 msgid "Complete month name for use by strftime|May"
 msgstr "五月"
 

-#: src/common/utils.c:4833
+#: src/common/utils.c:4871

 msgid "Complete month name for use by strftime|June"
 msgstr "六月"
 
 msgid "Complete month name for use by strftime|June"
 msgstr "六月"
 

-#: src/common/utils.c:4834
+#: src/common/utils.c:4872

 msgid "Complete month name for use by strftime|July"
 msgstr "七月"
 
 msgid "Complete month name for use by strftime|July"
 msgstr "七月"
 

-#: src/common/utils.c:4835
+#: src/common/utils.c:4873

 msgid "Complete month name for use by strftime|August"
 msgstr "八月"
 
 msgid "Complete month name for use by strftime|August"
 msgstr "八月"
 

-#: src/common/utils.c:4836
+#: src/common/utils.c:4874

 msgid "Complete month name for use by strftime|September"
 msgstr "九月"
 
 msgid "Complete month name for use by strftime|September"
 msgstr "九月"
 

-#: src/common/utils.c:4837
+#: src/common/utils.c:4875

 msgid "Complete month name for use by strftime|October"
 msgstr "十月"
 
 msgid "Complete month name for use by strftime|October"
 msgstr "十月"
 

-#: src/common/utils.c:4838
+#: src/common/utils.c:4876

 msgid "Complete month name for use by strftime|November"
 msgstr "十一月"
 
 msgid "Complete month name for use by strftime|November"
 msgstr "十一月"
 

-#: src/common/utils.c:4839
+#: src/common/utils.c:4877

 msgid "Complete month name for use by strftime|December"
 msgstr "十二月"
 
 msgid "Complete month name for use by strftime|December"
 msgstr "十二月"
 

-#: src/common/utils.c:4841
+#: src/common/utils.c:4879

 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "日"
 
 msgid "Abbr. day name for use by strftime|Sun"
 msgstr "日"
 

-#: src/common/utils.c:4842
+#: src/common/utils.c:4880

 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "一"
 
 msgid "Abbr. day name for use by strftime|Mon"
 msgstr "一"
 

-#: src/common/utils.c:4843
+#: src/common/utils.c:4881

 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "二"
 
 msgid "Abbr. day name for use by strftime|Tue"
 msgstr "二"
 

-#: src/common/utils.c:4844
+#: src/common/utils.c:4882

 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "三"
 
 msgid "Abbr. day name for use by strftime|Wed"
 msgstr "三"
 

-#: src/common/utils.c:4845
+#: src/common/utils.c:4883

 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "四"
 
 msgid "Abbr. day name for use by strftime|Thu"
 msgstr "四"
 

-#: src/common/utils.c:4846
+#: src/common/utils.c:4884

 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "五"
 
 msgid "Abbr. day name for use by strftime|Fri"
 msgstr "五"
 

-#: src/common/utils.c:4847
+#: src/common/utils.c:4885

 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "六"
 
 msgid "Abbr. day name for use by strftime|Sat"
 msgstr "六"
 

-#: src/common/utils.c:4849
+#: src/common/utils.c:4887

 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "一"
 
 msgid "Abbr. month name for use by strftime|Jan"
 msgstr "一"
 

-#: src/common/utils.c:4850
+#: src/common/utils.c:4888

 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "二"
 
 msgid "Abbr. month name for use by strftime|Feb"
 msgstr "二"
 

-#: src/common/utils.c:4851
+#: src/common/utils.c:4889

 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "三"
 
 msgid "Abbr. month name for use by strftime|Mar"
 msgstr "三"
 

-#: src/common/utils.c:4852
+#: src/common/utils.c:4890

 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "四"
 
 msgid "Abbr. month name for use by strftime|Apr"
 msgstr "四"
 

-#: src/common/utils.c:4853
+#: src/common/utils.c:4891

 msgid "Abbr. month name for use by strftime|May"
 msgstr "五"
 
 msgid "Abbr. month name for use by strftime|May"
 msgstr "五"
 

-#: src/common/utils.c:4854
+#: src/common/utils.c:4892

 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "六"
 
 msgid "Abbr. month name for use by strftime|Jun"
 msgstr "六"
 

-#: src/common/utils.c:4855
+#: src/common/utils.c:4893

 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "七"
 
 msgid "Abbr. month name for use by strftime|Jul"
 msgstr "七"
 

-#: src/common/utils.c:4856
+#: src/common/utils.c:4894

 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "八"
 
 msgid "Abbr. month name for use by strftime|Aug"
 msgstr "八"
 

-#: src/common/utils.c:4857
+#: src/common/utils.c:4895

 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "九"
 
 msgid "Abbr. month name for use by strftime|Sep"
 msgstr "九"
 

-#: src/common/utils.c:4858
+#: src/common/utils.c:4896

 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "十"
 
 msgid "Abbr. month name for use by strftime|Oct"
 msgstr "十"
 

-#: src/common/utils.c:4859
+#: src/common/utils.c:4897

 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "十一"
 
 msgid "Abbr. month name for use by strftime|Nov"
 msgstr "十一"
 

-#: src/common/utils.c:4860
+#: src/common/utils.c:4898

 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "十二"
 
 msgid "Abbr. month name for use by strftime|Dec"
 msgstr "十二"
 

-#: src/common/utils.c:4862
+#: src/common/utils.c:4900

 msgid "For use by strftime (morning)|AM"
 msgstr "上午"
 
 msgid "For use by strftime (morning)|AM"
 msgstr "上午"
 

-#: src/common/utils.c:4863
+#: src/common/utils.c:4901

 msgid "For use by strftime (afternoon)|PM"
 msgstr "下午"
 
 msgid "For use by strftime (afternoon)|PM"
 msgstr "下午"
 

-#: src/common/utils.c:4864
+#: src/common/utils.c:4902

 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 
 msgid "For use by strftime (morning, lowercase)|am"
 msgstr "am"
 

-#: src/common/utils.c:4865
+#: src/common/utils.c:4903

 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 
 msgid "For use by strftime (afternoon, lowercase)|pm"
 msgstr "pm"
 

-#: src/common/utils.c:4867
+#: src/common/utils.c:4905

 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr ""
 
 msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
 msgstr ""
 

-#: src/common/utils.c:4868
+#: src/common/utils.c:4906

 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr ""
 
 msgid "For use by strftime (default date format)|%m/%d/%y"
 msgstr ""
 

-#: src/common/utils.c:4869
+#: src/common/utils.c:4907

 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr ""
 
 msgid "For use by strftime (default time format)|%H:%M:%S"
 msgstr ""
 

-#: src/common/utils.c:4871
+#: src/common/utils.c:4909

 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr ""
 
 msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
 msgstr ""
 

-#: src/compose.c:540
+#: src/compose.c:551

 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 

-#: src/compose.c:541
+#: src/compose.c:552

 msgid "/_Remove"
 msgstr "/删除(_R)"
 
 msgid "/_Remove"
 msgstr "/删除(_R)"
 

-#: src/compose.c:543 src/folderview.c:293
+#: src/compose.c:554 src/folderview.c:293

 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 

-#: src/compose.c:548 src/mainwindow.c:755 src/messageview.c:289
+#: src/compose.c:559 src/mainwindow.c:755 src/messageview.c:289

 msgid "/_Message"
 msgstr "/邮件(_M)"
 
 msgid "/_Message"
 msgstr "/邮件(_M)"
 

-#: src/compose.c:549
+#: src/compose.c:560

 msgid "/_Message/S_end"
 msgstr "/邮件(_M)/发送(_e)"
 
 msgid "/_Message/S_end"
 msgstr "/邮件(_M)/发送(_e)"
 

-#: src/compose.c:551
+#: src/compose.c:562

 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 
 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 

-#: src/compose.c:553 src/compose.c:557 src/compose.c:560 src/mainwindow.c:765
+#: src/compose.c:564 src/compose.c:568 src/compose.c:571 src/mainwindow.c:765

 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
 #: src/mainwindow.c:775 src/mainwindow.c:788 src/mainwindow.c:794
 #: src/mainwindow.c:811 src/messageview.c:292 src/messageview.c:300
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 

-#: src/compose.c:554
+#: src/compose.c:565

 msgid "/_Message/_Attach file"
 msgstr "/邮件(_M)/附加(_A)"
 
 msgid "/_Message/_Attach file"
 msgstr "/邮件(_M)/附加(_A)"
 

-#: src/compose.c:555
+#: src/compose.c:566

 msgid "/_Message/_Insert file"
 msgstr "/邮件(_M)/插入文件(_I)"
 
 msgid "/_Message/_Insert file"
 msgstr "/邮件(_M)/插入文件(_I)"
 

-#: src/compose.c:556
+#: src/compose.c:567

 msgid "/_Message/Insert si_gnature"
 msgstr "/邮件(_M)/插入签名(_g)"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/邮件(_M)/插入签名(_g)"
 

-#: src/compose.c:558
+#: src/compose.c:569

 msgid "/_Message/_Save"
 msgstr "/邮件(_M)/保存(_S)"
 
 msgid "/_Message/_Save"
 msgstr "/邮件(_M)/保存(_S)"
 

-#: src/compose.c:561
+#: src/compose.c:572

 msgid "/_Message/_Close"
 msgstr "/邮件(_M)/关闭(_C)"
 
 msgid "/_Message/_Close"
 msgstr "/邮件(_M)/关闭(_C)"
 

-#: src/compose.c:564
+#: src/compose.c:575

 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤消(_U)"
 
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤消(_U)"
 

-#: src/compose.c:565
+#: src/compose.c:576

 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 

-#: src/compose.c:566 src/compose.c:654 src/compose.c:657 src/compose.c:663
+#: src/compose.c:577 src/compose.c:665 src/compose.c:668 src/compose.c:674

 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
 #: src/mainwindow.c:535 src/messageview.c:171
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 

-#: src/compose.c:567
+#: src/compose.c:578

 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 

-#: src/compose.c:568 src/mainwindow.c:531 src/messageview.c:169
+#: src/compose.c:579 src/mainwindow.c:531 src/messageview.c:169

 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 

-#: src/compose.c:569
+#: src/compose.c:580

 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 

-#: src/compose.c:570
+#: src/compose.c:581

 msgid "/_Edit/Special paste"
 msgstr "/编辑(_E)/选择性粘贴"
 
 msgid "/_Edit/Special paste"
 msgstr "/编辑(_E)/选择性粘贴"
 

-#: src/compose.c:571
+#: src/compose.c:582

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 

-#: src/compose.c:573
+#: src/compose.c:584

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
 

-#: src/compose.c:575
+#: src/compose.c:586

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
 

-#: src/compose.c:577 src/mainwindow.c:532 src/messageview.c:170
+#: src/compose.c:588 src/mainwindow.c:532 src/messageview.c:170

 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 

-#: src/compose.c:578
+#: src/compose.c:589

 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 

-#: src/compose.c:579
+#: src/compose.c:590

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 

-#: src/compose.c:584
+#: src/compose.c:595

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 

-#: src/compose.c:589
+#: src/compose.c:600

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 

-#: src/compose.c:594
+#: src/compose.c:605

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 

-#: src/compose.c:599
+#: src/compose.c:610

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 

-#: src/compose.c:604
+#: src/compose.c:615

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 

-#: src/compose.c:609
+#: src/compose.c:620

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 

-#: src/compose.c:614
+#: src/compose.c:625

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 

-#: src/compose.c:619
+#: src/compose.c:630

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 

-#: src/compose.c:624
+#: src/compose.c:635

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 

-#: src/compose.c:629
+#: src/compose.c:640

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 

-#: src/compose.c:634
+#: src/compose.c:645

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 

-#: src/compose.c:639
+#: src/compose.c:650

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:644
+#: src/compose.c:655

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:649
+#: src/compose.c:660

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 

-#: src/compose.c:655
+#: src/compose.c:666

 msgid "/_Edit/_Find"
 msgstr "/编辑(_E)/查找(_F)"
 
 msgid "/_Edit/_Find"
 msgstr "/编辑(_E)/查找(_F)"
 

-#: src/compose.c:658
+#: src/compose.c:669

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 

-#: src/compose.c:660
+#: src/compose.c:671

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 

-#: src/compose.c:662
+#: src/compose.c:673

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_o)"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_o)"
 

-#: src/compose.c:664
+#: src/compose.c:675

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 

-#: src/compose.c:667
+#: src/compose.c:678

 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 
 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 

-#: src/compose.c:668
+#: src/compose.c:679

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 

-#: src/compose.c:670
+#: src/compose.c:681

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 

-#: src/compose.c:672
+#: src/compose.c:683

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 

-#: src/compose.c:674
+#: src/compose.c:685

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 

-#: src/compose.c:676
+#: src/compose.c:687

 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 
 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 

-#: src/compose.c:677
+#: src/compose.c:688

 msgid "/_Spelling/Options"
 msgstr "/拼写(_S)/选项"
 
 msgid "/_Spelling/Options"
 msgstr "/拼写(_S)/选项"
 

-#: src/compose.c:680
+#: src/compose.c:691

 msgid "/_Options"
 msgstr "/选项(_O)"
 
 msgid "/_Options"
 msgstr "/选项(_O)"
 

-#: src/compose.c:681
+#: src/compose.c:692

 msgid "/_Options/Reply _mode"
 msgstr "/选项(_O)/回复方式(_m)"
 
 msgid "/_Options/Reply _mode"
 msgstr "/选项(_O)/回复方式(_m)"
 

-#: src/compose.c:682
+#: src/compose.c:693

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/选项(_O)/回复方式(_m)/普通(_N)"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/选项(_O)/回复方式(_m)/普通(_N)"
 

-#: src/compose.c:683
+#: src/compose.c:694

 msgid "/_Options/Reply _mode/_All"
 msgstr "/选项(_O)/回复方式(_m)/全部人(_a)"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/选项(_O)/回复方式(_m)/全部人(_a)"
 

-#: src/compose.c:684
+#: src/compose.c:695

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/选项(_O)/回复方式(_m)/发信人(_s)"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/选项(_O)/回复方式(_m)/发信人(_s)"
 

-#: src/compose.c:685
+#: src/compose.c:696

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/选项(_O)/回复方式(_m)/邮件列表(_M)"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/选项(_O)/回复方式(_m)/邮件列表(_M)"
 

-#: src/compose.c:686 src/compose.c:691 src/compose.c:698 src/compose.c:700
-#: src/compose.c:702
+#: src/compose.c:697 src/compose.c:702 src/compose.c:709 src/compose.c:711
+#: src/compose.c:713

 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 
 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 

-#: src/compose.c:687
+#: src/compose.c:698

 msgid "/_Options/Privacy _System"
 msgstr "/选项(_O)/隐私系统(_S)"
 
 msgid "/_Options/Privacy _System"
 msgstr "/选项(_O)/隐私系统(_S)"
 

-#: src/compose.c:688
+#: src/compose.c:699

 msgid "/_Options/Privacy _System/None"
 msgstr "/选项(_O)/隐私系统(_S)/无"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/选项(_O)/隐私系统(_S)/无"
 

-#: src/compose.c:689
+#: src/compose.c:700

 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 
 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 

-#: src/compose.c:690
+#: src/compose.c:701

 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 
 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 

-#: src/compose.c:692
+#: src/compose.c:703

 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 
 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 

-#: src/compose.c:693
+#: src/compose.c:704

 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 

-#: src/compose.c:694
+#: src/compose.c:705

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 

-#: src/compose.c:695
+#: src/compose.c:706

 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 

-#: src/compose.c:696
+#: src/compose.c:707

 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 

-#: src/compose.c:697
+#: src/compose.c:708

 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 

-#: src/compose.c:699
+#: src/compose.c:710

 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 

-#: src/compose.c:701
+#: src/compose.c:712

 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 

-#: src/compose.c:708
+#: src/compose.c:719

 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 
 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 

-#: src/compose.c:709
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 

-#: src/compose.c:711 src/compose.c:717 src/compose.c:725 src/compose.c:729
-#: src/compose.c:735 src/compose.c:739 src/compose.c:745 src/compose.c:751
-#: src/compose.c:755 src/compose.c:765 src/compose.c:769 src/compose.c:779
-#: src/compose.c:783
+#: src/compose.c:722 src/compose.c:728 src/compose.c:736 src/compose.c:740
+#: src/compose.c:746 src/compose.c:750 src/compose.c:756 src/compose.c:762
+#: src/compose.c:766 src/compose.c:776 src/compose.c:780 src/compose.c:790
+#: src/compose.c:794

 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 

-#: src/compose.c:713
+#: src/compose.c:724

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 

-#: src/compose.c:715
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 

-#: src/compose.c:719
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 

-#: src/compose.c:721
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 

-#: src/compose.c:723
+#: src/compose.c:734

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
 

-#: src/compose.c:727
+#: src/compose.c:738

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 

-#: src/compose.c:731
+#: src/compose.c:742

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 

-#: src/compose.c:733
+#: src/compose.c:744

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 

-#: src/compose.c:737
+#: src/compose.c:748

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:741
+#: src/compose.c:752

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:743
+#: src/compose.c:754

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 

-#: src/compose.c:747
+#: src/compose.c:758

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
 

-#: src/compose.c:749
+#: src/compose.c:760

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
 

-#: src/compose.c:753
+#: src/compose.c:764

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 

-#: src/compose.c:757
+#: src/compose.c:768

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 

-#: src/compose.c:759
+#: src/compose.c:770

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 

-#: src/compose.c:761
+#: src/compose.c:772

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 

-#: src/compose.c:763
+#: src/compose.c:774

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 

-#: src/compose.c:767
+#: src/compose.c:778

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 

-#: src/compose.c:771
+#: src/compose.c:782

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 

-#: src/compose.c:773
+#: src/compose.c:784

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 

-#: src/compose.c:775
+#: src/compose.c:786

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 

-#: src/compose.c:777
+#: src/compose.c:788

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 

-#: src/compose.c:781
+#: src/compose.c:792

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 

-#: src/compose.c:785
+#: src/compose.c:796

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 

-#: src/compose.c:787
+#: src/compose.c:798

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 

-#: src/compose.c:791
+#: src/compose.c:802

 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 

-#: src/compose.c:792 src/messageview.c:307
+#: src/compose.c:803 src/messageview.c:307

 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 

-#: src/compose.c:793
+#: src/compose.c:804

 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 

-#: src/compose.c:794 src/mainwindow.c:849 src/messageview.c:334
+#: src/compose.c:805 src/mainwindow.c:849 src/messageview.c:334

 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 

-#: src/compose.c:1049 src/prefs_compose_writing.c:369
+#: src/compose.c:1078 src/quote_fmt.c:417

 msgid "New message subject format error."
 msgstr "新邮件'主题'格式错误。"
 
 msgid "New message subject format error."
 msgstr "新邮件'主题'格式错误。"
 

-#: src/compose.c:1078 src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "新邮件内容格式错误。"
+#: src/compose.c:1107 src/quote_fmt.c:420
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "新邮件内容格式错误: 第%d行。"

 
 

-#: src/compose.c:1440 src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "邮件回复格式错误。"
+#: src/compose.c:1481 src/quote_fmt.c:438
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "邮件回复格式错误: 第%d行"

 
 

-#: src/compose.c:1557 src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "邮件转发格式错误。"
+#: src/compose.c:1614 src/quote_fmt.c:456
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "邮件转发格式错误: 第%d行"

 
 

-#: src/compose.c:1677
+#: src/compose.c:1735

 msgid "Fw: multiple emails"
 msgstr "转发: 多封邮件"
 
 msgid "Fw: multiple emails"
 msgstr "转发: 多封邮件"
 

-#: src/compose.c:2052
-msgid "Message redirect format error."
-msgstr "邮件重定向格式错误。"
+#: src/compose.c:2112
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "邮件重定向格式错误: 第%d行"
+
+#: src/compose.c:2176 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/compose.c:2179 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Bcc:"

 
 

-#: src/compose.c:2121
+#: src/compose.c:2182 src/gtk/headers.h:11

 msgid "Reply-To:"
 msgstr ""
 
 msgid "Reply-To:"
 msgstr ""
 

-#: src/compose.c:2124 src/compose.c:5702 src/compose.c:6521 src/compose.c:9667
+#: src/compose.c:2185 src/gtk/headers.h:32

 msgid "Newsgroups:"
 msgstr "新闻组:"
 
 msgid "Newsgroups:"
 msgstr "新闻组:"
 

-#: src/compose.c:2127
+#: src/compose.c:2188 src/gtk/headers.h:33

 msgid "Followup-To:"
 msgstr ""
 
 msgid "Followup-To:"
 msgstr ""
 

-#: src/compose.c:2306
+#: src/compose.c:2192 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "To:"
+
+#: src/compose.c:2367

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "已经添加附件'%s'。"
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr "已经添加附件'%s'。"
 

-#: src/compose.c:2310
+#: src/compose.c:2371

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "无法添加附件(转换字符集失败)。"
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "无法添加附件(转换字符集失败)。"
 

-#: src/compose.c:2541
+#: src/compose.c:2607

 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 
 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 

-#: src/compose.c:3146
+#: src/compose.c:3220

 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 

-#: src/compose.c:3150
+#: src/compose.c:3224

 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 

-#: src/compose.c:3177
+#: src/compose.c:3251

 #, c-format
 msgid "Message: %s"
 msgstr "邮件: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "邮件: %s"
 

-#: src/compose.c:3998
+#: src/compose.c:4073

 msgid " [Edited]"
 msgstr " [已修改] "
 
 msgid " [Edited]"
 msgstr " [已修改] "
 

-#: src/compose.c:4005
+#: src/compose.c:4080

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 

-#: src/compose.c:4008
+#: src/compose.c:4083

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[无主题] - 撰写新邮件%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[无主题] - 撰写新邮件%s"
 

-#: src/compose.c:4010
+#: src/compose.c:4085

 msgid "Compose message"
 msgstr "撰写新邮件"
 
 msgid "Compose message"
 msgstr "撰写新邮件"
 

-#: src/compose.c:4037 src/messageview.c:624
+#: src/compose.c:4112 src/messageview.c:624

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1738,32 +1776,32 @@ msgstr ""
 "你选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 
 "你选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 

-#: src/compose.c:4230 src/compose.c:4261 src/compose.c:4293 src/toolbar.c:414
-#: src/toolbar.c:470
+#: src/compose.c:4305 src/compose.c:4336 src/compose.c:4368
+#: src/prefs_account.c:2945 src/toolbar.c:415 src/toolbar.c:471

 msgid "Send"
 msgstr "发送"
 
 msgid "Send"
 msgstr "发送"
 

-#: src/compose.c:4231
+#: src/compose.c:4306

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
 

-#: src/compose.c:4232 src/compose.c:4263 src/compose.c:4295 src/compose.c:4772
+#: src/compose.c:4307 src/compose.c:4338 src/compose.c:4370 src/compose.c:4850

 msgid "+_Send"
 msgstr "+ 发送(_S)"
 
 msgid "+_Send"
 msgstr "+ 发送(_S)"
 

-#: src/compose.c:4262
+#: src/compose.c:4337

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
 

-#: src/compose.c:4279
+#: src/compose.c:4354

 msgid "Recipient is not specified."
 msgstr "没有指定收信人。"
 
 msgid "Recipient is not specified."
 msgstr "没有指定收信人。"
 

-#: src/compose.c:4294
+#: src/compose.c:4369

 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 

-#: src/compose.c:4341 src/compose.c:8026
+#: src/compose.c:4416 src/compose.c:8255

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1773,7 +1811,7 @@ msgstr ""
 "\n"
 "转换字符集失败。"
 
 "\n"
 "转换字符集失败。"
 

-#: src/compose.c:4344 src/compose.c:8029
+#: src/compose.c:4419 src/compose.c:8258

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1783,7 +1821,7 @@ msgstr ""
 "\n"
 "无法获取收件人的加密密钥。"
 
 "\n"
 "无法获取收件人的加密密钥。"
 

-#: src/compose.c:4348 src/compose.c:8023
+#: src/compose.c:4425 src/compose.c:8252

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1794,7 +1832,7 @@ msgstr ""
 "\n"
 "签名失败: %s"
 
 "\n"
 "签名失败: %s"
 

-#: src/compose.c:4351
+#: src/compose.c:4428

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1805,11 +1843,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4353
+#: src/compose.c:4430

 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 
 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 

-#: src/compose.c:4368 src/compose.c:4429
+#: src/compose.c:4445 src/compose.c:4507

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1817,7 +1855,7 @@ msgstr ""
 "邮件已加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
 "邮件已加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 

-#: src/compose.c:4423
+#: src/compose.c:4501

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1826,7 +1864,7 @@ msgstr ""
 "%s\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
 "%s\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 

-#: src/compose.c:4769
+#: src/compose.c:4847

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1836,7 +1874,7 @@ msgstr ""
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 

-#: src/compose.c:4828
+#: src/compose.c:4906

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1849,62 +1887,74 @@ msgstr ""
 "\n"
 "确实要发送吗?"
 
 "\n"
 "确实要发送吗?"
 

-#: src/compose.c:5016
+#: src/compose.c:5065
+msgid "Encryption warning"
+msgstr "加密告警"
+
+#: src/compose.c:5066
+msgid "+C_ontinue"
+msgstr "+继续编辑(_o)"
+
+#: src/compose.c:5120

 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 
 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 

-#: src/compose.c:5026
+#: src/compose.c:5130

 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 
 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 

-#: src/compose.c:5719
+#: src/compose.c:5800
+msgid "Add to address _book"
+msgstr "添加到地址簿(_b)"
+
+#: src/compose.c:5876

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "可以使用<tab>键自动完成地址"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "可以使用<tab>键自动完成地址"
 

-#: src/compose.c:5858
+#: src/compose.c:6024

 msgid "Mime type"
 msgstr "MIME 类型"
 
 msgid "Mime type"
 msgstr "MIME 类型"
 

-#: src/compose.c:5864 src/compose.c:6180 src/mimeview.c:212
+#: src/compose.c:6030 src/compose.c:6348 src/mimeview.c:214

 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86

-#: src/summaryview.c:495
+#: src/summaryview.c:501

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: src/compose.c:5934
+#: src/compose.c:6100

 msgid "Save Message to "
 msgstr "将邮件保存至"
 
 msgid "Save Message to "
 msgstr "将邮件保存至"
 

-#: src/compose.c:5956 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:6122 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
+#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:194
+#: src/plugins/bogofilter/bogofilter_gtk.c:216

 #: src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:383 src/prefs_spelling.c:207
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "浏览(_B)"
 
 msgid "_Browse"
 msgstr "浏览(_B)"
 

-#: src/compose.c:6179 src/compose.c:7433
+#: src/compose.c:6347 src/compose.c:7662

 msgid "MIME type"
 msgstr "MIME 类型"
 
 msgid "MIME type"
 msgstr "MIME 类型"
 

-#: src/compose.c:6253
+#: src/compose.c:6422

 msgid "Hea_der"
 msgstr "邮件头(_d)"
 
 msgid "Hea_der"
 msgstr "邮件头(_d)"
 

-#: src/compose.c:6257
+#: src/compose.c:6426

 msgid "_Attachments"
 msgstr "附件(_A)"
 
 msgid "_Attachments"
 msgstr "附件(_A)"
 

-#: src/compose.c:6261
+#: src/compose.c:6430

 msgid "Othe_rs"
 msgstr "其他(_r)"
 
 msgid "Othe_rs"
 msgstr "其他(_r)"
 

-#: src/compose.c:6276 src/summary_search.c:370
+#: src/compose.c:6445 src/gtk/headers.h:18 src/summary_search.c:370

 msgid "Subject:"
 msgstr "主题:"
 
 msgid "Subject:"
 msgstr "主题:"
 

-#: src/compose.c:6483
+#: src/compose.c:6652

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1913,71 +1963,72 @@ msgstr ""
 "无法启动拼写检查器.\n"
 "%s"
 
 "无法启动拼写检查器.\n"
 "%s"
 

-#: src/compose.c:6599
+#: src/compose.c:6770

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "发信人: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "发信人: <i>%s</i>"
 

-#: src/compose.c:6630
+#: src/compose.c:6804

 msgid "Account to use for this email"
 msgstr "用于此邮件的帐号"
 
 msgid "Account to use for this email"
 msgstr "用于此邮件的帐号"
 

-#: src/compose.c:6632
+#: src/compose.c:6806

 msgid "Sender address to be used"
 msgstr "想要使用的发送邮件地址"
 
 msgid "Sender address to be used"
 msgstr "想要使用的发送邮件地址"
 

-#: src/compose.c:6793
+#: src/compose.c:6967

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
 
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
 

-#: src/compose.c:6955 src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "模板内容格式错误。"
+#: src/compose.c:7167 src/prefs_template.c:607
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "模板内容格式错误: 第%d行。"

 
 

-#: src/compose.c:7063 src/prefs_template.c:587
+#: src/compose.c:7277 src/prefs_template.c:647

 msgid "Template To format error."
 msgstr "模板中'收件人'格式错误。"
 
 msgid "Template To format error."
 msgstr "模板中'收件人'格式错误。"
 

-#: src/compose.c:7076 src/prefs_template.c:592
+#: src/compose.c:7295 src/prefs_template.c:652

 msgid "Template Cc format error."
 msgstr "模板中'抄送'格式错误。"
 
 msgid "Template Cc format error."
 msgstr "模板中'抄送'格式错误。"
 

-#: src/compose.c:7089 src/prefs_template.c:597
+#: src/compose.c:7313 src/prefs_template.c:657

 msgid "Template Bcc format error."
 msgstr "模板中'密送'格式错误。"
 
 msgid "Template Bcc format error."
 msgstr "模板中'密送'格式错误。"
 

-#: src/compose.c:7103 src/prefs_template.c:602
+#: src/compose.c:7332 src/prefs_template.c:662

 msgid "Template subject format error."
 msgstr "模板中'主题'格式错误。"
 
 msgid "Template subject format error."
 msgstr "模板中'主题'格式错误。"
 

-#: src/compose.c:7327
+#: src/compose.c:7556

 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 
 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 

-#: src/compose.c:7342
+#: src/compose.c:7571

 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 
 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 

-#: src/compose.c:7415
+#: src/compose.c:7644

 msgid "Properties"
 msgstr "属性"
 
 msgid "Properties"
 msgstr "属性"
 

-#: src/compose.c:7466
+#: src/compose.c:7695

 msgid "Encoding"
 msgstr "编码"
 
 msgid "Encoding"
 msgstr "编码"
 

-#: src/compose.c:7486
+#: src/compose.c:7715

 msgid "Path"
 msgstr "路径"
 
 msgid "Path"
 msgstr "路径"
 

-#: src/compose.c:7487 src/prefs_toolbar.c:1069
+#: src/compose.c:7716 src/prefs_toolbar.c:1069

 msgid "File name"
 msgstr "文件名"
 
 msgid "File name"
 msgstr "文件名"
 

-#: src/compose.c:7670
+#: src/compose.c:7899

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1988,19 +2039,19 @@ msgstr ""
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 

-#: src/compose.c:7712
+#: src/compose.c:7941

 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 

-#: src/compose.c:7993 src/messageview.c:729
+#: src/compose.c:8222 src/messageview.c:729

 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail需要访问网络才能发送这封邮件。"
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail需要访问网络才能发送这封邮件。"
 

-#: src/compose.c:8018
+#: src/compose.c:8247

 msgid "Could not queue message."
 msgstr "无法将邮件加入待发送队列。"
 
 msgid "Could not queue message."
 msgstr "无法将邮件加入待发送队列。"
 

-#: src/compose.c:8020
+#: src/compose.c:8249

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -2011,20 +2062,40 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:8193
+#: src/compose.c:8386

 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 
 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 

-#: src/compose.c:8271 src/compose.c:8294
+#: src/compose.c:8390
+msgid "Could not save draft"
+msgstr "无法保存草稿。"
+
+#: src/compose.c:8391
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"无法保存草稿。\n"
+"请问是取消退出还是摒弃这封邮件？"
+
+#: src/compose.c:8393
+msgid "_Cancel exit"
+msgstr "取消退出(_C)"
+
+#: src/compose.c:8393
+msgid "_Discard email"
+msgstr "摈弃邮件(_D)"
+
+#: src/compose.c:8527 src/compose.c:8550

 msgid "Select file"
 msgstr "选择文件"
 
 msgid "Select file"
 msgstr "选择文件"
 

-#: src/compose.c:8307
+#: src/compose.c:8563

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 

-#: src/compose.c:8309
+#: src/compose.c:8565

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -2033,62 +2104,63 @@ msgstr ""
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 

-#: src/compose.c:8362
+#: src/compose.c:8618

 msgid "Discard message"
 msgstr "摈弃讯息"
 
 msgid "Discard message"
 msgstr "摈弃讯息"
 

-#: src/compose.c:8363
+#: src/compose.c:8619

 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 
 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Discard"
 msgstr "摈弃(_D)"
 
 msgid "_Discard"
 msgstr "摈弃(_D)"
 

-#: src/compose.c:8364
+#: src/compose.c:8620

 msgid "_Save to Drafts"
 msgstr "存为草稿(_S)"
 
 msgid "_Save to Drafts"
 msgstr "存为草稿(_S)"
 

-#: src/compose.c:8408
+#: src/compose.c:8664

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 

-#: src/compose.c:8410
+#: src/compose.c:8666

 msgid "Apply template"
 msgstr "使用模板"
 
 msgid "Apply template"
 msgstr "使用模板"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Replace"
 msgstr "替换(_R)"
 
 msgid "_Replace"
 msgstr "替换(_R)"
 

-#: src/compose.c:8411
+#: src/compose.c:8667

 msgid "_Insert"
 msgstr "插入(_I)"
 
 msgid "_Insert"
 msgstr "插入(_I)"
 

-#: src/compose.c:9142
+#: src/compose.c:9416

 msgid "Insert or attach?"
 msgstr "插入其内容还是添加附件?"
 
 msgid "Insert or attach?"
 msgstr "插入其内容还是添加附件?"
 

-#: src/compose.c:9143
+#: src/compose.c:9417

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr "请问是将文件的内容插入到邮件中，还是添加为附件？"
 
 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:9145
+#: src/compose.c:9419

 msgid "+_Insert"
 msgstr "+插入(_I)"
 
 msgid "+_Insert"
 msgstr "+插入(_I)"
 

-#: src/compose.c:9145
+#: src/compose.c:9419

 msgid "_Attach"
 msgstr "附加文件(_A)"
 
 msgid "_Attach"
 msgstr "附加文件(_A)"
 

-#: src/compose.c:9344
-msgid "Quote format error."
-msgstr "引文格式错误。"
+#: src/compose.c:9612
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "引文格式错误: 第%d行"

 
 

-#: src/compose.c:9563
+#: src/compose.c:9835

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -2117,7 +2189,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "调试日志"
 
 msgid "Debug log"
 msgstr "调试日志"
 

-#: src/crash.c:251 src/toolbar.c:483 src/toolbar.c:534
+#: src/crash.c:251 src/toolbar.c:484 src/toolbar.c:535

 msgid "Close"
 msgstr "关闭"
 
 msgid "Close"
 msgstr "关闭"
 


@@ -2129,73 +2201,73 @@ msgstr "正在保存..."
 msgid "Create bug report"
 msgstr "创建BUG报告"
 
 msgid "Create bug report"
 msgstr "创建BUG报告"
 

-#: src/crash.c:308
+#: src/crash.c:309

 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 
 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 

-#: src/editaddress.c:185
+#: src/editaddress.c:186

 msgid "Add New Person"
 msgstr "加入新的用户"
 
 msgid "Add New Person"
 msgstr "加入新的用户"
 

-#: src/editaddress.c:186
+#: src/editaddress.c:187

 msgid "Edit Person Details"
 msgstr "编辑个人的详细资料"
 
 msgid "Edit Person Details"
 msgstr "编辑个人的详细资料"
 

-#: src/editaddress.c:357
+#: src/editaddress.c:358

 msgid "An Email address must be supplied."
 msgstr "请务必提供一个电子邮件地址。"
 
 msgid "An Email address must be supplied."
 msgstr "请务必提供一个电子邮件地址。"
 

-#: src/editaddress.c:531
+#: src/editaddress.c:532

 msgid "A Name and Value must be supplied."
 msgstr "请务必提供名称和值。"
 
 msgid "A Name and Value must be supplied."
 msgstr "请务必提供名称和值。"
 

-#: src/editaddress.c:620
+#: src/editaddress.c:621

 msgid "Discard"
 msgstr "摈弃"
 
 msgid "Discard"
 msgstr "摈弃"
 

-#: src/editaddress.c:621
+#: src/editaddress.c:622

 msgid "Apply"
 msgstr "应用"
 
 msgid "Apply"
 msgstr "应用"
 

-#: src/editaddress.c:651 src/editaddress.c:700
+#: src/editaddress.c:652 src/editaddress.c:701

 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 
 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 

-#: src/editaddress.c:761 src/expldifdlg.c:508 src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:762 src/expldifdlg.c:508 src/exporthtml.c:752
+#: src/ldif.c:765

 msgid "Display Name"
 msgstr "用户名称"
 
 msgid "Display Name"
 msgstr "用户名称"
 

-#: src/editaddress.c:767 src/editaddress.c:771 src/ldif.c:771
+#: src/editaddress.c:768 src/editaddress.c:772 src/ldif.c:773

 msgid "Last Name"
 msgstr "姓"
 
 msgid "Last Name"
 msgstr "姓"
 

-#: src/editaddress.c:768 src/editaddress.c:770 src/ldif.c:767
+#: src/editaddress.c:769 src/editaddress.c:771 src/ldif.c:769

 msgid "First Name"
 msgstr "名"
 
 msgid "First Name"
 msgstr "名"
 

-#: src/editaddress.c:773
+#: src/editaddress.c:774

 msgid "Nickname"
 msgstr "绰号"
 
 msgid "Nickname"
 msgstr "绰号"
 

-#: src/editaddress.c:850 src/editaddress.c:906
+#: src/editaddress.c:851 src/editaddress.c:907

 msgid "Alias"
 msgstr "别名"
 
 msgid "Alias"
 msgstr "别名"
 

-#: src/editaddress.c:1044 src/editaddress.c:1101 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:536
+#: src/editaddress.c:1045 src/editaddress.c:1102 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:563

 msgid "Value"
 msgstr "值"
 
 msgid "Value"
 msgstr "值"
 

-#: src/editaddress.c:1163
+#: src/editaddress.c:1164

 msgid "_User Data"
 msgstr "用户数据(_U)"
 
 msgid "_User Data"
 msgstr "用户数据(_U)"
 

-#: src/editaddress.c:1164
+#: src/editaddress.c:1165

 msgid "_Email Addresses"
 msgstr "电子邮件帐号(_E)"
 
 msgid "_Email Addresses"
 msgstr "电子邮件帐号(_E)"
 

-#: src/editaddress.c:1165
+#: src/editaddress.c:1166

 msgid "O_ther Attributes"
 msgstr "其他属性(_t)"
 
 msgid "O_ther Attributes"
 msgstr "其他属性(_t)"
 


@@ -2220,7 +2292,7 @@ msgid " Check File "
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:2004
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1836

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 


@@ -2262,19 +2334,19 @@ msgstr "增加新的群组"
 
 #: src/editgroup.c:546
 msgid "Edit folder"
 
 #: src/editgroup.c:546
 msgid "Edit folder"

-msgstr "增加新的文件夹"
+msgstr "增加新的目录"

 
 #: src/editgroup.c:546
 msgid "Input the new name of folder:"
 
 #: src/editgroup.c:546
 msgid "Input the new name of folder:"

-msgstr "请输入文件夹的新名字:"
+msgstr "请输入目录的新名字:"

 
 #: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130
 msgid "New folder"
 
 #: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130
 msgid "New folder"

-msgstr "新文件夹"
+msgstr "新目录"

 
 #: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131
 msgid "Input the name of new folder:"
 
 #: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131
 msgid "Input the name of new folder:"

-msgstr "请输入文件夹的新名字:"
+msgstr "请输入目录的新名字:"

 
 #: src/editjpilot.c:200
 msgid "File does not appear to be JPilot format."
 
 #: src/editjpilot.c:200
 msgid "File does not appear to be JPilot format."


@@ -2363,7 +2435,7 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
 msgid "TLS"
 msgstr ""
 

-#: src/editldap.c:471
+#: src/editldap.c:471 src/prefs_account.c:3018

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 


@@ -2524,7 +2596,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜索时返回结果的最大条目数"
 
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜索时返回结果的最大条目数"
 

-#: src/editldap.c:808
+#: src/editldap.c:808 src/prefs_account.c:2909

 msgid "Basic"
 msgstr "基本设置"
 
 msgid "Basic"
 msgstr "基本设置"
 


@@ -2532,7 +2604,7 @@ msgstr "基本设置"
 msgid "Search"
 msgstr "搜寻"
 
 msgid "Search"
 msgstr "搜寻"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:496
+#: src/editldap.c:810 src/gtk/quicksearch.c:541

 msgid "Extended"
 msgstr "扩展"
 
 msgid "Extended"
 msgstr "扩展"
 


@@ -2607,7 +2679,7 @@ msgid "HTML Output File"
 msgstr "HTML输出文件"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 msgstr "HTML输出文件"
 
 #: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

-#: src/importldif.c:682
+#: src/importldif.c:691

 msgid "B_rowse"
 msgstr "棕色(_r)"
 
 msgid "B_rowse"
 msgstr "棕色(_r)"
 


@@ -2616,8 +2688,8 @@ msgid "Stylesheet"
 msgstr "样式表"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661
 msgstr "样式表"
 
 #: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1661

-#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:712
-#: src/summaryview.c:5115
+#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1022 src/prefs_account.c:841
+#: src/summaryview.c:5137

 msgid "None"
 msgstr "无"
 
 msgid "None"
 msgstr "无"
 


@@ -2669,7 +2741,7 @@ msgstr "电子邮件地址格式化为超链接"
 msgid "Format User Attributes"
 msgstr "将用户属性数据格式化"
 
 msgid "Format User Attributes"
 msgstr "将用户属性数据格式化"
 

-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:922

 msgid "File Name :"
 msgstr "文件名:"
 
 msgid "File Name :"
 msgstr "文件名:"
 


@@ -2681,7 +2753,7 @@ msgstr "用网页浏览器打开"
 msgid "Export Address Book to HTML File"
 msgstr "将地址簿输出成HTML文件"
 
 msgid "Export Address Book to HTML File"
 msgstr "将地址簿输出成HTML文件"
 

-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1042

 msgid "File Info"
 msgstr "文件内容"
 
 msgid "File Info"
 msgstr "文件内容"
 


@@ -2691,7 +2763,7 @@ msgstr "格式"
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."

-msgstr "请指明所要创建的文件夹和LDIF文件名。"
+msgstr "请指明所要创建的目录和LDIF文件名。"

 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."
 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."


@@ -2836,17 +2908,17 @@ msgstr "将地址簿输出成LDIF文件"
 msgid "Distguished Name"
 msgstr "唯一名称(DN)"
 
 msgid "Distguished Name"
 msgstr "唯一名称(DN)"
 

-#: src/export.c:120 src/summaryview.c:6586
+#: src/export.c:120 src/summaryview.c:6626

 msgid "Export to mbox file"
 msgid "Export to mbox file"

-msgstr "以mbox格式导出文件夹"
+msgstr "以mbox格式导出目录"

 
 #: src/export.c:139
 msgid "Locate the folder to export and specify the mbox file."
 
 #: src/export.c:139
 msgid "Locate the folder to export and specify the mbox file."

-msgstr "指定要导出的文件夹和输出mbox文件。"
+msgstr "指定要导出的目录和输出mbox文件。"

 
 #: src/export.c:150
 msgid "Source folder:"
 
 #: src/export.c:150
 msgid "Source folder:"

-msgstr "原始文件夹:"
+msgstr "原始目录:"

 
 #: src/export.c:156 src/import.c:150
 msgid "Mbox file:"
 
 #: src/export.c:156 src/import.c:150
 msgid "Mbox file:"


@@ -2858,11 +2930,11 @@ msgstr "目标mbox文件名不能为空。"
 
 #: src/export.c:216
 msgid "Source folder can't be left empty."
 
 #: src/export.c:216
 msgid "Source folder can't be left empty."

-msgstr "源文件夹不能为空。"
+msgstr "源目录不能为空。"

 
 #: src/export.c:229
 msgid "Couldn't find the source folder."
 
 #: src/export.c:229
 msgid "Couldn't find the source folder."

-msgstr "无法找到源文件夹。"
+msgstr "无法找到源目录。"

 
 #: src/export.c:252
 msgid "Select exporting file"
 
 #: src/export.c:252
 msgid "Select exporting file"


@@ -2872,109 +2944,109 @@ msgstr "选择输出文件"
 msgid "Full Name"
 msgstr "全名"
 
 msgid "Full Name"
 msgstr "全名"
 

-#: src/exporthtml.c:762 src/importldif.c:1028
+#: src/exporthtml.c:762 src/importldif.c:1043

 msgid "Attributes"
 msgstr "属性"
 
 msgid "Attributes"
 msgstr "属性"
 

-#: src/exporthtml.c:963
+#: src/exporthtml.c:964

 msgid "Claws Mail Address Book"
 msgstr "Claws Mail地址簿"
 
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail地址簿"
 

-#: src/exporthtml.c:1077 src/exportldif.c:551
+#: src/exporthtml.c:1078 src/exportldif.c:551

 msgid "Name already exists but is not a directory."
 msgstr "这个名字已经存在但不是一个目录名称。"
 
 msgid "Name already exists but is not a directory."
 msgstr "这个名字已经存在但不是一个目录名称。"
 

-#: src/exporthtml.c:1080 src/exportldif.c:554
+#: src/exporthtml.c:1081 src/exportldif.c:554

 msgid "No permissions to create directory."
 msgstr "你没有创建目录的权限。"
 
 msgid "No permissions to create directory."
 msgstr "你没有创建目录的权限。"
 

-#: src/exporthtml.c:1083 src/exportldif.c:557
+#: src/exporthtml.c:1084 src/exportldif.c:557

 msgid "Name is too long."
 msgstr "名字太长。"
 
 msgid "Name is too long."
 msgstr "名字太长。"
 

-#: src/exporthtml.c:1086 src/exportldif.c:560
+#: src/exporthtml.c:1087 src/exportldif.c:560

 msgid "Not specified."
 msgstr "不确定。"
 
 msgid "Not specified."
 msgstr "不确定。"
 

-#: src/folder.c:1334 src/foldersel.c:370 src/prefs_folder_item.c:239
+#: src/folder.c:1343 src/foldersel.c:370 src/prefs_folder_item.c:266

 msgid "Inbox"
 msgstr "收信夹"
 
 msgid "Inbox"
 msgstr "收信夹"
 

-#: src/folder.c:1338 src/foldersel.c:374
+#: src/folder.c:1347 src/foldersel.c:374

 msgid "Sent"
 msgstr "已发送"
 
 msgid "Sent"
 msgstr "已发送"
 

-#: src/folder.c:1342 src/foldersel.c:378 src/prefs_folder_item.c:242
+#: src/folder.c:1351 src/foldersel.c:378 src/prefs_folder_item.c:269

 msgid "Queue"
 msgstr "待发送"
 
 msgid "Queue"
 msgstr "待发送"
 

-#: src/folder.c:1346 src/foldersel.c:382 src/prefs_folder_item.c:243
-#: src/toolbar.c:385 src/toolbar.c:428 src/toolbar.c:526
+#: src/folder.c:1355 src/foldersel.c:382 src/prefs_folder_item.c:270
+#: src/toolbar.c:386 src/toolbar.c:429 src/toolbar.c:527

 msgid "Trash"
 msgid "Trash"

-msgstr "å\9e\83å\9c¾æ¡¶"
+msgstr "åº\9f件夹"

 
 

-#: src/folder.c:1350 src/foldersel.c:386 src/prefs_folder_item.c:241
+#: src/folder.c:1359 src/foldersel.c:386 src/prefs_folder_item.c:268

 msgid "Drafts"
 msgstr "草稿"
 
 msgid "Drafts"
 msgstr "草稿"
 

-#: src/folder.c:1644
+#: src/folder.c:1653

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 

-#: src/folder.c:2570
+#: src/folder.c:2585

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "将%s 复制到%s...\n"
 
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "将%s 复制到%s...\n"
 

-#: src/folder.c:2861
+#: src/folder.c:2876

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "将%s 移动到%s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "将%s 移动到%s...\n"
 

-#: src/folder.c:3148
+#: src/folder.c:3163

 #, c-format
 msgid "Updating cache for %s..."
 #, c-format
 msgid "Updating cache for %s..."

-msgstr "正在更新文件夹 %s 的缓存..."
+msgstr "正在更新目录 %s 的缓存..."

 
 

-#: src/folder.c:3859
+#: src/folder.c:3891

 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 
 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 

-#: src/folder.c:3988
+#: src/folder.c:4020

 #, c-format
 msgid "Synchronising %s for offline use...\n"
 #, c-format
 msgid "Synchronising %s for offline use...\n"

-msgstr "同步数据%s以便离线使用...\n"
+msgstr "正在同步%s以便离线使用...\n"

 
 #: src/foldersel.c:228
 msgid "Select folder"
 
 #: src/foldersel.c:228
 msgid "Select folder"

-msgstr "选择文件夹"
+msgstr "选择目录"

 
 #: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132
 msgid "NewFolder"
 
 #: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132
 msgid "NewFolder"

-msgstr "新文件夹"
+msgstr "新目录"

 
 #: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
 #: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241
 #, c-format
 msgid "'%c' can't be included in folder name."
 
 #: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
 #: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241
 #, c-format
 msgid "'%c' can't be included in folder name."

-msgstr "文件夹名称不能包含`%c'。"
+msgstr "目录名称不能包含`%c'。"

 
 #: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148
 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."
 
 #: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148
 #: src/mh_gtk.c:248
 #, c-format
 msgid "The folder '%s' already exists."

-msgstr "文件夹'%s'已存在。"
+msgstr "目录'%s'已存在。"

 
 #: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154
 #, c-format
 msgid "Can't create the folder '%s'."
 
 #: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154
 #, c-format
 msgid "Can't create the folder '%s'."

-msgstr "无法创建文件夹'%s'。"
+msgstr "无法创建目录'%s'。"

 
 #: src/folderview.c:290
 msgid "/Mark all re_ad"
 
 #: src/folderview.c:290
 msgid "/Mark all re_ad"


@@ -2982,7 +3054,7 @@ msgstr "/标记所有邮件为已读(_a)"
 
 #: src/folderview.c:292
 msgid "/_Search folder..."
 
 #: src/folderview.c:292
 msgid "/_Search folder..."

-msgstr "/在文件夹中搜索(_S)..."
+msgstr "/在目录中搜索(_S)..."

 
 #: src/folderview.c:294
 msgid "/Process_ing..."
 
 #: src/folderview.c:294
 msgid "/Process_ing..."


@@ -2990,7 +3062,7 @@ msgstr "/处理(_i)..."
 
 #: src/folderview.c:299
 msgid "/Empty _trash..."
 
 #: src/folderview.c:299
 msgid "/Empty _trash..."

-msgstr "/æ¸\85空å\9e\83å\9c¾æ¡¶(_t)..."
+msgstr "/æ¸\85空åº\9f件夹(_t)..."

 
 #: src/folderview.c:304
 msgid "/Send _queue..."
 
 #: src/folderview.c:304
 msgid "/Send _queue..."


@@ -3009,110 +3081,110 @@ msgid "Total"
 msgstr "全部"
 
 #. TRANSLATORS: This in Number sign in American style
 msgstr "全部"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:473 src/summaryview.c:496
+#: src/folderview.c:473 src/summaryview.c:502

 msgid "#"
 msgstr "＃"
 
 #: src/folderview.c:753
 msgid "Setting folder info..."
 msgid "#"
 msgstr "＃"
 
 #: src/folderview.c:753
 msgid "Setting folder info..."

-msgstr "设置文件夹资料..."
+msgstr "设置目录资料..."

 
 

-#: src/folderview.c:816 src/summaryview.c:3555
+#: src/folderview.c:816 src/summaryview.c:3573

 msgid "Mark all as read"
 msgstr "设所有为已读"
 
 msgid "Mark all as read"
 msgstr "设所有为已读"
 

-#: src/folderview.c:817 src/summaryview.c:3556
+#: src/folderview.c:817 src/summaryview.c:3574

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgid "Do you really want to mark all mails in this folder as read ?"

-msgstr "确定要将此文件夹中所有邮件设置已读？"
+msgstr "确定要将此目录中所有邮件设置已读？"

 
 

-#: src/folderview.c:1034 src/imap.c:3420 src/mainwindow.c:3897 src/setup.c:90
+#: src/folderview.c:1034 src/imap.c:3449 src/mainwindow.c:3900 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 #, c-format
 msgid "Scanning folder %s%c%s ..."

-msgstr "扫描文件夹%s%c%s..."
+msgstr "扫描目录%s%c%s..."

 
 

-#: src/folderview.c:1038 src/imap.c:3425 src/mainwindow.c:3902 src/setup.c:95
+#: src/folderview.c:1038 src/imap.c:3454 src/mainwindow.c:3905 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 #, c-format
 msgid "Scanning folder %s ..."

-msgstr " 扫描文件夹 %s ..."
+msgstr " 扫描目录 %s ..."

 
 #: src/folderview.c:1069
 msgid "Rebuild folder tree"
 
 #: src/folderview.c:1069
 msgid "Rebuild folder tree"

-msgstr "重建文件夹树"
+msgstr "重建目录树"

 
 #: src/folderview.c:1070
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 
 #: src/folderview.c:1070
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"

-msgstr "重建文件夹树将删除原有的本地缓存。是否要继续?"
+msgstr "重建目录树将删除原有的本地缓存。是否要继续?"

 
 #: src/folderview.c:1080
 msgid "Rebuilding folder tree..."
 
 #: src/folderview.c:1080
 msgid "Rebuilding folder tree..."

-msgstr " 重新建立文件夹树 ..."
+msgstr " 重新建立目录树 ..."

 
 #: src/folderview.c:1082 src/folderview.c:1122
 msgid "Scanning folder tree..."
 
 #: src/folderview.c:1082 src/folderview.c:1122
 msgid "Scanning folder tree..."

-msgstr " 正在扫描文件夹..."
+msgstr " 正在扫描目录..."

 
 #: src/folderview.c:1207
 #, c-format
 msgid "Couldn't scan folder %s\n"
 
 #: src/folderview.c:1207
 #, c-format
 msgid "Couldn't scan folder %s\n"

-msgstr "无法扫描文件夹 %s\n"
+msgstr "无法扫描目录 %s\n"

 
 

-#: src/folderview.c:1260
+#: src/folderview.c:1261

 msgid "Checking for new messages in all folders..."
 msgid "Checking for new messages in all folders..."

-msgstr "检查所有文件夹中的新邮件..."
+msgstr "检查所有目录中的新邮件..."

 
 

-#: src/folderview.c:2059
+#: src/folderview.c:2074

 #, c-format
 msgid "Closing Folder %s..."
 #, c-format
 msgid "Closing Folder %s..."

-msgstr "关闭文件夹%s..."
+msgstr "关闭目录%s..."

 
 

-#: src/folderview.c:2149
+#: src/folderview.c:2164

 #, c-format
 msgid "Opening Folder %s..."
 #, c-format
 msgid "Opening Folder %s..."

-msgstr "打开文件夹%s..."
+msgstr "打开目录%s..."

 
 

-#: src/folderview.c:2162
+#: src/folderview.c:2177

 msgid "Folder could not be opened."
 msgid "Folder could not be opened."

-msgstr "无法打开文件夹。"
+msgstr "无法打开目录。"

 
 

-#: src/folderview.c:2324 src/mainwindow.c:2121
+#: src/folderview.c:2339 src/mainwindow.c:2121

 msgid "Empty trash"
 msgid "Empty trash"

-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶"
+msgstr "æ¸\85空åº\9f件夹"

 
 

-#: src/folderview.c:2325
+#: src/folderview.c:2340

 msgid "Delete all messages in trash?"
 msgid "Delete all messages in trash?"

-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶内所有邮件？"
+msgstr "æ¸\85空åº\9f件夹内所有邮件？"

 
 

-#: src/folderview.c:2326
+#: src/folderview.c:2341

 msgid "+_Empty trash"
 msgid "+_Empty trash"

-msgstr "+æ¸\85空å\9e\83å\9c¾æ¡¶(_E)"
+msgstr "+æ¸\85空åº\9f件夹(_E)"

 
 

-#: src/folderview.c:2370 src/inc.c:1478 src/toolbar.c:2320
+#: src/folderview.c:2385 src/inc.c:1479 src/toolbar.c:2329

 msgid "Offline warning"
 msgstr "脱机警告"
 
 msgid "Offline warning"
 msgstr "脱机警告"
 

-#: src/folderview.c:2371 src/toolbar.c:2321
+#: src/folderview.c:2386 src/toolbar.c:2330

 msgid "You're working offline. Override?"
 msgstr "你正在脱机工作。是否更改？"
 
 msgid "You're working offline. Override?"
 msgstr "你正在脱机工作。是否更改？"
 

-#: src/folderview.c:2382 src/toolbar.c:2340
+#: src/folderview.c:2397 src/toolbar.c:2349

 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 
 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 

-#: src/folderview.c:2383 src/toolbar.c:2341
+#: src/folderview.c:2398 src/toolbar.c:2350

 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 
 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 

-#: src/folderview.c:2384 src/messageview.c:590 src/messageview.c:607
-#: src/prefs_account.c:1122 src/toolbar.c:2342
+#: src/folderview.c:2399 src/messageview.c:590 src/messageview.c:607
+#: src/toolbar.c:2351

 msgid "_Send"
 msgstr "发送(_S)"
 
 msgid "_Send"
 msgstr "发送(_S)"
 

-#: src/folderview.c:2392 src/toolbar.c:2360
+#: src/folderview.c:2407 src/toolbar.c:2369

 msgid "Some errors occurred while sending queued messages."
 msgstr "发送邮件时发生错误。"
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "发送邮件时发生错误。"
 

-#: src/folderview.c:2395 src/main.c:1755 src/toolbar.c:2363
+#: src/folderview.c:2410 src/main.c:1796 src/toolbar.c:2372

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -3121,65 +3193,65 @@ msgstr ""
 "发送邮件时发生错误:\n"
 "%s"
 
 "发送邮件时发生错误:\n"
 "%s"
 

-#: src/folderview.c:2462
+#: src/folderview.c:2477

 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s' ?"

-msgstr "确定要复制文件夹 '%s' 到 '%s'？"
+msgstr "确定要复制目录 '%s' 到 '%s'？"

 
 

-#: src/folderview.c:2463
+#: src/folderview.c:2478

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"

-msgstr "确定要将文件夹 '%s' 改为 '%s' 的一个子文件夹？"
+msgstr "确定要将目录 '%s' 改为 '%s' 的一个子目录？"

 
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Copy folder"
 msgid "Copy folder"

-msgstr "复制文件夹"
+msgstr "复制目录"

 
 

-#: src/folderview.c:2465
+#: src/folderview.c:2480

 msgid "Move folder"
 msgid "Move folder"

-msgstr "移动文件夹"
+msgstr "移动目录"

 
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Copying %s to %s..."
 msgstr "将%s 复制到%s..."
 
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "将%s 复制到%s..."
 

-#: src/folderview.c:2476
+#: src/folderview.c:2491

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "将%s 移动到%s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "将%s 移动到%s..."
 

-#: src/folderview.c:2507
+#: src/folderview.c:2522

 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 
 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 

-#: src/folderview.c:2510
+#: src/folderview.c:2525

 msgid "Can't copy a folder to one of its children."
 msgid "Can't copy a folder to one of its children."

-msgstr "无法将文件夹复制到其子文件夹中。"
+msgstr "无法将目录复制到其子目录中。"

 
 

-#: src/folderview.c:2511
+#: src/folderview.c:2526

 msgid "Can't move a folder to one of its children."
 msgid "Can't move a folder to one of its children."

-msgstr "无法将文件夹移到其子文件夹中。"
+msgstr "无法将目录移到其子目录中。"

 
 

-#: src/folderview.c:2514
+#: src/folderview.c:2529

 msgid "A folder cannot be moved between different mailboxes."
 msgid "A folder cannot be moved between different mailboxes."

-msgstr "文件夹不能跨邮箱移动。"
+msgstr "目录不能跨邮箱移动。"

 
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Copy failed!"
 msgstr "复制失败！"
 
 msgid "Copy failed!"
 msgstr "复制失败！"
 

-#: src/folderview.c:2517
+#: src/folderview.c:2532

 msgid "Move failed!"
 msgstr "移动失败！"
 
 msgid "Move failed!"
 msgstr "移动失败！"
 

-#: src/folderview.c:2568
+#: src/folderview.c:2583

 #, c-format
 msgid "Processing configuration for folder %s"
 #, c-format
 msgid "Processing configuration for folder %s"

-msgstr "文件夹 %s 的邮件分拣配置"
+msgstr "目录 %s 的邮件分拣配置"

 
 

-#: src/gedit-print.c:147 src/messageview.c:1544 src/summaryview.c:4246
-#: src/toolbar.c:188
+#: src/gedit-print.c:147 src/messageview.c:1556 src/summaryview.c:4268
+#: src/toolbar.c:189

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 


@@ -3205,64 +3277,64 @@ msgstr "打印预览"
 msgid "Page %N of %Q"
 msgstr "第%d页(共%d页)"
 
 msgid "Page %N of %Q"
 msgstr "第%d页(共%d页)"
 

-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174

 msgid "Newsgroup subscription"
 msgstr "订阅新闻组"
 
 msgid "Newsgroup subscription"
 msgstr "订阅新闻组"
 

-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190

 msgid "Select newsgroups for subscription:"
 msgstr "选择要订阅的新闻组:"
 
 msgid "Select newsgroups for subscription:"
 msgstr "选择要订阅的新闻组:"
 

-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196

 msgid "Find groups:"
 msgstr "查找新闻组:"
 
 msgid "Find groups:"
 msgstr "查找新闻组:"
 

-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204

 msgid " Search "
 msgstr " 搜索 "
 
 msgid " Search "
 msgstr " 搜索 "
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Newsgroup name"
 msgstr "新闻组名称"
 
 msgid "Newsgroup name"
 msgstr "新闻组名称"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Messages"
 msgstr "邮件"
 
 msgid "Messages"
 msgstr "邮件"
 

-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347

 msgid "moderated"
 msgstr "有管理的"
 
 msgid "moderated"
 msgstr "有管理的"
 

-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349

 msgid "readonly"
 msgstr "只读"
 
 msgid "readonly"
 msgstr "只读"
 

-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 

-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420

 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1367
+#: src/grouplistdialog.c:457 src/summaryview.c:1385

 msgid "Done."
 msgstr "完成。"
 
 msgid "Done."
 msgstr "完成。"
 

-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 

-#: src/gtk/about.c:79 src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:212

 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 
 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 

-#: src/gtk/about.c:80 src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:213

 msgid "/Copy this _link"
 msgstr "/复制链接地址(_l)"
 
 msgid "/Copy this _link"
 msgstr "/复制链接地址(_l)"
 


@@ -3518,15 +3590,15 @@ msgstr "灰色"
 
 #: src/gtk/colorlabel.c:56 src/prefs_common.c:361
 msgid "Light brown"
 
 #: src/gtk/colorlabel.c:56 src/prefs_common.c:361
 msgid "Light brown"

-msgstr "亮褐色"
+msgstr "亮褐"

 
 #: src/gtk/colorlabel.c:57 src/prefs_common.c:365
 msgid "Dark red"
 
 #: src/gtk/colorlabel.c:57 src/prefs_common.c:365
 msgid "Dark red"

-msgstr "暗红色"
+msgstr "暗红"

 
 #: src/gtk/colorlabel.c:58 src/prefs_common.c:369
 msgid "Dark pink"
 
 #: src/gtk/colorlabel.c:58 src/prefs_common.c:369
 msgid "Dark pink"

-msgstr "暗粉色"
+msgstr "暗粉"

 
 #: src/gtk/colorlabel.c:59 src/prefs_common.c:373
 msgid "Steel blue"
 
 #: src/gtk/colorlabel.c:59 src/prefs_common.c:373
 msgid "Steel blue"


@@ -3538,7 +3610,7 @@ msgstr "金色"
 
 #: src/gtk/colorlabel.c:61 src/prefs_common.c:381
 msgid "Bright green"
 
 #: src/gtk/colorlabel.c:61 src/prefs_common.c:381
 msgid "Bright green"

-msgstr "亮绿色"
+msgstr "亮绿"

 
 #: src/gtk/colorlabel.c:62 src/prefs_common.c:385
 msgid "Magenta"
 
 #: src/gtk/colorlabel.c:62 src/prefs_common.c:385
 msgid "Magenta"


@@ -3546,15 +3618,15 @@ msgstr "洋红"
 
 #: src/gtk/foldersort.c:156
 msgid "Set folder order"
 
 #: src/gtk/foldersort.c:156
 msgid "Set folder order"

-msgstr "设置文件夹顺序"
+msgstr "设置目录顺序"

 
 #: src/gtk/foldersort.c:190
 msgid "Move folders up or down to change the sort order in the folder list."
 
 #: src/gtk/foldersort.c:190
 msgid "Move folders up or down to change the sort order in the folder list."

-msgstr "上下移动文件夹以改变文件夹视图中的排列顺序。"
+msgstr "上下移动目录以改变目录视图中的排列顺序。"

 
 

-#: src/gtk/foldersort.c:214 src/toolbar.c:409
+#: src/gtk/foldersort.c:214 src/toolbar.c:410

 msgid "Folders"
 msgid "Folders"

-msgstr "文件夹"
+msgstr "目录"

 
 #: src/gtk/gtkaspell.c:638
 msgid "No dictionary selected."
 
 #: src/gtk/gtkaspell.c:638
 msgid "No dictionary selected."


@@ -3775,25 +3847,424 @@ msgstr "页眉和页脚字体"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
 

-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "新邮件"
-
-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "未读邮件"
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1164
+#: src/prefs_matcher.c:1913 src/prefs_summary_column.c:85 src/quote_fmt.c:48
+#: src/summaryview.c:500
+msgid "Date"
+msgstr "日期"

 
 

-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "已回复的邮件"
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "日期:"

 
 

-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "已转发的邮件"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1161
+#: src/prefs_matcher.c:170 src/prefs_matcher.c:1910
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:498
+msgid "From"
+msgstr "发信人"

 
 

-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "忽略讨论线索"
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "发信人:"
+
+#: src/gtk/headers.h:10 src/toolbar.c:425 src/toolbar.c:524
+msgid "Sender"
+msgstr "发信人"
+
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "发信人:"
+
+#: src/gtk/headers.h:11 src/prefs_account.c:1915
+msgid "Reply-To"
+msgstr "回信地址:"
+
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1162
+#: src/prefs_matcher.c:171 src/prefs_matcher.c:1911
+#: src/prefs_summary_column.c:84 src/prefs_template.c:198 src/quote_fmt.c:56
+#: src/summaryview.c:499
+msgid "To"
+msgstr "收信人"
+
+#: src/gtk/headers.h:13 src/prefs_account.c:1889
+#: src/prefs_filtering_action.c:1163 src/prefs_matcher.c:172
+#: src/prefs_matcher.c:1912 src/prefs_template.c:199 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "回信地址"
+
+#: src/gtk/headers.h:14 src/prefs_account.c:1902 src/prefs_template.c:200
+msgid "Bcc"
+msgstr "抄送地址"
+
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1165
+#: src/prefs_matcher.c:1914 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr ""
+
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr ""
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1167
+#: src/prefs_matcher.c:176 src/prefs_matcher.c:1916 src/quote_fmt.c:59
+msgid "References"
+msgstr "引用"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr ""
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1160
+#: src/prefs_matcher.c:169 src/prefs_matcher.c:1909
+#: src/prefs_summary_column.c:82 src/prefs_template.c:201 src/quote_fmt.c:55
+#: src/quote_fmt.c:155 src/summaryview.c:497
+msgid "Subject"
+msgstr "主题"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr ""
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr ""
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1166
+#: src/prefs_matcher.c:174 src/prefs_matcher.c:1915 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr ""
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:137 src/prefs_summary_column.c:80
+#: src/summaryview.c:2476
+msgid "Status"
+msgstr "状态"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "状态"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr ""
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr ""
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr ""
+
+#: src/gtk/headers.h:41 src/image_viewer.c:324
+msgid "Content-Type:"
+msgstr ""
+
+#: src/gtk/headers.h:42
+#, fuzzy
+msgid "Content-Transfer-Encoding"
+msgstr "传送编码"
+
+#: src/gtk/headers.h:42
+#, fuzzy
+msgid "Content-Transfer-Encoding:"
+msgstr "传送编码"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr ""
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr ""
+
+#: src/gtk/headers.h:45 src/prefs_account.c:971
+msgid "Organization"
+msgstr "组织"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "组织:"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "邮件列表"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "邮件列表:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr ""
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr ""
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr ""
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr ""
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr ""
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr ""
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr ""
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr ""
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr ""
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr ""
+
+#: src/gtk/headers.h:62 src/prefs_matcher.c:175
+msgid "In reply to"
+msgstr ""
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr ""
+
+#: src/gtk/headers.h:63 src/prefs_matcher.c:173
+msgid "To or Cc"
+msgstr ""
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr ""
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr ""
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr ""
+
+#: src/gtk/icon_legend.c:67
+msgid "New message"
+msgstr "新邮件"
+
+#: src/gtk/icon_legend.c:68
+msgid "Unread message"
+msgstr "未读邮件"
+
+#: src/gtk/icon_legend.c:69
+msgid "Message has been replied to"
+msgstr "已回复的邮件"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been forwarded"
+msgstr "已转发的邮件"
+
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "忽略讨论线索"

 
 #: src/gtk/icon_legend.c:72
 msgid "Message is spam"
 
 #: src/gtk/icon_legend.c:72
 msgid "Message is spam"


@@ -3841,15 +4312,15 @@ msgstr "已锁定的邮件"
 
 #: src/gtk/icon_legend.c:87
 msgid "Folder (normal, opened)"
 
 #: src/gtk/icon_legend.c:87
 msgid "Folder (normal, opened)"

-msgstr "文件夹(普通，已打开)"
+msgstr "目录(普通，已打开)"

 
 #: src/gtk/icon_legend.c:88
 msgid "Folder with read messages hidden"
 
 #: src/gtk/icon_legend.c:88
 msgid "Folder with read messages hidden"

-msgstr "隐藏已读邮件的文件夹"
+msgstr "隐藏已读邮件的目录"

 
 #: src/gtk/icon_legend.c:89
 msgid "Folder contains marked messages"
 
 #: src/gtk/icon_legend.c:89
 msgid "Folder contains marked messages"

-msgstr "含有已标记邮件的文件夹"
+msgstr "含有已标记邮件的目录"

 
 #: src/gtk/icon_legend.c:122
 msgid "Icon Legend"
 
 #: src/gtk/icon_legend.c:122
 msgid "Icon Legend"


@@ -3859,7 +4330,7 @@ msgstr "图标说明"
 msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"
 msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"

-msgstr "<span weight=\"bold\">下列图标用于标识邮件和文件夹的状态: </span>"
+msgstr "<span weight=\"bold\">下列图标用于标识邮件和目录的状态: </span>"

 
 #: src/gtk/inputdialog.c:189
 #, c-format
 
 #: src/gtk/inputdialog.c:189
 #, c-format


@@ -3874,11 +4345,11 @@ msgstr "输入密码"
 msgid "Remember this"
 msgstr "不再询问"
 
 msgid "Remember this"
 msgstr "不再询问"
 

-#: src/gtk/logwindow.c:443
+#: src/gtk/logwindow.c:445

 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 
 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 

-#: src/gtk/pluginwindow.c:151 src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3888,19 +4359,19 @@ msgstr ""
 "\n"
 "版本: "
 
 "\n"
 "版本: "
 

-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161

 msgid "Error: "
 msgstr "错误: "
 
 msgid "Error: "
 msgstr "错误: "
 

-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162

 msgid "Plugin is not functional."
 msgstr "该插件不能工作。"
 
 msgid "Plugin is not functional."
 msgstr "该插件不能工作。"
 

-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193

 msgid "Select the Plugins to load"
 msgstr "选择要加载的插件"
 
 msgid "Select the Plugins to load"
 msgstr "选择要加载的插件"
 

-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208

 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"
 #, c-format
 msgid ""
 "The following error occured while loading %s :\n"


@@ -3911,232 +4382,229 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:287 src/plugins/bogofilter/bogofilter_gtk.c:428
+#: src/gtk/pluginwindow.c:294 src/plugins/bogofilter/bogofilter_gtk.c:447

 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/clamav/clamav_plugin_gtk.c:211
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:548
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
+#: src/plugins/pgpcore/prefs_gpg.c:550
+#: src/plugins/spamassassin/spamassassin_gtk.c:563

 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "插件"
 
 #: src/plugins/trayicon/trayicon_prefs.c:69
 msgid "Plugins"
 msgstr "插件"
 

-#: src/gtk/pluginwindow.c:321 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:328 src/prefs_summaries.c:212

 msgid "Description"
 msgstr "描述"
 
 msgid "Description"
 msgstr "描述"
 

-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:345

 msgid "More plugins are available from the Claws Mail website."
 msgstr "可从Claws Mail网站下载更多插件。"
 
 msgid "More plugins are available from the Claws Mail website."
 msgstr "可从Claws Mail网站下载更多插件。"
 

-#: src/gtk/pluginwindow.c:344 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:351 src/prefs_themes.c:862

 msgid "Get more..."
 msgstr "下载更多..."
 
 msgid "Get more..."
 msgstr "下载更多..."
 

-#: src/gtk/pluginwindow.c:354
+#: src/gtk/pluginwindow.c:357

 msgid "Load Plugin..."
 msgstr "加载插件..."
 
 msgid "Load Plugin..."
 msgstr "加载插件..."
 

-#: src/gtk/pluginwindow.c:355
+#: src/gtk/pluginwindow.c:358

 msgid "Unload Plugin"
 msgstr "卸载插件"
 
 msgid "Unload Plugin"
 msgstr "卸载插件"
 

-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:387

 msgid "Click here to load one or more plugins"
 msgstr "点击此处加载插件(可多选)"
 
 msgid "Click here to load one or more plugins"
 msgstr "点击此处加载插件(可多选)"
 

-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:391

 msgid "Unload the selected plugin"
 msgstr "卸载选中的插件"
 
 msgid "Unload the selected plugin"
 msgstr "卸载选中的插件"
 

-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:456

 msgid "Loaded plugins"
 msgstr "已加载的插件"
 
 msgid "Loaded plugins"
 msgstr "已加载的插件"
 

-#: src/gtk/prefswindow.c:535
+#: src/gtk/prefswindow.c:575

 msgid "Page Index"
 msgstr "页面"
 
 msgid "Page Index"
 msgstr "页面"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:842
-#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:376
-#: src/prefs_filtering.c:1489
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2908
+#: src/prefs_account.c:2926 src/prefs_account.c:2944 src/prefs_account.c:2962
+#: src/prefs_account.c:2980 src/prefs_account.c:2998 src/prefs_account.c:3017
+#: src/prefs_account.c:3036 src/prefs_filtering_action.c:399
+#: src/prefs_filtering.c:374 src/prefs_filtering.c:1487

 msgid "Account"
 msgstr "帐号"
 
 msgid "Account"
 msgstr "帐号"
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2458
-msgid "Status"
-msgstr "状态"
-
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:374

 msgid "all messages"
 msgstr "所有邮件"
 
 msgid "all messages"
 msgstr "所有邮件"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:375

 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 
 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:376

 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 
 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:377

 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 
 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:378

 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 
 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:379

 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 
 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:380

 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 
 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:381

 msgid "deleted messages"
 msgstr "已删除的邮件"
 
 msgid "deleted messages"
 msgstr "已删除的邮件"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:382

 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 
 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:383

 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:384

 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 
 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:385

 msgid "forwarded messages"
 msgstr "已转发的邮件"
 
 msgid "forwarded messages"
 msgstr "已转发的邮件"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:386

 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 
 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:387

 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:388

 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:389

 msgid "messages which are marked with color #"
 msgstr "带颜色标记#的邮件"
 
 msgid "messages which are marked with color #"
 msgstr "带颜色标记#的邮件"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:390

 msgid "locked messages"
 msgstr "已锁定的邮件"
 
 msgid "locked messages"
 msgstr "已锁定的邮件"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:391

 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 
 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:392

 msgid "new messages"
 msgstr "新邮件"
 
 msgid "new messages"
 msgstr "新邮件"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:393

 msgid "old messages"
 msgstr "旧邮件"
 
 msgid "old messages"
 msgstr "旧邮件"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:394

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:395

 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 
 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:396

 msgid "read messages"
 msgstr "已读邮件"
 
 msgid "read messages"
 msgstr "已读邮件"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:397

 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 
 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:398

 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 
 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:399

 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 
 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:400

 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 
 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:401

 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 
 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 

-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:402

 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 
 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:403

 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 
 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:404

 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 
 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:405

 msgid "marked messages"
 msgstr "已标记的邮件"
 
 msgid "marked messages"
 msgstr "已标记的邮件"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:406

 msgid "unread messages"
 msgstr "未读邮件"
 
 msgid "unread messages"
 msgstr "未读邮件"
 

-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:407

 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 
 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:408

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "邮件传送给命令进行处理时返回0 - %F为邮件文件名称"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "邮件传送给命令进行处理时返回0 - %F为邮件文件名称"
 

-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:409

 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 
 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:374
+#: src/gtk/quicksearch.c:411

 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 
 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 

-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:412

 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 
 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 

-#: src/gtk/quicksearch.c:376
+#: src/gtk/quicksearch.c:413

 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 
 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 

-#: src/gtk/quicksearch.c:377
+#: src/gtk/quicksearch.c:414

 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 
 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 

-#: src/gtk/quicksearch.c:379
+#: src/gtk/quicksearch.c:416

 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 
 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 

-#: src/gtk/quicksearch.c:387 src/summary_search.c:401
+#: src/gtk/quicksearch.c:424 src/summary_search.c:401

 msgid "Extended Search"
 msgstr "高级搜索"
 
 msgid "Extended Search"
 msgstr "高级搜索"
 

-#: src/gtk/quicksearch.c:388
+#: src/gtk/quicksearch.c:425

 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"
 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"


@@ -4147,115 +4615,99 @@ msgstr ""
 "\n"
 "可以使用如下一些符号:"
 
 "\n"
 "可以使用如下一些符号:"
 

-#: src/gtk/quicksearch.c:484 src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1160 src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1882 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:48 src/summaryview.c:491
-msgid "Subject"
-msgstr "主题"
-
-#: src/gtk/quicksearch.c:488 src/prefs_filtering_action.c:1161
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1883
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:492
-msgid "From"
-msgstr "发信人"
-
-#: src/gtk/quicksearch.c:492 src/prefs_filtering_action.c:1162
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1884
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:49
-#: src/summaryview.c:493
-msgid "To"
-msgstr "收信人"
-
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:548

 msgid "Recursive"
 msgid "Recursive"

-msgstr "搜索子文件夹"
+msgstr "搜索子目录"

 
 

-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:558

 msgid "Sticky"
 msgid "Sticky"

-msgstr "切换文件夹时保持有效"
+msgstr "切换目录时保持有效"

 
 

-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:568

 msgid "Type-ahead"
 msgstr "递增式"
 
 msgid "Type-ahead"
 msgstr "递增式"
 

-#: src/gtk/quicksearch.c:554 src/gtk/quicksearch.c:647
+#: src/gtk/quicksearch.c:580
+msgid "Run on select"
+msgstr ""
+
+#: src/gtk/quicksearch.c:614 src/gtk/quicksearch.c:706

 msgid " Clear "
 msgstr " 清除 "
 
 msgid " Clear "
 msgstr " 清除 "
 

-#: src/gtk/quicksearch.c:562
+#: src/gtk/quicksearch.c:622

 msgid "Clear the current search"
 msgstr "清除当前搜索"
 
 msgid "Clear the current search"
 msgstr "清除当前搜索"
 

-#: src/gtk/quicksearch.c:577 src/summary_search.c:354
+#: src/gtk/quicksearch.c:637 src/summary_search.c:354

 msgid "Edit search criteria"
 msgstr "编辑搜索条件"
 
 msgid "Edit search criteria"
 msgstr "编辑搜索条件"
 

-#: src/gtk/quicksearch.c:583 src/gtk/quicksearch.c:645
+#: src/gtk/quicksearch.c:643 src/gtk/quicksearch.c:704

 msgid " Extended Symbols... "
 msgstr "扩展符号"
 
 msgid " Extended Symbols... "
 msgstr "扩展符号"
 

-#: src/gtk/quicksearch.c:591
+#: src/gtk/quicksearch.c:651

 msgid "Information about extended symbols"
 msgstr "扩展符号说明"
 
 msgid "Information about extended symbols"
 msgstr "扩展符号说明"
 

-#: src/gtk/quicksearch.c:663
+#: src/gtk/quicksearch.c:722

 msgid "Info"
 msgstr "说明"
 
 msgid "Info"
 msgstr "说明"
 

-#: src/gtk/quicksearch.c:665
+#: src/gtk/quicksearch.c:724

 msgid "Clear"
 msgstr "清除 "
 
 msgid "Clear"
 msgstr "清除 "
 

-#: src/gtk/quicksearch.c:1090 src/summaryview.c:1175
+#: src/gtk/quicksearch.c:1157 src/summaryview.c:1208

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "正在搜索(%s)... \n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "正在搜索(%s)... \n"
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:130 src/gtk/sslcertwindow.c:283
+#: src/gtk/sslcertwindow.c:323 src/gtk/sslcertwindow.c:377

 msgid "correct"
 msgstr "正确"
 
 msgid "correct"
 msgstr "正确"
 

-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:135

 msgid "Owner"
 msgstr "所有者"
 
 msgid "Owner"
 msgstr "所有者"
 

-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:136

 msgid "Signer"
 msgstr "歌者"
 
 msgid "Signer"
 msgstr "歌者"
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:143 src/gtk/sslcertwindow.c:164

 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "名称: "
 
 #: src/prefs_themes.c:879
 msgid "Name: "
 msgstr "名称: "
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:150 src/gtk/sslcertwindow.c:171

 msgid "Organization: "
 msgstr "组织"
 
 msgid "Organization: "
 msgstr "组织"
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:178

 msgid "Location: "
 msgstr "位置"
 
 msgid "Location: "
 msgstr "位置"
 

-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:185

 msgid "Fingerprint: "
 msgstr "指纹"
 
 msgid "Fingerprint: "
 msgstr "指纹"
 

-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:191

 msgid "Signature status: "
 msgstr "签名状况: "
 
 msgid "Signature status: "
 msgstr "签名状况: "
 

-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:197

 msgid "Expires on: "
 msgstr "有效期至: "
 
 msgid "Expires on: "
 msgstr "有效期至: "
 

-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:258

 #, c-format
 msgid "SSL certificate for %s"
 msgstr "%s的SSL认证"
 
 #, c-format
 msgid "SSL certificate for %s"
 msgstr "%s的SSL认证"
 

-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:274

 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"


@@ -4264,30 +4716,30 @@ msgstr ""
 "对 %s 的认证是未知的。\n"
 "是否接受？"
 
 "对 %s 的认证是未知的。\n"
 "是否接受？"
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:285 src/gtk/sslcertwindow.c:325
+#: src/gtk/sslcertwindow.c:379

 #, c-format
 msgid "Signature status: %s"
 msgstr "签名状态: %s"
 
 #, c-format
 msgid "Signature status: %s"
 msgstr "签名状态: %s"
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:292 src/gtk/sslcertwindow.c:332

 msgid "_View certificate"
 msgstr "查看认证(_V)"
 
 msgid "_View certificate"
 msgstr "查看认证(_V)"
 

-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:297

 msgid "Unknown SSL Certificate"
 msgstr "不明的SSL认证"
 
 msgid "Unknown SSL Certificate"
 msgstr "不明的SSL认证"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:391

 msgid "_Cancel connection"
 msgstr "取消连接(_C)"
 
 msgid "_Cancel connection"
 msgstr "取消连接(_C)"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:298 src/gtk/sslcertwindow.c:391

 msgid "_Accept and save"
 msgstr "接受并保存(_A)"
 
 msgid "_Accept and save"
 msgstr "接受并保存(_A)"
 

-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:314

 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"


@@ -4296,40 +4748,40 @@ msgstr ""
 "对 %s 的认证已经过期。\n"
 "是否继续？"
 
 "对 %s 的认证已经过期。\n"
 "是否继续？"
 

-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:337

 msgid "Expired SSL Certificate"
 msgstr "已过期的SSL认证"
 
 msgid "Expired SSL Certificate"
 msgstr "已过期的SSL认证"
 

-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:338

 msgid "_Accept"
 msgstr "接受(_A)"
 
 msgid "_Accept"
 msgstr "接受(_A)"
 

-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:356

 msgid "New certificate:"
 msgstr "新的认证:"
 
 msgid "New certificate:"
 msgstr "新的认证:"
 

-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:361

 msgid "Known certificate:"
 msgstr "已知的认证:"
 
 msgid "Known certificate:"
 msgstr "已知的认证:"
 

-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:368

 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "%s的认证已更改。是否接受？"
 
 #, c-format
 msgid "Certificate for %s has changed. Do you want to accept it?"
 msgstr "%s的认证已更改。是否接受？"
 

-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:386

 msgid "_View certificates"
 msgstr "查看认证(_V)"
 
 msgid "_View certificates"
 msgstr "查看认证(_V)"
 

-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:390

 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 

-#: src/headerview.c:195 src/summaryview.c:2866 src/summaryview.c:2877
+#: src/headerview.c:194 src/summaryview.c:2884 src/summaryview.c:2895

 msgid "(No From)"
 msgstr "(没有发信人)"
 
 msgid "(No From)"
 msgstr "(没有发信人)"
 

-#: src/headerview.c:210 src/summaryview.c:2901 src/summaryview.c:2904
+#: src/headerview.c:209 src/summaryview.c:2919 src/summaryview.c:2922

 msgid "(No Subject)"
 msgstr "(没有主题)"
 
 msgid "(No Subject)"
 msgstr "(没有主题)"
 


@@ -4345,11 +4797,7 @@ msgstr "文件大小 :"
 msgid "Load Image"
 msgstr "加载图片"
 
 msgid "Load Image"
 msgstr "加载图片"
 

-#: src/image_viewer.c:324
-msgid "Content-Type:"
-msgstr ""
-
-#: src/imap.c:633
+#: src/imap.c:639

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4361,36 +4809,36 @@ msgstr ""
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 

-#: src/imap.c:640
+#: src/imap.c:646

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 

-#: src/imap.c:644
+#: src/imap.c:650

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 

-#: src/imap.c:661
+#: src/imap.c:667

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 

-#: src/imap.c:666 src/imap.c:669
+#: src/imap.c:672 src/imap.c:675

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 

-#: src/imap.c:718 src/imap.c:2447 src/imap.c:2956 src/imap.c:3041
-#: src/imap.c:3386 src/imap.c:4143
+#: src/imap.c:740 src/imap.c:2474 src/imap.c:2983 src/imap.c:3068
+#: src/imap.c:3415 src/imap.c:4198

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail需要访问网络才能连接IMAP服务。"
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail需要访问网络才能连接IMAP服务。"
 

-#: src/imap.c:797 src/inc.c:773 src/news.c:295 src/send_message.c:299
+#: src/imap.c:821 src/inc.c:773 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "不安全的连接"
 
 msgid "Insecure connection"
 msgstr "不安全的连接"
 

-#: src/imap.c:798 src/inc.c:774 src/news.c:296 src/send_message.c:300
+#: src/imap.c:822 src/inc.c:774 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -4402,104 +4850,104 @@ msgstr ""
 "有加入)。\n"
 "请问是否要继续连接该服务器? 如果继续的话，并不能保证通讯是安全的。"
 
 "有加入)。\n"
 "请问是否要继续连接该服务器? 如果继续的话，并不能保证通讯是安全的。"
 

-#: src/imap.c:804 src/inc.c:780 src/news.c:302 src/send_message.c:306
+#: src/imap.c:828 src/inc.c:780 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "继续连接(_t)"
 
 msgid "Con_tinue connecting"
 msgstr "继续连接(_t)"
 

-#: src/imap.c:814
+#: src/imap.c:838

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器: %s..."
 

-#: src/imap.c:852
+#: src/imap.c:876

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器: %s:%d"
 

-#: src/imap.c:855
+#: src/imap.c:879

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
 

-#: src/imap.c:884 src/imap.c:2764
+#: src/imap.c:908 src/imap.c:2791

 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 

-#: src/imap.c:921
+#: src/imap.c:945

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 

-#: src/imap.c:932 src/imap.c:935
+#: src/imap.c:956 src/imap.c:959

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "无法登录到 IMAP 服务器 %s。"
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "无法登录到 IMAP 服务器 %s。"
 

-#: src/imap.c:1153
+#: src/imap.c:1177

 msgid "Adding messages..."
 msgstr "正在添加邮件..."
 
 msgid "Adding messages..."
 msgstr "正在添加邮件..."
 

-#: src/imap.c:1305 src/mh.c:500
+#: src/imap.c:1329 src/mh.c:500

 msgid "Copying messages..."
 msgstr "正在复制邮件..."
 
 msgid "Copying messages..."
 msgstr "正在复制邮件..."
 

-#: src/imap.c:1481
+#: src/imap.c:1505

 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 
 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 

-#: src/imap.c:1487 src/imap.c:3894
+#: src/imap.c:1511 src/imap.c:3925

 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 
 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 

-#: src/imap.c:1814
+#: src/imap.c:1838

 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "正在%s中查找未订阅的目录..."
 
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "正在%s中查找未订阅的目录..."
 

-#: src/imap.c:1817
+#: src/imap.c:1841

 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "正在查找%s的子目录..."
 
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "正在查找%s的子目录..."
 

-#: src/imap.c:2053
+#: src/imap.c:2077

 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹: LIST失败\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹: LIST失败\n"
 

-#: src/imap.c:2069
+#: src/imap.c:2093

 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 
 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 

-#: src/imap.c:2156
+#: src/imap.c:2180

 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 

-#: src/imap.c:2187
+#: src/imap.c:2211

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 

-#: src/imap.c:2278
+#: src/imap.c:2302

 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 
 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 

-#: src/imap.c:2524
+#: src/imap.c:2551

 msgid "LIST failed\n"
 msgstr ""
 
 msgid "LIST failed\n"
 msgstr ""
 

-#: src/imap.c:2641
+#: src/imap.c:2668

 #, c-format
 msgid "can't select folder: %s\n"
 #, c-format
 msgid "can't select folder: %s\n"

-msgstr "无法选择文件夹: %s\n"
+msgstr "无法选择目录: %s\n"

 
 

-#: src/imap.c:2761
+#: src/imap.c:2788

 msgid "Server requires TLS to log in.\n"
 msgstr "需要TLS特性才能登录服务器。\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "需要TLS特性才能登录服务器。\n"
 

-#: src/imap.c:2770
+#: src/imap.c:2797

 msgid "Can't refresh capabilities.\n"
 msgstr "无法更新能力基线数据。\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "无法更新能力基线数据。\n"
 

-#: src/imap.c:2775
+#: src/imap.c:2802

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "


@@ -4508,34 +4956,34 @@ msgstr ""
 "不能成功连接上%s: 需要TLS特性才能登录该服务器，但编译时Claws Mail没有指定要包"
 "含OpenSSL支持。\n"
 
 "不能成功连接上%s: 需要TLS特性才能登录该服务器，但编译时Claws Mail没有指定要包"
 "含OpenSSL支持。\n"
 

-#: src/imap.c:2783
+#: src/imap.c:2810

 msgid "Server logins are disabled.\n"
 msgstr "登录功能已被禁用。\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "登录功能已被禁用。\n"
 

-#: src/imap.c:2961
+#: src/imap.c:2988

 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 
 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 

-#: src/imap.c:3128
+#: src/imap.c:3155

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 

-#: src/imap.c:3158
+#: src/imap.c:3185

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 

-#: src/imap.c:3202
+#: src/imap.c:3229

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 

-#: src/imap.c:3879
+#: src/imap.c:3910

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 

-#: src/imap.c:4604
+#: src/imap.c:4738

 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 "
 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 "


@@ -4550,23 +4998,23 @@ msgstr ""
 
 #: src/imap_gtk.c:58 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 
 #: src/imap_gtk.c:58 src/mh_gtk.c:50
 msgid "/Create _new folder..."

-msgstr "/创建新文件夹(_n)..."
+msgstr "/创建新目录(_n)..."

 
 #: src/imap_gtk.c:60 src/mh_gtk.c:52
 msgid "/_Rename folder..."
 
 #: src/imap_gtk.c:60 src/mh_gtk.c:52
 msgid "/_Rename folder..."

-msgstr "/重命名文件夹(_R)..."
+msgstr "/重命名目录(_R)..."

 
 #: src/imap_gtk.c:61 src/mh_gtk.c:53
 msgid "/M_ove folder..."
 
 #: src/imap_gtk.c:61 src/mh_gtk.c:53
 msgid "/M_ove folder..."

-msgstr "/移动文件夹(_o)..."
+msgstr "/移动目录(_o)..."

 
 #: src/imap_gtk.c:62 src/mh_gtk.c:54
 msgid "/Cop_y folder..."
 
 #: src/imap_gtk.c:62 src/mh_gtk.c:54
 msgid "/Cop_y folder..."

-msgstr "/复制文件夹(_y)..."
+msgstr "/复制目录(_y)..."

 
 #: src/imap_gtk.c:64 src/mh_gtk.c:56
 msgid "/_Delete folder..."
 
 #: src/imap_gtk.c:64 src/mh_gtk.c:56
 msgid "/_Delete folder..."

-msgstr "/删除文件夹(_D)..."
+msgstr "/删除目录(_D)..."

 
 #: src/imap_gtk.c:66
 msgid "/_Synchronise"
 
 #: src/imap_gtk.c:66
 msgid "/_Synchronise"


@@ -4582,7 +5030,7 @@ msgstr "/订阅(_u)"
 
 #: src/imap_gtk.c:70
 msgid "/Subscriptions/Show only subscribed _folders"
 
 #: src/imap_gtk.c:70
 msgid "/Subscriptions/Show only subscribed _folders"

-msgstr "/订阅/只显示已订阅的邮件夹"
+msgstr "/订阅/只显示已订阅的目录"

 
 #: src/imap_gtk.c:72
 msgid "/Subscriptions/---"
 
 #: src/imap_gtk.c:72
 msgid "/Subscriptions/---"


@@ -4602,11 +5050,11 @@ msgstr "/检查新邮件(_C)"
 
 #: src/imap_gtk.c:78 src/mh_gtk.c:59
 msgid "/C_heck for new folders"
 
 #: src/imap_gtk.c:78 src/mh_gtk.c:59
 msgid "/C_heck for new folders"

-msgstr "/检查新文件夹(_C)"
+msgstr "/检查新目录(_C)"

 
 #: src/imap_gtk.c:79 src/mh_gtk.c:60
 msgid "/R_ebuild folder tree"
 
 #: src/imap_gtk.c:79 src/mh_gtk.c:60
 msgid "/R_ebuild folder tree"

-msgstr "/重新建立文件夹树(_e)"
+msgstr "/重新建立目录树(_e)"

 
 #: src/imap_gtk.c:156
 msgid ""
 
 #: src/imap_gtk.c:156
 msgid ""


@@ -4614,8 +5062,8 @@ msgid ""
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""

-"请输入新文件夹的名字:\n"
-"(如果想创建一个可包含子夹但不包含邮件的文件夹，\n"
+"请输入新目录的名字:\n"
+"(如果想创建一个可包含子夹但不包含邮件的目录，\n"

 "请在名字的后面加上'/')"
 
 #: src/imap_gtk.c:214 src/mh_gtk.c:231
 "请在名字的后面加上'/')"
 
 #: src/imap_gtk.c:214 src/mh_gtk.c:231


@@ -4625,12 +5073,12 @@ msgstr "请输入'%s'的新名字:"
 
 #: src/imap_gtk.c:216 src/mh_gtk.c:233
 msgid "Rename folder"
 
 #: src/imap_gtk.c:216 src/mh_gtk.c:233
 msgid "Rename folder"

-msgstr "重新命名文件夹"
+msgstr "重新命名目录"

 
 #: src/imap_gtk.c:230
 #, c-format
 msgid "`%c' can't be included in folder name."
 
 #: src/imap_gtk.c:230
 #, c-format
 msgid "`%c' can't be included in folder name."

-msgstr "文件夹名称不能包含`%c'。"
+msgstr "目录名称不能包含`%c'。"

 
 #: src/imap_gtk.c:247 src/mh_gtk.c:258
 msgid ""
 
 #: src/imap_gtk.c:247 src/mh_gtk.c:258
 msgid ""


@@ -4648,14 +5096,14 @@ msgid ""
 "\n"
 "Do you really want to delete?"
 msgstr ""
 "\n"
 "Do you really want to delete?"
 msgstr ""

-"在'%s'之下的所有文件夹以及其中所有的邮件将被永久删除，不可能恢复。\n"
+"在'%s'之下的所有目录以及其中所有的邮件将被永久删除，不可能恢复。\n"

 "\n"
 "确实要删除吗？"
 
 #: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:241
 #, c-format
 msgid "Can't remove the folder '%s'."
 "\n"
 "确实要删除吗？"
 
 #: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:241
 #, c-format
 msgid "Can't remove the folder '%s'."

-msgstr "无法删除文件夹'%s'。"
+msgstr "无法删除目录'%s'。"

 
 #: src/imap_gtk.c:445
 #, c-format
 
 #: src/imap_gtk.c:445
 #, c-format


@@ -4666,7 +5114,7 @@ msgstr "是否要搜索'%s'的尚未订阅的子目录?"
 msgid "Search recursively"
 msgstr "递归搜索"
 
 msgid "Search recursively"
 msgstr "递归搜索"
 

-#: src/imap_gtk.c:453 src/imap_gtk.c:496
+#: src/imap_gtk.c:453 src/imap_gtk.c:498

 msgid "Subscriptions"
 msgstr "订阅"
 
 msgid "Subscriptions"
 msgstr "订阅"
 


@@ -4688,31 +5136,35 @@ msgid "All of them"
 msgstr "全部"
 
 #: src/imap_gtk.c:481
 msgstr "全部"
 
 #: src/imap_gtk.c:481

-msgid "This folder is already subscribed and has no unsubscribed subfolders."
-msgstr "该目录已经订阅，没有尚未订阅的子目录。"
+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."
+msgstr ""

 
 

-#: src/imap_gtk.c:488
+#: src/imap_gtk.c:490

 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 #, c-format
 msgid "Do you want to %s the '%s' folder?"

-msgstr "你想要%s'%s'这个目录么?"
+msgstr ""

 
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "subscribe"
 msgstr "订阅"
 
 msgid "subscribe"
 msgstr "订阅"
 

-#: src/imap_gtk.c:489
+#: src/imap_gtk.c:491

 msgid "unsubscribe"
 msgstr "退订"
 
 msgid "unsubscribe"
 msgstr "退订"
 

-#: src/imap_gtk.c:491
+#: src/imap_gtk.c:493

 msgid "Apply to subfolders"
 msgid "Apply to subfolders"

-msgstr "应用于子文件夹"
+msgstr "应用于子目录"

 
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Subscribe"
 msgstr "+订阅(_S)"
 
 msgid "+_Subscribe"
 msgstr "+订阅(_S)"
 

-#: src/imap_gtk.c:497
+#: src/imap_gtk.c:499

 msgid "+_Unsubscribe"
 msgstr "+退订新闻组(_U)"
 
 msgid "+_Unsubscribe"
 msgstr "+退订新闻组(_U)"
 


@@ -4722,7 +5174,7 @@ msgstr "导入mbox格式的邮件包"
 
 #: src/import.c:139
 msgid "Locate the mbox file and specify the destination folder."
 
 #: src/import.c:139
 msgid "Locate the mbox file and specify the destination folder."

-msgstr "请指定mbox文件和目标文件夹。"
+msgstr "请指定mbox文件和目标目录。"

 
 #: src/import.c:156
 msgid "Destination folder:"
 
 #: src/import.c:156
 msgid "Destination folder:"


@@ -4737,100 +5189,92 @@ msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the inbox folder?"
 msgstr ""
 "Destination folder is not set.\n"
 "Import mbox file to the inbox folder?"
 msgstr ""

-"未设置目标文件夹.\n"
+"未设置目标目录.\n"

 "是否要将mbox文件导入收信夹?"
 
 #: src/import.c:237
 msgid "Can't find the destination folder."
 "是否要将mbox文件导入收信夹?"
 
 #: src/import.c:237
 msgid "Can't find the destination folder."

-msgstr "无法找到目标文件夹。"
+msgstr "无法找到目标目录。"

 
 #: src/import.c:261
 msgid "Select importing file"
 msgstr "选择导入文件"
 
 
 #: src/import.c:261
 msgid "Select importing file"
 msgstr "选择导入文件"
 

-#: src/importldif.c:190
+#: src/importldif.c:191

 msgid "Please specify address book name and file to import."
 msgstr "请选择欲导入的地址簿及文件名。"
 
 msgid "Please specify address book name and file to import."
 msgstr "请选择欲导入的地址簿及文件名。"
 

-#: src/importldif.c:193
+#: src/importldif.c:194

 msgid "Select and rename LDIF field names to import."
 msgstr "选择并重命名要导入的LDIF字段名。"
 
 msgid "Select and rename LDIF field names to import."
 msgstr "选择并重命名要导入的LDIF字段名。"
 

-#: src/importldif.c:196
+#: src/importldif.c:197

 msgid "File imported."
 msgstr "文件导入完成。"
 
 msgid "File imported."
 msgstr "文件导入完成。"
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:125 src/importpine.c:125

 msgid "Please select a file."
 msgstr "请选择一个文件。"
 
 msgid "Please select a file."
 msgstr "请选择一个文件。"
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:130 src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "必须提供地址簿名称。"
 
 msgid "Address book name must be supplied."
 msgstr "必须提供地址簿名称。"
 

-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "读取LDIF字段失败。"
-
-#: src/importldif.c:495
+#: src/importldif.c:498

 msgid "LDIF file imported successfully."
 msgstr "LDIF文件导入成功。"
 
 msgid "LDIF file imported successfully."
 msgstr "LDIF文件导入成功。"
 

-#: src/importldif.c:574
+#: src/importldif.c:583

 msgid "Select LDIF File"
 msgstr "选择LDIF文件"
 
 msgid "Select LDIF File"
 msgstr "选择LDIF文件"
 

-#: src/importldif.c:662
+#: src/importldif.c:671

 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr "指定地址簿的名称, 该地址簿用于存放从LDIF文件中导入的数据。"
 
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr "指定地址簿的名称, 该地址簿用于存放从LDIF文件中导入的数据。"
 

-#: src/importldif.c:668
+#: src/importldif.c:677

 msgid "File Name"
 msgstr "文件名称"
 
 msgid "File Name"
 msgstr "文件名称"
 

-#: src/importldif.c:679
+#: src/importldif.c:688

 msgid "The full file specification of the LDIF file to import."
 msgstr "需要导入的LDIF文件的位置"
 
 msgid "The full file specification of the LDIF file to import."
 msgstr "需要导入的LDIF文件的位置"
 

-#: src/importldif.c:688
+#: src/importldif.c:697

 msgid "Select the LDIF file to import."
 msgstr "请选择要导入的LDIF文件。"
 
 msgid "Select the LDIF file to import."
 msgstr "请选择要导入的LDIF文件。"
 

-#: src/importldif.c:725
+#: src/importldif.c:734

 msgid "R"
 msgstr ""
 
 msgid "R"
 msgstr ""
 

-#: src/importldif.c:726 src/summaryview.c:489
+#: src/importldif.c:735 src/summaryview.c:495

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 

-#: src/importldif.c:727
+#: src/importldif.c:736

 msgid "LDIF Field Name"
 msgstr "LDIF字段名"
 
 msgid "LDIF Field Name"
 msgstr "LDIF字段名"
 

-#: src/importldif.c:728
+#: src/importldif.c:737

 msgid "Attribute Name"
 msgstr "条目名称"
 
 msgid "Attribute Name"
 msgstr "条目名称"
 

-#: src/importldif.c:783
+#: src/importldif.c:792

 msgid "LDIF Field"
 msgstr "LDIF域"
 
 msgid "LDIF Field"
 msgstr "LDIF域"
 

-#: src/importldif.c:795
+#: src/importldif.c:804

 msgid "Attribute"
 msgstr "条目"
 
 msgid "Attribute"
 msgstr "条目"
 

-#: src/importldif.c:806
+#: src/importldif.c:815

 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF域可以重命名为用户属性名称。"
 
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF域可以重命名为用户属性名称。"
 

-#: src/importldif.c:811
-msgid "???"
-msgstr ""
-
-#: src/importldif.c:829
+#: src/importldif.c:832

 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 "
 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 "


@@ -4845,30 +5289,35 @@ msgstr ""
 "行的其他地方将使得该字段的详细内容显示在下面，可以进行重命名；双击一行重任何"
 "地方也可以使该字段处于选中状态。"
 
 "行的其他地方将使得该字段的详细内容显示在下面，可以进行重命名；双击一行重任何"
 "地方也可以使该字段处于选中状态。"
 

-#: src/importldif.c:841
+#: src/importldif.c:844

 msgid "Select for Import"
 msgstr "选择导入该项"
 
 msgid "Select for Import"
 msgstr "选择导入该项"
 

-#: src/importldif.c:847
+#: src/importldif.c:850

 msgid "Select the LDIF field for import into the address book."
 msgstr "选择要导入到地址簿的LDIF字段。"
 
 msgid "Select the LDIF field for import into the address book."
 msgstr "选择要导入到地址簿的LDIF字段。"
 

-#: src/importldif.c:850
+#: src/importldif.c:853

 msgid " Modify "
 msgstr " 修改 "
 
 msgid " Modify "
 msgstr " 修改 "
 

-#: src/importldif.c:856
+#: src/importldif.c:859

 msgid "This button will update the list above with the data supplied."
 msgstr "此按钮将把此处给出的数据更新到上面列表中去。"
 
 msgid "This button will update the list above with the data supplied."
 msgstr "此按钮将把此处给出的数据更新到上面列表中去。"
 

-#: src/importldif.c:929
+#: src/importldif.c:932

 msgid "Records Imported :"
 msgstr "已导入的记录:"
 
 msgid "Records Imported :"
 msgstr "已导入的记录:"
 

-#: src/importldif.c:960
+#: src/importldif.c:964

 msgid "Import LDIF file into Address Book"
 msgstr "将LDIF文件导入至地址簿"
 
 msgid "Import LDIF file into Address Book"
 msgstr "将LDIF文件导入至地址簿"
 

+#: src/importldif.c:1002
+#, fuzzy
+msgid "Proceed"
+msgstr "已锁定"
+

 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "导入MUTT文件失败。"
 #: src/importmutt.c:144
 msgid "Error importing MUTT file."
 msgstr "导入MUTT文件失败。"


@@ -4935,11 +5384,11 @@ msgstr "连接失败"
 msgid "Auth failed"
 msgstr "授权失败"
 
 msgid "Auth failed"
 msgstr "授权失败"
 

-#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2454
+#: src/inc.c:612 src/prefs_summary_column.c:89 src/summaryview.c:2472

 msgid "Locked"
 msgstr "已锁定"
 
 msgid "Locked"
 msgstr "已锁定"
 

-#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:622 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "超时时间"
 
 msgid "Timeout"
 msgstr "超时时间"
 


@@ -5100,21 +5549,21 @@ msgstr "到 %s:%d 的连接超时。"
 msgid "Incorporation cancelled\n"
 msgstr "合并操作被取消\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "合并操作被取消\n"
 

-#: src/inc.c:1468
+#: src/inc.c:1469

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s你正在脱机工作。是否在%d分钟内更改？"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s你正在脱机工作。是否在%d分钟内更改？"
 

-#: src/inc.c:1474
+#: src/inc.c:1475

 #, c-format
 msgid "%s%sYou're working offline. Override?"
 #, c-format
 msgid "%s%sYou're working offline. Override?"

-msgstr "%s%s你正在脱机工作。是否更改？"
+msgstr "%s%s你正在脱机工作。是否临时切换到离线模式？"

 
 

-#: src/inc.c:1481
+#: src/inc.c:1482

 msgid "On_ly once"
 msgstr "仅一次(_l)"
 
 msgid "On_ly once"
 msgstr "仅一次(_l)"
 

-#: src/ldif.c:775
+#: src/ldif.c:777

 msgid "Nick Name"
 msgstr "绰号"
 
 msgid "Nick Name"
 msgstr "绰号"
 


@@ -5125,26 +5574,39 @@ msgid ""
 "Can't create folder."
 msgstr ""
 "文件'%s'已存在。\n"
 "Can't create folder."
 msgstr ""
 "文件'%s'已存在。\n"

-"无法创建文件夹。"
+"无法创建目录。"

 
 #: src/main.c:219
 msgid "Exiting..."
 msgstr "正在退出..."
 
 
 #: src/main.c:219
 msgid "Exiting..."
 msgstr "正在退出..."
 

-#: src/main.c:322
+#: src/main.c:329

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"找到 %s (或者以前版本) 的配置。\n"
+"找到 %s 的配置。\n"

 "是否要将该配置迁移过来?"
 
 "是否要将该配置迁移过来?"
 

-#: src/main.c:330
+#: src/main.c:331
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"您的Sylpheed过滤规则可以采用下面位置指定的脚本进行转换:\n"
+"%s"
+
+#: src/main.c:344

 msgid "Keep old configuration"
 msgstr "保存旧版本的配置"
 
 msgid "Keep old configuration"
 msgstr "保存旧版本的配置"
 

-#: src/main.c:333
+#: src/main.c:347

 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 "
 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 "


@@ -5153,27 +5615,27 @@ msgstr ""
 "保留备份使得你可以转回使用一个旧版本，但升级过程会多消耗一些时间(尤其是您有缓"
 "冲的IMAP或者新闻组邮件的话)，并且会多占用一些磁盘空间。"
 
 "保留备份使得你可以转回使用一个旧版本，但升级过程会多消耗一些时间(尤其是您有缓"
 "冲的IMAP或者新闻组邮件的话)，并且会多占用一些磁盘空间。"
 

-#: src/main.c:342
+#: src/main.c:356

 msgid "Migration of configuration"
 msgstr "迁移设置"
 
 msgid "Migration of configuration"
 msgstr "迁移设置"
 

-#: src/main.c:353
+#: src/main.c:367

 msgid "Copying configuration... This may take a while..."
 msgstr "正在复制配置文件...这将需要一会儿..."
 
 msgid "Copying configuration... This may take a while..."
 msgstr "正在复制配置文件...这将需要一会儿..."
 

-#: src/main.c:362
+#: src/main.c:376

 msgid "Migration failed!"
 msgstr "迁移失败！"
 
 msgid "Migration failed!"
 msgstr "迁移失败！"
 

-#: src/main.c:371
+#: src/main.c:385

 msgid "Migrating configuration..."
 msgstr "正在迁移配置..."
 
 msgid "Migrating configuration..."
 msgstr "正在迁移配置..."
 

-#: src/main.c:688
+#: src/main.c:707

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 

-#: src/main.c:694
+#: src/main.c:713

 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "
 msgid ""
 "Claws Mail has been compiled with a more recent GTK+ library than is "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "


@@ -5182,7 +5644,7 @@ msgstr ""
 "Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
 "级GTK+的版本，或者重新编译Claws Mail。"
 
 "Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
 "级GTK+的版本，或者重新编译Claws Mail。"
 

-#: src/main.c:703
+#: src/main.c:722

 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgid ""
 "Claws Mail has been compiled with an older GTK+ library than is currently "
 "available. This will cause crashes. You need to recompile Claws Mail."


@@ -5190,22 +5652,34 @@ msgstr ""
 "Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
 "级GTK+的版本，或者重新编译Claws Mail。"
 
 "Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
 "级GTK+的版本，或者重新编译Claws Mail。"
 

-#: src/main.c:988
+#: src/main.c:752
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0或者更老"
+
+#: src/main.c:755
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15或者更老"
+
+#: src/main.c:758
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5或者更老"
+
+#: src/main.c:1013

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
 
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
 

-#: src/main.c:1007
+#: src/main.c:1032

 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."
 msgstr ""
 "Claws Mail检测到一个尚未配置完全的邮箱。它很可能是由于IMAP帐号失败造成的。请"
 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."
 msgstr ""
 "Claws Mail检测到一个尚未配置完全的邮箱。它很可能是由于IMAP帐号失败造成的。请"

-"选择邮箱，用右键菜单里的\"重建邮件夹树\"来尝试修复它。"
+"选择邮箱，用右键菜单中的\"重建邮件夹树\"来尝试修复它。"

 
 

-#: src/main.c:1013
+#: src/main.c:1038

 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 "
 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 "


@@ -5214,20 +5688,20 @@ msgstr ""
 "Claws Mail检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的第三"
 "方插件建立的。请重新安装该插件后再尝试。"
 
 "Claws Mail检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的第三"
 "方插件建立的。请重新安装该插件后再尝试。"
 

-#: src/main.c:1274
+#: src/main.c:1307

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法: %s [选项]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法: %s [选项]...\n"
 

-#: src/main.c:1276
+#: src/main.c:1309

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 

-#: src/main.c:1277
+#: src/main.c:1310

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      订阅指定的URI"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      订阅指定的URI"
 

-#: src/main.c:1278
+#: src/main.c:1311

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -5236,86 +5710,86 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 

-#: src/main.c:1281
+#: src/main.c:1314

 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 

-#: src/main.c:1282
+#: src/main.c:1315

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 

-#: src/main.c:1283
+#: src/main.c:1316

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 

-#: src/main.c:1284
+#: src/main.c:1317

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 

-#: src/main.c:1285
+#: src/main.c:1318

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""

-"  --status-full [文件夹]...\n"
-"                         显示每个文件夹的状态"
+"  --status-full [目录]...\n"
+"                         显示每个目录的状态"

 
 

-#: src/main.c:1287
+#: src/main.c:1320

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""

-"  --select folder[/msg]  跳转到指定的文件夹/邮件\n"
-"                         可采用如下方式指定文件夹: 'folder/sub_folder'"
+"  --select folder[/msg]  跳转到指定的目录/邮件\n"
+"                         可采用如下方式指定目录: 'folder/sub_folder'"

 
 

-#: src/main.c:1289
+#: src/main.c:1322

 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 

-#: src/main.c:1290
+#: src/main.c:1323

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 

-#: src/main.c:1291
+#: src/main.c:1324

 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       退出Claws Mail"
 
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       退出Claws Mail"
 

-#: src/main.c:1292
+#: src/main.c:1325

 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 

-#: src/main.c:1293
+#: src/main.c:1326

 msgid "  --help -h              display this help and exit"
 msgstr "  --help -               显示本说明并结束程序"
 
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -               显示本说明并结束程序"
 

-#: src/main.c:1294
+#: src/main.c:1327

 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           显示版本内容并结束程序"
 
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           显示版本内容并结束程序"
 

-#: src/main.c:1295
+#: src/main.c:1328

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 

-#: src/main.c:1335
+#: src/main.c:1368

 msgid "Unknown option\n"
 msgstr "未知选项\n"
 
 msgid "Unknown option\n"
 msgstr "未知选项\n"
 

-#: src/main.c:1353
+#: src/main.c:1386

 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 

-#: src/main.c:1356
+#: src/main.c:1389

 msgid "top level folder"
 msgid "top level folder"

-msgstr "最上一层文件夹"
+msgstr "最上一层目录"

 
 

-#: src/main.c:1425
+#: src/main.c:1466

 msgid "Queued messages"
 msgstr "待发送的邮件"
 
 msgid "Queued messages"
 msgstr "待发送的邮件"
 

-#: src/main.c:1426
+#: src/main.c:1467

 msgid "Some unsent messages are queued. Exit now?"
 msgid "Some unsent messages are queued. Exit now?"

-msgstr "待发送文件夹内尚有邮件。要退出吗？"
+msgstr "待发送目录内尚有邮件。要退出吗？"

 
 #: src/mainwindow.c:508 src/messageview.c:162
 msgid "/_File"
 
 #: src/mainwindow.c:508 src/messageview.c:162
 msgid "/_File"


@@ -5337,7 +5811,7 @@ msgstr "/文件(_F)/---"
 
 #: src/mainwindow.c:512
 msgid "/_File/Change folder order..."
 
 #: src/mainwindow.c:512
 msgid "/_File/Change folder order..."

-msgstr "/文件(_F)/修改文件夹顺序..."
+msgstr "/文件(_F)/修改目录顺序..."

 
 #: src/mainwindow.c:514
 msgid "/_File/_Import mbox file..."
 
 #: src/mainwindow.c:514
 msgid "/_File/_Import mbox file..."


@@ -5345,7 +5819,7 @@ msgstr "/文件(_F)/导入mbox的文件(_I)... "
 
 #: src/mainwindow.c:515
 msgid "/_File/_Export to mbox file..."
 
 #: src/mainwindow.c:515
 msgid "/_File/_Export to mbox file..."

-msgstr "/文件(_F)/以mbox格式导出文件夹(_E)..."
+msgstr "/文件(_F)/以mbox格式导出目录(_E)..."

 
 #: src/mainwindow.c:516
 msgid "/_File/Exp_ort selected to mbox file..."
 
 #: src/mainwindow.c:516
 msgid "/_File/Exp_ort selected to mbox file..."


@@ -5353,7 +5827,7 @@ msgstr "/文件(_F)/以mbox格式导出选中的邮件(_o)..."
 
 #: src/mainwindow.c:519
 msgid "/_File/Empty all _Trash folders"
 
 #: src/mainwindow.c:519
 msgid "/_File/Empty all _Trash folders"

-msgstr "/æ\96\87件(_F)/æ¸\85空æ\89\80æ\9c\89å\9e\83å\9c¾æ¡¶(_T)"
+msgstr "/æ\96\87件(_F)/æ¸\85空æ\89\80æ\9c\89åº\9f件夹(_T)"

 
 #: src/mainwindow.c:521 src/messageview.c:163
 msgid "/_File/_Save as..."
 
 #: src/mainwindow.c:521 src/messageview.c:163
 msgid "/_File/_Save as..."


@@ -5369,7 +5843,7 @@ msgstr "/文件(_F)/脱机工作(_W)"
 
 #: src/mainwindow.c:525
 msgid "/_File/Synchronise folders"
 
 #: src/mainwindow.c:525
 msgid "/_File/Synchronise folders"

-msgstr "/文件(_F)/同步文件夹"
+msgstr "/文件(_F)/同步目录"

 
 #: src/mainwindow.c:528
 msgid "/_File/E_xit"
 
 #: src/mainwindow.c:528
 msgid "/_File/E_xit"


@@ -5389,13 +5863,13 @@ msgstr "/编辑(_E)/在邮件中查找(_F)..."
 
 #: src/mainwindow.c:538
 msgid "/_Edit/_Search folder..."
 
 #: src/mainwindow.c:538
 msgid "/_Edit/_Search folder..."

-msgstr "/编辑(_E)/在文件夹中搜索(_S)..."
+msgstr "/编辑(_E)/在目录中搜索(_S)..."

 
 #: src/mainwindow.c:539
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 
 
 #: src/mainwindow.c:539
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 

-#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:477
+#: src/mainwindow.c:540 src/messageview.c:175 src/summaryview.c:483

 msgid "/_View"
 msgstr "/查看(_V)"
 
 msgid "/_View"
 msgstr "/查看(_V)"
 


@@ -5441,11 +5915,11 @@ msgstr "/查看(_V)/设置显示列(_c)..."
 
 #: src/mainwindow.c:559
 msgid "/_View/Set displayed _columns/in _Folder list..."
 
 #: src/mainwindow.c:559
 msgid "/_View/Set displayed _columns/in _Folder list..."

-msgstr "/查看(_V)/设置显示列(_c)/文件夹列表(_F)..."
+msgstr "/查看(_V)/设置显示列(_c)/目录列表(_F)..."

 
 #: src/mainwindow.c:560
 msgid "/_View/Set displayed _columns/in _Message list..."
 
 #: src/mainwindow.c:560
 msgid "/_View/Set displayed _columns/in _Message list..."

-msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
+msgstr "/查看(_V)/设置显示列(_c)/邮件摘要列表(M)..."

 
 #: src/mainwindow.c:562 src/mainwindow.c:569 src/mainwindow.c:597
 #: src/mainwindow.c:627 src/mainwindow.c:744 src/mainwindow.c:752
 
 #: src/mainwindow.c:562 src/mainwindow.c:569 src/mainwindow.c:597
 #: src/mainwindow.c:627 src/mainwindow.c:744 src/mainwindow.c:752


@@ -5471,11 +5945,11 @@ msgstr "/查看(_V)/布局/宽邮件阅读器(_W)"
 
 #: src/mainwindow.c:567
 msgid "/_View/Layout/W_ide message list"
 
 #: src/mainwindow.c:567
 msgid "/_View/Layout/W_ide message list"

-msgstr "/查看(_V)/布局/宽邮件列表(_i) "
+msgstr "/查看(_V)/布局/宽邮件摘要(_i) "

 
 #: src/mainwindow.c:568
 msgid "/_View/Layout/S_mall screen"
 
 #: src/mainwindow.c:568
 msgid "/_View/Layout/S_mall screen"

-msgstr "/查看(_V)/布局(_o)/小屏幕(_m)"
+msgstr "/查看(_V)/布局(_o)/小屏幕模式(_m)"

 
 #: src/mainwindow.c:570
 msgid "/_View/_Sort"
 
 #: src/mainwindow.c:570
 msgid "/_View/_Sort"


@@ -5624,11 +6098,11 @@ msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 
 #: src/mainwindow.c:625
 msgid "/_View/_Go to/Next unread _folder"
 
 #: src/mainwindow.c:625
 msgid "/_View/_Go to/Next unread _folder"

-msgstr "/查看(_V)/转到(_G)/下一个未读文件夹(_f)"
+msgstr "/查看(_V)/转到(_G)/下一个未读目录(_f)"

 
 #: src/mainwindow.c:626
 msgid "/_View/_Go to/_Other folder..."
 
 #: src/mainwindow.c:626
 msgid "/_View/_Go to/_Other folder..."

-msgstr "/查看(_V)/转到(_G)/其他文件夹(_O)..."
+msgstr "/查看(_V)/转到(_G)/其他目录(_O)..."

 
 #: src/mainwindow.c:630 src/mainwindow.c:637 src/messageview.c:178
 msgid "/_View/Character _encoding/---"
 
 #: src/mainwindow.c:630 src/mainwindow.c:637 src/messageview.c:178
 msgid "/_View/Character _encoding/---"


@@ -5795,7 +6269,7 @@ msgstr "/查看(_V)/解码/_Base64"
 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 

-#: src/mainwindow.c:745 src/summaryview.c:478
+#: src/mainwindow.c:745 src/summaryview.c:484

 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 


@@ -5933,7 +6407,7 @@ msgstr "/邮件(_M)/复制(_C)"
 
 #: src/mainwindow.c:791
 msgid "/_Message/Move to _trash"
 
 #: src/mainwindow.c:791
 msgid "/_Message/Move to _trash"

-msgstr "/é\82®ä»¶(_M)/移å\8a¨å\88°å\9e\83å\9c¾æ¡¶(_t)"
+msgstr "/é\82®ä»¶(_M)/移å\8a¨å\88°åº\9f件夹(_t)"

 
 #: src/mainwindow.c:792
 msgid "/_Message/_Delete..."
 
 #: src/mainwindow.c:792
 msgid "/_Message/_Delete..."


@@ -6017,7 +6491,7 @@ msgstr "/工具(_T)/批量提取通讯地址(_H)"
 
 #: src/mainwindow.c:819
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 
 #: src/mainwindow.c:819
 msgid "/_Tools/_Harvest addresses/from _Folder..."

-msgstr "/工具(_T)/批量提取通讯地址(_H)/从文件夹(_F)"
+msgstr "/工具(_T)/批量提取通讯地址(_H)/从目录(_F)"

 
 #: src/mainwindow.c:821
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 
 #: src/mainwindow.c:821
 msgid "/_Tools/_Harvest addresses/from _Messages..."


@@ -6025,7 +6499,7 @@ msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 
 #: src/mainwindow.c:824
 msgid "/_Tools/_Filter all messages in folder"
 
 #: src/mainwindow.c:824
 msgid "/_Tools/_Filter all messages in folder"

-msgstr "/工具(_T)/过滤文件夹中所有邮件(_F)"
+msgstr "/工具(_T)/过滤目录中所有邮件(_F)"

 
 #: src/mainwindow.c:826
 msgid "/_Tools/Filter _selected messages"
 
 #: src/mainwindow.c:826
 msgid "/_Tools/Filter _selected messages"


@@ -6077,7 +6551,7 @@ msgstr "/工具(_T)/列出所有_URL..."
 
 #: src/mainwindow.c:851
 msgid "/_Tools/Ch_eck for new messages in all folders"
 
 #: src/mainwindow.c:851
 msgid "/_Tools/Ch_eck for new messages in all folders"

-msgstr "/工具(_T)/检查所有文件夹中的新邮件(_e)"
+msgstr "/工具(_T)/检查所有目录中的新邮件(_e)"

 
 #: src/mainwindow.c:853
 msgid "/_Tools/Delete du_plicated messages"
 
 #: src/mainwindow.c:853
 msgid "/_Tools/Delete du_plicated messages"


@@ -6085,11 +6559,11 @@ msgstr "/工具(_T)/删除重复邮件(_p)"
 
 #: src/mainwindow.c:855
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 
 #: src/mainwindow.c:855
 msgid "/_Tools/Delete du_plicated messages/In selected folder"

-msgstr "/工具(_T)/删除重复邮件(_p)/选定文件夹"
+msgstr "/工具(_T)/删除重复邮件(_p)/选定目录"

 
 #: src/mainwindow.c:857
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 
 #: src/mainwindow.c:857
 msgid "/_Tools/Delete du_plicated messages/In all folders"

-msgstr "/工具(_T)/删除重复邮件(_p)/所有文件夹"
+msgstr "/工具(_T)/删除重复邮件(_p)/所有目录"

 
 #: src/mainwindow.c:860
 msgid "/_Tools/E_xecute"
 
 #: src/mainwindow.c:860
 msgid "/_Tools/E_xecute"


@@ -6100,12 +6574,12 @@ msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 
 #: src/mainwindow.c:867
 msgstr "/工具(_T)/SSL认证(_t)"
 
 #: src/mainwindow.c:867

-msgid "/_Tools/Filtering debug window"
-msgstr "/工具(_T)/过滤器调试日志"
+msgid "/_Tools/Filtering Log"
+msgstr "/工具(_T)/过滤日志"

 
 #: src/mainwindow.c:868
 
 #: src/mainwindow.c:868

-msgid "/_Tools/_Log window"
-msgstr "/工具(_T)/日志窗口(_L)"
+msgid "/_Tools/Network _Log"
+msgstr "/工具(_T)/网络日志(_L)"

 
 #: src/mainwindow.c:870
 msgid "/_Configuration"
 
 #: src/mainwindow.c:870
 msgid "/_Configuration"


@@ -6191,25 +6665,25 @@ msgstr "目前离线。点击图标转到在线状态。"
 msgid "Select account"
 msgstr "选择帐号"
 
 msgid "Select account"
 msgstr "选择帐号"
 

-#: src/mainwindow.c:1300 src/prefs_logging.c:114
-msgid "Protocol log"
-msgstr "协议日志"
+#: src/mainwindow.c:1300 src/prefs_logging.c:112
+msgid "Network log"
+msgstr "网络标记"

 
 

-#: src/mainwindow.c:1304 src/prefs_logging.c:152
+#: src/mainwindow.c:1304

 msgid "Filtering/processing debug log"
 msgid "Filtering/processing debug log"

-msgstr "过滤/处理调试日志"
+msgstr "过滤/处理 调试日志"

 
 

-#: src/mainwindow.c:1323 src/prefs_logging.c:339
-msgid "filtering debug enabled\n"
-msgstr "å\90¯ç\94¨è¿\87滤è°\83è¯\95æ\97¥å¿\97\n"
+#: src/mainwindow.c:1323 src/prefs_logging.c:331
+msgid "filtering log enabled\n"
+msgstr "å·²ç»\8få¼\80å\90¯è¿\87滤æ\97¥å¿\97å\8a\9fè\83½\n"

 
 

-#: src/mainwindow.c:1325 src/prefs_logging.c:341
-msgid "filtering debug disabled\n"
-msgstr "过滤器调试跟踪功能已被禁用\n"
+#: src/mainwindow.c:1325 src/prefs_logging.c:333
+msgid "filtering log disabled\n"
+msgstr "已经关闭过滤日志功能\n"

 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871
 
 #: src/mainwindow.c:1715 src/mainwindow.c:1756 src/mainwindow.c:1792
 #: src/mainwindow.c:1828 src/mainwindow.c:1871

-#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:765
+#: src/plugins/trayicon/trayicon.c:147 src/prefs_folder_item.c:792

 msgid "Untitled"
 msgstr "未命名"
 
 msgid "Untitled"
 msgstr "未命名"
 


@@ -6219,7 +6693,7 @@ msgstr "无"
 
 #: src/mainwindow.c:2122
 msgid "Delete all messages in trash folders?"
 
 #: src/mainwindow.c:2122
 msgid "Delete all messages in trash folders?"

-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶内所有邮件？"
+msgstr "æ¸\85空åº\9f件夹内所有邮件？"

 
 #: src/mainwindow.c:2141
 msgid "Add mailbox"
 
 #: src/mainwindow.c:2141
 msgid "Add mailbox"


@@ -6228,11 +6702,12 @@ msgstr "添加邮箱"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"
 #: src/mainwindow.c:2142
 msgid ""
 "Input the location of mailbox.\n"

-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"

 "scanned automatically."
 msgstr ""
 "请输入邮箱位置。\n"
 "scanned automatically."
 msgstr ""
 "请输入邮箱位置。\n"

-"如果指定已存在的邮箱，它将会自动被扫描。"
+"如果指定已存在的邮箱，它将会自动被扫描。\n"
+" "

 
 #: src/mainwindow.c:2148
 #, c-format
 
 #: src/mainwindow.c:2148
 #, c-format


@@ -6252,133 +6727,111 @@ msgstr ""
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 

-#: src/mainwindow.c:2488
+#: src/mainwindow.c:2490

 msgid "No posting allowed"
 msgstr "不允许发贴"
 
 msgid "No posting allowed"
 msgstr "不允许发贴"
 

-#: src/mainwindow.c:3044
+#: src/mainwindow.c:3046

 msgid "Mbox import has failed."
 msgstr "导入mbox文件失败。"
 
 msgid "Mbox import has failed."
 msgstr "导入mbox文件失败。"
 

-#: src/mainwindow.c:3053 src/mainwindow.c:3062
+#: src/mainwindow.c:3055 src/mainwindow.c:3064

 msgid "Export to mbox has failed."
 msgstr "导出到mbox失败。"
 
 msgid "Export to mbox has failed."
 msgstr "导出到mbox失败。"
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit"
 msgstr "退出"
 
 msgid "Exit"
 msgstr "退出"
 

-#: src/mainwindow.c:3085 src/plugins/trayicon/trayicon.c:543
+#: src/mainwindow.c:3087 src/plugins/trayicon/trayicon.c:544

 msgid "Exit Claws Mail?"
 msgstr "退出 Claws Mail?"
 
 msgid "Exit Claws Mail?"
 msgstr "退出 Claws Mail?"
 

-#: src/mainwindow.c:3223
+#: src/mainwindow.c:3225

 msgid "Folder synchronisation"
 msgid "Folder synchronisation"

-msgstr "文件夹同步"
+msgstr "目录同步"

 
 

-#: src/mainwindow.c:3224
+#: src/mainwindow.c:3226

 msgid "Do you want to synchronise your folders now?"
 msgid "Do you want to synchronise your folders now?"

-msgstr "是否现在同步文件夹?"
+msgstr "是否现在同步目录?"

 
 

-#: src/mainwindow.c:3225
+#: src/mainwindow.c:3227

 msgid "+_Synchronise"
 msgstr "+同步(_S)"
 
 msgid "+_Synchronise"
 msgstr "+同步(_S)"
 

-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3575

 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 
 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 

-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3612

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"

-msgstr[0] "删除 %d 个重复的邮件(分布于 %d 个文件夹)。\n"
+msgstr[0] "删除 %d 个重复的邮件(分布于 %d 个目录)。\n"

 
 

-#: src/mainwindow.c:3774 src/summaryview.c:4907
+#: src/mainwindow.c:3777 src/summaryview.c:4929

 msgid "Processing rules to apply before folder rules"
 msgid "Processing rules to apply before folder rules"

-msgstr "在文件夹规则前应用的规则"
+msgstr "在目录规则前应用的规则"

 
 

-#: src/mainwindow.c:3783
+#: src/mainwindow.c:3786

 msgid "Processing rules to apply after folder rules"
 msgid "Processing rules to apply after folder rules"

-msgstr "在文件夹规则后应用的规则"
+msgstr "在目录规则后应用的规则"

 
 

-#: src/mainwindow.c:3792 src/summaryview.c:4918
+#: src/mainwindow.c:3795 src/summaryview.c:4940

 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 
 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 

-#: src/matcher.c:750 src/matcher.c:752
-msgid "subject"
-msgstr "主题"
-
-#: src/matcher.c:754 src/matcher.c:756
-msgid "From: header"
-msgstr "发信人"
-
-#: src/matcher.c:758 src/matcher.c:760 src/matcher.c:766
-msgid "To: header"
-msgstr "收信人"
-
-#: src/matcher.c:762 src/matcher.c:764 src/matcher.c:767
-msgid "Cc: header"
-msgstr "抄送"
-
-#: src/matcher.c:975 src/matcher.c:977
-msgid "Newsgroups: header"
-msgstr "新闻组"
-
-#: src/matcher.c:979 src/matcher.c:981
-msgid "InReplyTo: header"
-msgstr "回复给"
-
-#: src/matcher.c:985 src/matcher.c:987
-msgid "InReplyTo: header (references)"
-msgstr ""
+#: src/matcher.c:782 src/matcher.c:793 src/matcher.c:804 src/matcher.c:814
+#: src/matcher.c:815 src/matcher.c:827 src/matcher.c:828 src/matcher.c:1044
+#: src/matcher.c:1056 src/matcher.c:1068
+#, c-format
+msgid "%s header"
+msgstr "%s 邮件头"

 
 

-#: src/matcher.c:1071 src/matcher.c:1073
-#, fuzzy
+#: src/matcher.c:1157 src/matcher.c:1159

 msgid "header"
 msgstr "邮件头"
 
 msgid "header"
 msgstr "邮件头"
 

-#: src/matcher.c:1082
+#: src/matcher.c:1168

 #, fuzzy
 msgid "header line"
 msgstr "信头名称"
 
 #, fuzzy
 msgid "header line"
 msgstr "信头名称"
 

-#: src/matcher.c:1084
+#: src/matcher.c:1170

 #, fuzzy
 msgid "headers line"
 msgstr "信头名称"
 
 #, fuzzy
 msgid "headers line"
 msgstr "信头名称"
 

-#: src/matcher.c:1086 src/matcher.c:1088
+#: src/matcher.c:1172 src/matcher.c:1174

 #, fuzzy
 msgid "message line"
 #, fuzzy
 msgid "message line"

-msgstr "邮件视图"
+msgstr "邮件内容"

 
 

-#: src/matcher.c:1099 src/matcher.c:1232 src/prefs_matcher.c:526
-#: src/prefs_matcher.c:1344 src/prefs_matcher.c:1361 src/prefs_matcher.c:2116
+#: src/matcher.c:1185 src/matcher.c:1318 src/prefs_matcher.c:553
+#: src/prefs_matcher.c:1371 src/prefs_matcher.c:1388 src/prefs_matcher.c:2143

 msgid "Filtering Matcher Menu|All"
 msgstr "全部"
 
 msgid "Filtering Matcher Menu|All"
 msgstr "全部"
 

-#: src/matcher.c:1306 src/matcher.c:1309
+#: src/matcher.c:1392 src/matcher.c:1395

 #, fuzzy
 msgid "body line"
 msgstr "命令行"
 
 #, fuzzy
 msgid "body line"
 msgstr "命令行"
 

-#: src/matcher.c:1485
+#: src/matcher.c:1571

 #, c-format
 msgid "checking if message matches [ %s ]\n"
 #, c-format
 msgid "checking if message matches [ %s ]\n"

-msgstr "正在检查邮件是否满足规则[ %s]\n"
+msgstr "正在检查邮件是否匹配[ %s ]\n"

 
 

-#: src/matcher.c:1542 src/matcher.c:1561 src/matcher.c:1574
+#: src/matcher.c:1628 src/matcher.c:1647 src/matcher.c:1660

 msgid "message matches\n"
 msgid "message matches\n"

-msgstr "满足规则\n"
+msgstr "邮件匹配\n"

 
 

-#: src/matcher.c:1549 src/matcher.c:1567 src/matcher.c:1576
+#: src/matcher.c:1635 src/matcher.c:1653 src/matcher.c:1662

 msgid "message does not match\n"
 msgid "message does not match\n"

-msgstr "邮件不满足规则\n"
+msgstr "邮件不匹配\n"

 
 

-#: src/matcher.c:1829 src/matcher.c:1830 src/matcher.c:1831 src/matcher.c:1832
-#: src/matcher.c:1833 src/matcher.c:1834 src/matcher.c:1835 src/matcher.c:1836
+#: src/matcher.c:1915 src/matcher.c:1916 src/matcher.c:1917 src/matcher.c:1918
+#: src/matcher.c:1919 src/matcher.c:1920 src/matcher.c:1921 src/matcher.c:1922

 msgid "(none)"
 msgstr "(无)"
 
 msgid "(none)"
 msgstr "(无)"
 


@@ -6404,8 +6857,8 @@ msgstr "覆盖mbox文件"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "该文件已经存在, 是否要覆盖?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "该文件已经存在, 是否要覆盖?"
 

-#: src/mbox.c:531 src/messageview.c:1180 src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:531 src/messageview.c:1192 src/mimeview.c:1514
+#: src/textview.c:2671

 msgid "Overwrite"
 msgstr "覆盖"
 
 msgid "Overwrite"
 msgstr "覆盖"
 


@@ -6420,7 +6873,7 @@ msgstr ""
 
 #: src/mbox.c:548
 msgid "Exporting to mbox..."
 
 #: src/mbox.c:548
 msgid "Exporting to mbox..."

-msgstr "正在导出文件夹到mbox文件..."
+msgstr "正在导出目录到mbox文件..."

 
 #: src/message_search.c:169
 msgid "Find in current message"
 
 #: src/message_search.c:169
 msgid "Find in current message"


@@ -6430,27 +6883,27 @@ msgstr "在当前邮件中查找"
 msgid "Find text:"
 msgstr "查找文字"
 
 msgid "Find text:"
 msgstr "查找文字"
 

-#: src/message_search.c:210 src/prefs_matcher.c:655 src/summary_search.c:396
+#: src/message_search.c:210 src/prefs_matcher.c:682 src/summary_search.c:396

 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 msgid "Case sensitive"
 msgstr "大小写敏感"
 

-#: src/message_search.c:323 src/summary_search.c:644
+#: src/message_search.c:326 src/summary_search.c:668

 msgid "Search failed"
 msgstr "搜索失败"
 
 msgid "Search failed"
 msgstr "搜索失败"
 

-#: src/message_search.c:324 src/summary_search.c:645
+#: src/message_search.c:327 src/summary_search.c:669

 msgid "Search string not found."
 msgstr "未找到指定字符串。"
 
 msgid "Search string not found."
 msgstr "未找到指定字符串。"
 

-#: src/message_search.c:333
+#: src/message_search.c:336

 msgid "Beginning of message reached; continue from end?"
 msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
 

-#: src/message_search.c:336
+#: src/message_search.c:339

 msgid "End of message reached; continue from beginning?"
 msgstr "已到达邮件末尾，是否重新开始查找？"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "已到达邮件末尾，是否重新开始查找？"
 

-#: src/message_search.c:339 src/summary_search.c:656
+#: src/message_search.c:342 src/summary_search.c:680

 msgid "Search finished"
 msgstr "搜索完成"
 
 msgid "Search finished"
 msgstr "搜索完成"
 


@@ -6528,39 +6981,39 @@ msgstr ""
 "\n"
 "建议不发送回执。"
 
 "\n"
 "建议不发送回执。"
 

-#: src/messageview.c:817 src/procmime.c:883
+#: src/messageview.c:817 src/procmime.c:881

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "无法解密: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "无法解密: %s"
 

-#: src/messageview.c:1175 src/mimeview.c:1606 src/summaryview.c:4187
-#: src/summaryview.c:4190 src/textview.c:2648
+#: src/messageview.c:1184 src/messageview.c:1187 src/mimeview.c:1663
+#: src/summaryview.c:4209 src/summaryview.c:4212 src/textview.c:2659

 msgid "Save as"
 msgstr "保存为"
 
 msgid "Save as"
 msgstr "保存为"
 

-#: src/messageview.c:1181
+#: src/messageview.c:1193

 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 
 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 

-#: src/messageview.c:1189 src/summaryview.c:4207 src/summaryview.c:4210
-#: src/summaryview.c:4225
+#: src/messageview.c:1201 src/summaryview.c:4229 src/summaryview.c:4232
+#: src/summaryview.c:4247

 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 

-#: src/messageview.c:1249
+#: src/messageview.c:1261

 msgid "You asked for a return receipt in this message."
 msgstr "该邮件要求返回回执。"
 
 msgid "You asked for a return receipt in this message."
 msgstr "该邮件要求返回回执。"
 

-#: src/messageview.c:1254
+#: src/messageview.c:1266

 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执。"
 
 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执。"
 

-#: src/messageview.c:1255
+#: src/messageview.c:1267

 msgid "Send receipt"
 msgstr "发送回执"
 
 msgid "Send receipt"
 msgstr "发送回执"
 

-#: src/messageview.c:1298
+#: src/messageview.c:1310

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6568,7 +7021,7 @@ msgstr ""
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了。"
 
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了。"
 

-#: src/messageview.c:1304
+#: src/messageview.c:1316

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6577,15 +7030,15 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它是 %s。"
 
 "这封邮件只有部分被取回; \n"
 "它是 %s。"
 

-#: src/messageview.c:1308 src/messageview.c:1330
+#: src/messageview.c:1320 src/messageview.c:1342

 msgid "Mark for download"
 msgstr "标记为待下载"
 
 msgid "Mark for download"
 msgstr "标记为待下载"
 

-#: src/messageview.c:1309 src/messageview.c:1321
+#: src/messageview.c:1321 src/messageview.c:1333

 msgid "Mark for deletion"
 msgstr "标记为待删除"
 
 msgid "Mark for deletion"
 msgstr "标记为待删除"
 

-#: src/messageview.c:1314
+#: src/messageview.c:1326

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6594,12 +7047,12 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载。"
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载。"
 

-#: src/messageview.c:1319 src/messageview.c:1332
+#: src/messageview.c:1331 src/messageview.c:1344

 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "不标记"
 
 #: src/prefs_filtering_action.c:163
 msgid "Unmark"
 msgstr "不标记"
 

-#: src/messageview.c:1325
+#: src/messageview.c:1337

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6608,11 +7061,11 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除。"
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除。"
 

-#: src/messageview.c:1402
+#: src/messageview.c:1414

 msgid "Return Receipt Notification"
 msgstr "返回回执"
 
 msgid "Return Receipt Notification"
 msgstr "返回回执"
 

-#: src/messageview.c:1403
+#: src/messageview.c:1415

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6621,19 +7074,19 @@ msgstr ""
 "该邮件发送到了你的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 
 "该邮件发送到了你的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Cancel"
 msgstr "取消(_C)"
 
 msgid "_Cancel"
 msgstr "取消(_C)"
 

-#: src/messageview.c:1407
+#: src/messageview.c:1419

 msgid "_Send Notification"
 msgstr "发送通知(_S)"
 
 msgid "_Send Notification"
 msgstr "发送通知(_S)"
 

-#: src/messageview.c:1474
+#: src/messageview.c:1486

 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 

-#: src/messageview.c:1545 src/summaryview.c:4247
+#: src/messageview.c:1557 src/summaryview.c:4269

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6642,7 +7095,7 @@ msgstr ""
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 

-#: src/messageview.c:1551 src/summaryview.c:4253
+#: src/messageview.c:1563 src/summaryview.c:4275

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6651,10 +7104,10 @@ msgstr ""
 "打印命令行无效:\n"
 "`%s'"
 
 "打印命令行无效:\n"
 "`%s'"
 

-#: src/messageview.c:1829 src/messageview.c:1835 src/summaryview.c:3624
-#: src/summaryview.c:5689
+#: src/messageview.c:1841 src/messageview.c:1847 src/summaryview.c:3642
+#: src/summaryview.c:5720

 msgid "An error happened while learning.\n"
 msgid "An error happened while learning.\n"

-msgstr "训练时发生错误.\n"
+msgstr "培训时发生错误.\n"

 
 #: src/mh.c:423
 #, c-format
 
 #: src/mh.c:423
 #, c-format


@@ -6690,83 +7143,87 @@ msgstr "删除邮箱"
 msgid "_Remove"
 msgstr "删除(_R)"
 
 msgid "_Remove"
 msgstr "删除(_R)"
 

-#: src/mimeview.c:168
-msgid "/_Open"
+#: src/mimeview.c:169
+msgid "/_Open (l)"

 msgstr "/打开(_O)"
 
 msgstr "/打开(_O)"
 

-#: src/mimeview.c:169
-msgid "/Open _with..."
+#: src/mimeview.c:170
+msgid "/Open _with (o)..."

 msgstr "/打开方式(_w)..."
 
 msgstr "/打开方式(_w)..."
 

-#: src/mimeview.c:170
-msgid "/_Display as text"
+#: src/mimeview.c:171
+msgid "/_Display as text (t)"

 msgstr "/以文本方式显示(_D)"
 
 msgstr "/以文本方式显示(_D)"
 

-#: src/mimeview.c:171 src/summaryview.c:483
-msgid "/_Save as..."
+#: src/mimeview.c:172
+msgid "/_Save as (y)..."

 msgstr "/另存为(_S)..."
 
 msgstr "/另存为(_S)..."
 

-#: src/mimeview.c:172
+#: src/mimeview.c:173

 msgid "/Save _all..."
 msgstr "/全部保存(_a)..."
 
 msgid "/Save _all..."
 msgstr "/全部保存(_a)..."
 

-#: src/mimeview.c:211
+#: src/mimeview.c:174
+msgid "/Next part (a)"
+msgstr ""
+
+#: src/mimeview.c:213

 msgid "MIME Type"
 msgstr "MIME类型"
 
 msgid "MIME Type"
 msgstr "MIME类型"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:761

 msgid "Check signature"
 msgstr "检查签名"
 
 msgid "Check signature"
 msgstr "检查签名"
 

-#: src/mimeview.c:764 src/mimeview.c:769 src/mimeview.c:774
+#: src/mimeview.c:766 src/mimeview.c:771 src/mimeview.c:776

 msgid "View full information"
 msgstr "查看详细信息"
 
 msgid "View full information"
 msgstr "查看详细信息"
 

-#: src/mimeview.c:779 src/mimeview.c:783
+#: src/mimeview.c:781 src/mimeview.c:785

 msgid "Check again"
 msgstr "再次检查"
 
 msgid "Check again"
 msgstr "再次检查"
 

-#: src/mimeview.c:792
+#: src/mimeview.c:794

 msgid "Click the icon or hit 'C' to check it."
 msgstr "点击图标或者按'C'选中。"
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "点击图标或者按'C'选中。"
 

-#: src/mimeview.c:797
+#: src/mimeview.c:799

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "检查签名超时。请点击图标或者按'C'以重试。"
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "检查签名超时。请点击图标或者按'C'以重试。"
 

-#: src/mimeview.c:1007
+#: src/mimeview.c:1009

 msgid "Checking signature..."
 msgstr "正在检查签名..."
 
 msgid "Checking signature..."
 msgstr "正在检查签名..."
 

-#: src/mimeview.c:1049
+#: src/mimeview.c:1051

 msgid "Go back to email"
 msgstr "回到邮件"
 
 msgid "Go back to email"
 msgstr "回到邮件"
 

-#: src/mimeview.c:1388 src/mimeview.c:1472 src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1438 src/mimeview.c:1522 src/mimeview.c:1710
+#: src/mimeview.c:1744

 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "无法保存复合邮件的这一部分: %s"
 
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "无法保存复合邮件的这一部分: %s"
 

-#: src/mimeview.c:1461 src/textview.c:2658
+#: src/mimeview.c:1511 src/textview.c:2669

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 

-#: src/mimeview.c:1502
+#: src/mimeview.c:1552

 msgid "Select destination folder"
 msgid "Select destination folder"

-msgstr "选择目的文件夹"
+msgstr "选择目的目录"

 
 

-#: src/mimeview.c:1509
+#: src/mimeview.c:1559

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 

-#: src/mimeview.c:1734 src/mimeview.c:1742 src/textview.c:2589
+#: src/mimeview.c:1791 src/mimeview.c:1799 src/textview.c:2600

 msgid "Open with"
 msgstr "打开方式"
 
 msgid "Open with"
 msgstr "打开方式"
 

-#: src/mimeview.c:1735 src/mimeview.c:1743 src/textview.c:2590
+#: src/mimeview.c:1792 src/mimeview.c:1800 src/textview.c:2601

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6878,71 +7335,70 @@ msgstr "退订新闻组"
 msgid "_Unsubscribe"
 msgstr "/退订新闻组(_S)"
 
 msgid "_Unsubscribe"
 msgstr "/退订新闻组(_S)"
 

-#: src/news_gtk.c:302
+#: src/news_gtk.c:303 src/news_gtk.c:305

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"
 
 #: src/plugins/bogofilter/bogofilter.c:77
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"
 
 #: src/plugins/bogofilter/bogofilter.c:77

-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:448

 msgid "Bogofilter"
 msgstr ""
 
 msgid "Bogofilter"
 msgstr ""
 

-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:456

 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: 正在提取邮件内容..."
 
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: 正在提取邮件内容..."
 

-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:469

 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: 正在过滤邮件..."
 
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: 正在过滤邮件..."
 

-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:563

 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."
 msgstr ""
 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."
 msgstr ""

-"Bogofilter无法过滤邮件。很可能是因为它还没有接受过训练。\n"
-"请使用\"标记/标记为垃圾邮件\"和\"标记/标记为非垃圾邮件\"来训练Bogofilter，一"
-"般得训练几百封邮件后才能有较高的识别率。"
+"Bogofilter无法过滤邮件。很可能是因为它还没有接受过培训。\n"
+"请使用\"标记/标记为垃圾邮件\"和\"标记/标记为非垃圾邮件\"来培训Bogofilter，一"
+"般得培训几百封邮件后才能有较高的识别率。"

 
 

-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:570

 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."

-msgstr ""
-"Bogofilter插件无法筛选邮件。命令`%s %s %s`无法运行。"
+msgstr "Bogofilter插件无法过滤邮件: 无法运行命令 `%s %s %s`。"

 
 

-#: src/plugins/bogofilter/bogofilter.c:714
+#: src/plugins/bogofilter/bogofilter.c:718

 msgid "Bogofilter: learning from message..."
 msgid "Bogofilter: learning from message..."

-msgstr "Bogofilter: 正在从邮件接受训练..."
+msgstr "Bogofilter: 正在从邮件接受培训..."

 
 

-#: src/plugins/bogofilter/bogofilter.c:727
-#: src/plugins/bogofilter/bogofilter.c:776
+#: src/plugins/bogofilter/bogofilter.c:731
+#: src/plugins/bogofilter/bogofilter.c:780

 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."

-msgstr "训练失败: `%s`返回值为%d."
+msgstr "培训失败: `%s`返回状态%d。"

 
 

-#: src/plugins/bogofilter/bogofilter.c:744
+#: src/plugins/bogofilter/bogofilter.c:748

 msgid "Bogofilter: learning from messages..."
 msgid "Bogofilter: learning from messages..."

-msgstr "Bogofilter: 正在从邮件接受训练..."
+msgstr "Bogofilter: 正在从邮件接受培训..."

 
 

-#: src/plugins/bogofilter/bogofilter.c:832
+#: src/plugins/bogofilter/bogofilter.c:836

 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""

-"训练失败: `%s %s %s`返回错误:\n"
+"培训失败: `%s %s %s`返回错误:\n"

 "%s"
 
 "%s"
 

-#: src/plugins/bogofilter/bogofilter.c:834 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:838 src/privacy.c:61

 msgid "Unknown error"
 msgstr "未知错误"
 
 msgid "Unknown error"
 msgstr "未知错误"
 

-#: src/plugins/bogofilter/bogofilter.c:958
+#: src/plugins/bogofilter/bogofilter.c:963

 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 "
 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 "


@@ -6960,111 +7416,117 @@ msgstr ""
 "本插件用Botofilter程序检查所有从IMAP, LOCAL或者POP帐号收到的邮件, 以判断来信"
 "是否是垃圾邮件。你需要先在本机安装Bogofilter。\n"
 "\n"
 "本插件用Botofilter程序检查所有从IMAP, LOCAL或者POP帐号收到的邮件, 以判断来信"
 "是否是垃圾邮件。你需要先在本机安装Bogofilter。\n"
 "\n"

-"在Bogofilter能够正确识别垃圾邮件之前，你得先对它进行一下训练。训练方法就是先"
+"在Bogofilter能够正确识别垃圾邮件之前，你得先对它进行一下培训。培训方法就是先"

 "告诉它哪些是垃圾邮件(\"标记/标记为垃圾邮件\")，哪些不是(\"标记/标记为非垃圾邮"
 "件\")。\n"
 "\n"
 "告诉它哪些是垃圾邮件(\"标记/标记为垃圾邮件\")，哪些不是(\"标记/标记为非垃圾邮"
 "件\")。\n"
 "\n"

-"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊文件夹。\n"
+"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊目录。\n"

 "\n"
 "相关选项可以在'/配置/偏好/插件/Bogofilter'中设置"
 
 "\n"
 "相关选项可以在'/配置/偏好/插件/Bogofilter'中设置"
 

-#: src/plugins/bogofilter/bogofilter.c:991
-#: src/plugins/spamassassin/spamassassin.c:589
+#: src/plugins/bogofilter/bogofilter.c:996
+#: src/plugins/spamassassin/spamassassin.c:593

 msgid "Spam detection"
 msgstr "垃圾邮件检测"
 
 msgid "Spam detection"
 msgstr "垃圾邮件检测"
 

-#: src/plugins/bogofilter/bogofilter.c:992
-#: src/plugins/spamassassin/spamassassin.c:590
+#: src/plugins/bogofilter/bogofilter.c:997
+#: src/plugins/spamassassin/spamassassin.c:594

 msgid "Spam learning"
 msgstr "学习识别能力"
 
 msgid "Spam learning"
 msgstr "学习识别能力"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:155
+#: src/plugins/spamassassin/spamassassin_gtk.c:368

 msgid "Process messages on receiving"
 msgstr "接收邮件时进行过滤"
 
 msgid "Process messages on receiving"
 msgstr "接收邮件时进行过滤"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:163
+#: src/plugins/spamassassin/spamassassin_gtk.c:325

 msgid "Maximum size"
 msgstr "最大尺寸"
 
 msgid "Maximum size"
 msgstr "最大尺寸"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:172
+#: src/plugins/spamassassin/spamassassin_gtk.c:334

 msgid "Messages larger than this will not be checked"
 msgstr "大于此值的邮件将不会被检查"
 
 msgid "Messages larger than this will not be checked"
 msgstr "大于此值的邮件将不会被检查"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
+#: src/plugins/bogofilter/bogofilter_gtk.c:175
+#: src/plugins/spamassassin/spamassassin_gtk.c:337

 msgid "kB"
 msgstr "kB"
 
 msgid "kB"
 msgstr "kB"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:183
+#: src/plugins/spamassassin/spamassassin_gtk.c:376

 msgid "Save spam in"
 msgstr "保存垃圾邮件到"
 
 msgid "Save spam in"
 msgstr "保存垃圾邮件到"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:191
+#: src/plugins/spamassassin/spamassassin_gtk.c:384

 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."

-msgstr "用于保存垃圾邮件的文件夹，不设置时将缺省使用垃圾桶"
+msgstr "用于保存垃圾邮件的目录，不设置时将缺省使用废件夹"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
+#: src/plugins/spamassassin/spamassassin_gtk.c:391

 msgid "Click this button to select a folder for storing spam"
 msgid "Click this button to select a folder for storing spam"

-msgstr "点击此按钮选择用于存放垃圾邮件的文件夹"
+msgstr "点击此按钮选择用于存放垃圾邮件的目录"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:201
+#: src/plugins/bogofilter/bogofilter_gtk.c:205

 msgid "When unsure, move to"
 msgid "When unsure, move to"

-msgstr "å°\86ä¸\8dç¡®å®\9aç\9a\84é\82®ä»¶è½¬到"
+msgstr "å¦\82æ\9e\9cä¸\8dç¡®å®\9aï¼\8c移å\8a¨到"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:213

 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 "用于保存不能确定是否是垃圾邮件的文件夹，不设置时将缺省使用收件箱"
+msgstr "用于保存不能确定是否是垃圾邮件的目录，不设置时将缺省使用收件箱"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:220

 msgid "Click this button to select a folder for storing Unsure mails."
 msgid "Click this button to select a folder for storing Unsure mails."

-msgstr "点击此按钮可选择一个文件夹，以用于存放不确定是否是垃圾的邮件"
+msgstr "点击此按钮可选择一个目录，以用于存放不确定是否是垃圾的邮件"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:223

 msgid "Insert X-Bogosity header"
 msgid "Insert X-Bogosity header"

-msgstr "插入X-Bogosity信头"
+msgstr "插入X-Bogosity邮件头"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:227

 msgid "Only done for messages in MH folders"
 msgstr "只检查MH格式的邮箱"
 
 msgid "Only done for messages in MH folders"
 msgstr "只检查MH格式的邮箱"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:230
+#: src/plugins/bogofilter/bogofilter_gtk.c:234

 msgid "Whitelist senders found in address book/folder"
 msgid "Whitelist senders found in address book/folder"

-msgstr "å\9c¨å\9c°å\9d\80簿中æ\89¾å\88°è¯¥å\9c°å\9d\80"
+msgstr "å°\86å\9c°å\9d\80簿中ç\9a\84å\9c°å\9d\80ä½\9c为ç\99½å\90\8då\8d\95"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:238

 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""

-"如果来信地址存在于地址簿中，该邮件会被存放于普通邮件夹中，均不会被认为是垃圾邮件"
+"如果邮件来自一个您地址簿中已有的地址，则该邮件即使被识别为一个垃圾邮件，也将"
+"会保存在普通邮件夹中"

 
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/plugins/bogofilter/bogofilter_gtk.c:256

 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505
 #: src/prefs_filtering_action.c:498 src/prefs_filtering_action.c:505

-#: src/prefs_matcher.c:584
+#: src/prefs_matcher.c:611

 msgid "Select ..."
 msgstr "选择..."
 
 msgid "Select ..."
 msgstr "选择..."
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:260

 msgid "Click this button to select a book or folder in the address book"
 msgstr "点击此按钮选择地址簿的目录"
 
 msgid "Click this button to select a book or folder in the address book"
 msgstr "点击此按钮选择地址簿的目录"
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:267

 msgid "Bogofilter call"
 msgstr ""
 
 msgid "Bogofilter call"
 msgstr ""
 

-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:275

 msgid "Path to bogofilter executable"
 msgstr "bogofilter程序目录"
 
 msgid "Path to bogofilter executable"
 msgstr "bogofilter程序目录"
 

+#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/spamassassin/spamassassin_gtk.c:399
+msgid "Mark spam as read"
+msgstr "将垃圾邮件设置为已读"
+

 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"
 #: src/plugins/clamav/clamav_plugin.c:49
 #: src/plugins/clamav/clamav_plugin_gtk.c:212
 msgid "Clam AntiVirus"


@@ -7078,7 +7540,7 @@ msgstr "ClamAV: 正在扫描邮件..."
 msgid "Failed to register mail filtering hook"
 msgstr "注册邮件过滤器失败"
 
 msgid "Failed to register mail filtering hook"
 msgstr "注册邮件过滤器失败"
 

-#: src/plugins/clamav/clamav_plugin.c:303
+#: src/plugins/clamav/clamav_plugin.c:304

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -7090,11 +7552,11 @@ msgid ""
 msgstr ""
 "本插件调用Clam AntiVirus扫描从IMAP, LOCAL以及POP帐户收取的所有邮件。\n"
 "\n"
 msgstr ""
 "本插件调用Clam AntiVirus扫描从IMAP, LOCAL以及POP帐户收取的所有邮件。\n"
 "\n"

-"当邮件附件被发现含有病毒时，它会被删除或者存入一个特殊的文件夹。\n"
+"当邮件附件被发现含有病毒时，它会被删除或者存入一个特殊的目录。\n"

 "\n"
 "你可以在/配置/偏好/插件/Clam AntiVirus中配置选项。"
 
 "\n"
 "你可以在/配置/偏好/插件/Clam AntiVirus中配置选项。"
 

-#: src/plugins/clamav/clamav_plugin.c:330
+#: src/plugins/clamav/clamav_plugin.c:331

 msgid "Virus detection"
 msgstr "检查病毒"
 
 msgid "Virus detection"
 msgstr "检查病毒"
 


@@ -7129,13 +7591,13 @@ msgstr "保存带有病毒的邮件"
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"

-msgstr "用于保存受感染邮件的文件夹，不设置时将缺省使用垃圾桶"
+msgstr "用于保存受感染邮件的目录，不设置时将缺省使用废件夹"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"

-msgstr "点击此按钮可选择一个文件夹，以用于存放受感染的邮件"
+msgstr "点击此按钮可选择一个目录，以用于存放受感染的邮件"

 
 

-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100

 msgid "Demo"
 msgstr "演示"
 
 msgid "Demo"
 msgstr "演示"
 


@@ -7143,7 +7605,7 @@ msgstr "演示"
 msgid "Failed to register log text hook"
 msgstr "注册写日志钩子失败"
 
 msgid "Failed to register log text hook"
 msgstr "注册写日志钩子失败"
 

-#: src/plugins/demo/demo.c:75
+#: 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"
 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"


@@ -7183,7 +7645,7 @@ msgstr "等价于Dillo的'--fullwindow'选项"
 msgid "Dillo HTML Viewer"
 msgstr "Dillo网页查看器"
 
 msgid "Dillo HTML Viewer"
 msgstr "Dillo网页查看器"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:196

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -7193,11 +7655,11 @@ msgstr ""
 "\n"
 "你以在'/配置/偏好/插件/Dillo浏览器'中配置选项。"
 
 "\n"
 "你以在'/配置/偏好/插件/Dillo浏览器'中配置选项。"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:219
+#: src/plugins/dillo_viewer/dillo_viewer.c:220

 msgid "text/html"
 msgstr ""
 
 msgid "text/html"
 msgstr ""
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:104
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106

 msgid "Passphrase"
 msgstr "密码"
 
 msgid "Passphrase"
 msgstr "密码"
 


@@ -7331,7 +7793,7 @@ msgstr "   该密钥已在你的密钥环里面.\n"
 msgid "PGP/Core"
 msgstr ""
 
 msgid "PGP/Core"
 msgstr ""
 

-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -7352,71 +7814,71 @@ msgstr ""
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 

-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94

 msgid "Core operations"
 msgstr "核心操作"
 
 msgid "Core operations"
 msgstr "核心操作"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:104

 msgid "Automatically check signatures"
 msgstr "自动检查数字签名"
 
 msgid "Automatically check signatures"
 msgstr "自动检查数字签名"
 

-#: src/plugins/pgpcore/prefs_gpg.c:107
+#: src/plugins/pgpcore/prefs_gpg.c:109

 msgid "Use gpg-agent to manage passwords"
 msgstr "采用gpg-agent管理密码"
 
 msgid "Use gpg-agent to manage passwords"
 msgstr "采用gpg-agent管理密码"
 

-#: src/plugins/pgpcore/prefs_gpg.c:112
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Store passphrase in memory"
 msgstr "将passphrase暂时存在内存中"
 
 msgid "Store passphrase in memory"
 msgstr "将passphrase暂时存在内存中"
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:124

 msgid "Expire after"
 msgstr "到期时间"
 
 msgid "Expire after"
 msgstr "到期时间"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
+#: src/plugins/pgpcore/prefs_gpg.c:139

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 

-#: src/plugins/pgpcore/prefs_gpg.c:142 src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:157

 msgid "minute(s)"
 msgstr "分钟"
 
 msgid "minute(s)"
 msgstr "分钟"
 

-#: src/plugins/pgpcore/prefs_gpg.c:152
+#: src/plugins/pgpcore/prefs_gpg.c:154

 msgid "Grab input while entering a passphrase"
 msgstr "导入 passphrase 时抓取导入"
 
 msgid "Grab input while entering a passphrase"
 msgstr "导入 passphrase 时抓取导入"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:161

 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "若 GnuPG 无法运作，则在启动时发出警告"
 
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "若 GnuPG 无法运作，则在启动时发出警告"
 

-#: src/plugins/pgpcore/prefs_gpg.c:293
+#: src/plugins/pgpcore/prefs_gpg.c:295

 msgid "Sign key"
 msgstr ""
 
 msgid "Sign key"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:301
+#: src/plugins/pgpcore/prefs_gpg.c:303

 msgid "Use default GnuPG key"
 msgstr "使用缺省 GnuPG 密钥"
 
 msgid "Use default GnuPG key"
 msgstr "使用缺省 GnuPG 密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:312
+#: src/plugins/pgpcore/prefs_gpg.c:314

 msgid "Select key by your email address"
 msgstr "按邮件地址选择密钥"
 
 msgid "Select key by your email address"
 msgstr "按邮件地址选择密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:323
+#: src/plugins/pgpcore/prefs_gpg.c:325

 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:333
+#: src/plugins/pgpcore/prefs_gpg.c:335

 msgid "User or key ID:"
 msgstr "用户ID或者密钥ID:"
 
 msgid "User or key ID:"
 msgstr "用户ID或者密钥ID:"
 

-#: src/plugins/pgpcore/prefs_gpg.c:374
+#: src/plugins/pgpcore/prefs_gpg.c:376

 msgid "No secret key found."
 msgstr "没有找到密钥。"
 
 msgid "No secret key found."
 msgstr "没有找到密钥。"
 

-#: src/plugins/pgpcore/prefs_gpg.c:377
+#: src/plugins/pgpcore/prefs_gpg.c:379

 msgid "Generate a new key pair"
 msgstr "生成新的密钥对"
 
 msgid "Generate a new key pair"
 msgstr "生成新的密钥对"
 

-#: src/plugins/pgpcore/prefs_gpg.c:549
+#: src/plugins/pgpcore/prefs_gpg.c:551

 msgid "GPG"
 msgstr ""
 
 msgid "GPG"
 msgstr ""
 


@@ -7446,7 +7908,7 @@ msgstr "值"
 msgid "Select"
 msgstr "选择"
 
 msgid "Select"
 msgstr "选择"
 

-#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:372
+#: src/plugins/pgpcore/select-keys.c:428 src/prefs_logging.c:364

 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "其它"
 #: src/prefs_other.c:682
 msgid "Other"
 msgstr "其它"


@@ -7707,10 +8169,10 @@ msgid "Couldn't convert text data to any sane charset."
 msgstr "无法将文本数据转换到任意字符集。"
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554
 msgstr "无法将文本数据转换到任意字符集。"
 
 #: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:554

-#: src/plugins/pgpinline/pgpinline.c:676 src/plugins/pgpinline/pgpinline.c:723
+#: src/plugins/pgpinline/pgpinline.c:693 src/plugins/pgpinline/pgpinline.c:740

 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
 #: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
 #: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468

-#: src/plugins/pgpmime/pgpmime.c:594
+#: src/plugins/pgpmime/pgpmime.c:611

 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "无法初始化GPG，%s"
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "无法初始化GPG，%s"


@@ -7764,22 +8226,28 @@ msgstr "数据加密失败，结果为空。"
 msgid "Data signing failed, no contents."
 msgstr "数据加密失败，内容为空。"
 
 msgid "Data signing failed, no contents."
 msgstr "数据加密失败，内容为空。"
 

-#: src/plugins/pgpinline/pgpinline.c:685 src/plugins/pgpmime/pgpmime.c:603
+#: src/plugins/pgpinline/pgpinline.c:659
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr "请注意PGP/Inline系统无法加密附件，也无法加密邮件头(比如邮件主题)。"
+
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:620

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "无法添加GPG密钥 %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "无法添加GPG密钥 %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:706 src/plugins/pgpmime/pgpmime.c:631
+#: src/plugins/pgpinline/pgpinline.c:723 src/plugins/pgpmime/pgpmime.c:648

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "无法创建临时文件, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "无法创建临时文件, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:734 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:673

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失败, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失败, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:799
+#: src/plugins/pgpinline/pgpinline.c:818

 msgid "PGP/Inline"
 msgstr ""
 
 msgid "PGP/Inline"
 msgstr ""
 


@@ -7787,7 +8255,7 @@ msgstr ""
 msgid "PGP/inline"
 msgstr ""
 
 msgid "PGP/inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7827,7 +8295,13 @@ msgstr "无法读取已解密的部分。"
 msgid "Couldn't create temporary file: %s"
 msgstr "无法创建临时文件: %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "无法创建临时文件: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpmime/pgpmime.c:577
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr "请注意PGP/Mimei无法加密邮件头(比如邮件主题)。"
+
+#: src/plugins/pgpmime/pgpmime.c:743

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 


@@ -7835,7 +8309,7 @@ msgstr "PGP/Mime"
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59

 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"
 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"


@@ -7861,27 +8335,27 @@ msgstr ""
 " "
 
 #: src/plugins/spamassassin/spamassassin.c:75
 " "
 
 #: src/plugins/spamassassin/spamassassin.c:75

-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin_gtk.c:564

 msgid "SpamAssassin"
 msgstr ""
 
 msgid "SpamAssassin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:163

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:179

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin插件过滤失败。\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin插件过滤失败。\n"
 

-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:205

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经被设置为禁用.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经被设置为禁用.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:210

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 正在过滤邮件..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 正在过滤邮件..."
 

-#: src/plugins/spamassassin/spamassassin.c:311
+#: src/plugins/spamassassin/spamassassin.c:314

 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 "
 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 "


@@ -7890,21 +8364,21 @@ msgstr ""
 "SpamAssassin无法过滤邮件，因为无法连接上spamd服务程序。请确定该服务器已经启动"
 "并可访问。"
 
 "SpamAssassin无法过滤邮件，因为无法连接上spamd服务程序。请确定该服务器已经启动"
 "并可访问。"
 

-#: src/plugins/spamassassin/spamassassin.c:370
+#: src/plugins/spamassassin/spamassassin.c:373

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr "Claws Mail需要访问网络才能将此邮件的内容反馈给远端的垃圾邮件识别器。"
 
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr "Claws Mail需要访问网络才能将此邮件的内容反馈给远端的垃圾邮件识别器。"
 

-#: src/plugins/spamassassin/spamassassin.c:513
+#: src/plugins/spamassassin/spamassassin.c:516

 msgid "Failed to get username"
 msgstr "获取用户名失败"
 
 msgid "Failed to get username"
 msgstr "获取用户名失败"
 

-#: src/plugins/spamassassin/spamassassin.c:525
+#: src/plugins/spamassassin/spamassassin.c:528

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经加载，但用户选择了禁用。\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经加载，但用户选择了禁用。\n"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:562

 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 "
 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 "


@@ -7922,66 +8396,66 @@ msgstr ""
 "\n"
 "它也可以用于手工标识垃圾邮件。\n"
 "\n"
 "\n"
 "它也可以用于手工标识垃圾邮件。\n"
 "\n"

-"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊文件夹。\n"
+"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊目录。\n"

 "\n"
 "相关选项可以在'/配置/偏好/插件/SpamAssassin'中设置"
 
 "\n"
 "相关选项可以在'/配置/偏好/插件/SpamAssassin'中设置"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:86

 msgid "Localhost"
 msgstr "本机"
 
 msgid "Localhost"
 msgstr "本机"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:87

 msgid "TCP"
 msgstr ""
 
 msgid "TCP"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:88

 msgid "Unix Socket"
 msgstr ""
 
 msgid "Unix Socket"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:239

 msgid "Enable SpamAssassin plugin"
 msgstr "启用SpamAssassin插件"
 
 msgid "Enable SpamAssassin plugin"
 msgstr "启用SpamAssassin插件"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Transport"
 msgstr "传输"
 
 msgid "Transport"
 msgstr "传输"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:251

 msgid "Type of transport"
 msgstr "传输方式"
 
 msgid "Type of transport"
 msgstr "传输方式"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:267

 msgid "User"
 msgstr "用户ID"
 
 msgid "User"
 msgstr "用户ID"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:280

 msgid "User to use with spamd server"
 msgstr "用于使用spamd服务器的用户名"
 
 msgid "User to use with spamd server"
 msgstr "用于使用spamd服务器的用户名"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:283

 msgid "spamd"
 msgstr ""
 
 msgid "spamd"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:301

 msgid "Hostname or IP address of spamd server"
 msgstr "spamd服务的主机名或者IP地址"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "spamd服务的主机名或者IP地址"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:312

 msgid "Port of spamd server"
 msgstr "spamd服务器端口"
 
 msgid "Port of spamd server"
 msgstr "spamd服务器端口"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Path of Unix socket"
 msgstr "UNIX套接字路径"
 
 msgid "Path of Unix socket"
 msgstr "UNIX套接字路径"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:354

 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
 
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:355 src/prefs_other.c:575
-#: src/prefs_summaries.c:493
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:575
+#: src/prefs_summaries.c:484

 msgid "seconds"
 msgstr "秒"
 
 msgid "seconds"
 msgstr "秒"
 


@@ -7993,7 +8467,7 @@ msgstr "方向"
 msgid "The orientation of the tray."
 msgstr "通知栏图标的方向。"
 
 msgid "The orientation of the tray."
 msgstr "通知栏图标的方向。"
 

-#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:566
+#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:567

 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr ""
 #: src/plugins/trayicon/trayicon_prefs.c:70
 msgid "Trayicon"
 msgstr ""


@@ -8059,7 +8533,7 @@ msgstr "注册程序关闭钩子失败"
 msgid "Failed to register got iconified hook"
 msgstr "注册程序最小化钩子失败"
 
 msgid "Failed to register got iconified hook"
 msgstr "注册程序最小化钩子失败"
 

-#: src/plugins/trayicon/trayicon.c:484
+#: src/plugins/trayicon/trayicon.c:485

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -8074,11 +8548,11 @@ msgstr ""
 
 #: src/plugins/trayicon/trayicon_prefs.c:111
 msgid "Hide at start-up"
 
 #: src/plugins/trayicon/trayicon_prefs.c:111
 msgid "Hide at start-up"

-msgstr "启动时隐藏"
+msgstr "启动时隐藏Claws-Mail"

 
 #: src/plugins/trayicon/trayicon_prefs.c:117
 msgid "Hide Claws Mail at start-up"
 
 #: src/plugins/trayicon/trayicon_prefs.c:117
 msgid "Hide Claws Mail at start-up"

-msgstr "启动时隐藏Claws Mail"
+msgstr "启动时隐藏Claws Mail主窗口"

 
 #: src/plugins/trayicon/trayicon_prefs.c:121
 msgid "Close to tray"
 
 #: src/plugins/trayicon/trayicon_prefs.c:121
 msgid "Close to tray"


@@ -8098,8 +8572,7 @@ msgstr "最小化到通知栏"
 
 #: src/plugins/trayicon/trayicon_prefs.c:137
 msgid "Hide Claws Mail using the tray icon instead of minimizing it"
 
 #: src/plugins/trayicon/trayicon_prefs.c:137
 msgid "Hide Claws Mail using the tray icon instead of minimizing it"

-msgstr ""
-"点击通知栏图标时隐藏主窗，而不是将其最小化"
+msgstr "利用通知栏图标隐藏Claws Mail(而不是最小化程序)"

 
 #: src/pop.c:150
 msgid "Required APOP timestamp not found in greeting\n"
 
 #: src/pop.c:150
 msgid "Required APOP timestamp not found in greeting\n"


@@ -8109,133 +8582,96 @@ msgstr "未找到握手信息中需要的APOP时间戳\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "握手信息中时间戳格式错误\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "握手信息中时间戳格式错误\n"
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:164
+#, fuzzy
+msgid "Timestamp syntax error in greeting (not ascii)\n"
+msgstr "握手信息中时间戳格式错误\n"
+
+#: src/pop.c:188 src/pop.c:215

 msgid "POP3 protocol error\n"
 msgstr "POP3协议错误\n"
 
 msgid "POP3 protocol error\n"
 msgstr "POP3协议错误\n"
 

-#: src/pop.c:256
+#: src/pop.c:261

 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "无效的UIDL响应: %s\n"
 
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "无效的UIDL响应: %s\n"
 

-#: src/pop.c:808
+#: src/pop.c:822

 #, c-format
 #, c-format

-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 删除过期邮件 %d\n"
+msgid "POP3: Deleting expired message %d [%s]\n"
+msgstr "POP3: 删除过期邮件 %d [%s]\n"

 
 

-#: src/pop.c:824
+#: src/pop.c:838

 #, c-format
 #, c-format

-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: 跳过旧邮件 %d (%d字节)\n"
+msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
+msgstr "POP3: 跳过旧邮件 %d [%s] (%d字节)\n"

 
 

-#: src/pop.c:856
+#: src/pop.c:870

 msgid "mailbox is locked\n"
 msgstr "邮箱已被锁住\n"
 
 msgid "mailbox is locked\n"
 msgstr "邮箱已被锁住\n"
 

-#: src/pop.c:859
+#: src/pop.c:873

 msgid "Session timeout\n"
 msgstr "会话超时\n"
 
 msgid "Session timeout\n"
 msgstr "会话超时\n"
 

-#: src/pop.c:878
+#: src/pop.c:892

 msgid "command not supported\n"
 msgstr "命令不被支持\n"
 
 msgid "command not supported\n"
 msgstr "命令不被支持\n"
 

-#: src/pop.c:883
+#: src/pop.c:897

 msgid "error occurred on POP3 session\n"
 msgstr "POP3会话中出现错误\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "POP3会话中出现错误\n"
 

-#: src/pop.c:1077
+#: src/pop.c:1091

 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 

-#: src/prefs_account.c:242 src/prefs_account.c:1553 src/prefs_account.c:2286
+#: src/prefs_account.c:304 src/prefs_account.c:1340 src/prefs_account.c:2215

 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 
 #: src/wizard.c:1144
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:245 src/prefs_account.c:1668 src/prefs_account.c:2299
+#: src/prefs_account.c:307 src/prefs_account.c:1452 src/prefs_account.c:2228

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:246
+#: src/prefs_account.c:308

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:247 src/wizard.c:1154
+#: src/prefs_account.c:309 src/wizard.c:1154

 msgid "Local mbox file"
 msgstr "本地mbox文件"
 
 msgid "Local mbox file"
 msgstr "本地mbox文件"
 

-#: src/prefs_account.c:248
+#: src/prefs_account.c:310

 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 

-#: src/prefs_account.c:784
-#, c-format
-msgid "Account%d"
-msgstr "帐号%d"
-
-#: src/prefs_account.c:1081
-msgid "Preferences for new account"
-msgstr "设置新帐号"
-
-#: src/prefs_account.c:1083
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - 帐号设置"
-
-#: src/prefs_account.c:1118
-msgid "_Basic"
-msgstr "基本设置(_B)"
-
-#: src/prefs_account.c:1120
-msgid "_Receive"
-msgstr "接收(_R)"
-
-#: src/prefs_account.c:1124
-msgid "Co_mpose"
-msgstr "撰写(_m)"
-
-#: src/prefs_account.c:1126
-msgid "_Privacy"
-msgstr "隐私(_P)"
-
-#: src/prefs_account.c:1129
-msgid "SS_L"
-msgstr "SS_L"
-
-#: src/prefs_account.c:1132
-msgid "A_dvanced"
-msgstr "高级(_d)"
-
-#: src/prefs_account.c:1190
+#: src/prefs_account.c:933

 msgid "Name of account"
 msgstr "帐号名称"
 
 msgid "Name of account"
 msgstr "帐号名称"
 

-#: src/prefs_account.c:1199
+#: src/prefs_account.c:942

 msgid "Set as default"
 msgstr "设为缺省帐号"
 
 msgid "Set as default"
 msgstr "设为缺省帐号"
 

-#: src/prefs_account.c:1207
+#: src/prefs_account.c:950

 msgid "Personal information"
 msgstr "个人资料"
 
 msgid "Personal information"
 msgstr "个人资料"
 

-#: src/prefs_account.c:1216
+#: src/prefs_account.c:959

 msgid "Full name"
 msgstr "全名"
 
 msgid "Full name"
 msgstr "全名"
 

-#: src/prefs_account.c:1222
+#: src/prefs_account.c:965

 msgid "Mail address"
 msgstr "邮件地址"
 
 msgid "Mail address"
 msgstr "邮件地址"
 

-#: src/prefs_account.c:1228
-msgid "Organization"
-msgstr "组织"
-
-#: src/prefs_account.c:1252
+#: src/prefs_account.c:995

 msgid "Server information"
 msgstr "服务器信息"
 
 msgid "Server information"
 msgstr "服务器信息"
 

-#: src/prefs_account.c:1287 src/wizard.c:1248
+#: src/prefs_account.c:1030 src/wizard.c:1248

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -8243,92 +8679,93 @@ msgstr ""
 "<span weight=\"bold\">警告: 当前的Claws Mail\n"
 "编译时没有启用IMAP支持。</span>"
 
 "<span weight=\"bold\">警告: 当前的Claws Mail\n"
 "编译时没有启用IMAP支持。</span>"
 

-#: src/prefs_account.c:1316
+#: src/prefs_account.c:1059

 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 
 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 

-#: src/prefs_account.c:1323
+#: src/prefs_account.c:1066

 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 
 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 

-#: src/prefs_account.c:1377
+#: src/prefs_account.c:1120

 msgid "News server"
 msgstr "新闻服务器"
 
 msgid "News server"
 msgstr "新闻服务器"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1126

 msgid "Server for receiving"
 msgstr "接收服务器"
 
 msgid "Server for receiving"
 msgstr "接收服务器"
 

-#: src/prefs_account.c:1389
+#: src/prefs_account.c:1132

 msgid "Local mailbox"
 msgstr "本地邮箱"
 
 msgid "Local mailbox"
 msgstr "本地邮箱"
 

-#: src/prefs_account.c:1396
+#: src/prefs_account.c:1139

 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 

-#: src/prefs_account.c:1404
+#: src/prefs_account.c:1147

 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 

-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1156

 msgid "command to send mails"
 msgstr "发送邮件的命令"
 
 msgid "command to send mails"
 msgstr "发送邮件的命令"
 

-#: src/prefs_account.c:1420 src/prefs_account.c:1852
+#: src/prefs_account.c:1163 src/prefs_account.c:1669

 msgid "User ID"
 msgstr "用户ID"
 
 msgid "User ID"
 msgstr "用户ID"
 

-#: src/prefs_account.c:1426 src/prefs_account.c:1872
+#: src/prefs_account.c:1169 src/prefs_account.c:1689

 msgid "Password"
 msgstr "密码"
 
 msgid "Password"
 msgstr "密码"
 

-#: src/prefs_account.c:1525
+#: src/prefs_account.c:1219
+#, c-format
+msgid "Account%d"
+msgstr "帐号%d"
+
+#: src/prefs_account.c:1312

 msgid "Local"
 msgstr "本机"
 
 msgid "Local"
 msgstr "本机"
 

-#: src/prefs_account.c:1531 src/prefs_account.c:1620
+#: src/prefs_account.c:1318 src/prefs_account.c:1404

 msgid "Default inbox"
 msgstr "缺省收信夹"
 
 msgid "Default inbox"
 msgstr "缺省收信夹"
 

-#: src/prefs_account.c:1538 src/prefs_account.c:1546 src/prefs_account.c:1627
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1325 src/prefs_account.c:1333 src/prefs_account.c:1411
+#: src/prefs_account.c:1419

 msgid "Unfiltered messages will be stored in this folder"
 msgid "Unfiltered messages will be stored in this folder"

-msgstr "未被过滤的邮件将放入该文件夹"
+msgstr "未被过滤的邮件将放入该目录"

 
 

-#: src/prefs_account.c:1543 src/prefs_account.c:1632 src/prefs_account.c:2036
+#: src/prefs_account.c:1330 src/prefs_account.c:1416 src/prefs_account.c:1868

 msgid "Bro_wse"
 msgstr "浏览(_w)"
 
 msgid "Bro_wse"
 msgstr "浏览(_w)"
 

-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1342

 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1345

 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 

-#: src/prefs_account.c:1569
+#: src/prefs_account.c:1356

 msgid "Remove after"
 msgstr "删除于"
 
 msgid "Remove after"
 msgstr "删除于"
 

-#: src/prefs_account.c:1578
+#: src/prefs_account.c:1365

 msgid "0 days: remove immediately"
 msgstr "(0 天: 立即删除)"
 
 msgid "0 days: remove immediately"
 msgstr "(0 天: 立即删除)"
 

-#: src/prefs_account.c:1582
+#: src/prefs_account.c:1369

 msgid "days"
 msgstr "天后"
 
 msgid "days"
 msgstr "天后"
 

-#: src/prefs_account.c:1589
-msgid "Download all messages on server"
-msgstr "下载服务器上所有邮件"
-
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1379

 msgid "Receive size limit"
 msgstr "邮件大小限制"
 
 msgid "Receive size limit"
 msgstr "邮件大小限制"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1382

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -8336,298 +8773,340 @@ msgstr ""
 "大小超过此限制的邮件只会被部分收取，在你查看它的时候可以选择是否要全部收取或"
 "者删除。"
 
 "大小超过此限制的邮件只会被部分收取，在你查看它的时候可以选择是否要全部收取或"
 "者删除。"
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1392

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1642 src/prefs_account.c:2312
+#: src/prefs_account.c:1426 src/prefs_account.c:2241

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1433

 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 
 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 

-#: src/prefs_account.c:1661
+#: src/prefs_account.c:1445

 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 
 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 

-#: src/prefs_account.c:1674 src/prefs_account.c:1822
+#: src/prefs_account.c:1458 src/prefs_account.c:1639

 msgid "Authentication method"
 msgstr "鉴权方式"
 
 msgid "Authentication method"
 msgstr "鉴权方式"
 

-#: src/prefs_account.c:1684 src/prefs_account.c:1832 src/prefs_send.c:278
+#: src/prefs_account.c:1468 src/prefs_account.c:1649 src/prefs_send.c:278

 msgid "Automatic"
 msgstr "自动"
 
 msgid "Automatic"
 msgstr "自动"
 

-#: src/prefs_account.c:1696
+#: src/prefs_account.c:1480

 msgid "IMAP server directory"
 msgstr "IMAP服务器目录:"
 
 msgid "IMAP server directory"
 msgstr "IMAP服务器目录:"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1484

 msgid "(usually empty)"
 msgstr "(一般可保持为空)"
 
 msgid "(usually empty)"
 msgstr "(一般可保持为空)"
 

-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1498

 msgid "Show subscribed folders only"
 msgstr "只显示已订阅的目录"
 
 msgid "Show subscribed folders only"
 msgstr "只显示已订阅的目录"
 

-#: src/prefs_account.c:1717
+#: src/prefs_account.c:1505
+msgid "Bandwidth-efficient mode"
+msgstr ""
+
+#: src/prefs_account.c:1507
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr ""
+
+#: src/prefs_account.c:1511

 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 
 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 

-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1518
+msgid "Allow filtering using plug-ins on receiving"
+msgstr "接收邮件时允许采用插件进行过滤"
+
+#: src/prefs_account.c:1522

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 

-#: src/prefs_account.c:1783 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1600 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:179

 msgid "Header"
 msgstr "邮件头"
 
 msgid "Header"
 msgstr "邮件头"
 

-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1602

 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 

-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1609

 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 
 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 

-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1621

 msgid "Authentication"
 msgstr "鉴权"
 
 msgid "Authentication"
 msgstr "鉴权"
 

-#: src/prefs_account.c:1807
+#: src/prefs_account.c:1624

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 

-#: src/prefs_account.c:1894
+#: src/prefs_account.c:1711

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 

-#: src/prefs_account.c:1905
+#: src/prefs_account.c:1722

 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1737

 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 
 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1746

 msgid "minutes"
 msgstr "分钟"
 
 msgid "minutes"
 msgstr "分钟"
 

-#: src/prefs_account.c:1982 src/prefs_account.c:2028
+#: src/prefs_account.c:1814 src/prefs_account.c:1860

 msgid "Signature"
 msgstr "签名"
 
 msgid "Signature"
 msgstr "签名"
 

-#: src/prefs_account.c:1985
+#: src/prefs_account.c:1817

 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 
 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 

-#: src/prefs_account.c:1990
+#: src/prefs_account.c:1822

 msgid "Signature separator"
 msgstr "签名分隔符"
 
 msgid "Signature separator"
 msgstr "签名分隔符"
 

-#: src/prefs_account.c:2015
+#: src/prefs_account.c:1847

 msgid "Command output"
 msgstr "命令输出"
 
 msgid "Command output"
 msgstr "命令输出"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:1880

 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 
 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 

-#: src/prefs_account.c:2057 src/prefs_filtering_action.c:1163
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1885 src/prefs_template.c:188
-#: src/quote_fmt.c:50
-msgid "Cc"
-msgstr "回信地址"
-
-#: src/prefs_account.c:2070 src/prefs_template.c:189
-msgid "Bcc"
-msgstr "抄送地址"
-
-#: src/prefs_account.c:2083
-msgid "Reply-To"
-msgstr "回信地址"
-
-#: src/prefs_account.c:2097
+#: src/prefs_account.c:1929

 msgid "Spell check dictionaries"
 msgstr "拼写检查字典"
 
 msgid "Spell check dictionaries"
 msgstr "拼写检查字典"
 

-#: src/prefs_account.c:2107 src/prefs_folder_item.c:791
+#: src/prefs_account.c:1939 src/prefs_folder_item.c:818

 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "缺省字典"
 
 #: src/prefs_spelling.c:233
 msgid "Default dictionary"
 msgstr "缺省字典"
 

-#: src/prefs_account.c:2124 src/prefs_folder_item.c:824
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:851

 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "缺省的备选字典"
 
 #: src/prefs_spelling.c:251
 msgid "Default alternate dictionary"
 msgstr "缺省的备选字典"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2036 src/prefs_folder_item.c:1099
+#, fuzzy
+msgid "Use a specific format for new messages"
+msgstr "撰写新邮件时使用格式"
+
+#: src/prefs_account.c:2044 src/prefs_folder_item.c:1128
+msgid "Use a specific reply quote format"
+msgstr ""
+
+#: src/prefs_account.c:2052 src/prefs_folder_item.c:1157
+msgid "Use a specific forward quote format"
+msgstr ""
+
+#: src/prefs_account.c:2100

 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 
 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2109

 msgid "Always sign messages"
 msgstr "总是添加签名"
 
 msgid "Always sign messages"
 msgstr "总是添加签名"
 

-#: src/prefs_account.c:2199
+#: src/prefs_account.c:2111

 msgid "Always encrypt messages"
 msgstr "总是加密邮件"
 
 msgid "Always encrypt messages"
 msgstr "总是加密邮件"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2113

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "回复加密邮件时也采用加密模式"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "回复加密邮件时也采用加密模式"
 

-#: src/prefs_account.c:2204
+#: src/prefs_account.c:2116

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "采用自己和收件人的密钥进行双重加密"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "采用自己和收件人的密钥进行双重加密"
 

-#: src/prefs_account.c:2206
+#: src/prefs_account.c:2118

 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 

-#: src/prefs_account.c:2290 src/prefs_account.c:2303 src/prefs_account.c:2315
+#: src/prefs_account.c:2219 src/prefs_account.c:2232 src/prefs_account.c:2244

 msgid "Don't use SSL"
 msgstr "不采用SSL"
 
 msgid "Don't use SSL"
 msgstr "不采用SSL"
 

-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2222

 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 
 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 

-#: src/prefs_account.c:2296 src/prefs_account.c:2309 src/prefs_account.c:2336
+#: src/prefs_account.c:2225 src/prefs_account.c:2238 src/prefs_account.c:2265

 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 

-#: src/prefs_account.c:2306
+#: src/prefs_account.c:2235

 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 

-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2253

 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 
 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 

-#: src/prefs_account.c:2326
+#: src/prefs_account.c:2255

 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2259

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 

-#: src/prefs_account.c:2333
+#: src/prefs_account.c:2262

 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 
 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 

-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2273

 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2285

 msgid "Turn this off if you have SSL connection problems"
 msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
 

-#: src/prefs_account.c:2482
+#: src/prefs_account.c:2392

 msgid "SMTP port"
 msgstr "SMTP端口"
 
 msgid "SMTP port"
 msgstr "SMTP端口"
 

-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2398

 msgid "POP3 port"
 msgstr "POP3端口"
 
 msgid "POP3 port"
 msgstr "POP3端口"
 

-#: src/prefs_account.c:2494
+#: src/prefs_account.c:2404

 msgid "IMAP4 port"
 msgstr "IMAP4端口"
 
 msgid "IMAP4 port"
 msgstr "IMAP4端口"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2410

 msgid "NNTP port"
 msgstr "NNTP端口"
 
 msgid "NNTP port"
 msgstr "NNTP端口"
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2415

 msgid "Domain name"
 msgstr "域名"
 
 msgid "Domain name"
 msgstr "域名"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2425

 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 
 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 

-#: src/prefs_account.c:2523
+#: src/prefs_account.c:2433

 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 

-#: src/prefs_account.c:2565
+#: src/prefs_account.c:2475

 msgid "Browse"
 msgstr "浏览"
 
 msgid "Browse"
 msgstr "浏览"
 

-#: src/prefs_account.c:2578
+#: src/prefs_account.c:2488

 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 
 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 

-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2490

 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 
 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 

-#: src/prefs_account.c:2582
+#: src/prefs_account.c:2492

 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 
 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 

-#: src/prefs_account.c:2584
+#: src/prefs_account.c:2494

 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 
 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 

-#: src/prefs_account.c:2627
+#: src/prefs_account.c:2548

 msgid "Account name is not entered."
 msgstr "未输入帐户名称。"
 
 msgid "Account name is not entered."
 msgstr "未输入帐户名称。"
 

-#: src/prefs_account.c:2631
+#: src/prefs_account.c:2552

 msgid "Mail address is not entered."
 msgstr "未输入邮件地址。"
 
 msgid "Mail address is not entered."
 msgstr "未输入邮件地址。"
 

-#: src/prefs_account.c:2638
+#: src/prefs_account.c:2559

 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 
 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 

-#: src/prefs_account.c:2643
+#: src/prefs_account.c:2564

 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 
 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 

-#: src/prefs_account.c:2648
+#: src/prefs_account.c:2569

 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 
 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 

-#: src/prefs_account.c:2669
+#: src/prefs_account.c:2590

 msgid "The default inbox folder doesn't exist."
 msgstr "缺省的收件夹不存在。"
 
 msgid "The default inbox folder doesn't exist."
 msgstr "缺省的收件夹不存在。"
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2596

 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 
 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 

-#: src/prefs_account.c:2680
+#: src/prefs_account.c:2601

 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 
 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2607

 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 
 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 

-#: src/prefs_account.c:2692
+#: src/prefs_account.c:2613

 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 
 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 

-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2927
+msgid "Receive"
+msgstr "接收"
+
+#: src/prefs_account.c:2963 src/prefs_compose_writing.c:347
+#: src/prefs_folder_item.c:1459 src/prefs_quote.c:179 src/prefs_spelling.c:441
+#: src/prefs_wrapping.c:144 src/toolbar.c:1683
+msgid "Compose"
+msgstr "撰写"
+
+#: src/prefs_account.c:2981 src/prefs_folder_item.c:1475 src/prefs_quote.c:180
+msgid "Templates"
+msgstr "模板"
+
+#: src/prefs_account.c:2999
+msgid "Privacy"
+msgstr "隐私"
+
+#: src/prefs_account.c:3037
+msgid "Advanced"
+msgstr "高级"
+
+#: src/prefs_account.c:3323
+msgid "Preferences for new account"
+msgstr "设置新帐号"
+
+#: src/prefs_account.c:3325
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - 帐号设置"
+
+#: src/prefs_account.c:3420

 msgid "Select signature file"
 msgstr "选择签名文件"
 
 msgid "Select signature file"
 msgstr "选择签名文件"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:3515

 msgid "Protocol:"
 msgstr "通讯协议:"
 
 msgid "Protocol:"
 msgstr "通讯协议:"
 

-#: src/prefs_account.c:3006
+#: src/prefs_account.c:3668

 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (插件未加载)"
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (插件未加载)"


@@ -8645,20 +9124,20 @@ msgid "Command line"
 msgstr "命令行"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544
 msgstr "命令行"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:544

-#: src/prefs_filtering.c:454 src/prefs_matcher.c:679 src/prefs_template.c:270
+#: src/prefs_filtering.c:452 src/prefs_matcher.c:706 src/prefs_template.c:281

 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "替换"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515
 #: src/prefs_toolbar.c:791
 msgid "Replace"
 msgstr "替换"
 
 #: src/prefs_actions.c:291 src/prefs_filtering_action.c:515

-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:602

 msgid "Info..."
 msgstr "说明..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641
 msgid "Info..."
 msgstr "说明..."
 
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:641

-#: src/prefs_filtering.c:761 src/prefs_filtering.c:763
-#: src/prefs_filtering.c:764 src/prefs_filtering.c:839 src/prefs_matcher.c:817
-#: src/prefs_template.c:367
+#: src/prefs_filtering.c:759 src/prefs_filtering.c:761
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:837 src/prefs_matcher.c:844
+#: src/prefs_template.c:414

 msgid "(New)"
 msgstr "(新建)"
 
 msgid "(New)"
 msgstr "(新建)"
 


@@ -8705,21 +9184,21 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "你真的要删除此动作码? "
 
 msgid "Do you really want to delete this action?"
 msgstr "你真的要删除此动作码? "
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1252
-#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1838
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1250
+#: src/prefs_filtering.c:1272 src/prefs_matcher.c:1865
+#: src/prefs_template.c:473 src/prefs_template.c:490

 msgid "Entry not saved"
 msgstr "项目未保存"
 
 msgid "Entry not saved"
 msgstr "项目未保存"
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1251
+#: src/prefs_filtering.c:1273 src/prefs_template.c:474
+#: src/prefs_template.c:491

 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_matcher.c:1840
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1252
+#: src/prefs_filtering.c:1274 src/prefs_matcher.c:1867
+#: src/prefs_template.c:475 src/prefs_template.c:492

 msgid "+_Continue editing"
 msgstr "+继续编辑(_C)"
 
 msgid "+_Continue editing"
 msgstr "+继续编辑(_C)"
 


@@ -8836,93 +9315,91 @@ msgstr ""
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 

-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:120

 msgid "Automatic account selection"
 msgstr "自动选择帐户"
 
 msgid "Automatic account selection"
 msgstr "自动选择帐户"
 

-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:128

 msgid "when replying"
 msgstr "回信时"
 
 msgid "when replying"
 msgstr "回信时"
 

-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:130

 msgid "when forwarding"
 msgstr "转发时"
 
 msgid "when forwarding"
 msgstr "转发时"
 

-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:132

 msgid "when re-editing"
 msgstr "重新编辑时"
 
 msgid "when re-editing"
 msgstr "重新编辑时"
 

-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "转发"
-
-#: src/prefs_compose_writing.c:141 src/prefs_filtering_action.c:171
-msgid "Forward as attachment"
-msgstr "以附件形式转发"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "重定向时保持原来的发信人"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:134

 msgid "Editing"
 msgstr "编辑"
 
 msgid "Editing"
 msgstr "编辑"
 

-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:137

 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 

-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:144

 msgid "Autosave message text to Drafts folder every"
 msgstr "自动保存草稿:  每"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "自动保存草稿:  每"
 

-#: src/prefs_compose_writing.c:166 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:154 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "个字符"
 
 msgid "characters"
 msgstr "个字符"
 

-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:162

 msgid "Undo level"
 msgstr "撤销纪录数"
 
 msgid "Undo level"
 msgstr "撤销纪录数"
 

-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:174
+msgid "Replying"
+msgstr "回复"
+
+#: src/prefs_compose_writing.c:177
+msgid "Reply will quote by default"
+msgstr "回信时引用原文"
+
+#: src/prefs_compose_writing.c:180

 msgid "Reply button invokes mailing list reply"
 msgstr "点击回信按钮时回复给邮件列表"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "点击回信按钮时回复给邮件列表"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:182
+msgid "Forwarding"
+msgstr "转发"
+
+#: src/prefs_compose_writing.c:185 src/prefs_filtering_action.c:171
+msgid "Forward as attachment"
+msgstr "以附件形式转发"
+
+#: src/prefs_compose_writing.c:188
+msgid "Keep the original 'From' header when redirecting"
+msgstr "重定向时保持原来的发信人"
+
+#: src/prefs_compose_writing.c:191

 msgid "When dropping files into the Compose window"
 msgstr "拖放文件到编写邮件窗口时"
 
 msgid "When dropping files into the Compose window"
 msgstr "拖放文件到编写邮件窗口时"
 

-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:199

 msgid "Ask"
 msgstr "询问"
 
 msgid "Ask"
 msgstr "询问"
 

-#: src/prefs_compose_writing.c:199 src/toolbar.c:475
+#: src/prefs_compose_writing.c:200 src/toolbar.c:476

 msgid "Insert"
 msgstr "插入"
 
 msgid "Insert"
 msgstr "插入"
 

-#: src/prefs_compose_writing.c:200 src/toolbar.c:477
+#: src/prefs_compose_writing.c:201 src/toolbar.c:478

 msgid "Attach"
 msgstr "附加文件"
 
 msgid "Attach"
 msgstr "附加文件"
 

-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "撰写新邮件时使用格式"
-

 #: src/prefs_compose_writing.c:218
 #: src/prefs_compose_writing.c:218

-msgid "New message format"
-msgstr "新邮件格式"
-
-#: src/prefs_compose_writing.c:267 src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " 特殊符号说明... "
+msgid "Quotation characters"
+msgstr "引文标识"

 
 

-#: src/prefs_compose_writing.c:387 src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311 src/prefs_spelling.c:441 src/prefs_wrapping.c:144
-#: src/toolbar.c:1674
-msgid "Compose"
-msgstr "撰写"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "将这些字符作为引文标识: "

 
 

-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:348

 msgid "Writing"
 msgstr "编辑"
 
 msgid "Writing"
 msgstr "编辑"
 


@@ -8934,10 +9411,10 @@ msgstr "自定义信头"
 msgid "From file..."
 msgstr "从文件读取..."
 
 msgid "From file..."
 msgstr "从文件读取..."
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1327 src/prefs_matcher.c:1337
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:568
+#: src/prefs_matcher.c:1354 src/prefs_matcher.c:1364

 msgid "Header name is not set."
 msgid "Header name is not set."

-msgstr "未设定信头名称。"
+msgstr "为设定信头名称。"

 
 #: src/prefs_customheader.c:515
 msgid "This Header name is not allowed as a custom header."
 
 #: src/prefs_customheader.c:515
 msgid "This Header name is not allowed as a custom header."


@@ -9000,7 +9477,7 @@ msgid "Displayed header configuration"
 msgstr "信头字段显示配置"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435
 msgstr "信头字段显示配置"
 
 #: src/prefs_display_header.c:251 src/prefs_filtering_action.c:435

-#: src/prefs_matcher.c:497
+#: src/prefs_matcher.c:524

 msgid "Header name"
 msgstr "信头名称"
 
 msgid "Header name"
 msgstr "信头名称"
 


@@ -9016,7 +9493,7 @@ msgstr "需隐藏的信头"
 msgid "Show all unspecified headers"
 msgstr "显示所有未指明的信头字段"
 
 msgid "Show all unspecified headers"
 msgstr "显示所有未指明的信头字段"
 

-#: src/prefs_display_header.c:575
+#: src/prefs_display_header.c:578

 msgid "This header is already in the list."
 msgstr "该字段已经在列表中存在。"
 
 msgid "This header is already in the list."
 msgstr "该字段已经在列表中存在。"
 


@@ -9067,7 +9544,7 @@ msgid "Copy"
 msgstr "复制"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79
 msgstr "复制"
 
 #: src/prefs_filtering_action.c:162 src/prefs_summary_column.c:79

-#: src/summaryview.c:2448
+#: src/summaryview.c:2466

 msgid "Mark"
 msgstr "标记"
 
 msgid "Mark"
 msgstr "标记"
 


@@ -9095,7 +9572,7 @@ msgstr "标记为垃圾邮件"
 msgid "Mark as ham"
 msgstr "标记为非垃圾邮件"
 
 msgid "Mark as ham"
 msgstr "标记为非垃圾邮件"
 

-#: src/prefs_filtering_action.c:170 src/toolbar.c:426 src/toolbar.c:524
+#: src/prefs_filtering_action.c:170 src/toolbar.c:427 src/toolbar.c:525

 msgid "Forward"
 msgstr "转发"
 
 msgid "Forward"
 msgstr "转发"
 


@@ -9104,7 +9581,7 @@ msgid "Redirect"
 msgstr "重新指定"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468
 msgstr "重新指定"
 
 #: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:468

-#: src/toolbar.c:184 src/toolbar.c:1825
+#: src/toolbar.c:185 src/toolbar.c:1834

 msgid "Execute"
 msgstr "执行"
 
 msgid "Execute"
 msgstr "执行"
 


@@ -9124,7 +9601,7 @@ msgstr "设置积分"
 msgid "Hide"
 msgstr "隐藏"
 
 msgid "Hide"
 msgstr "隐藏"
 

-#: src/prefs_filtering_action.c:178 src/toolbar.c:187
+#: src/prefs_filtering_action.c:178 src/toolbar.c:188

 msgid "Ignore thread"
 msgstr "忽略讨论线索"
 
 msgid "Ignore thread"
 msgstr "忽略讨论线索"
 


@@ -9136,7 +9613,7 @@ msgstr "停止过滤"
 msgid "Filtering action configuration"
 msgstr "过滤动作配置"
 
 msgid "Filtering action configuration"
 msgstr "过滤动作配置"
 

-#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:412
+#: src/prefs_filtering_action.c:363 src/prefs_filtering.c:410

 msgid "Action"
 msgstr "动作"
 
 msgid "Action"
 msgstr "动作"
 


@@ -9149,13 +9626,13 @@ msgid "Recipient"
 msgstr "回执"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88
 msgstr "回执"
 
 #: src/prefs_filtering_action.c:478 src/prefs_summary_column.c:88

-#: src/summaryview.c:497
+#: src/summaryview.c:503

 msgid "Score"
 msgstr "得分"
 
 msgid "Score"
 msgstr "得分"
 

-#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:550
+#: src/prefs_filtering_action.c:483 src/prefs_matcher.c:577

 msgid "Book/folder"
 msgid "Book/folder"

-msgstr "地址簿/文件夹"
+msgstr "地址簿/目录"

 
 #: src/prefs_filtering_action.c:859
 msgid "Command line not set"
 
 #: src/prefs_filtering_action.c:859
 msgid "Command line not set"


@@ -9179,50 +9656,31 @@ msgstr "未设定信头名称。"
 
 #: src/prefs_filtering_action.c:903
 msgid "Target addressbook/folder is not set."
 
 #: src/prefs_filtering_action.c:903
 msgid "Target addressbook/folder is not set."

-msgstr "æ\9cªè®¾å®\9aç\9b®æ \87å\9c°å\9d\80ç°¿。"
+msgstr "æ\9cªè¾\93å\85¥ç\9b®æ \87å\9c°å\9d\80ç°¿/ç\9b®å½\95。"

 
 #: src/prefs_filtering_action.c:1122
 msgid "No action was defined."
 msgstr "没有定义动作。"
 
 
 #: src/prefs_filtering_action.c:1122
 msgid "No action was defined."
 msgstr "没有定义动作。"
 

-#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1881
-#: src/quote_fmt.c:63
+#: src/prefs_filtering_action.c:1159 src/prefs_matcher.c:1908
+#: src/quote_fmt.c:75

 msgid "literal %"
 msgstr "% 符号"
 
 msgid "literal %"
 msgstr "% 符号"
 

-#: src/prefs_filtering_action.c:1164 src/prefs_matcher.c:1886
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:494
-msgid "Date"
-msgstr "日期"
-
-#: src/prefs_filtering_action.c:1165 src/prefs_matcher.c:1887
-#: src/quote_fmt.c:53
-msgid "Message-ID"
-msgstr ""
-
-#: src/prefs_filtering_action.c:1166 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1888 src/quote_fmt.c:51
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: src/prefs_filtering_action.c:1167 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1889 src/quote_fmt.c:52
-msgid "References"
-msgstr "引用"
-
-#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1890
+#: src/prefs_filtering_action.c:1168 src/prefs_matcher.c:1917

 msgid "filename (should not be modified)"
 msgstr "文件名(请勿更动)"
 
 msgid "filename (should not be modified)"
 msgstr "文件名(请勿更动)"
 

-#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1891
+#: src/prefs_filtering_action.c:1169 src/prefs_matcher.c:1918
+#: src/quote_fmt.c:83

 msgid "new line"
 msgstr "新行"
 
 msgid "new line"
 msgstr "新行"
 

-#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1892
+#: src/prefs_filtering_action.c:1170 src/prefs_matcher.c:1919

 msgid "escape character for quotes"
 msgstr "引文逃逸字符"
 
 msgid "escape character for quotes"
 msgstr "引文逃逸字符"
 

-#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1893
+#: src/prefs_filtering_action.c:1171 src/prefs_matcher.c:1920

 msgid "quote character"
 msgstr "引文字符"
 
 msgid "quote character"
 msgstr "引文字符"
 


@@ -9246,73 +9704,73 @@ msgstr ""
 msgid "Current action list"
 msgstr "当前动作列表"
 
 msgid "Current action list"
 msgstr "当前动作列表"
 

-#: src/prefs_filtering.c:187 src/prefs_filtering.c:338
+#: src/prefs_filtering.c:185 src/prefs_filtering.c:336

 msgid "Filtering/Processing configuration"
 msgstr "过滤/处理 配置"
 
 msgid "Filtering/Processing configuration"
 msgstr "过滤/处理 配置"
 

-#: src/prefs_filtering.c:249 src/prefs_filtering.c:780
-#: src/prefs_filtering.c:871
+#: src/prefs_filtering.c:247 src/prefs_filtering.c:778
+#: src/prefs_filtering.c:869

 msgid "Filtering Account Menu|All"
 msgstr "全部"
 
 msgid "Filtering Account Menu|All"
 msgstr "全部"
 

-#: src/prefs_filtering.c:390
+#: src/prefs_filtering.c:388

 msgid "Condition"
 msgstr "条件"
 
 msgid "Condition"
 msgstr "条件"
 

-#: src/prefs_filtering.c:403 src/prefs_filtering.c:425
+#: src/prefs_filtering.c:401 src/prefs_filtering.c:423

 msgid " Define... "
 msgstr "定义... "
 
 msgid " Define... "
 msgstr "定义... "
 

-#: src/prefs_filtering.c:927 src/prefs_filtering.c:1013
+#: src/prefs_filtering.c:925 src/prefs_filtering.c:1011

 msgid "Condition string is not valid."
 msgstr "无效的条件字符串。"
 
 msgid "Condition string is not valid."
 msgstr "无效的条件字符串。"
 

-#: src/prefs_filtering.c:963 src/prefs_filtering.c:1021
+#: src/prefs_filtering.c:961 src/prefs_filtering.c:1019

 msgid "Action string is not valid."
 msgstr "无效的动作。"
 
 msgid "Action string is not valid."
 msgstr "无效的动作。"
 

-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:998

 msgid "Condition string is empty."
 msgstr "条件字符串为空。"
 
 msgid "Condition string is empty."
 msgstr "条件字符串为空。"
 

-#: src/prefs_filtering.c:1006
+#: src/prefs_filtering.c:1004

 msgid "Action string is empty."
 msgstr "文件 %s 不存在。"
 
 msgid "Action string is empty."
 msgstr "文件 %s 不存在。"
 

-#: src/prefs_filtering.c:1090
+#: src/prefs_filtering.c:1088

 msgid "Delete rule"
 msgstr "删除规则"
 
 msgid "Delete rule"
 msgstr "删除规则"
 

-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1089

 msgid "Do you really want to delete this rule?"
 msgstr "确定删除这项规则？"
 
 msgid "Do you really want to delete this rule?"
 msgstr "确定删除这项规则？"
 

-#: src/prefs_filtering.c:1468
+#: src/prefs_filtering.c:1466

 msgid "Enable"
 msgstr "启用"
 
 msgid "Enable"
 msgstr "启用"
 

-#: src/prefs_filtering.c:1500
+#: src/prefs_filtering.c:1498

 msgid "Rule"
 msgstr "规则"
 
 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgid "Rule"
 msgstr "规则"
 
 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"

-msgstr "文件夹栏目设置"
+msgstr "目录栏目设置"

 
 #: src/prefs_folder_column.c:222
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 
 #: src/prefs_folder_column.c:222
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""

-"请选择要在文件夹列表窗口要显示的字段列。\n"
+"请选择要在目录列表窗口要显示的字段列。\n"

 "你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
 
 #: src/prefs_folder_column.c:251 src/prefs_summary_column.c:265
 msgid "Hidden columns"
 msgstr "隐藏列"
 
 "你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
 
 #: src/prefs_folder_column.c:251 src/prefs_summary_column.c:265
 msgid "Hidden columns"
 msgstr "隐藏列"
 

-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:394
-#: src/prefs_summaries.c:536 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:401
+#: src/prefs_summaries.c:527 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "显示列"
 
 msgid "Displayed columns"
 msgstr "显示列"
 


@@ -9321,95 +9779,96 @@ msgstr "显示列"
 msgid " Use default "
 msgstr "使用缺省值"
 
 msgid " Use default "
 msgstr "使用缺省值"
 

-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:229 src/prefs_folder_item.c:676

 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 "to subfolders\".</i>"
 msgstr ""
 msgid ""
 "<i>These preferences will not be saved as this folder is a top-level one. "
 "However you can use them to set them to the whole mailbox tree using \"Apply "
 "to subfolders\".</i>"
 msgstr ""

-"<i>这些设置不会保存，因为当前文件夹是一个顶级目录。但你可以点击\"应用到子文件"
-"夹\"按钮，将这些设置保存到当前邮箱的所有子文件夹中去。</i>"
+"<i>这些设置不会保存，因为当前目录是一个顶级目录。但你可以点击\"应用到子文件夹"
+"\"按钮，将这些设置保存到当前邮箱的所有子目录中去。</i>"

 
 

-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:688
+#: src/prefs_folder_item.c:1082

 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 "应用于\n"
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 "应用于\n"

-"子文件夹"
+"子目录"

 
 

-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:265

 msgid "Normal"
 msgstr "普通"
 
 msgid "Normal"
 msgstr "普通"
 

-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:267

 msgid "Outbox"
 msgstr "发信夹"
 
 msgid "Outbox"
 msgstr "发信夹"
 

-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:284

 msgid "Folder type"
 msgid "Folder type"

-msgstr "文件夹类型"
+msgstr "目录类型"

 
 

-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:296

 msgid "Simplify Subject RegExp"
 msgstr "简化邮件标题的正则表达式"
 
 msgid "Simplify Subject RegExp"
 msgstr "简化邮件标题的正则表达式"
 

-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:322

 msgid "Test RegExp"
 msgstr "测试正则表达式"
 
 msgid "Test RegExp"
 msgstr "测试正则表达式"
 

-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:354

 msgid "Folder chmod"
 msgid "Folder chmod"

-msgstr "修改文件夹权限: "
+msgstr "修改目录权限: "

 
 

-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:380

 msgid "Folder color"
 msgid "Folder color"

-msgstr "文件夹颜色"
+msgstr "目录颜色"

 
 

-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:394 src/prefs_folder_item.c:1334

 msgid "Pick color for folder"
 msgid "Pick color for folder"

-msgstr "选文件夹的颜色"
+msgstr "选目录的颜色"

 
 

-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:411

 msgid "Process at start-up"
 msgstr "启动时处理"
 
 msgid "Process at start-up"
 msgstr "启动时处理"
 

-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:425

 msgid "Scan for new mail"
 msgstr "检查新邮件"
 
 msgid "Scan for new mail"
 msgstr "检查新邮件"
 

-#: src/prefs_folder_item.c:411
+#: src/prefs_folder_item.c:438

 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 
 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 

-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:697

 msgid "Request Return Receipt"
 msgstr "请求回执"
 
 msgid "Request Return Receipt"
 msgstr "请求回执"
 

-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:712

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgid "Save copy of outgoing messages to this folder instead of Sent"

-msgstr "将发出的邮件保存一份复制到此文件夹"
+msgstr "将发出的邮件保存一份复制到此目录"

 
 

-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:725

 msgid "Default To:"
 msgstr "新邮件缺省收件人:"
 
 msgid "Default To:"
 msgstr "新邮件缺省收件人:"
 

-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:746

 msgid "Default To: for replies"
 msgstr "回复邮件缺省收件人:"
 
 msgid "Default To: for replies"
 msgstr "回复邮件缺省收件人:"
 

-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:1442

 msgid "General"
 msgstr "一般"
 
 msgid "General"
 msgstr "一般"
 

-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1504

 #, c-format
 msgid "Properties for folder %s"
 #, c-format
 msgid "Properties for folder %s"

-msgstr "%s - 文件夹设置"
+msgstr "%s - 目录设置"

 
 #: src/prefs_fonts.c:74
 msgid "Folder and Message Lists"
 
 #: src/prefs_fonts.c:74
 msgid "Folder and Message Lists"

-msgstr "文件夹和邮件列表"
+msgstr "目录和邮件摘要列表"

 
 #: src/prefs_fonts.c:91
 msgid "Message"
 
 #: src/prefs_fonts.c:91
 msgid "Message"


@@ -9423,7 +9882,7 @@ msgstr "以不同的字体打印"
 msgid "Message Printing"
 msgstr "打印"
 
 msgid "Message Printing"
 msgstr "打印"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:669
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:657

 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "显示"
 #: src/prefs_themes.c:361
 msgid "Display"
 msgstr "显示"


@@ -9432,7 +9891,7 @@ msgstr "显示"
 msgid "Fonts"
 msgstr "字体"
 
 msgid "Fonts"
 msgstr "字体"
 

-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:992

 msgid "Preferences"
 msgstr "偏好设置"
 
 msgid "Preferences"
 msgstr "偏好设置"
 


@@ -9456,267 +9915,256 @@ msgstr "嵌入显示图片"
 msgid "Image Viewer"
 msgstr "图片查看器"
 
 msgid "Image Viewer"
 msgstr "图片查看器"
 

-#: src/prefs_logging.c:117 src/prefs_logging.c:236
-msgid "Clip the log size"
-msgstr "限制日志文件大小"
-
-#: src/prefs_logging.c:122 src/prefs_logging.c:241
-msgid "Log window length"
-msgstr "日志窗口长度"
+#: src/prefs_logging.c:119 src/prefs_logging.c:237
+msgid "Restrict the log window to"
+msgstr "限制日志窗口信息行数: "

 
 

-#: src/prefs_logging.c:139 src/prefs_logging.c:258
+#: src/prefs_logging.c:133 src/prefs_logging.c:251

 msgid "0 to stop logging in the log window"
 msgstr "0 表示禁止往日志窗口写信息"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 表示禁止往日志窗口写信息"
 

-#: src/prefs_logging.c:142 src/prefs_logging.c:261
+#: src/prefs_logging.c:136 src/prefs_logging.c:254

 msgid "lines"
 msgstr "行"
 
 msgid "lines"
 msgstr "行"
 

-#: src/prefs_logging.c:155
-msgid "Enable debugging of filtering/processing rules"
-msgstr "开启过滤/筛选的调试信息"
+#: src/prefs_logging.c:145
+msgid "Filtering/processing log"
+msgstr "过滤/过滤日志"

 
 

-#: src/prefs_logging.c:162
+#: src/prefs_logging.c:148
+msgid "Enable logging of filtering/processing rules"
+msgstr "开启过滤/处理的日志功能"
+
+#: src/prefs_logging.c:156

 msgid ""
 msgid ""

-"If checked, turns on debugging of filtering and processing rules.\n"
-"Debug log is available from 'Tools/Filtering debug window'.\n"
+"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."
 msgstr ""
 
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
 

-#: src/prefs_logging.c:169
-msgid "Debugging of filtering/processing rules when.."
-msgstr ""
+#: src/prefs_logging.c:164
+msgid "Log filtering/processing when..."
+msgstr "记录以下过滤/处理中的日志..."

 
 

-#: src/prefs_logging.c:172
-#, fuzzy
+#: src/prefs_logging.c:167

 msgid "filtering at incorporation"
 msgid "filtering at incorporation"

-msgstr "过滤动作配置"
+msgstr ""

 
 

-#: src/prefs_logging.c:178
+#: src/prefs_logging.c:173

 msgid "manually filtering"
 msgid "manually filtering"

-msgstr "手工启动过滤"
+msgstr "手工过滤"

 
 

-#: src/prefs_logging.c:184
+#: src/prefs_logging.c:179

 msgid "processing folders"
 msgstr "邮件夹自动过滤"
 
 msgid "processing folders"
 msgstr "邮件夹自动过滤"
 

-#: src/prefs_logging.c:190
-#, fuzzy
+#: src/prefs_logging.c:185

 msgid "pre-processing folders"
 msgid "pre-processing folders"

-msgstr "/创建处理规则"
+msgstr "前处理"

 
 

-#: src/prefs_logging.c:196
-#, fuzzy
+#: src/prefs_logging.c:191

 msgid "post-processing folders"
 msgid "post-processing folders"

-msgstr "/创建处理规则"
+msgstr "后处理"

 
 

-#: src/prefs_logging.c:211
-msgid "Debug level"
-msgstr "è°\83è¯\95级å\88«"
+#: src/prefs_logging.c:202
+msgid "Log level"
+msgstr "è®°å½\95é\87\8f"

 
 

-#: src/prefs_logging.c:219
+#: src/prefs_logging.c:210

 msgid "Low"
 msgstr "低"
 
 msgid "Low"
 msgstr "低"
 

-#: src/prefs_logging.c:220
+#: src/prefs_logging.c:211

 msgid "Medium"
 msgstr "中"
 
 msgid "Medium"
 msgstr "中"
 

-#: src/prefs_logging.c:221
+#: src/prefs_logging.c:212

 msgid "High"
 msgstr "高"
 
 msgid "High"
 msgstr "高"
 

-#: src/prefs_logging.c:228
+#: src/prefs_logging.c:220

 msgid ""
 msgid ""

-"Select the level of detail displayed if debugging is enabled.\n"
-"Choose low level to see when rules are applied, what conditions match or not "
-"and what actions are performed.\n"
-"Choose medium level to see more detail about the message that is being "
-"processed, and why rules are skipped.\n"
-"Choose high level to explicitely show the reason why all rules are skipped "
-"or not, and why all conditions are matching or not.\n"
-"Caution: the higher the level is, the more it will impact the performances."
+"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"
+"Caution: the higher the level, the greater the impact on performance."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_logging.c:373
+#: src/prefs_logging.c:365

 msgid "Logging"
 msgstr "日志"
 
 msgid "Logging"
 msgstr "日志"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:168

 msgid "All messages"
 msgstr "所有邮件"
 
 msgid "All messages"
 msgstr "所有邮件"
 

-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr ""
-
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "回复"
-
-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:177

 msgid "Age greater than"
 msgstr "邮件年龄大于"
 
 msgid "Age greater than"
 msgstr "邮件年龄大于"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:178

 msgid "Age lower than"
 msgstr "邮件年龄小于"
 
 msgid "Age lower than"
 msgstr "邮件年龄小于"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:180

 msgid "Headers part"
 msgstr "信头"
 
 msgid "Headers part"
 msgstr "信头"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:181

 msgid "Body part"
 msgstr "主体"
 
 msgid "Body part"
 msgstr "主体"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:182

 msgid "Whole message"
 msgstr "完整邮件"
 
 msgid "Whole message"
 msgstr "完整邮件"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:183

 msgid "Unread flag"
 msgstr "未读标记"
 
 msgid "Unread flag"
 msgstr "未读标记"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:184

 msgid "New flag"
 msgstr "新邮件标记"
 
 msgid "New flag"
 msgstr "新邮件标记"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:185

 msgid "Marked flag"
 msgstr "记号标记"
 
 msgid "Marked flag"
 msgstr "记号标记"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:186

 msgid "Deleted flag"
 msgstr "已删除标记"
 
 msgid "Deleted flag"
 msgstr "已删除标记"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:187

 msgid "Replied flag"
 msgstr "已回复标记"
 
 msgid "Replied flag"
 msgstr "已回复标记"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:188

 msgid "Forwarded flag"
 msgstr "已转发标记"
 
 msgid "Forwarded flag"
 msgstr "已转发标记"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:189

 msgid "Locked flag"
 msgstr "已锁定标记"
 
 msgid "Locked flag"
 msgstr "已锁定标记"
 

-#: src/prefs_matcher.c:169
+#: src/prefs_matcher.c:190

 msgid "Spam flag"
 msgstr "垃圾邮件标识"
 
 msgid "Spam flag"
 msgstr "垃圾邮件标识"
 

-#: src/prefs_matcher.c:170
+#: src/prefs_matcher.c:191

 msgid "Color label"
 msgstr "颜色标签"
 
 msgid "Color label"
 msgstr "颜色标签"
 

-#: src/prefs_matcher.c:171
+#: src/prefs_matcher.c:192

 msgid "Ignored thread"
 msgstr "忽略讨论线索"
 
 msgid "Ignored thread"
 msgstr "忽略讨论线索"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:193

 msgid "Score greater than"
 msgstr "积分大于"
 
 msgid "Score greater than"
 msgstr "积分大于"
 

-#: src/prefs_matcher.c:172
+#: src/prefs_matcher.c:194

 msgid "Score lower than"
 msgstr "积分少于"
 
 msgid "Score lower than"
 msgstr "积分少于"
 

-#: src/prefs_matcher.c:173
+#: src/prefs_matcher.c:195

 msgid "Score equal to"
 msgstr "积分等于"
 
 msgid "Score equal to"
 msgstr "积分等于"
 

-#: src/prefs_matcher.c:174
+#: src/prefs_matcher.c:196

 msgid "Test"
 msgstr "测试"
 
 msgid "Test"
 msgstr "测试"
 

-#: src/prefs_matcher.c:175
+#: src/prefs_matcher.c:197

 msgid "Size greater than"
 msgstr "尺寸大于"
 
 msgid "Size greater than"
 msgstr "尺寸大于"
 

-#: src/prefs_matcher.c:176
+#: src/prefs_matcher.c:198

 msgid "Size smaller than"
 msgstr "尺寸小于"
 
 msgid "Size smaller than"
 msgstr "尺寸小于"
 

-#: src/prefs_matcher.c:177
+#: src/prefs_matcher.c:199

 msgid "Size exactly"
 msgstr "尺寸等于"
 
 msgid "Size exactly"
 msgstr "尺寸等于"
 

-#: src/prefs_matcher.c:178
+#: src/prefs_matcher.c:200

 msgid "Partially downloaded"
 msgstr "仅部分下载"
 
 msgid "Partially downloaded"
 msgstr "仅部分下载"
 

-#: src/prefs_matcher.c:179
+#: src/prefs_matcher.c:201

 msgid "Found in addressbook"
 msgstr "已在地址簿中找到"
 
 msgid "Found in addressbook"
 msgstr "已在地址簿中找到"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "or"
 msgstr "或"
 
 msgid "or"
 msgstr "或"
 

-#: src/prefs_matcher.c:196
+#: src/prefs_matcher.c:219

 msgid "and"
 msgstr "与"
 
 msgid "and"
 msgstr "与"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "contains"
 msgstr "包含"
 
 msgid "contains"
 msgstr "包含"
 

-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:236

 msgid "does not contain"
 msgstr "不包含"
 
 msgid "does not contain"
 msgstr "不包含"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "yes"
 msgstr "是"
 
 msgid "yes"
 msgstr "是"
 

-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:260

 msgid "no"
 msgstr "不"
 
 msgid "no"
 msgstr "不"
 

-#: src/prefs_matcher.c:438
+#: src/prefs_matcher.c:461

 msgid "Condition configuration"
 msgstr "条件设置"
 
 msgid "Condition configuration"
 msgstr "条件设置"
 

-#: src/prefs_matcher.c:465
+#: src/prefs_matcher.c:488

 msgid "Match type"
 msgstr "匹配类型"
 
 msgid "Match type"
 msgstr "匹配类型"
 

-#: src/prefs_matcher.c:518
+#: src/prefs_matcher.c:545

 msgid "Address header"
 msgstr "地址信头"
 
 msgid "Address header"
 msgstr "地址信头"
 

-#: src/prefs_matcher.c:605
+#: src/prefs_matcher.c:632

 msgid "Predicate"
 msgstr "谓词"
 
 msgid "Predicate"
 msgstr "谓词"
 

-#: src/prefs_matcher.c:656
+#: src/prefs_matcher.c:683

 msgid "Use regexp"
 msgstr "使用正则表达式"
 
 msgid "Use regexp"
 msgstr "使用正则表达式"
 

-#: src/prefs_matcher.c:694
+#: src/prefs_matcher.c:721

 msgid "Boolean Op"
 msgstr "逻辑操作符"
 
 msgid "Boolean Op"
 msgstr "逻辑操作符"
 

-#: src/prefs_matcher.c:1309
+#: src/prefs_matcher.c:1336

 msgid "Value is not set."
 msgstr "尚未赋值"
 
 msgid "Value is not set."
 msgstr "尚未赋值"
 

-#: src/prefs_matcher.c:1345
+#: src/prefs_matcher.c:1372

 msgid "all addresses in all headers"
 msgstr "所有信头中的所有地址"
 
 msgid "all addresses in all headers"
 msgstr "所有信头中的所有地址"
 

-#: src/prefs_matcher.c:1348
+#: src/prefs_matcher.c:1375

 msgid "any address in any header"
 msgstr "任意信头中的任意地址"
 
 msgid "any address in any header"
 msgstr "任意信头中的任意地址"
 

-#: src/prefs_matcher.c:1350
+#: src/prefs_matcher.c:1377

 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "信头'%s'中的地址"
 
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "信头'%s'中的地址"
 

-#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:1378

 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"


@@ -9724,11 +10172,11 @@ msgid ""
 "If you want to match %s against the whole address book, you have to select "
 "'Any' from the book/folder drop-down list."
 msgstr ""
 "If you want to match %s against the whole address book, you have to select "
 "'Any' from the book/folder drop-down list."
 msgstr ""

-"未设置对应地址簿/文件夹。\n"
+"未设置对应地址簿/目录。\n"

 "\n"
 "\n"

-"如果你对整个地址簿匹配%s, 请在地址簿/文件夹下拉列表中选择'任意'"
+"如果你对整个地址簿匹配%s, 请在地址簿/目录下拉列表中选择'任意'"

 
 

-#: src/prefs_matcher.c:1839
+#: src/prefs_matcher.c:1866

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -9736,11 +10184,11 @@ msgstr ""
 "该项未保存，\n"
 "确实关闭？"
 
 "该项未保存，\n"
 "确实关闭？"
 

-#: src/prefs_matcher.c:1901
+#: src/prefs_matcher.c:1928

 msgid "Match Type: 'Test'"
 msgstr "匹配类型: 'Test'"
 
 msgid "Match Type: 'Test'"
 msgstr "匹配类型: 'Test'"
 

-#: src/prefs_matcher.c:1902
+#: src/prefs_matcher.c:1929

 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"
 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"


@@ -9752,7 +10200,7 @@ msgstr ""
 "\n"
 "可以使用如下一些符号:"
 
 "\n"
 "可以使用如下一些符号:"
 

-#: src/prefs_matcher.c:1996
+#: src/prefs_matcher.c:2023

 msgid "Current condition rules"
 msgstr "当前条件规则"
 
 msgid "Current condition rules"
 msgstr "当前条件规则"
 


@@ -9906,27 +10354,27 @@ msgstr "选择签名的颜色"
 msgid "Signatures"
 msgstr "签名"
 
 msgid "Signatures"
 msgstr "签名"
 

-#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:346
+#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:349

 msgid "Folder list"
 msgid "Folder list"

-msgstr "文件夹列表"
+msgstr "目录列表"

 
 #: src/prefs_msg_colors.c:378
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 
 #: src/prefs_msg_colors.c:378
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"

-msgstr "选择目标文件夹的颜色。当'移动或删除邮件时立即执行'选项关闭时有效。"
+msgstr "选择目标目录的颜色。当'移动或删除邮件时立即执行'选项关闭时有效。"

 
 #: src/prefs_msg_colors.c:382
 msgid "Target folder"
 
 #: src/prefs_msg_colors.c:382
 msgid "Target folder"

-msgstr "目标文件夹"
+msgstr "目标目录"

 
 #: src/prefs_msg_colors.c:397
 msgid "Pick color for folders containing new messages"
 
 #: src/prefs_msg_colors.c:397
 msgid "Pick color for folders containing new messages"

-msgstr "选择有新邮件的文件夹颜色"
+msgstr "选择有新邮件的目录颜色"

 
 #: src/prefs_msg_colors.c:399
 msgid "Folder containing new messages"
 
 #: src/prefs_msg_colors.c:399
 msgid "Folder containing new messages"

-msgstr "有新邮件的文件夹"
+msgstr "有新邮件的目录"

 
 #: src/prefs_msg_colors.c:405
 msgid "Color labels"
 
 #: src/prefs_msg_colors.c:405
 msgid "Color labels"


@@ -9983,7 +10431,7 @@ msgstr "选择超级链接颜色"
 
 #: src/prefs_msg_colors.c:621
 msgid "Dialog title|Pick color for target folder"
 
 #: src/prefs_msg_colors.c:621
 msgid "Dialog title|Pick color for target folder"

-msgstr "选择目标文件夹颜色"
+msgstr "选择目标目录颜色"

 
 #: src/prefs_msg_colors.c:624
 msgid "Dialog title|Pick color for signatures"
 
 #: src/prefs_msg_colors.c:624
 msgid "Dialog title|Pick color for signatures"


@@ -9991,7 +10439,7 @@ msgstr "选择签名的颜色"
 
 #: src/prefs_msg_colors.c:627
 msgid "Dialog title|Pick color for folder"
 
 #: src/prefs_msg_colors.c:627
 msgid "Dialog title|Pick color for folder"

-msgstr "选择文件夹颜色"
+msgstr "选择目录颜色"

 
 #: src/prefs_msg_colors.c:835
 msgid "Colors"
 
 #: src/prefs_msg_colors.c:835
 msgid "Colors"


@@ -10031,7 +10479,7 @@ msgstr "退出时确认"
 
 #: src/prefs_other.c:530
 msgid "Empty trash on exit"
 
 #: src/prefs_other.c:530
 msgid "Empty trash on exit"

-msgstr "é\80\80å\87ºæ\97¶æ¸\85空å\9e\83å\9c¾æ¡¶"
+msgstr "é\80\80å\87ºæ\97¶æ¸\85空åº\9f件夹"

 
 #: src/prefs_other.c:533
 msgid "Warn if there are queued messages"
 
 #: src/prefs_other.c:533
 msgid "Warn if there are queued messages"


@@ -10066,43 +10514,19 @@ msgstr "清除前请求确认"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"
 
 #: src/prefs_other.c:586
 msgid "Ask about account specific filtering rules when filtering manually"

-msgstr "手工启动过滤时确认帐号相关设置"
+msgstr "手工启动过滤时确认与帐号相关的过滤规则"

 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"
 
 #: src/prefs_other.c:589
 msgid "Synchronise offline folders as soon as possible"

-msgstr "尽快同步脱机目录"
-
-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "回信时引用原文"
-
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "回复格式"
-
-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "引文符号"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "转发格式"
-
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "引文标识"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "将这些字符作为引文标识: "
+msgstr "尽可能地同步离线邮件夹"

 
 

-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "引用"
+#: src/prefs_quote.c:78
+msgid "New message format"
+msgstr "新邮件格式"

 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"
 
 #: src/prefs_receive.c:121
 msgid "External incorporation program"

-msgstr "用于合并邮件的外部程序"
+msgstr ""

 
 #: src/prefs_receive.c:124
 msgid "Use external program for receiving mail"
 
 #: src/prefs_receive.c:124
 msgid "Use external program for receiving mail"


@@ -10118,7 +10542,7 @@ msgstr "自动检查"
 
 #: src/prefs_receive.c:147
 msgid "Automatically check for new mail every"
 
 #: src/prefs_receive.c:147
 msgid "Automatically check for new mail every"

-msgstr "自动检查新邮件"
+msgstr "自动检查新邮件, 每隔"

 
 #: src/prefs_receive.c:165
 msgid "Check for new mail on start-up"
 
 #: src/prefs_receive.c:165
 msgid "Check for new mail on start-up"


@@ -10132,7 +10556,7 @@ msgstr "对话框"
 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 
 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 

-#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:448
+#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:438

 msgid "Always"
 msgstr "总显示"
 
 msgid "Always"
 msgstr "总显示"
 


@@ -10158,7 +10582,7 @@ msgstr "转到收信夹"
 
 #: src/prefs_receive.c:202
 msgid "Update all local folders"
 
 #: src/prefs_receive.c:202
 msgid "Update all local folders"

-msgstr "更新所有本地文件夹"
+msgstr "更新所有本地目录"

 
 #: src/prefs_receive.c:204
 msgid "Run command"
 
 #: src/prefs_receive.c:204
 msgid "Run command"


@@ -10191,7 +10615,7 @@ msgstr "邮件收取"
 
 #: src/prefs_send.c:144
 msgid "Save sent messages to Sent folder"
 
 #: src/prefs_send.c:144
 msgid "Save sent messages to Sent folder"

-msgstr "将已经发送的邮件保存到已发送文件夹"
+msgstr "将已经发送的邮件保存到已发送目录"

 
 #: src/prefs_send.c:147
 msgid "Confirm before sending queued messages"
 
 #: src/prefs_send.c:147
 msgid "Confirm before sending queued messages"


@@ -10402,210 +10826,189 @@ msgstr "选择拼写错误时的颜色(黑色表示下划线)"
 msgid "Spell Checking"
 msgstr "拼写检查"
 
 msgid "Spell Checking"
 msgstr "拼写检查"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full abbreviated weekday name"
 msgstr "(星期)一、二、..."
 
 msgid "the full abbreviated weekday name"
 msgstr "(星期)一、二、..."
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the full month name"
 msgstr "一月、二月、..."
 
 msgid "the full month name"
 msgstr "一月、二月、..."
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 
 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 
 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 
 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 
 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 
 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "either AM or PM"
 msgstr "上午或下午"
 
 msgid "either AM or PM"
 msgstr "上午或下午"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 
 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 
 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 
 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 
 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 
 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 

-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161

 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 
 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 

-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:504
+#: src/prefs_summaries.c:182 src/prefs_summaries.c:230
+#: src/prefs_summaries.c:495

 msgid "Date format"
 msgstr "日期格式"
 
 msgid "Date format"
 msgstr "日期格式"
 

-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:206

 msgid "Specifier"
 msgstr "特殊符号"
 
 msgid "Specifier"
 msgstr "特殊符号"
 

-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:248

 msgid "Example"
 msgstr "示例"
 
 msgid "Example"
 msgstr "示例"
 

-#: src/prefs_summaries.c:352
+#: src/prefs_summaries.c:355

 msgid "Display message number next to folder name"
 msgid "Display message number next to folder name"

-msgstr "在文件夹名称后显示邮件数"
+msgstr "在目录名称后显示邮件数"

 
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:363

 msgid "No"
 msgstr "无"
 
 msgid "No"
 msgstr "无"
 

-#: src/prefs_summaries.c:361
+#: src/prefs_summaries.c:364

 msgid "Unread messages"
 msgid "Unread messages"

-msgstr "未读邮件数"
+msgstr "未读邮件"

 
 

-#: src/prefs_summaries.c:362
+#: src/prefs_summaries.c:365

 msgid "Unread and Total messages"
 msgid "Unread and Total messages"

-msgstr "未读邮件数和总数"
+msgstr "未读邮件和邮件总数"

 
 

-#: src/prefs_summaries.c:372
+#: src/prefs_summaries.c:376
+msgid "Open last opened folder at startup"
+msgstr "在启动时自动打开上次最后访问的邮件夹"
+
+#: src/prefs_summaries.c:379

 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 

-#: src/prefs_summaries.c:386
+#: src/prefs_summaries.c:393

 msgid "letters"
 msgstr "个字母"
 
 msgid "letters"
 msgstr "个字母"
 

-#: src/prefs_summaries.c:404
+#: src/prefs_summaries.c:411

 msgid "Message list"
 msgid "Message list"

-msgstr " 邮件列表"
-
-#: src/prefs_summaries.c:410
-msgid "When entering a folder"
-msgstr "进入文件夹时"
-
-#: src/prefs_summaries.c:418
-msgid "Do nothing"
-msgstr "不错"
-
-#: src/prefs_summaries.c:419
-msgid "Select first unread (or new or marked) message"
-msgstr "选择第一个未读/新/已标记邮件"
-
-#: src/prefs_summaries.c:421
-msgid "Select first unread (or marked or new) message"
-msgstr "选择第一个未读/已标记/新邮件"
+msgstr " 邮件摘要列表"

 
 

-#: src/prefs_summaries.c:423
-msgid "Select first new (or unread or marked) message"
-msgstr "选择第一个新/未读/已标记邮件"
-
-#: src/prefs_summaries.c:425
-msgid "Select first new (or marked or unread) message"
-msgstr "选择第一个新/已标记/未读邮件"
-
-#: src/prefs_summaries.c:427
-msgid "Select first marked (or new or unread) message"
-msgstr "选择第一个已标记/新/未读邮件"
-
-#: src/prefs_summaries.c:429
-msgid "Select first marked (or unread or new) message"
-msgstr "选择第一个已标记/未读/新邮件"
+#: src/prefs_summaries.c:417
+#, fuzzy
+msgid "Set default selection when entering a folder"
+msgstr "进入目录时"

 
 

-#: src/prefs_summaries.c:440
+#: src/prefs_summaries.c:430

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 

-#: src/prefs_summaries.c:449
+#: src/prefs_summaries.c:439

 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 
 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 

-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:441

 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 
 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 

-#: src/prefs_summaries.c:459
+#: src/prefs_summaries.c:449

 msgid "Always open message when selected"
 msgid "Always open message when selected"

-msgstr "选中文件夹时总打开里面的邮件"
+msgstr "选中目录时总打开里面的邮件"

 
 

-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:452

 msgid "Thread using subject in addition to standard headers"
 msgstr "按线索分组时也考虑邮件主题（除了标准信头中的信息）"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "按线索分组时也考虑邮件主题（除了标准信头中的信息）"
 

-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:458

 msgid "Execute immediately when moving or deleting messages"
 msgstr "移动或删除邮件时立即执行"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移动或删除邮件时立即执行"
 

-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:460

 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr "将移动、复制和删除操作延迟到选择了'工具/执行'之后再处理"
 
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr "将移动、复制和删除操作延迟到选择了'工具/执行'之后再处理"
 

-#: src/prefs_summaries.c:475
-msgid "Only mark message as read when opened in a new window"
-msgstr "只在用新窗口打开邮件时标记为已读"
+#: src/prefs_summaries.c:465
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"
+msgstr "只将用新窗口打开过邮件或者回复过的邮件标记为已读"

 
 

-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:473

 msgid "Mark messages as read after"
 msgstr "一段时间后将邮件标记为已读"
 
 msgid "Mark messages as read after"
 msgstr "一段时间后将邮件标记为已读"
 

-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:489

 msgid "Display sender using address book"
 msgstr "以地址簿中的名字显示发信人"
 
 msgid "Display sender using address book"
 msgstr "以地址簿中的名字显示发信人"
 

-#: src/prefs_summaries.c:530
+#: src/prefs_summaries.c:521

 msgid "Date format help"
 msgstr "日期格式说明"
 
 msgid "Date format help"
 msgstr "日期格式说明"
 

-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:539

 msgid "Confirm before marking all mails in a folder as read"
 msgid "Confirm before marking all mails in a folder as read"

-msgstr "在标记文件夹里所有邮件为只读时请求确认"
+msgstr "在标记目录里所有邮件为只读时请求确认"

 
 

-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:542

 msgid "Translate header names"
 msgstr "翻译信头名称"
 
 msgid "Translate header names"
 msgstr "翻译信头名称"
 

-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:544

 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."


@@ -10613,11 +11016,11 @@ msgstr ""
 "标准信头(比如'From:', 'Subject')也将翻译为你所采用的语言(比如'发件人', '主"
 "题')。"
 
 "标准信头(比如'From:', 'Subject')也将翻译为你所采用的语言(比如'发件人', '主"
 "题')。"
 

-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:658

 msgid "Summaries"
 msgid "Summaries"

-msgstr "邮件列表"
+msgstr "邮件摘要列表"

 
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2442
+#: src/prefs_summary_column.c:81 src/summaryview.c:2460

 msgid "Attachment"
 msgstr "附件"
 
 msgid "Attachment"
 msgstr "附件"
 


@@ -10627,45 +11030,77 @@ msgstr "号码"
 
 #: src/prefs_summary_column.c:219
 msgid "Message list columns configuration"
 
 #: src/prefs_summary_column.c:219
 msgid "Message list columns configuration"

-msgstr "邮件列表列设置"
+msgstr "邮件摘要列表列设置"

 
 #: src/prefs_summary_column.c:236
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 
 #: src/prefs_summary_column.c:236
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""

-"请选择要在邮件列表栏显示的字段列。\n"
+"请选择要在邮件摘要列表栏显示的字段列。\n"

 "你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
 
 "你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
 

-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "Go to first marked email"
+msgstr "转到第一个标记过的邮件"
+
+#: src/prefs_summary_open.c:109
+msgid "Go to first new email"
+msgstr "转到第一个新邮件"
+
+#: src/prefs_summary_open.c:110
+msgid "Go to first unread email"
+msgstr "转到第一封未读邮件"
+
+#: src/prefs_summary_open.c:111
+msgid "Go to last opened email"
+msgstr "转到最后打开的邮件"
+
+#: src/prefs_summary_open.c:112
+msgid "Go to last email in the list"
+msgstr "转到列表中的最后一封邮件"
+
+#: src/prefs_summary_open.c:113
+msgid "Do nothing"
+msgstr "不做什么动作"
+
+#: src/prefs_summary_open.c:187 src/prefs_summary_open.c:269
+msgid "Action on folder opening"
+msgstr "打开邮件夹时的动作"
+
+#: src/prefs_summary_open.c:233
+msgid "Possible actions"
+msgstr "允许的动作"
+
+#: src/prefs_template.c:197

 msgid "This name is used as the Menu item"
 msgstr "该名称已经用于菜单项"
 
 msgid "This name is used as the Menu item"
 msgstr "该名称已经用于菜单项"
 

-#: src/prefs_template.c:286
+#: src/prefs_template.c:297

 msgid " Symbols... "
 msgstr " 符号... "
 
 msgid " Symbols... "
 msgstr " 符号... "
 

-#: src/prefs_template.c:315
+#: src/prefs_template.c:362

 msgid "Template configuration"
 msgstr "模板设置"
 
 msgid "Template configuration"
 msgstr "模板设置"
 

-#: src/prefs_template.c:557
+#: src/prefs_template.c:617

 msgid "Template name is not set."
 msgstr "未设定模板名称。"
 
 msgid "Template name is not set."
 msgstr "未设定模板名称。"
 

-#: src/prefs_template.c:667
+#: src/prefs_template.c:728

 msgid "Delete template"
 msgstr "删除模板"
 
 msgid "Delete template"
 msgstr "删除模板"
 

-#: src/prefs_template.c:668
+#: src/prefs_template.c:729

 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 
 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 

-#: src/prefs_template.c:805
+#: src/prefs_template.c:889

 msgid "Current templates"
 msgstr "目前使用的模板"
 
 msgid "Current templates"
 msgstr "目前使用的模板"
 

-#: src/prefs_template.c:830
+#: src/prefs_template.c:914

 msgid "Template"
 msgstr "模板"
 
 msgid "Template"
 msgstr "模板"
 


@@ -10805,10 +11240,6 @@ msgstr "作者: "
 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "状态"
-

 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "预览"
 #: src/prefs_themes.c:937
 msgid "Preview"
 msgstr "预览"


@@ -10913,12 +11344,12 @@ msgstr "自动折行"
 msgid "No information available"
 msgstr "没有信息"
 
 msgid "No information available"
 msgstr "没有信息"
 

-#: src/privacy.c:406
+#: src/privacy.c:440

 #, fuzzy
 msgid "No recipient keys defined."
 msgstr "没有定义动作。"
 
 #, fuzzy
 msgid "No recipient keys defined."
 msgstr "没有定义动作。"
 

-#: src/procmime.c:341 src/procmime.c:343
+#: src/procmime.c:339 src/procmime.c:341

 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64解码错误]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64解码错误]\n"
 


@@ -10969,176 +11400,246 @@ msgstr "发送新闻过程中写往临时文件时出错。"
 msgid "Error occurred while posting the message to %s."
 msgstr "发贴至 %s 时发生错误。"
 
 msgid "Error occurred while posting the message to %s."
 msgstr "发贴至 %s 时发生错误。"
 

-#: src/procmsg.c:2159
+#: src/procmsg.c:2165

 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 
 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 

-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">符号:</span>"
+
+#: src/quote_fmt.c:47

 msgid "customized date format (see 'man strftime')"
 msgstr "自定义日期显示格式 (请查看strftime的手册页)"
 
 msgid "customized date format (see 'man strftime')"
 msgstr "自定义日期显示格式 (请查看strftime的手册页)"
 

-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50

 msgid "email address of sender"
 msgstr "发件人邮件地址"
 
 msgid "email address of sender"
 msgstr "发件人邮件地址"
 

-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:51

 msgid "full name of sender"
 msgstr "发信人全名"
 
 msgid "full name of sender"
 msgstr "发信人全名"
 

-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:52

 msgid "first name of sender"
 msgstr "发信人的姓"
 
 msgid "first name of sender"
 msgstr "发信人的姓"
 

-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:53

 msgid "last name of sender"
 msgstr "发信人的名"
 
 msgid "last name of sender"
 msgstr "发信人的名"
 

-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:54

 msgid "initials of sender"
 msgstr "发信人缩写"
 
 msgid "initials of sender"
 msgstr "发信人缩写"
 

-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:61

 msgid "message body"
 msgstr "邮件内容"
 
 msgid "message body"
 msgstr "邮件内容"
 

-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:62

 msgid "quoted message body"
 msgstr "引文"
 
 msgid "quoted message body"
 msgstr "引文"
 

-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:63

 msgid "message body without signature"
 msgstr "邮件内容（不含签名）"
 
 msgid "message body without signature"
 msgstr "邮件内容（不含签名）"
 

-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:64

 msgid "quoted message body without signature"
 msgstr "引文（不含签名）"
 
 msgid "quoted message body without signature"
 msgstr "引文（不含签名）"
 

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:65
+msgid "current dictionary"
+msgstr "当前目录"
+
+#: src/quote_fmt.c:66

 msgid "cursor position"
 msgstr "光标位置"
 
 msgid "cursor position"
 msgstr "光标位置"
 

-#: src/quote_fmt.c:59
-msgid "Account property: your name"
+#: src/quote_fmt.c:67
+msgid "account property: your name"

 msgstr "账户属性: 你的名字"
 
 msgstr "账户属性: 你的名字"
 

-#: src/quote_fmt.c:60
-msgid "Account property: your email address"
+#: src/quote_fmt.c:68
+msgid "account property: your email address"

 msgstr "账户属性: 你的邮件地址"
 
 msgstr "账户属性: 你的邮件地址"
 

-#: src/quote_fmt.c:61
-msgid "Account property: account name"
+#: src/quote_fmt.c:69
+msgid "account property: account name"

 msgstr "账户属性: 账户名称"
 
 msgstr "账户属性: 账户名称"
 

-#: src/quote_fmt.c:62
-msgid "Account property: organization"
+#: src/quote_fmt.c:70
+msgid "account property: organization"

 msgstr "账户属性: 组织名称"
 
 msgstr "账户属性: 组织名称"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:71
+msgid "account property: default dictionary"
+msgstr "账户属性: 账户名称"
+
+#: src/quote_fmt.c:72
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr ""
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr ""
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr ""
+
+#: src/quote_fmt.c:76

 msgid "literal backslash"
 msgstr "反斜线"
 
 msgid "literal backslash"
 msgstr "反斜线"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:77

 msgid "literal question mark"
 msgstr "问号"
 
 msgid "literal question mark"
 msgstr "问号"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:78

 msgid "literal exclamation mark"
 msgstr "感叹号"
 
 msgid "literal exclamation mark"
 msgstr "感叹号"
 

-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:79

 msgid "literal pipe"
 msgstr "竖线"
 
 msgid "literal pipe"
 msgstr "竖线"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:80

 msgid "literal opening curly brace"
 msgstr "左大括弧"
 
 msgid "literal opening curly brace"
 msgstr "左大括弧"
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:81

 msgid "literal closing curly brace"
 msgstr "右大括弧"
 
 msgid "literal closing curly brace"
 msgstr "右大括弧"
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:82

 msgid "tab"
 msgstr "制表符"
 
 msgid "tab"
 msgstr "制表符"
 

-#: src/quote_fmt.c:71
-msgid "linefeed"
-msgstr "换行符"
+#: src/quote_fmt.c:85
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">命令:</span>"

 
 

-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:86

 msgid ""
 msgid ""

-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"如果x已经设置，则插入expr\n"
-"(x可以是dfNFLIstcnri中的任意一个，或者af, ao)"
+"当x标志已经设置时，插入<span style=\"oblique\">expr</span>。\n"
+"其中x为[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]中的任何一个\n"
+"(或者它们的长表达式)"

 
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:87

 msgid ""
 msgid ""

-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"

 msgstr ""
 msgstr ""

-"如果x尚未设置，则插入expr\n"
-"(x可以是dfNFLIstcnri中的任意一个，或者af, ao)"
+"当x标志未被设置时，插入<span style=\"oblique\">expr</span>。\n"
+"其中x为[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]中的任何一个\n"
+"(或者它们的长表达式)"

 
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:88

 msgid ""
 "insert file:\n"
 msgid ""
 "insert file:\n"

-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"

 msgstr ""
 "插入文件:\n"
 msgstr ""
 "插入文件:\n"

-"sub_expr将被替换为要插入的文件名"
+"<span style=\"oblique\">sub_expr</span>将被替换为要插入的文件名"

 
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:89

 msgid ""
 "insert program output:\n"
 msgid ""
 "insert program output:\n"

-"sub_expr 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 ""
 "插入程序输出:\n"
 "the output from"
 msgstr ""
 "插入程序输出:\n"

-"sub_expr将被替换为一命令行，该命令行被用于获取输出\n"
+"<span style=\"oblique\">sub_expr</span>将被替换为一命令行，该命令行被用于获取"
+"输出\n"

 " "
 
 " "
 

-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:90

 msgid ""
 "insert user input:\n"
 msgid ""
 "insert user input:\n"

-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"

 "user-entered text"
 msgstr ""
 "插入用户输入:\n"
 "user-entered text"
 msgstr ""
 "插入用户输入:\n"

-"sub_expr将被替换为用户输入的文本\n"
+"<span style=\"oblique\">sub_expr</span>将被替换为用户输入的文本\n"

 " "
 
 " "
 

-#: src/quote_fmt.c:79
-msgid "terms definition:"
-msgstr "术语定义:"
+#: src/quote_fmt.c:92
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">术语定义:</span>"

 
 

-#: src/quote_fmt.c:80
-msgid "text that can contain any of the symbols above"
-msgstr "可以包含上述符号的文字"
+#: src/quote_fmt.c:93
+msgid ""
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr "可以包含上述符号或者命令的文字"

 
 

-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:94
+msgid ""
+"text that can contain any of the symbols (no\n"
+"commands) above"
+msgstr "可以包含上述符号(不能包含命令)的文字"
+
+#: src/quote_fmt.c:95

 msgid ""
 msgid ""

-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"

 msgstr ""
 msgstr ""

-"可以包含上述符号，除了:\n"
-"?x{}, !x{}, |f{}, |p{}和|i{}"

 
 

-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:103

 msgid "Description of symbols"
 msgstr "符号描述"
 
 msgid "Description of symbols"
 msgstr "符号描述"
 

-#: src/quote_fmt.c:90
-msgid "The following symbols can be used:"
-msgstr "可以使用下述符号:"
+#: src/quote_fmt.c:104
+msgid "The following symbols and commands can be used:"
+msgstr "可以使用下述符号和命令:"
+
+#: src/quote_fmt.c:144
+msgid "Use format when composing new messages"
+msgstr "撰写新邮件时使用格式"
+
+#: src/quote_fmt.c:230
+msgid "Reply format"
+msgstr "回复格式"
+
+#: src/quote_fmt.c:248 src/quote_fmt.c:341
+msgid "Quotation mark"
+msgstr "引文符号"
+
+#: src/quote_fmt.c:323
+msgid "Forward format"
+msgstr "转发格式"
+
+#: src/quote_fmt.c:400
+msgid "Description of symbols..."
+msgstr "特殊符号说明... "
+
+#: src/quote_fmt.c:435
+#, fuzzy
+msgid "Message reply quotation mark format error."
+msgstr "邮件回复格式错误。"
+
+#: src/quote_fmt.c:453
+#, fuzzy
+msgid "Message forward quotation mark format error."
+msgstr "邮件转发格式错误。"

 
 

-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt_parse.y:489

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "请输入要替换'%s'的文字"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "请输入要替换'%s'的文字"
 

-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:490

 msgid "Enter variable"
 msgstr "请输入变量"
 
 msgid "Enter variable"
 msgstr "请输入变量"
 


@@ -11281,10 +11782,6 @@ msgstr "满足下面任意一条件"
 msgid "Match all of the following"
 msgstr "满足下面所有条件"
 
 msgid "Match all of the following"
 msgstr "满足下面所有条件"
 

-#: src/summary_search.c:356
-msgid "From:"
-msgstr "发信人:"
-

 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "正文:"
 #: src/summary_search.c:377
 msgid "Body:"
 msgstr "正文:"


@@ -11297,370 +11794,384 @@ msgstr "条件:"
 msgid "Find _all"
 msgstr "查找全部(_a)"
 
 msgid "Find _all"
 msgstr "查找全部(_a)"
 

-#: src/summary_search.c:652
+#: src/summary_search.c:676

 msgid "Beginning of list reached; continue from end?"
 msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 

-#: src/summary_search.c:654
+#: src/summary_search.c:678

 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:428

 msgid "/_Reply"
 msgstr "/回复(_R)"
 
 msgid "/_Reply"
 msgstr "/回复(_R)"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:429

 msgid "/Repl_y to"
 msgstr "/回复给(_y)"
 
 msgid "/Repl_y to"
 msgstr "/回复给(_y)"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:430

 msgid "/Repl_y to/_all"
 msgstr "/回复给(_y)/所有人(_a)"
 
 msgid "/Repl_y to/_all"
 msgstr "/回复给(_y)/所有人(_a)"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:431

 msgid "/Repl_y to/_sender"
 msgstr "/回复给(_y)/发信人(_s)"
 
 msgid "/Repl_y to/_sender"
 msgstr "/回复给(_y)/发信人(_s)"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:432

 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 

-#: src/summaryview.c:429 src/toolbar.c:247
+#: src/summaryview.c:435 src/toolbar.c:248

 msgid "/_Forward"
 msgstr "转发(_F)"
 
 msgid "/_Forward"
 msgstr "转发(_F)"
 

-#: src/summaryview.c:430 src/toolbar.c:248
+#: src/summaryview.c:436 src/toolbar.c:249

 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_w)"
 
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_w)"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:437

 msgid "/Redirect"
 msgstr "/重定向"
 
 msgid "/Redirect"
 msgstr "/重定向"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:439

 msgid "/M_ove..."
 msgstr "/移动(_o)..."
 
 msgid "/M_ove..."
 msgstr "/移动(_o)..."
 

-#: src/summaryview.c:434
+#: src/summaryview.c:440

 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 

-#: src/summaryview.c:435
+#: src/summaryview.c:441

 msgid "/Move to _trash"
 msgid "/Move to _trash"

-msgstr "/移å\8a¨å\88°å\9e\83å\9c¾æ¡¶(_t)"
+msgstr "/移å\8a¨å\88°åº\9f件夹(_t)"

 
 

-#: src/summaryview.c:436
+#: src/summaryview.c:442

 msgid "/_Delete..."
 msgstr "/删除(_D)..."
 
 msgid "/_Delete..."
 msgstr "/删除(_D)..."
 

-#: src/summaryview.c:438
+#: src/summaryview.c:444

 msgid "/_Mark"
 msgstr "/标记(_M)"
 
 msgid "/_Mark"
 msgstr "/标记(_M)"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:445

 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 
 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:446

 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/去除标记(_U)"
 
 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/去除标记(_U)"
 

-#: src/summaryview.c:441 src/summaryview.c:447 src/summaryview.c:450
+#: src/summaryview.c:447 src/summaryview.c:453 src/summaryview.c:456

 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:448

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_e)"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_e)"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:449

 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_d)"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_d)"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:450

 msgid "/_Mark/Mark all read"
 msgstr "/标记(_M)/标记全部为已读"
 
 msgid "/_Mark/Mark all read"
 msgstr "/标记(_M)/标记全部为已读"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:451

 msgid "/_Mark/Ignore thread"
 msgstr "/标记(_M)/忽略邮件线索"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/标记(_M)/忽略邮件线索"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:452

 msgid "/_Mark/Unignore thread"
 msgstr "/标记(_M)/不忽略邮件线索"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/标记(_M)/不忽略邮件线索"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:454

 msgid "/_Mark/Mark as _spam"
 msgstr "/标记(_M)/标记为垃圾邮件(_s)"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/标记(_M)/标记为垃圾邮件(_s)"
 

-#: src/summaryview.c:449
+#: src/summaryview.c:455

 msgid "/_Mark/Mark as _ham"
 msgstr "/标记(_M)/标记为非垃圾邮件(_h)"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/标记(_M)/标记为非垃圾邮件(_h)"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:457

 msgid "/_Mark/Lock"
 msgstr "/标记(_M)/锁定"
 
 msgid "/_Mark/Lock"
 msgstr "/标记(_M)/锁定"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:458

 msgid "/_Mark/Unlock"
 msgstr "/标记(_M)/解锁"
 
 msgid "/_Mark/Unlock"
 msgstr "/标记(_M)/解锁"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:459

 msgid "/Color la_bel"
 msgstr "/彩色标记(_b)"
 
 msgid "/Color la_bel"
 msgstr "/彩色标记(_b)"
 

-#: src/summaryview.c:456
+#: src/summaryview.c:462

 msgid "/Add sender to address boo_k"
 msgstr "将发信人加入地址簿中(_k)"
 
 msgid "/Add sender to address boo_k"
 msgstr "将发信人加入地址簿中(_k)"
 

-#: src/summaryview.c:458
+#: src/summaryview.c:464

 msgid "/Create f_ilter rule"
 msgstr "/创建邮件过滤规则(_i)"
 
 msgid "/Create f_ilter rule"
 msgstr "/创建邮件过滤规则(_i)"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:465

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建邮件过滤规则(_i)/自动创建"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建邮件过滤规则(_i)/自动创建"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:467

 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
 

-#: src/summaryview.c:463
+#: src/summaryview.c:469

 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
 

-#: src/summaryview.c:465
+#: src/summaryview.c:471

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:473

 msgid "/Create processing rule"
 msgstr "/创建处理规则"
 
 msgid "/Create processing rule"
 msgstr "/创建处理规则"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:474

 msgid "/Create processing rule/_Automatically"
 msgstr "/创建处理规则/自动创建(_A)"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/创建处理规则/自动创建(_A)"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:476

 msgid "/Create processing rule/by _From"
 msgstr "/创建处理规则/按来源(_F)"
 
 msgid "/Create processing rule/by _From"
 msgstr "/创建处理规则/按来源(_F)"
 

-#: src/summaryview.c:472
+#: src/summaryview.c:478

 msgid "/Create processing rule/by _To"
 msgstr "/创建处理规则/按收信人(_T)"
 
 msgid "/Create processing rule/by _To"
 msgstr "/创建处理规则/按收信人(_T)"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:480

 msgid "/Create processing rule/by _Subject"
 msgstr "/创建处理规则/按标题(_S)"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/创建处理规则/按标题(_S)"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:486

 msgid "/_View/Message _source"
 msgstr "/查看(_V)/邮件源文件(_s)"
 
 msgid "/_View/Message _source"
 msgstr "/查看(_V)/邮件源文件(_s)"
 

-#: src/summaryview.c:481
+#: src/summaryview.c:487

 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有信头(_h)"
 
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有信头(_h)"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:489
+msgid "/_Save as..."
+msgstr "/另存为(_S)..."
+
+#: src/summaryview.c:490

 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 

-#: src/summaryview.c:601
+#: src/summaryview.c:610

 msgid "Toggle quick search bar"
 msgstr "切换快速搜索条显示状态"
 
 msgid "Toggle quick search bar"
 msgstr "切换快速搜索条显示状态"
 

-#: src/summaryview.c:1065
+#: src/summaryview.c:648
+#, fuzzy
+msgid "Toggle multiple selection"
+msgstr "选中的文字"
+
+#: src/summaryview.c:1098

 msgid "Process mark"
 msgstr "邮件标记"
 
 msgid "Process mark"
 msgstr "邮件标记"
 

-#: src/summaryview.c:1066
+#: src/summaryview.c:1099

 msgid "Some marks are left. Process them?"
 msgstr "某些邮件已做了待处理标记。是否进行处理？"
 
 msgid "Some marks are left. Process them?"
 msgstr "某些邮件已做了待处理标记。是否进行处理？"
 

-#: src/summaryview.c:1123
+#: src/summaryview.c:1156

 #, c-format
 msgid "Scanning folder (%s)..."
 #, c-format
 msgid "Scanning folder (%s)..."

-msgstr "扫描文件夹(%s)..."
+msgstr "扫描目录(%s)..."

 
 

-#: src/summaryview.c:1591 src/summaryview.c:1643
+#: src/summaryview.c:1609 src/summaryview.c:1661

 msgid "No more unread messages"
 msgstr "没有其他新邮件"
 
 msgid "No more unread messages"
 msgstr "没有其他新邮件"
 

-#: src/summaryview.c:1592
+#: src/summaryview.c:1610

 msgid "No unread message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
 msgid "No unread message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1604 src/summaryview.c:1656 src/summaryview.c:1703
-#: src/summaryview.c:1755 src/summaryview.c:1834
+#: src/summaryview.c:1622 src/summaryview.c:1674 src/summaryview.c:1721
+#: src/summaryview.c:1773 src/summaryview.c:1852

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 

-#: src/summaryview.c:1612
+#: src/summaryview.c:1630

 msgid "No unread messages."
 msgstr "没有未读邮件。"
 
 msgid "No unread messages."
 msgstr "没有未读邮件。"
 

-#: src/summaryview.c:1644
+#: src/summaryview.c:1662

 msgid "No unread message found. Go to next folder?"
 msgid "No unread message found. Go to next folder?"

-msgstr "没有新邮件。要到下一个文件夹吗？"
+msgstr "没有新邮件。要到下一个目录吗？"

 
 

-#: src/summaryview.c:1690 src/summaryview.c:1742
+#: src/summaryview.c:1708 src/summaryview.c:1760

 msgid "No more new messages"
 msgstr "没有其他新邮件"
 
 msgid "No more new messages"
 msgstr "没有其他新邮件"
 

-#: src/summaryview.c:1691
+#: src/summaryview.c:1709

 msgid "No new message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
 msgid "No new message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1711
+#: src/summaryview.c:1729

 msgid "No new messages."
 msgstr "没有新邮件"
 
 msgid "No new messages."
 msgstr "没有新邮件"
 

-#: src/summaryview.c:1743
+#: src/summaryview.c:1761

 msgid "No new message found. Go to next folder?"
 msgid "No new message found. Go to next folder?"

-msgstr "没有新邮件。要转到下一个文件夹吗？"
+msgstr "没有新邮件。要转到下一个目录吗？"

 
 

-#: src/summaryview.c:1780 src/summaryview.c:1821
+#: src/summaryview.c:1798 src/summaryview.c:1839

 msgid "No more marked messages"
 msgstr "没有其他已标记邮件"
 
 msgid "No more marked messages"
 msgstr "没有其他已标记邮件"
 

-#: src/summaryview.c:1781
+#: src/summaryview.c:1799

 msgid "No marked message found. Search from the end?"
 msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
 
 msgid "No marked message found. Search from the end?"
 msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1790
+#: src/summaryview.c:1808

 msgid "No marked messages."
 msgstr "没有已标记邮件"
 
 msgid "No marked messages."
 msgstr "没有已标记邮件"
 

-#: src/summaryview.c:1822
+#: src/summaryview.c:1840

 msgid "No marked message found. Go to next folder?"
 msgid "No marked message found. Go to next folder?"

-msgstr "没有已标记的新邮件。要转到下一个文件夹吗？"
+msgstr "没有已标记的新邮件。要转到下一个目录吗？"

 
 

-#: src/summaryview.c:1859 src/summaryview.c:1884
+#: src/summaryview.c:1877 src/summaryview.c:1902

 msgid "No more labeled messages"
 msgstr "没有已标记颜色之邮件"
 
 msgid "No more labeled messages"
 msgstr "没有已标记颜色之邮件"
 

-#: src/summaryview.c:1860
+#: src/summaryview.c:1878

 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1869 src/summaryview.c:1894
+#: src/summaryview.c:1887 src/summaryview.c:1912

 msgid "No labeled messages."
 msgstr "没有已标记颜色之邮件"
 
 msgid "No labeled messages."
 msgstr "没有已标记颜色之邮件"
 

-#: src/summaryview.c:1885
+#: src/summaryview.c:1903

 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
 

-#: src/summaryview.c:2176
+#: src/summaryview.c:2194

 msgid "Attracting messages by subject..."
 msgstr "正在按主题排列邮件邮件..."
 
 msgid "Attracting messages by subject..."
 msgstr "正在按主题排列邮件邮件..."
 

-#: src/summaryview.c:2334
+#: src/summaryview.c:2352

 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 

-#: src/summaryview.c:2338
+#: src/summaryview.c:2356

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 封已移动"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 封已移动"
 

-#: src/summaryview.c:2339 src/summaryview.c:2346
+#: src/summaryview.c:2357 src/summaryview.c:2364

 msgid ", "
 msgstr "，"
 
 msgid ", "
 msgstr "，"
 

-#: src/summaryview.c:2344
+#: src/summaryview.c:2362

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已复制"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已复制"
 

-#: src/summaryview.c:2359
+#: src/summaryview.c:2377

 msgid " item selected"
 msgstr "封已选择"
 
 msgid " item selected"
 msgstr "封已选择"
 

-#: src/summaryview.c:2361
+#: src/summaryview.c:2379

 msgid " items selected"
 msgstr "封已选择"
 
 msgid " items selected"
 msgstr "封已选择"
 

-#: src/summaryview.c:2377
+#: src/summaryview.c:2395

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 

-#: src/summaryview.c:2586
+#: src/summaryview.c:2604

 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 
 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 

-#: src/summaryview.c:2667
+#: src/summaryview.c:2685

 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 
 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 

-#: src/summaryview.c:2845
+#: src/summaryview.c:2863

 msgid "(No Date)"
 msgstr "(没有日期)"
 
 msgid "(No Date)"
 msgstr "(没有日期)"
 

-#: src/summaryview.c:2883
+#: src/summaryview.c:2901

 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 
 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 

-#: src/summaryview.c:3725
+#: src/summaryview.c:3743

 msgid "You're not the author of the article.\n"
 msgstr "你不是这篇文章的作者。\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "你不是这篇文章的作者。\n"
 

-#: src/summaryview.c:3814
+#: src/summaryview.c:3832

 msgid "Do you really want to delete the selected message?"
 msgid "Do you really want to delete the selected message?"

-msgstr "确定删除选定的邮件吗？"
+msgstr "确实要删除选定的邮件吗？"
+
+#: src/summaryview.c:3835
+#, c-format
+msgid "Do you really want to delete the %d selected messages?"
+msgstr "确定要删除选定的%d封邮件吗？"

 
 

-#: src/summaryview.c:3819
+#: src/summaryview.c:3837

 msgid "Delete message(s)"
 msgstr "删除邮件"
 
 msgid "Delete message(s)"
 msgstr "删除邮件"
 

-#: src/summaryview.c:3974
+#: src/summaryview.c:3992

 msgid "Destination is same as current folder."
 msgid "Destination is same as current folder."

-msgstr "目标文件夹与当前文件夹相同"
+msgstr "目标目录与当前目录相同"

 
 

-#: src/summaryview.c:4065
+#: src/summaryview.c:4083

 msgid "Destination to copy is same as current folder."
 msgid "Destination to copy is same as current folder."

-msgstr "目标文件夹与来源文件夹相同"
+msgstr "目标目录与来源目录相同"

 
 

-#: src/summaryview.c:4194
+#: src/summaryview.c:4216

 msgid "Append or Overwrite"
 msgstr "附加或覆盖"
 
 msgid "Append or Overwrite"
 msgstr "附加或覆盖"
 

-#: src/summaryview.c:4195
+#: src/summaryview.c:4217

 msgid "Append or overwrite existing file?"
 msgstr "附加或覆盖文件？"
 
 msgid "Append or overwrite existing file?"
 msgstr "附加或覆盖文件？"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Append"
 msgstr "追加(_A)"
 
 msgid "_Append"
 msgstr "追加(_A)"
 

-#: src/summaryview.c:4196
+#: src/summaryview.c:4218

 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 

-#: src/summaryview.c:4553
+#: src/summaryview.c:4575

 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 
 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 

-#: src/summaryview.c:4772
+#: src/summaryview.c:4794

 msgid "Skip these rules"
 msgstr "忽略这些规则"
 
 msgid "Skip these rules"
 msgstr "忽略这些规则"
 

-#: src/summaryview.c:4775
+#: src/summaryview.c:4797

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "使用这些规则(不管它们属于那个账户)"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "使用这些规则(不管它们属于那个账户)"
 

-#: src/summaryview.c:4778
+#: src/summaryview.c:4800

 msgid "Apply these rules if they apply to the current account"
 msgstr "使用这些规则(如果它们可用于当前账户)"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "使用这些规则(如果它们可用于当前账户)"
 

-#: src/summaryview.c:4807
+#: src/summaryview.c:4829

 msgid "Filtering"
 msgstr "正在过滤邮件..."
 
 msgid "Filtering"
 msgstr "正在过滤邮件..."
 

-#: src/summaryview.c:4808
+#: src/summaryview.c:4830

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -11668,19 +12179,19 @@ msgstr ""
 "有些规则是专属于某个账户的。\n"
 "请选择如何使用它们:"
 
 "有些规则是专属于某个账户的。\n"
 "请选择如何使用它们:"
 

-#: src/summaryview.c:4810
+#: src/summaryview.c:4832

 msgid "_Filter"
 msgstr "过滤(_F)"
 
 msgid "_Filter"
 msgstr "过滤(_F)"
 

-#: src/summaryview.c:4838
+#: src/summaryview.c:4860

 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 
 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 

-#: src/summaryview.c:4912
+#: src/summaryview.c:4934

 msgid "Processing configuration"
 msgstr "过滤处理配置"
 
 msgid "Processing configuration"
 msgstr "过滤处理配置"
 

-#: src/summaryview.c:6399
+#: src/summaryview.c:6439

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11689,45 +12200,45 @@ msgstr ""
 "正则表达式(regexp)错误:\n"
 "%s"
 
 "正则表达式(regexp)错误:\n"
 "%s"
 

-#: src/summaryview.c:6502
+#: src/summaryview.c:6542

 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到邮件夹列表(您有未读邮件)"
 
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到邮件夹列表(您有未读邮件)"
 

-#: src/summaryview.c:6508
+#: src/summaryview.c:6548

 msgid "Go back to the folder list"
 msgstr "回到邮件夹列表"
 
 msgid "Go back to the folder list"
 msgstr "回到邮件夹列表"
 

-#: src/textview.c:220
+#: src/textview.c:218

 msgid "/Compose _new message"
 msgstr "/撰写新邮件(_n)"
 
 msgid "/Compose _new message"
 msgstr "/撰写新邮件(_n)"
 

-#: src/textview.c:221
+#: src/textview.c:219

 msgid "/Add to _address book"
 msgstr "/将地址加入地址簿(_a)"
 
 msgid "/Add to _address book"
 msgstr "/将地址加入地址簿(_a)"
 

-#: src/textview.c:222
+#: src/textview.c:220

 msgid "/Copy this add_ress"
 msgstr "/复制此地址(_r)"
 
 msgid "/Copy this add_ress"
 msgstr "/复制此地址(_r)"
 

-#: src/textview.c:227
+#: src/textview.c:225

 msgid "/_Open image"
 msgstr "/打开图片(_O)"
 
 msgid "/_Open image"
 msgstr "/打开图片(_O)"
 

-#: src/textview.c:228
+#: src/textview.c:226

 msgid "/_Save image..."
 msgstr "/保存图片(_S)..."
 
 msgid "/_Save image..."
 msgstr "/保存图片(_S)..."
 

-#: src/textview.c:637
+#: src/textview.c:635

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s %s (%d字节)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s %s (%d字节)]"
 

-#: src/textview.c:640
+#: src/textview.c:638

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d字节)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d字节)]"
 

-#: src/textview.c:811
+#: src/textview.c:809

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11741,79 +12252,79 @@ msgstr ""
 "\n"
 "  可用'工具'菜单中的 "
 
 "\n"
 "  可用'工具'菜单中的 "
 

-#: src/textview.c:816
+#: src/textview.c:814

 msgid "'View Log'"
 msgstr "查看日志文件"
 
 msgid "'View Log'"
 msgstr "查看日志文件"
 

-#: src/textview.c:817
+#: src/textview.c:815

 msgid " in the Tools menu for more information."
 msgstr "一项了解更多信息。"
 
 msgid " in the Tools menu for more information."
 msgstr "一项了解更多信息。"
 

-#: src/textview.c:838
+#: src/textview.c:836

 msgid "  The following can be performed on this part by\n"
 msgstr "  可对该部分执行以下操作\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  可对该部分执行以下操作\n"
 

-#: src/textview.c:839
+#: src/textview.c:837

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  右键点击图标或者列表项:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  右键点击图标或者列表项:\n"
 

-#: src/textview.c:841
+#: src/textview.c:839

 msgid "     - To save, select "
 msgstr "     - 若要保存，请选择"
 
 msgid "     - To save, select "
 msgstr "     - 若要保存，请选择"
 

-#: src/textview.c:842
+#: src/textview.c:840

 msgid "'Save as...'"
 msgstr "另存为..."
 
 msgid "'Save as...'"
 msgstr "另存为..."
 

-#: src/textview.c:843
+#: src/textview.c:841

 msgid " (Shortcut key: 'y')\n"
 msgstr " (快捷键: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (快捷键: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:842

 msgid "     - To display as text, select "
 msgstr "     - 若要以文本方式显示，请选择 "
 
 msgid "     - To display as text, select "
 msgstr "     - 若要以文本方式显示，请选择 "
 

-#: src/textview.c:845
+#: src/textview.c:843

 msgid "'Display as text'"
 msgstr "'以文本方式显示'"
 
 msgid "'Display as text'"
 msgstr "'以文本方式显示'"
 

-#: src/textview.c:846
+#: src/textview.c:844

 msgid " (Shortcut key: 't')\n"
 msgstr " (快捷键: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (快捷键: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:845

 msgid "     - To open with an external program, select "
 msgstr "    - 若要用外部程序打开，请选择"
 
 msgid "     - To open with an external program, select "
 msgstr "    - 若要用外部程序打开，请选择"
 

-#: src/textview.c:848
+#: src/textview.c:846

 msgid "'Open'"
 msgstr "'打开'"
 
 msgid "'Open'"
 msgstr "'打开'"
 

-#: src/textview.c:849
+#: src/textview.c:847

 msgid " (Shortcut key: 'l')\n"
 msgstr " (快捷键: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (快捷键: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:848

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (也可以双击或者点击),"
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (也可以双击或者点击),"
 

-#: src/textview.c:851
+#: src/textview.c:849

 msgid "mouse button)\n"
 msgstr "鼠标中键)\n"
 
 msgid "mouse button)\n"
 msgstr "鼠标中键)\n"
 

-#: src/textview.c:852
+#: src/textview.c:850

 msgid "     - Or use "
 msgstr "     - 或者采用"
 
 msgid "     - Or use "
 msgstr "     - 或者采用"
 

-#: src/textview.c:853
+#: src/textview.c:851

 msgid "'Open with...'"
 msgstr "'打开方式...'"
 
 msgid "'Open with...'"
 msgstr "'打开方式...'"
 

-#: src/textview.c:854
+#: src/textview.c:852

 msgid " (Shortcut key: 'o')\n"
 msgstr " (快捷键: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (快捷键: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:941

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -11824,7 +12335,7 @@ msgstr ""
 "    %s\n"
 "程序退出码 %d\n"
 
 "    %s\n"
 "程序退出码 %d\n"
 

-#: src/textview.c:2498
+#: src/textview.c:2509

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -11843,243 +12354,243 @@ msgstr ""
 "\n"
 "真的要打开吗?"
 
 "\n"
 "真的要打开吗?"
 

-#: src/textview.c:2507
+#: src/textview.c:2518

 msgid "Phishing attempt warning"
 msgstr "钓鱼企图警告"
 
 msgid "Phishing attempt warning"
 msgstr "钓鱼企图警告"
 

-#: src/textview.c:2508
+#: src/textview.c:2519

 msgid "_Open URL"
 msgstr "打开(_O)"
 
 msgid "_Open URL"
 msgstr "打开(_O)"
 

-#: src/toolbar.c:171 src/toolbar.c:1637
+#: src/toolbar.c:172 src/toolbar.c:1646

 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 
 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 

-#: src/toolbar.c:172 src/toolbar.c:1651
+#: src/toolbar.c:173 src/toolbar.c:1660

 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 
 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 

-#: src/toolbar.c:173 src/toolbar.c:1657
+#: src/toolbar.c:174 src/toolbar.c:1666

 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 
 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 

-#: src/toolbar.c:174 src/toolbar.c:1682
+#: src/toolbar.c:175 src/toolbar.c:1691

 msgid "Compose Email"
 msgstr "写信"
 
 msgid "Compose Email"
 msgstr "写信"
 

-#: src/toolbar.c:175 src/toolbar.c:1686
+#: src/toolbar.c:176 src/toolbar.c:1695

 msgid "Compose News"
 msgstr "撰写文章"
 
 msgid "Compose News"
 msgstr "撰写文章"
 

-#: src/toolbar.c:176 src/toolbar.c:1728 src/toolbar.c:1738
+#: src/toolbar.c:177 src/toolbar.c:1737 src/toolbar.c:1747

 msgid "Reply to Message"
 msgstr "回应原文"
 
 msgid "Reply to Message"
 msgstr "回应原文"
 

-#: src/toolbar.c:177 src/toolbar.c:1745 src/toolbar.c:1755
+#: src/toolbar.c:178 src/toolbar.c:1754 src/toolbar.c:1764

 msgid "Reply to Sender"
 msgstr "回复给发信人"
 
 msgid "Reply to Sender"
 msgstr "回复给发信人"
 

-#: src/toolbar.c:178 src/toolbar.c:1762 src/toolbar.c:1772
+#: src/toolbar.c:179 src/toolbar.c:1771 src/toolbar.c:1781

 msgid "Reply to All"
 msgstr "回复给所有人"
 
 msgid "Reply to All"
 msgstr "回复给所有人"
 

-#: src/toolbar.c:179 src/toolbar.c:1779 src/toolbar.c:1789
+#: src/toolbar.c:180 src/toolbar.c:1788 src/toolbar.c:1798

 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 
 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 

-#: src/toolbar.c:180 src/toolbar.c:1669
+#: src/toolbar.c:181 src/toolbar.c:1678

 msgid "Open email"
 msgstr "打开邮件"
 
 msgid "Open email"
 msgstr "打开邮件"
 

-#: src/toolbar.c:181 src/toolbar.c:1796 src/toolbar.c:1806
+#: src/toolbar.c:182 src/toolbar.c:1805 src/toolbar.c:1815

 msgid "Forward Message"
 msgstr "转发邮件"
 
 msgid "Forward Message"
 msgstr "转发邮件"
 

-#: src/toolbar.c:182 src/toolbar.c:1813
+#: src/toolbar.c:183 src/toolbar.c:1822

 msgid "Trash Message"
 msgid "Trash Message"

-msgstr "将邮件转移到垃圾桶"
+msgstr "将邮件移到废件夹"

 
 

-#: src/toolbar.c:183 src/toolbar.c:1819
+#: src/toolbar.c:184 src/toolbar.c:1828

 msgid "Delete Message"
 msgstr "删除邮件"
 
 msgid "Delete Message"
 msgstr "删除邮件"
 

-#: src/toolbar.c:185 src/toolbar.c:1831
+#: src/toolbar.c:186 src/toolbar.c:1840

 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 
 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 

-#: src/toolbar.c:186 src/toolbar.c:1838
+#: src/toolbar.c:187 src/toolbar.c:1847

 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 
 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 

-#: src/toolbar.c:189
+#: src/toolbar.c:190

 msgid "Learn Spam or Ham"
 msgstr "训练识别垃圾邮件的能力"
 
 msgid "Learn Spam or Ham"
 msgstr "训练识别垃圾邮件的能力"
 

-#: src/toolbar.c:190 src/toolbar.c:1631
-msgid "Go to folder list"
-msgstr "转到邮件夹列表"
+#: src/toolbar.c:191
+msgid "Open folder/Go to folder list"
+msgstr "打开邮件夹/转到邮件夹列表"

 
 

-#: src/toolbar.c:192 src/toolbar.c:1847
+#: src/toolbar.c:193 src/toolbar.c:1856

 msgid "Send Message"
 msgstr "发送邮件"
 
 msgid "Send Message"
 msgstr "发送邮件"
 

-#: src/toolbar.c:193 src/toolbar.c:1853
+#: src/toolbar.c:194 src/toolbar.c:1862

 msgid "Put into queue folder and send later"
 msgid "Put into queue folder and send later"

-msgstr "放入待发送文件夹稍后再送"
+msgstr "放入待发送目录稍后再送"

 
 

-#: src/toolbar.c:194 src/toolbar.c:1859
+#: src/toolbar.c:195 src/toolbar.c:1868

 msgid "Save to draft folder"
 msgid "Save to draft folder"

-msgstr "存入草稿文件夹"
+msgstr "存入草稿目录"

 
 

-#: src/toolbar.c:195 src/toolbar.c:1865
+#: src/toolbar.c:196 src/toolbar.c:1874

 msgid "Insert file"
 msgstr "插入文件"
 
 msgid "Insert file"
 msgstr "插入文件"
 

-#: src/toolbar.c:196 src/toolbar.c:1871
+#: src/toolbar.c:197 src/toolbar.c:1880

 msgid "Attach file"
 msgstr "附加文件"
 
 msgid "Attach file"
 msgstr "附加文件"
 

-#: src/toolbar.c:197 src/toolbar.c:1877
+#: src/toolbar.c:198 src/toolbar.c:1886

 msgid "Insert signature"
 msgstr "插入签名"
 
 msgid "Insert signature"
 msgstr "插入签名"
 

-#: src/toolbar.c:198 src/toolbar.c:1883
+#: src/toolbar.c:199 src/toolbar.c:1892

 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 
 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 

-#: src/toolbar.c:199 src/toolbar.c:1889
+#: src/toolbar.c:200 src/toolbar.c:1898

 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 

-#: src/toolbar.c:200 src/toolbar.c:1895
+#: src/toolbar.c:201 src/toolbar.c:1904

 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 
 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 

-#: src/toolbar.c:203 src/toolbar.c:1908
+#: src/toolbar.c:204 src/toolbar.c:1917

 msgid "Check spelling"
 msgstr "检查拼写"
 
 msgid "Check spelling"
 msgstr "检查拼写"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:206

 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail 动作特性"
 
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail 动作特性"
 

-#: src/toolbar.c:206 src/toolbar.c:1931
+#: src/toolbar.c:207 src/toolbar.c:1940

 msgid "Cancel receiving"
 msgstr "取消收信"
 
 msgid "Cancel receiving"
 msgstr "取消收信"
 

-#: src/toolbar.c:207 src/toolbar.c:1663
+#: src/toolbar.c:208 src/toolbar.c:1672

 msgid "Close window"
 msgstr "关闭窗口"
 
 msgid "Close window"
 msgstr "关闭窗口"
 

-#: src/toolbar.c:227
+#: src/toolbar.c:228

 msgid "/Reply with _quote"
 msgstr "/回信时引用原文(_q)"
 
 msgid "/Reply with _quote"
 msgstr "/回信时引用原文(_q)"
 

-#: src/toolbar.c:228
+#: src/toolbar.c:229

 msgid "/_Reply without quote"
 msgstr "/回信时不引用原文(_R)"
 
 msgid "/_Reply without quote"
 msgstr "/回信时不引用原文(_R)"
 

-#: src/toolbar.c:232
+#: src/toolbar.c:233

 msgid "/Reply to all with _quote"
 msgstr "/回信给所有人时引用原文(_q)"
 
 msgid "/Reply to all with _quote"
 msgstr "/回信给所有人时引用原文(_q)"
 

-#: src/toolbar.c:233
+#: src/toolbar.c:234

 msgid "/_Reply to all without quote"
 msgstr "/回信给所有人时不引用原文(_R)"
 
 msgid "/_Reply to all without quote"
 msgstr "/回信给所有人时不引用原文(_R)"
 

-#: src/toolbar.c:237
+#: src/toolbar.c:238

 msgid "/Reply to list with _quote"
 msgstr "/回信给列表且引用原文(_q)"
 
 msgid "/Reply to list with _quote"
 msgstr "/回信给列表且引用原文(_q)"
 

-#: src/toolbar.c:238
+#: src/toolbar.c:239

 msgid "/_Reply to list without quote"
 msgstr "/回信到列表不引用原文(_R)"
 
 msgid "/_Reply to list without quote"
 msgstr "/回信到列表不引用原文(_R)"
 

-#: src/toolbar.c:242
+#: src/toolbar.c:243

 msgid "/Reply to sender with _quote"
 msgstr "/回信时引用原文(_q)"
 
 msgid "/Reply to sender with _quote"
 msgstr "/回信时引用原文(_q)"
 

-#: src/toolbar.c:243
+#: src/toolbar.c:244

 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 
 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 

-#: src/toolbar.c:249
+#: src/toolbar.c:250

 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 
 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 

-#: src/toolbar.c:253
+#: src/toolbar.c:254

 msgid "/Learn as _Spam"
 msgstr "/学习垃圾邮件"
 
 msgid "/Learn as _Spam"
 msgstr "/学习垃圾邮件"
 

-#: src/toolbar.c:254
+#: src/toolbar.c:255

 msgid "/Learn as _Ham"
 msgstr "/学习非垃圾邮件"
 
 msgid "/Learn as _Ham"
 msgstr "/学习非垃圾邮件"
 

-#: src/toolbar.c:412
+#: src/toolbar.c:413

 msgid "Get Mail"
 msgstr "收信"
 
 msgid "Get Mail"
 msgstr "收信"
 

-#: src/toolbar.c:416
+#: src/toolbar.c:417

 msgid "Toolbar|Compose"
 msgstr "撰写"
 
 msgid "Toolbar|Compose"
 msgstr "撰写"
 

-#: src/toolbar.c:419
+#: src/toolbar.c:420

 msgid "Open"
 msgstr "打开"
 
 msgid "Open"
 msgstr "打开"
 

-#: src/toolbar.c:421 src/toolbar.c:521
+#: src/toolbar.c:422 src/toolbar.c:522

 msgid "Reply"
 msgstr "回复"
 
 msgid "Reply"
 msgstr "回复"
 

-#: src/toolbar.c:423 src/toolbar.c:522
+#: src/toolbar.c:424 src/toolbar.c:523

 msgid "All"
 msgstr "全部"
 
 msgid "All"
 msgstr "全部"
 

-#: src/toolbar.c:424 src/toolbar.c:523
-msgid "Sender"
-msgstr "发信人"
-
-#: src/toolbar.c:430 src/toolbar.c:528
+#: src/toolbar.c:431 src/toolbar.c:529

 msgid "Spam"
 msgstr "垃圾邮件"
 
 msgid "Spam"
 msgstr "垃圾邮件"
 

-#: src/toolbar.c:433 src/toolbar.c:530
+#: src/toolbar.c:434 src/toolbar.c:531

 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: src/toolbar.c:471
+#: src/toolbar.c:472

 msgid "Send later"
 msgstr "稍后再送"
 
 msgid "Send later"
 msgstr "稍后再送"
 

-#: src/toolbar.c:472
+#: src/toolbar.c:473

 msgid "Draft"
 msgstr "草稿"
 
 msgid "Draft"
 msgstr "草稿"
 

-#: src/toolbar.c:1644
+#: src/toolbar.c:1640
+msgid "Go to folder list"
+msgstr "转到邮件夹列表"
+
+#: src/toolbar.c:1653

 msgid "Receive Mail on selected Account"
 msgstr "收选中帐号的信"
 
 msgid "Receive Mail on selected Account"
 msgstr "收选中帐号的信"
 

-#: src/toolbar.c:1693
+#: src/toolbar.c:1702

 msgid "Compose with selected Account"
 msgstr "以选中帐号撰写邮件"
 
 msgid "Compose with selected Account"
 msgstr "以选中帐号撰写邮件"
 

-#: src/toolbar.c:1699
+#: src/toolbar.c:1708

 msgid "Ham"
 msgstr "非垃圾"
 
 msgid "Ham"
 msgstr "非垃圾"
 

-#: src/toolbar.c:1707
+#: src/toolbar.c:1716

 msgid "Learn Spam"
 msgstr "学习垃圾邮件"
 
 msgid "Learn Spam"
 msgstr "学习垃圾邮件"
 

-#: src/toolbar.c:1711
+#: src/toolbar.c:1720

 msgid "Learn Ham"
 msgstr "学习非垃圾邮件"
 
 msgid "Learn Ham"
 msgstr "学习非垃圾邮件"
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn as..."
 msgstr "学习..."
 
 msgid "Learn as..."
 msgstr "学习..."
 

-#: src/toolbar.c:1721
+#: src/toolbar.c:1730

 msgid "Learn"
 msgstr "学习"
 
 msgid "Learn"
 msgstr "学习"
 


@@ -12377,81 +12888,3 @@ msgstr ""
 "Claws Mail配置完成。\n"
 "\n"
 "点击[保存]开始使用。"
 "Claws Mail配置完成。\n"
 "\n"
 "点击[保存]开始使用。"

-
-#~ msgid "Log Size"
-#~ msgstr "日志大小"
-
-#~ msgid "Really quit?"
-#~ msgstr "确定要退出吗?"
-
-#~ msgid "Composing message exists."
-#~ msgstr "所编辑的文件已经存在。"
-
-#~ msgid "_Save to Draft"
-#~ msgstr "存为草稿(_S)"
-
-#~ msgid "_Discard them"
-#~ msgstr "摈弃(_D)"
-
-#~ msgid "Do_n't quit"
-#~ msgstr "不退出(_n)"
-
-#~ msgid "/_View/Show or hi_de/_Folder tree"
-#~ msgstr "/查看(_V)/显示或隐藏(_d)/文件夹树(_F)"
-
-#~ msgid "/_View/Separate f_older tree"
-#~ msgstr "/查看(_V)/用单独窗口显示文件夹树(_o)"
-
-#~ msgid "/_View/Separate _message view"
-#~ msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
-
-#~ msgid "Claws Mail - Folder View"
-#~ msgstr "Claws Mail - 文件夹"
-
-#~ msgid "Exit this program?"
-#~ msgstr "退出本程序？"
-
-#~ msgid "Default account: "
-#~ msgstr "缺省帐号: "
-
-#~ msgid "Default dictionary: "
-#~ msgstr "缺省字典: "
-
-#~ msgid "Default alternate dictionary: "
-#~ msgstr "缺省的备选字典: "
-
-#~ msgid " Select... "
-#~ msgstr " 选择... "
-
-#~ msgid "Pick color for 1st level text "
-#~ msgstr "选择第一层引文颜色"
-
-#~ msgid "Pick color for 2nd level text "
-#~ msgstr "选择第二层引文颜色"
-
-#~ msgid "Pick color for 3rd level text "
-#~ msgstr "选择第三层引文颜色"
-
-#~ msgid "Pick color for 1st level text background "
-#~ msgstr "选择第一层引文的背景色"
-
-#~ msgid "Pick color for 2nd level text background "
-#~ msgstr "选择第二层引文的背景色"
-
-#~ msgid "Pick color for 3rd level text background "
-#~ msgstr "选择第三层引文的背景色"
-
-#~ msgid "Pick color for links "
-#~ msgstr "选择超级链接的颜色"
-
-#~ msgid "Pick color for signatures "
-#~ msgstr "选择签名颜色"
-
-#~ msgid "not initialized\n"
-#~ msgstr "未初始化\n"
-
-#~ msgid "selecting folder '%s'\n"
-#~ msgstr "选择文件夹: '%s'\n"
-
-#~ msgid "selecting message %d\n"
-#~ msgstr "选择邮件 %d\n"