From 624ade4b3b5441b7df70899ad27bd49ee1dd2f6a Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sun, 22 Jul 2001 12:35:04 +0000
Subject: [PATCH] readying release of 0.5.1claws

---
 ChangeLog.claws       |    9 +
 po/nl.po              | 1526 +++++++++++++++++++++++++++--------------
 src/prefs_filtering.c |   17 +-
 src/prefs_matcher.c   |   28 +-
 4 files changed, 1040 insertions(+), 540 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 592b9253e..652b6418a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2001-07-22 [alfons]
+
+	* po/nl.po
+		update Dutch translation
+
+	* src/prefs_filtering.c, 
+	  src/prefs_matcher.c
+		add more translatable strings		
+
 2001-07-21 [alfons]
 
 	0.5.0claws7
diff --git a/po/nl.po b/po/nl.po
index 7161a8ada..425dbce33 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,14 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.5.0claws2\n"
-"POT-Creation-Date: 2001-07-12 22:11+0200\n"
-"PO-Revision-Date: 2001-07-12 22:44CET\n"
+"POT-Creation-Date: 2001-07-22 14:42+0200\n"
+"PO-Revision-Date: 2001-07-22 14:47+0200\n"
 "Last-Translator: Alfons Hoogervorst <alfons@users.sourceforge.net>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.7.1\n"
 
 #: src/about.c:90
 msgid "About"
@@ -28,9 +27,9 @@ msgid ""
 "\n"
 msgstr ""
 "De delen die toegepast zijn van fetchmail zijn copyright 1997 door Eric S. "
-"Raymond. Delen daarvan zijn ook copyright 1993 en 1995 door Carl Harris."
-"Copyright voorbehouden met het doel de verspreiding van vrije broncode te "
-"beschermen.\n"
+"Raymond. Delen daarvan zijn ook copyright 1993 en 1995 door Carl "
+"Harris.Copyright voorbehouden met het doel de verspreiding van vrije broncode "
+"te beschermen.\n"
 "\n"
 
 #: src/about.c:211
@@ -53,10 +52,9 @@ msgstr ""
 
 #: src/about.c:220
 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 ""
 "Dit programma is vrije software. U kunt het verspreiden en/of aanpassen "
@@ -68,15 +66,15 @@ msgstr ""
 #: src/about.c:226
 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"
+"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 ""
-"Dit programma wordt verspreid in de hoop dat het nuttig is, maar ZONDER "
-"ENIGE GARANTIE. Zelfs zonder de impliciete garantie van VERKOOPWAARDIGHEID "
-"of GESCHIKTHEID VOOR ENIG DOEL. Lees de GNU General Public License voor "
-"verdere details.\n"
+"Dit programma wordt verspreid in de hoop dat het nuttig is, maar ZONDER ENIGE "
+"GARANTIE. Zelfs zonder de impliciete garantie van VERKOOPWAARDIGHEID of "
+"GESCHIKTHEID VOOR ENIG DOEL. Lees de GNU General Public License voor verdere "
+"details.\n"
 "\n"
 
 #: src/about.c:232
@@ -87,17 +85,22 @@ msgid ""
 msgstr ""
 "U zou een kopie van de GNU GPL (General Public License) ontvangen moeten "
 "hebben bij dit programma. Als dit niet het geval is, dan kun u een aanvragen "
-"bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
-"MA 02111-1307, USA."
+"bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA "
+"02111-1307, USA."
 
+#. Button panel
 #: src/about.c:239 src/addressbook.c:1815 src/alertpanel.c:238
-#: src/compose.c:1981 src/compose.c:3721 src/export.c:185 src/foldersel.c:179
-#: src/import.c:189 src/inputdialog.c:160 src/main.c:371 src/main.c:379
+#: src/compose.c:1981 src/compose.c:3723 src/editjpilot.c:340
+#: src/editldap.c:241 src/editldap_basedn.c:212 src/editvcard.c:236
+#: src/export.c:185 src/foldersel.c:179 src/grouplistdialog.c:204
+#: src/import.c:189 src/inputdialog.c:160 src/main.c:357 src/main.c:365
 #: src/mainwindow.c:2000 src/messageview.c:348 src/mimeview.c:717
 #: src/passphrase.c:119 src/prefs.c:475 src/prefs_common.c:1459
 #: src/prefs_common.c:2289 src/prefs_common.c:2557 src/prefs_common.c:2676
-#: src/prefs_display_header.c:206 src/prefs_filter.c:203
-#: src/summaryview.c:2642 src/summaryview.c:3208
+#: src/prefs_customheader.c:165 src/prefs_display_header.c:206
+#: src/prefs_filter.c:203 src/prefs_filtering.c:323 src/prefs_matcher.c:301
+#: src/prefs_matcher.c:1454 src/prefs_scoring.c:199 src/sigstatus.c:134
+#: src/summaryview.c:2732 src/summaryview.c:3297
 msgid "OK"
 msgstr "OK"
 
@@ -122,76 +125,83 @@ msgstr ""
 msgid "Opening account edit window...\n"
 msgstr "Postvak eigenschappen worden geopend...\n"
 
-#: src/account.c:395
+#: src/account.c:389
 msgid "Creating account edit window...\n"
 msgstr "Postvak eigenschappen venster word gemaakt...\n"
 
-#: src/account.c:400
+#: src/account.c:394
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:428 src/addressbook.c:443 src/addressbook.c:1811
-#: src/compose.c:2772 src/mimeview.c:139 src/select-keys.c:301
+#: src/account.c:422 src/addressbook.c:443 src/addressbook.c:1811
+#: src/compose.c:2774 src/editjpilot.c:291 src/editldap.c:296
+#: src/editvcard.c:207 src/mimeview.c:139 src/select-keys.c:301
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:429 src/prefs_account.c:726
+#: src/account.c:423 src/prefs_account.c:726
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:430
+#: src/account.c:424
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:452 src/addressbook.c:578 src/prefs_display_header.c:290
-#: src/prefs_display_header.c:345
+#: src/account.c:446 src/addressbook.c:578 src/prefs_customheader.c:243
+#: src/prefs_display_header.c:290 src/prefs_display_header.c:345
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/account.c:458
+#: src/account.c:452
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/account.c:464
+#: src/account.c:458 src/prefs_customheader.c:250
 msgid " Delete "
 msgstr "Verwijderen"
 
-#: src/account.c:470 src/prefs_display_header.c:309 src/prefs_filter.c:453
+#: src/account.c:464 src/prefs_customheader.c:297
+#: src/prefs_display_header.c:309 src/prefs_filter.c:453
+#: src/prefs_filtering.c:569 src/prefs_matcher.c:572 src/prefs_scoring.c:330
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/account.c:476 src/prefs_display_header.c:303 src/prefs_filter.c:447
+#: src/account.c:470 src/prefs_customheader.c:291
+#: src/prefs_display_header.c:303 src/prefs_filter.c:447
+#: src/prefs_filtering.c:563 src/prefs_matcher.c:566 src/prefs_scoring.c:324
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/account.c:490
+#: src/account.c:484
 msgid " Set as usually used account "
 msgstr "Instellen als hoofdaccount"
 
-#: src/account.c:496 src/prefs_common.c:3012 src/summary_search.c:192
+#: src/account.c:490 src/prefs_common.c:3012 src/summary_search.c:192
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/account.c:550
+#: src/account.c:544
 msgid "Delete account"
 msgstr "Verwijder Postvak"
 
-#: src/account.c:551
+#: src/account.c:545
 msgid "Do you really want to delete this account?"
 msgstr "Wilt u werkelijk dit postvak verwijderen?"
 
-#: src/account.c:552 src/addressbook.c:785 src/addressbook.c:1746
-#: src/compose.c:3895 src/folderview.c:1706 src/folderview.c:1749
-#: src/folderview.c:1848 src/folderview.c:1893 src/folderview.c:1991
-#: src/folderview.c:2024 src/mainwindow.c:1026 src/messageview.c:417
-#: src/prefs_filter.c:736 src/summary_search.c:297 src/summaryview.c:790
-#: src/summaryview.c:1119 src/summaryview.c:1145 src/summaryview.c:1175
+#: src/account.c:546 src/addressbook.c:785 src/addressbook.c:1746
+#: src/compose.c:3897 src/folderview.c:1704 src/folderview.c:1747
+#: src/folderview.c:1846 src/folderview.c:1891 src/folderview.c:1989
+#: src/folderview.c:2022 src/mainwindow.c:1026 src/messageview.c:417
+#: src/prefs_customheader.c:546 src/prefs_filter.c:736
+#: src/prefs_filtering.c:836 src/prefs_scoring.c:646 src/summary_search.c:297
+#: src/summaryview.c:879 src/summaryview.c:1215 src/summaryview.c:1241
+#: src/summaryview.c:1271
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:552 src/compose.c:3895 src/folderview.c:1706
-#: src/folderview.c:1749 src/folderview.c:1848 src/folderview.c:1893
-#: src/folderview.c:1991 src/folderview.c:2024
+#: src/account.c:546 src/compose.c:3897 src/folderview.c:1704
+#: src/folderview.c:1747 src/folderview.c:1846 src/folderview.c:1891
+#: src/folderview.c:1989 src/folderview.c:2022
 msgid "+No"
 msgstr "+Nee"
 
@@ -200,7 +210,6 @@ msgid "/_File"
 msgstr "/_Bestand"
 
 #: src/addressbook.c:337
-#, fuzzy
 msgid "/_File/New _Address"
 msgstr "/_Bestand/Nieuw adres"
 
@@ -209,7 +218,6 @@ msgid "/_File/New _Group"
 msgstr "/_Bestand/Nieuwe groep"
 
 #: src/addressbook.c:339
-#, fuzzy
 msgid "/_File/New _Folder"
 msgstr "/_Bestand/Nieuwe map"
 
@@ -251,17 +259,14 @@ msgid "/_Help/_About"
 msgstr "/_Help/_Info"
 
 #: src/addressbook.c:358 src/addressbook.c:375
-#, fuzzy
 msgid "/New _Address"
 msgstr "/Nieuw adres"
 
 #: src/addressbook.c:359 src/addressbook.c:376
-#, fuzzy
 msgid "/New _Group"
 msgstr "/Nieuwe groep"
 
 #: src/addressbook.c:360 src/addressbook.c:377
-#, fuzzy
 msgid "/New _Folder"
 msgstr "/Nieuwe map"
 
@@ -280,8 +285,8 @@ msgstr "Nieuwe Server"
 #: src/addressbook.c:368 src/addressbook.c:378 src/compose.c:395
 #: src/folderview.c:219 src/folderview.c:221 src/folderview.c:231
 #: src/folderview.c:234 src/folderview.c:244 src/folderview.c:247
-#: src/folderview.c:257 src/folderview.c:259 src/summaryview.c:343
-#: src/summaryview.c:351 src/summaryview.c:356 src/summaryview.c:359
+#: src/folderview.c:257 src/folderview.c:259 src/summaryview.c:340
+#: src/summaryview.c:348 src/summaryview.c:353 src/summaryview.c:356
 msgid "/---"
 msgstr "/---"
 
@@ -290,7 +295,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:370 src/addressbook.c:380 src/summaryview.c:321
+#: src/addressbook.c:370 src/addressbook.c:380 src/summaryview.c:326
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
@@ -302,7 +307,7 @@ msgstr "E-Mail adres"
 msgid "Remarks"
 msgstr "Opmerkingen"
 
-#: src/addressbook.c:454 src/compose.c:3367
+#: src/addressbook.c:454 src/compose.c:3369
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -312,7 +317,8 @@ msgstr "Naam:"
 
 #: src/addressbook.c:575 src/addressbook.c:1746 src/mainwindow.c:1644
 #: src/prefs_display_header.c:296 src/prefs_display_header.c:352
-#: src/prefs_filter.c:413
+#: src/prefs_filter.c:413 src/prefs_filtering.c:218 src/prefs_filtering.c:529
+#: src/prefs_matcher.c:503 src/prefs_scoring.c:290
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -361,23 +367,24 @@ msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen echt verwijderen?"
 
 #: src/addressbook.c:785 src/addressbook.c:1746 src/mainwindow.c:1026
-#: src/messageview.c:417 src/prefs_filter.c:736 src/summary_search.c:297
-#: src/summaryview.c:790 src/summaryview.c:1119 src/summaryview.c:1145
-#: src/summaryview.c:1175
+#: src/messageview.c:417 src/prefs_customheader.c:546 src/prefs_filter.c:736
+#: src/prefs_filtering.c:836 src/prefs_scoring.c:646 src/summary_search.c:297
+#: src/summaryview.c:879 src/summaryview.c:1215 src/summaryview.c:1241
+#: src/summaryview.c:1271
 msgid "No"
 msgstr "Nee"
 
-#: src/addressbook.c:1469 src/folderview.c:1479 src/folderview.c:1536
-#: src/folderview.c:1780
+#: src/addressbook.c:1469 src/folderview.c:1477 src/folderview.c:1534
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/addressbook.c:1470 src/folderview.c:1480 src/folderview.c:1537
+#: src/addressbook.c:1470 src/folderview.c:1478 src/folderview.c:1535
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
-#: src/addressbook.c:1471 src/folderview.c:1481 src/folderview.c:1538
-#: src/folderview.c:1784
+#: src/addressbook.c:1471 src/folderview.c:1479 src/folderview.c:1536
+#: src/folderview.c:1782
 msgid "NewFolder"
 msgstr "NieuweMap"
 
@@ -423,18 +430,21 @@ msgstr "Wilt u '%s' echt verwijderen?"
 msgid "Edit address"
 msgstr "Adres aanpassen"
 
-#: src/addressbook.c:1812 src/compose.c:3366 src/select-keys.c:302
+#: src/addressbook.c:1812 src/compose.c:3368 src/select-keys.c:302
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressbook.c:1816 src/compose.c:1981 src/compose.c:3722
-#: src/compose.c:4385 src/export.c:186 src/foldersel.c:180 src/import.c:190
-#: src/inputdialog.c:161 src/main.c:371 src/main.c:379 src/mainwindow.c:2000
+#: src/addressbook.c:1816 src/compose.c:1981 src/compose.c:3724
+#: src/compose.c:4387 src/editjpilot.c:341 src/editldap.c:242
+#: src/editldap_basedn.c:213 src/editvcard.c:237 src/export.c:186
+#: src/foldersel.c:180 src/grouplistdialog.c:205 src/import.c:190
+#: src/inputdialog.c:161 src/main.c:357 src/main.c:365 src/mainwindow.c:2000
 #: src/messageview.c:348 src/mimeview.c:717 src/passphrase.c:123
 #: src/prefs.c:476 src/prefs_common.c:1460 src/prefs_common.c:2677
-#: src/prefs_display_header.c:207 src/prefs_filter.c:204
-#: src/progressdialog.c:77 src/select-keys.c:326 src/summaryview.c:790
-#: src/summaryview.c:2642 src/summaryview.c:3208
+#: src/prefs_customheader.c:166 src/prefs_display_header.c:207
+#: src/prefs_filter.c:204 src/prefs_filtering.c:324 src/prefs_matcher.c:302
+#: src/prefs_scoring.c:200 src/progressdialog.c:77 src/select-keys.c:326
+#: src/summaryview.c:879 src/summaryview.c:2732 src/summaryview.c:3297
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -448,11 +458,11 @@ msgid "%s doesn't exist.\n"
 msgstr "%s bestaat niet.\n"
 
 #: src/addressbook.c:2201 src/addressbook.c:2593 src/imap.c:1211
-#: src/imap.c:1230 src/mainwindow.c:721 src/mainwindow.c:1423 src/mh.c:869
-#: src/mh.c:876 src/news.c:662 src/procmsg.c:259 src/procmsg.c:326
-#: src/summaryview.c:1405 src/summaryview.c:1625 src/summaryview.c:1824
-#: src/summaryview.c:1900 src/summaryview.c:2421 src/summaryview.c:2919
-#: src/summaryview.c:2942 src/summaryview.c:2963 src/summaryview.c:3084
+#: src/imap.c:1230 src/mainwindow.c:721 src/mainwindow.c:1423 src/mh.c:871
+#: src/mh.c:878 src/news.c:749 src/procmsg.c:261 src/procmsg.c:325
+#: src/summaryview.c:1501 src/summaryview.c:1721 src/summaryview.c:1920
+#: src/summaryview.c:1996 src/summaryview.c:2518 src/summaryview.c:3008
+#: src/summaryview.c:3031 src/summaryview.c:3052 src/summaryview.c:3173
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -472,7 +482,22 @@ msgstr "Persoonlijke adressen"
 msgid "Common addresses"
 msgstr "Algemene adressen"
 
-#: src/alertpanel.c:119 src/compose.c:3895 src/main.c:369
+#: src/addr_compl.c:219
+#, c-format
+msgid "%s%d entering read_address_book\n"
+msgstr "%s%d adress boek wordt gelezen\n"
+
+#: src/addr_compl.c:224
+#, c-format
+msgid "%s(%d) no addressbook\n"
+msgstr "%s(%d) geen adresboek\n"
+
+#: src/addr_compl.c:242
+#, c-format
+msgid "%s(%d) leaving read_address_book - OK\n"
+msgstr "%s(%d)·leaving·read_address_book·-·OK\n"
+
+#: src/alertpanel.c:119 src/compose.c:3897 src/main.c:355
 msgid "Notice"
 msgstr "Bericht"
 
@@ -480,7 +505,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:145 src/inc.c:434
+#: src/alertpanel.c:145 src/inc.c:452
 msgid "Error"
 msgstr "Fout"
 
@@ -627,54 +652,56 @@ msgstr "/_Gereedschap/Lineaal weergeven"
 msgid "/_Tool/_Address book"
 msgstr "/_Gereedschap/Adresboek"
 
-#: src/compose.c:604 src/compose.c:917 src/compose.c:1037 src/procmsg.c:695
+#: quote_fmt_parse.y:268 quote_fmt_parse.y:280 quote_fmt_parse.y:294
+#: quote_fmt_parse.y:308 src/compose.c:603 src/compose.c:915
+#: src/compose.c:1035 src/procmsg.c:693
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:686 src/mimeview.c:415
+#: src/compose.c:685 src/mimeview.c:415
 msgid "Can't get the part of multipart message."
 msgstr "Kan deel van een bericht niet ophalen"
 
-#: src/compose.c:906 src/compose.c:990
+#: src/compose.c:904 src/compose.c:988
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1676 src/compose.c:1726
+#: src/compose.c:1674 src/compose.c:1724
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1680 src/compose.c:1730
+#: src/compose.c:1678 src/compose.c:1728
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1684 src/compose.c:1734
+#: src/compose.c:1682 src/compose.c:1732
 #, c-format
 msgid "File %s is empty\n"
 msgstr "Bestand %s is leeg\n"
 
-#: src/compose.c:1704 src/compose.c:1755
+#: src/compose.c:1702 src/compose.c:1753
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1853
+#: src/compose.c:1851
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:1855
+#: src/compose.c:1853
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:1858
+#: src/compose.c:1856
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:1882
+#: src/compose.c:1880
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -682,11 +709,11 @@ msgstr ""
 "Geen postvak opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een postvak."
 
-#: src/compose.c:1907 src/compose.c:4262
+#: src/compose.c:1905 src/compose.c:4264
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:1925
+#: src/compose.c:1923
 msgid "can't get recipient list."
 msgstr "fout in lijst met geadresseerden."
 
@@ -707,7 +734,7 @@ msgstr ""
 "Er is een fout opgetreden bij het verzenden.\n"
 "Wilt u het bericht in de wachtrij plaatsen?"
 
-#: src/compose.c:1985 src/compose.c:4274
+#: src/compose.c:1985 src/compose.c:4276
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
@@ -715,12 +742,14 @@ msgstr "Kan bericht niet in de wachtrij plaatsen."
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/compose.c:1995 src/compose.c:4281
+#: src/compose.c:1995 src/compose.c:4283
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2021 src/compose.c:2142 src/compose.c:2232
-#: src/messageview.c:199 src/messageview.c:303 src/utils.c:1630
+#: src/compose.c:2021 src/compose.c:2142 src/compose.c:2233
+#: src/mbox_folder.c:1267 src/mbox_folder.c:1369 src/mbox_folder.c:1940
+#: src/mbox_folder.c:1971 src/mbox_folder.c:2034 src/mbox_folder.c:2067
+#: src/messageview.c:199 src/messageview.c:303 src/utils.c:1641
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
@@ -740,140 +769,140 @@ msgstr "verzonden bericht wordt opgeslagen...\n"
 msgid "can't save message\n"
 msgstr "kan bericht niet opslaan\n"
 
-#: src/compose.c:2189 src/compose.c:2299 src/messageview.c:261
+#: src/compose.c:2189 src/compose.c:2300 src/messageview.c:261
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:2212 src/messageview.c:180
+#: src/compose.c:2213 src/messageview.c:180
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:2290 src/messageview.c:252
+#: src/compose.c:2291 src/messageview.c:252
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:2328
+#: src/compose.c:2330
 #, c-format
 msgid "Can't open file %s\n"
 msgstr "Kan bestand niet openen %s\n"
 
-#: src/compose.c:2698
+#: src/compose.c:2700
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:2772 src/compose.c:3668
+#: src/compose.c:2774 src/compose.c:3670
 msgid "MIME type"
 msgstr "MIME type"
 
-#: src/compose.c:2772 src/mimeview.c:139 src/prefs_common.c:2671
-#: src/select-keys.c:299 src/summaryview.c:495
+#: src/compose.c:2774 src/mimeview.c:139 src/prefs_common.c:2671
+#: src/select-keys.c:299 src/summaryview.c:582
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:2789
+#: src/compose.c:2791
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:2835 src/headerview.c:54 src/summary_search.c:145
+#: src/compose.c:2837 src/headerview.c:54 src/summary_search.c:145
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3293 src/mainwindow.c:1507 src/prefs_account.c:568
+#: src/compose.c:3295 src/mainwindow.c:1507 src/prefs_account.c:568
 #: src/prefs_common.c:713
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3294
+#: src/compose.c:3296
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:3301
+#: src/compose.c:3303
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:3302
+#: src/compose.c:3304
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:3309 src/folderview.c:813
+#: src/compose.c:3311 src/folderview.c:813
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:3310
+#: src/compose.c:3312
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:3319
+#: src/compose.c:3321
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:3320
+#: src/compose.c:3322
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:3327
+#: src/compose.c:3329
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:3328
+#: src/compose.c:3330
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/compose.c:3337 src/prefs_common.c:1146
+#: src/compose.c:3339 src/prefs_common.c:1146
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:3338
+#: src/compose.c:3340
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:3346
+#: src/compose.c:3348
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:3347
+#: src/compose.c:3349
 msgid "Edit with external editor"
 msgstr "Aanpassen met externe editor"
 
-#: src/compose.c:3355
+#: src/compose.c:3357
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:3356
+#: src/compose.c:3358
 msgid "Wrap long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:3563
+#: src/compose.c:3565
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:3581
+#: src/compose.c:3583
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:3650
+#: src/compose.c:3652
 msgid "Property"
 msgstr "Eigenschap"
 
-#: src/compose.c:3695
+#: src/compose.c:3697
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:3718
+#: src/compose.c:3720
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:3719
+#: src/compose.c:3721
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:3866
+#: src/compose.c:3868
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:3892
+#: src/compose.c:3894
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -884,65 +913,193 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:3905
+#: src/compose.c:3907
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:3906
+#: src/compose.c:3908
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:3930
+#: src/compose.c:3932
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
 #. failed
-#: src/compose.c:3963
+#: src/compose.c:3965
 msgid "Couldn't exec external editor\n"
 msgstr "Kon de externe editor niet aanroepen\n"
 
-#: src/compose.c:3967
+#: src/compose.c:3969
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:3969
+#: src/compose.c:3971
 msgid "Pipe read failed\n"
 msgstr "Leesfout pipe\n"
 
-#: src/compose.c:4303
+#: src/compose.c:4305
 msgid "can't remove the old draft message\n"
 msgstr "kan het oude kladbericht niet verwijderen\n"
 
-#: src/compose.c:4331 src/compose.c:4351
+#: src/compose.c:4333 src/compose.c:4353
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:4383
+#: src/compose.c:4385
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:4384
+#: src/compose.c:4386
 msgid "This message has been modified. discard it?"
 msgstr "Bericht is gewijzigd, weggooien?"
 
-#: src/compose.c:4385
+#: src/compose.c:4387
 msgid "Discard"
 msgstr "Gooi weg"
 
-#: src/compose.c:4385
+#: src/compose.c:4387
 msgid "to Draft"
 msgstr "opslaan als klad"
 
-#: src/compose.c:4791
+#: src/compose.c:4793
 msgid "Quote mark format error."
 msgstr "Fout in citaatformaat."
 
-#: src/compose.c:4805
+#: src/compose.c:4807
 msgid "Message reply/forward format error."
 msgstr "Fout in formaat beantwoorden/doorsturen."
 
+#: src/editjpilot.c:185
+msgid "File does not appear to be JPilot format."
+msgstr "Bestand heeft geen JPilot formaat"
+
+#: src/editjpilot.c:188 src/editvcard.c:96
+msgid "Could not read file."
+msgstr "Kon bestand niet lezen."
+
+#: src/editjpilot.c:221
+msgid "Select JPilot File"
+msgstr "Selecteer JPilot-bestand"
+
+#: src/editjpilot.c:269 src/editjpilot.c:394
+msgid "Edit JPilot Entry"
+msgstr "Wijzig JPilot"
+
+#: src/editjpilot.c:298 src/editvcard.c:214
+msgid " Check File "
+msgstr " Controleer bestand"
+
+#: src/editjpilot.c:303 src/editvcard.c:219
+msgid "File"
+msgstr "Bestand"
+
+#: src/editjpilot.c:310 src/editldap.c:338 src/editvcard.c:226
+msgid " ... "
+msgstr " ... "
+
+#: src/editjpilot.c:315
+msgid "Additional e-Mail address item(s)"
+msgstr "Andere email-adres(sen)"
+
+#: src/editjpilot.c:401
+msgid "Add New JPilot Entry"
+msgstr "Nieuwe JPilot invoer"
+
+#: src/editldap.c:162
+msgid "Connected successfully to server"
+msgstr "Verbonden met server"
+
+#: src/editldap.c:165 src/editldap_basedn.c:291
+msgid "Could not connect to server"
+msgstr "Geen verbinding met server"
+
+#: src/editldap.c:213 src/editldap.c:528
+msgid "Edit LDAP Server"
+msgstr "Wijzig LDAP server"
+
+#: src/editldap.c:305 src/editldap_basedn.c:161
+msgid "Hostname"
+msgstr "Hostnaam"
+
+#: src/editldap.c:314 src/editldap_basedn.c:171
+msgid "Port"
+msgstr "Poort"
+
+#: src/editldap.c:326
+msgid " Check Server "
+msgstr " Controleer server "
+
+#: src/editldap.c:331 src/editldap_basedn.c:181
+msgid "Search Base"
+msgstr "Zoek base"
+
+#: src/editldap.c:388
+msgid "Search Criteria"
+msgstr "Zoekcriteria"
+
+#: src/editldap.c:395
+msgid " Reset "
+msgstr " Opnieuw "
+
+#: src/editldap.c:400
+msgid "Bind DN"
+msgstr "Bind DN"
+
+#: src/editldap.c:409
+msgid "Bind Password"
+msgstr "Wachtwoord"
+
+#: src/editldap.c:418
+msgid "Timeout (secs)"
+msgstr "Wachttijd (sec)"
+
+#: src/editldap.c:432
+msgid "Maximum Entries"
+msgstr "Maximum"
+
+#: src/editldap.c:459 src/prefs_account.c:564
+msgid "Basic"
+msgstr "Algemeen"
+
+#: src/editldap.c:460
+msgid "Extended"
+msgstr "Uitgebreid"
+
+#: src/editldap.c:540
+msgid "Add New LDAP Server"
+msgstr "Nieuwe LDAP server"
+
+#: src/editldap_basedn.c:141
+msgid "Edit LDAP - Select Search Base"
+msgstr "Wijzig LDAP - Selecteer zoekbasis"
+
+#: src/editldap_basedn.c:202
+msgid "Available Search Base(s)"
+msgstr "Beschikbare zoekbase"
+
+#: src/editldap_basedn.c:287
+msgid "Could not read Search Base(s) from server - please set manually"
+msgstr "Zoekbases niet gevonden - zet handmatig"
+
+#: src/editvcard.c:93
+msgid "File does not appear to be VCard format."
+msgstr "Bestand heeft geen VCard-formaat."
+
+#: src/editvcard.c:129
+msgid "Select VCard File"
+msgstr "Selecteer VCard-bestand"
+
+#: src/editvcard.c:185 src/editvcard.c:286
+msgid "Edit VCard Entry"
+msgstr "Wijzig VCard"
+
+#: src/editvcard.c:291
+msgid "Add New VCard Entry"
+msgstr "Toevoegen nieuwe VCard"
+
 #: src/export.c:122
 msgid "Export"
 msgstr "Exporteren"
@@ -998,7 +1155,6 @@ msgid "/_Update folder tree"
 msgstr "/Ververs mapvenster"
 
 #: src/folderview.c:246
-#, fuzzy
 msgid "/Remove _IMAP4 account"
 msgstr "/Verwijder IMAP4 server"
 
@@ -1011,7 +1167,6 @@ msgid "/_Remove newsgroup"
 msgstr "/Verwijder nieuwsgroep"
 
 #: src/folderview.c:258
-#, fuzzy
 msgid "/Remove _news account"
 msgstr "/Verwijder nieuwsgroep"
 
@@ -1054,7 +1209,6 @@ msgid "Scanning folder %s ..."
 msgstr "Map wordt ingelezen %s ..."
 
 #: src/folderview.c:644
-#, fuzzy
 msgid "Updating folder tree..."
 msgstr "Mappen worden ververst..."
 
@@ -1078,32 +1232,32 @@ msgstr "Wachtrij"
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/folderview.c:1346
+#: src/folderview.c:1341
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1485 src/folderview.c:1593 src/folderview.c:1789
+#: src/folderview.c:1483 src/folderview.c:1591 src/folderview.c:1787
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/folderview.c:1493 src/folderview.c:1543 src/folderview.c:1602
-#: src/folderview.c:1657 src/folderview.c:1797
+#: src/folderview.c:1491 src/folderview.c:1541 src/folderview.c:1600
+#: src/folderview.c:1655 src/folderview.c:1795
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/folderview.c:1585 src/folderview.c:1647
+#: src/folderview.c:1583 src/folderview.c:1645
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:1587 src/folderview.c:1649
+#: src/folderview.c:1585 src/folderview.c:1647
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:1702
+#: src/folderview.c:1700
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1112,16 +1266,16 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:1705 src/folderview.c:1847
+#: src/folderview.c:1703 src/folderview.c:1845
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:1711 src/folderview.c:1853
+#: src/folderview.c:1709 src/folderview.c:1851
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:1745
+#: src/folderview.c:1743
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1130,11 +1284,11 @@ msgstr ""
 "Wilt u het '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zullen niet van de schijf worden verwijderd)"
 
-#: src/folderview.c:1748
+#: src/folderview.c:1746
 msgid "Remove folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:1781
+#: src/folderview.c:1779
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1144,48 +1298,73 @@ msgstr ""
 "(wanneer deze meerdere mappen moet bevatten,\n"
 " voeg een `/' toe aan het eind van de naam)"
 
-#: src/folderview.c:1805
-#, fuzzy, c-format
+#: src/folderview.c:1803
+#, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:1845
+#: src/folderview.c:1843
 #, c-format
 msgid "Really delete folder `%s'?"
 msgstr "Map '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:1890
-#, fuzzy, c-format
+#: src/folderview.c:1888
+#, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 server '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:1892
+#: src/folderview.c:1890
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 Postvak"
 
-#: src/folderview.c:1942
+#: src/folderview.c:1940
 #, c-format
 msgid "The newsgroup `%s' already exists."
 msgstr "De nieuwsgroep '%s' betsaat al."
 
-#: src/folderview.c:1988
+#: src/folderview.c:1986
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:1990
+#: src/folderview.c:1988
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2021
-#, fuzzy, c-format
+#: src/folderview.c:2019
+#, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2023
+#: src/folderview.c:2021
 msgid "Delete news account"
 msgstr "Verwijder Nieuws Postvak"
 
+#: src/grouplistdialog.c:155
+msgid "Subscribe to newsgroup"
+msgstr "Abonneren op een nieuwsgroep"
+
+#: src/grouplistdialog.c:174
+msgid "Input subscribing newsgroup:"
+msgstr "Nieuwsgroep:"
+
+#: src/grouplistdialog.c:206
+msgid "Refresh"
+msgstr "Verversen"
+
+#: src/grouplistdialog.c:233
+msgid "Can't retrieve newsgroup list."
+msgstr "Kan groeplijst niet ophalen."
+
+#: src/grouplistdialog.c:249 src/summaryview.c:1042
+msgid "Done."
+msgstr "Klaar."
+
+#: src/grouplistdialog.c:260
+#, c-format
+msgid "%d newsgroups received (%s read)"
+msgstr "%d nieuwsgroepen (%s gelezen)"
+
 #: src/gtkutils.c:50 src/gtkutils.c:66
 msgid "Abcdef"
 msgstr "Abcdef"
@@ -1202,11 +1381,11 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:174 src/summaryview.c:1948
+#: src/headerview.c:174 src/summaryview.c:2044
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
-#: src/headerview.c:189 src/summaryview.c:1982
+#: src/headerview.c:189 src/summaryview.c:2080
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1239,14 +1418,15 @@ msgstr "Kan plaatje niet weergeven."
 #: src/imap.c:234
 #, c-format
 msgid "IMAP4 connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
+msgstr ""
+"IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:256 src/inc.c:400 src/news.c:129
+#: src/imap.c:256 src/inc.c:418 src/news.c:129
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Geef wachtwoord voor %s op %s:"
 
-#: src/imap.c:258 src/inc.c:404 src/news.c:131
+#: src/imap.c:258 src/inc.c:422 src/news.c:131
 msgid "Input password"
 msgstr "Geef wachtwoord"
 
@@ -1265,7 +1445,7 @@ msgstr "bericht %d is reeds gebufferd.\n"
 msgid "getting message %d...\n"
 msgstr "bericht %d wordt opgehaald...\n"
 
-#: src/imap.c:454 src/procmsg.c:595
+#: src/imap.c:454 src/procmsg.c:593
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
@@ -1275,8 +1455,8 @@ msgstr "kan bericht %d niet ophalen\n"
 msgid "can't append message %s\n"
 msgstr "kan bericht niet opslaan\n"
 
-#: src/imap.c:506 src/imap.c:558 src/mh.c:191 src/mh.c:267 src/mh.c:321
-#: src/mh.c:456
+#: src/imap.c:506 src/imap.c:558 src/mh.c:191 src/mh.c:267 src/mh.c:322
+#: src/mh.c:457
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
@@ -1285,7 +1465,7 @@ msgstr "de bronmap is hetzelfde als de doelmap.\n"
 msgid "Moving message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt verplaatst naar %s ...\n"
 
-#: src/imap.c:517 src/imap.c:567 src/mh.c:337 src/mh.c:459
+#: src/imap.c:517 src/imap.c:567 src/mh.c:338 src/mh.c:460
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
@@ -1305,9 +1485,8 @@ msgid "can't set deleted flags: 1:%d\n"
 msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
 
 #: src/imap.c:841
-#, fuzzy
 msgid "error occured while getting LIST.\n"
-msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
+msgstr "er is een fout opgetreden bij ophalen LIST\n"
 
 #: src/imap.c:1042
 msgid "can't create mailbox: LIST failed\n"
@@ -1400,138 +1579,142 @@ msgstr "Doelmap:"
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/inc.c:192 src/inc.c:241 src/send.c:298
+#: src/inc.c:210 src/inc.c:259 src/send.c:298
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:260
+#: src/inc.c:278
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:424
+#: src/inc.c:442
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:431
+#: src/inc.c:449
 msgid "Done"
 msgstr "Klaar"
 
-#: src/inc.c:444
+#: src/inc.c:462
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Identificatie voor %s op %s is mislukt"
 
-#: src/inc.c:514
+#: src/inc.c:532
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:522
+#: src/inc.c:540
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:548
+#: src/inc.c:566
 #, c-format
 msgid "Connecting to POP3 server: %s ..."
 msgstr "Verbinden met POP3 server: %s ..."
 
-#: src/inc.c:559 src/inc.c:766
+#: src/inc.c:577 src/inc.c:734
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met POP3 server: %s:%d\n"
 
-#: src/inc.c:566 src/inc.c:773
+#: src/inc.c:584 src/inc.c:741
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan geen verbinding maken met POP3 server: %s:%d"
 
-#: src/inc.c:586
-msgid "SSL not available\n"
-msgstr "Geen SSL ondersteuning\n"
-
-#: src/inc.c:596
-msgid "Error creating ssl context\n"
-msgstr "Fout bij maken ssl context\n"
-
-#: src/inc.c:605
-msgid "SSL connect failed\n"
-msgstr "SSL connectie mislukt\n"
-
-#. Get the cipher
-#: src/inc.c:615
+#: src/inc.c:776 src/inc.c:828
 #, c-format
-msgid "SSL connection using %s\n"
-msgstr "SSL connectie gebruikt %s\n"
-
-#: src/inc.c:622
-msgid "Server certificate:\n"
-msgstr "Servercertificatie:\n"
-
-#: src/inc.c:625
-#, c-format
-msgid "  Subject: %s\n"
-msgstr "  Onderwerp: %s\n"
-
-#: src/inc.c:630
-#, c-format
-msgid "  Issuer: %s\n"
-msgstr ""
+msgid "Retrieving message (%d / %d) (%s / %s)"
+msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:805 src/inc.c:855
-#, c-format
-msgid "Retrieving message (%d / %d) (%d / %d bytes)"
-msgstr "Bericht wordt opgehaald (%d / %d) (%d / %d bytes)"
-
-#: src/inc.c:830
+#: src/inc.c:802
 msgid "Authorizing..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:835
+#: src/inc.c:807
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:840
+#: src/inc.c:812
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:845
+#: src/inc.c:817
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:850
+#: src/inc.c:822
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:866
+#: src/inc.c:840
 msgid "Deleting message"
 msgstr "Bericht wordt verwijderd"
 
-#: src/inc.c:870
+#: src/inc.c:844
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:902
+#: src/inc.c:876
 msgid "a message won't be received\n"
 msgstr "een bericht wordt niet ontvangen\n"
 
-#: src/inc.c:941
+#: src/inc.c:912
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:945
+#: src/inc.c:916
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1029
+#: src/inc.c:1000
 msgid "no messages in local mailbox.\n"
 msgstr "geen berichten in de lokale mailbox\n"
 
-#: src/inc.c:1043
+#: src/inc.c:1014
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
 
+#: src/labelcolors.c:46
+msgid "Orange"
+msgstr "Oranje"
+
+#: src/labelcolors.c:47
+msgid "Red"
+msgstr "Rood"
+
+#: src/labelcolors.c:48
+msgid "Pink"
+msgstr "Roze"
+
+#: src/labelcolors.c:49
+msgid "Sky blue"
+msgstr "Hemelsblauw"
+
+#: src/labelcolors.c:50
+msgid "Blue"
+msgstr "Blauw"
+
+#: src/labelcolors.c:51
+msgid "Green"
+msgstr "Groen"
+
+#: src/labelcolors.c:52
+msgid "Brown"
+msgstr "Bruin"
+
+#. create sub items. for the menu item activation callback we pass the
+#. * index of label_colors[] as data parameter. for the None color we pass
+#. * an invalid (high) value. also we attach a data pointer so we can
+#. * always get back the SummaryView pointer.
+#: src/labelcolors.c:281 src/summaryview.c:511
+msgid "None"
+msgstr "Geen"
+
 #: src/logwindow.c:50
 msgid "Creating log window...\n"
 msgstr "logvenster wordt aangemaakt...\n"
@@ -1541,7 +1724,7 @@ msgid "Protocol log"
 msgstr "Protocol log"
 
 #. for gettext
-#: src/main.c:113 src/main.c:122 src/mh.c:637
+#: src/main.c:113 src/main.c:122 src/mbox_folder.c:2089 src/mh.c:639
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1562,59 +1745,51 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: src/main.c:249
-msgid "SSL disabled\n"
-msgstr "SSL uitgeschakeld\n"
-
-#: src/main.c:251
-msgid "SSL loaded: \n"
-msgstr "SSL geladen: \n"
-
-#: src/main.c:337
+#: src/main.c:323
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:340
+#: src/main.c:326
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:341
+#: src/main.c:327
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:342
+#: src/main.c:328
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:343
+#: src/main.c:329
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:344
+#: src/main.c:330
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:345
+#: src/main.c:331
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:370
+#: src/main.c:356
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:377
+#: src/main.c:363
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:378
+#: src/main.c:364
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
 #. remote command mode
-#: src/main.c:451
+#: src/main.c:437
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
@@ -2186,7 +2361,7 @@ msgstr "Opstellen email bericht"
 msgid "email"
 msgstr "email"
 
-#: src/mainwindow.c:1534
+#: src/mainwindow.c:1534 src/mainwindow.c:1571
 msgid "Email"
 msgstr "Email"
 
@@ -2198,22 +2373,14 @@ msgstr "Opstellen nieuwsartikel"
 msgid "news"
 msgstr "nieuws"
 
-#: src/mainwindow.c:1558 src/prefs_common.c:865
+#: src/mainwindow.c:1558 src/mainwindow.c:1582 src/prefs_common.c:865
 msgid "News"
 msgstr "Nieuws"
 
-#: src/mainwindow.c:1571
-msgid "Compose email"
-msgstr "Bericht opstellen"
-
 #: src/mainwindow.c:1572
 msgid "Compose an email message"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:1582
-msgid "Compose news"
-msgstr "Nieuwsartikel opstellen"
-
 #: src/mainwindow.c:1583
 msgid "Compose a news message"
 msgstr "Nieuw bericht opstellen"
@@ -2242,7 +2409,7 @@ msgstr "Afzender"
 msgid "Reply to sender"
 msgstr "Afzender beantwoorden"
 
-#: src/mainwindow.c:1633
+#: src/mainwindow.c:1633 src/prefs_filtering.c:223
 msgid "Forward"
 msgstr "Doorsturen"
 
@@ -2254,7 +2421,8 @@ msgstr "Stuur dit bericht door"
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1653 src/prefs_filtering.c:225 src/prefs_filtering.c:461
+#: src/prefs_matcher.c:149
 msgid "Execute"
 msgstr "Doen!"
 
@@ -2278,11 +2446,11 @@ msgstr "Email bericht"
 msgid "News article"
 msgstr "Nieuwsartikel"
 
-#: src/mainwindow.c:1999 src/summaryview.c:3207
+#: src/mainwindow.c:1999 src/summaryview.c:3296
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:1999 src/summaryview.c:3207
+#: src/mainwindow.c:1999 src/summaryview.c:3296
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -2295,6 +2463,11 @@ msgstr "Het verzenden van de berichten uit de wachtrij is mislukt."
 msgid "forced charset: %s\n"
 msgstr "geforceerde karakterset: %s\n"
 
+#: src/matcher.c:1359
+#, c-format
+msgid "%s(%d) - filename is not set"
+msgstr "%s(%d) - geen bestandsnaam"
+
 #: src/mbox.c:51 src/mbox.c:198
 msgid "can't write to temporary file\n"
 msgstr "kan niet naar tijdelijk bestand schrijven\n"
@@ -2331,52 +2504,122 @@ msgstr ""
 "Afzender zonder escapecodes gevonden:\n"
 "%s"
 
-#: src/mbox.c:247
+#: src/mbox.c:243
 #, c-format
 msgid "%d messages found.\n"
 msgstr "%d berichten gevonden\n"
 
-#: src/mbox.c:264
+#: src/mbox.c:260 src/mbox_folder.c:122
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan lock-bestand niet aanmaken: %s\n"
 
-#: src/mbox.c:265
+#: src/mbox.c:261 src/mbox_folder.c:123
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "gebruik 'flock' in plaats van 'file' waar mogelijk\n"
 
-#: src/mbox.c:277
+#: src/mbox.c:273 src/mbox_folder.c:135
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan %s niet aanmaken\n"
 
-#: src/mbox.c:283
+#: src/mbox.c:279 src/mbox_folder.c:141
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox wordt vastgehouden door een ander proces. we wachten even...\n"
 
-#: src/mbox.c:312
+#: src/mbox.c:308
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan %s niet locken\n"
 
-#: src/mbox.c:319 src/mbox.c:366
+#: src/mbox.c:315 src/mbox.c:362
 msgid "invalid lock type\n"
 msgstr "ongeldig locktype\n"
 
-#: src/mbox.c:352
+#: src/mbox.c:348
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan de lock niet verwijderen van %s\n"
 
-#: src/mbox.c:383
+#: src/mbox.c:379
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan de mailbox niet inkorten tot 0.\n"
 
-#: src/mbox.c:404
+#: src/mbox.c:400
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 
+#: src/mbox_folder.c:219
+#, c-format
+msgid "could not lock read file %s\n"
+msgstr "kan lock-bestand niet aanmaken: %s\n"
+
+#: src/mbox_folder.c:238
+#, c-format
+msgid "could not lock write file %s\n"
+msgstr "kan niet schrijven naar bestand %s\n"
+
+#: src/mbox_folder.c:797
+#, c-format
+msgid "read mbox - %s\n"
+msgstr "mbox wordt gelezen - %s\n"
+
+#: src/mbox_folder.c:828
+#, c-format
+msgid "read mbox from file - %s\n"
+msgstr "mbox wordt gelezen uit - %s\n"
+
+#: src/mbox_folder.c:1378 src/mbox_folder.c:1390
+#, c-format
+msgid "unvalid file - %s.\n"
+msgstr "ongeldig bestand - %s.\n"
+
+#: src/mbox_folder.c:1408 src/mbox_folder.c:1783 src/utils.c:1571
+#: src/utils.c:1648
+#, c-format
+msgid "writing to %s failed.\n"
+msgstr "schrijven naar %s is mislukt.\n"
+
+#: src/mbox_folder.c:1731 src/mh.c:609
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Laatste nummer in map %s = %d\n"
+
+#: src/mbox_folder.c:1924
+#, c-format
+msgid "no modification - %s\n"
+msgstr "geen permissie - %s\n"
+
+#: src/mbox_folder.c:1928
+#, c-format
+msgid "save modification - %s\n"
+msgstr "wijzig aanpassing - %s\n"
+
+#: src/mbox_folder.c:1961 src/mbox_folder.c:2057
+#, c-format
+msgid "can't rename %s to %s\n"
+msgstr "kan %d niet naar %s kopiëren\n"
+
+#: src/mbox_folder.c:1982 src/mbox_folder.c:2078
+#, c-format
+msgid "%i messages written - %s\n"
+msgstr "%i berichten geschreven - %s\n"
+
+#: src/mbox_folder.c:2018
+#, c-format
+msgid "no deleted messages - %s\n"
+msgstr "geen verwijderde berichten - %s\n"
+
+#: src/mbox_folder.c:2022
+#, c-format
+msgid "purge deleted messages - %s\n"
+msgstr "verwijderde bestanden worden gewist - %s\n"
+
+#: src/mbox_folder.c:2200
+msgid "Cannot rename folder item"
+msgstr "Kan map niet hernoemen"
+
 #: src/messageview.c:70
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
@@ -2414,30 +2657,25 @@ msgstr "Fout bij het versturen van bevestiging."
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: src/mh.c:202 src/mh.c:261 src/mh.c:335 src/mh.c:450
+#: src/mh.c:202 src/mh.c:261 src/mh.c:336 src/mh.c:451
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/mh.c:346 src/mh.c:468
+#: src/mh.c:347 src/mh.c:469
 #, c-format
 msgid "%s already exists."
 msgstr "%s bestaat al."
 
-#: src/mh.c:607
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Laatste nummer in map %s = %d\n"
-
-#: src/mh.c:812
+#: src/mh.c:814
 msgid "\tSearching uncached messages... "
 msgstr "\tOngebufferde berichten worden doorzocht..."
 
-#: src/mh.c:867
+#: src/mh.c:869
 #, c-format
 msgid "%d uncached message(s) found.\n"
 msgstr "%d ongebufferde bericht(en) gevonden.\n"
 
-#: src/mh.c:873
+#: src/mh.c:875
 msgid "\tSorting uncached messages in numerical order... "
 msgstr "\tOngebufferde berichten worden op nummer gesorteerd..."
 
@@ -2453,7 +2691,7 @@ msgstr "/Open met..."
 msgid "/_Display as text"
 msgstr "/Als tekst weergeven"
 
-#: src/mimeview.c:116 src/summaryview.c:357
+#: src/mimeview.c:116 src/summaryview.c:354
 msgid "/_Save as..."
 msgstr "/Opslaan als..."
 
@@ -2477,15 +2715,15 @@ msgstr "Selecteer \"Verifieer handtekening\" om te controleren"
 msgid "Can't save the part of multipart message."
 msgstr "Kan het deel van een meerdelig bericht niet opslaan."
 
-#: src/mimeview.c:709 src/summaryview.c:2635
+#: src/mimeview.c:709 src/summaryview.c:2725
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/mimeview.c:715 src/summaryview.c:2640
+#: src/mimeview.c:715 src/summaryview.c:2730
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: src/mimeview.c:716 src/summaryview.c:2641
+#: src/mimeview.c:716 src/summaryview.c:2731
 msgid "Overwrite existing file?"
 msgstr "Bestaand bestand overschrijven?"
 
@@ -2512,106 +2750,93 @@ msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
 
-#: src/news.c:181
+#: src/news.c:182
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "De NNTP-verbinding is verbroken. Opnieuw contact aan het leggen...\n"
 
-#: src/news.c:255
+#: src/news.c:258
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikel %d is al gebufferd.\n"
 
-#: src/news.c:267
+#: src/news.c:271
 #, c-format
 msgid "can't select group %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:272
+#: src/news.c:276
 #, c-format
 msgid "getting article %d...\n"
 msgstr "artikel %d wordt opgehaald...\n"
 
-#: src/news.c:277
+#: src/news.c:281
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan artikel %d niet lezen\n"
 
-#: src/news.c:309
+#: src/news.c:324
+msgid "can't retrieve newsgroup list\n"
+msgstr "Kan groeplijst niet ophalen\n"
+
+#: src/news.c:396
 msgid "can't post article.\n"
 msgstr "kan het ertikel niet versturen.\n"
 
-#: src/news.c:333
+#: src/news.c:420
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan het artikel %d niet ophalen\n"
 
-#: src/news.c:403
+#: src/news.c:490
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:410
+#: src/news.c:497
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:419
+#: src/news.c:506
 msgid "no new articles.\n"
 msgstr "geen nieuwe artikelen.\n"
 
-#: src/news.c:432
+#: src/news.c:519
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:435
+#: src/news.c:522
 msgid "can't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:441
+#: src/news.c:528
 msgid "error occurred while getting xover.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: src/news.c:449
+#: src/news.c:536
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: src/news.c:466 src/news.c:491
+#: src/news.c:554 src/news.c:579
 msgid "can't get xhdr\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:474 src/news.c:499
+#: src/news.c:562 src/news.c:587
 msgid "error occurred while getting xhdr.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: src/news.c:625
+#: src/news.c:712
 #, c-format
 msgid "Deleting cached articles 1 - %d ... "
 msgstr "Verwijderen cache berichten 1 - %d ... "
 
-#: src/news.c:654
+#: src/news.c:741
 msgid "\tDeleting all cached articles... "
 msgstr "\tAlle gebufferde artikelen worden verwijderd..."
 
-#: src/news.c:701
-msgid "group list has been already cached.\n"
-msgstr "Cache met groeplijst bestaat al.\n"
-
-#: src/news.c:709
-msgid "can't retrieve group list\n"
-msgstr "Kan groeplijst niet ophalen\n"
-
-#: src/news.c:742
-msgid "\tDeleting cached group list... "
-msgstr "\tVerwijderen cache met groeplijst... "
-
-#: src/news.c:750
-#, c-format
-msgid "can't delete cached group list %s\n"
-msgstr "Kan cache met groeplijst %s niet verwijderen\n"
-
 #: src/nntp.c:52
 #, c-format
 msgid "Can't connect to NNTP server: %s:%d\n"
@@ -2687,9 +2912,10 @@ msgid "Finished reading configuration.\n"
 msgstr "Klaar met inlezen van de configuratie.\n"
 
 #: src/prefs.c:141 src/prefs.c:169 src/prefs.c:214 src/prefs_account.c:423
-#: src/prefs_account.c:437 src/prefs_display_header.c:429
+#: src/prefs_account.c:437 src/prefs_customheader.c:394
+#: src/prefs_customheader.c:440 src/prefs_display_header.c:429
 #: src/prefs_display_header.c:454 src/prefs_filter.c:533
-#: src/prefs_filter.c:557
+#: src/prefs_filter.c:557 src/scoring.c:425 src/scoring.c:436
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
 
@@ -2727,10 +2953,6 @@ msgstr "Accountvoorkeuren"
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account.c:564
-msgid "Basic"
-msgstr "Algemeen"
-
 #: src/prefs_account.c:566 src/prefs_common.c:711
 msgid "Receive"
 msgstr "Ontvangen"
@@ -2857,7 +3079,8 @@ msgstr "Filter de berichten bij het ophalen"
 msgid "IMAP server directory"
 msgstr "IMAP server directory"
 
-#: src/prefs_account.c:999 src/prefs_filter.c:259
+#: src/prefs_account.c:999 src/prefs_customheader.c:199 src/prefs_filter.c:259
+#: src/prefs_matcher.c:143
 msgid "Header"
 msgstr "Header"
 
@@ -2881,7 +3104,7 @@ msgstr "Bewerken"
 msgid "Automatically set following addresses"
 msgstr "Velden om automatisch in te vullen"
 
-#: src/prefs_account.c:1035
+#: src/prefs_account.c:1035 src/prefs_matcher.c:140
 msgid "Cc"
 msgstr "Cc"
 
@@ -3197,7 +3420,7 @@ msgstr "Regels met citaten afbreken"
 msgid "Wrap before sending"
 msgstr "Regels afbreken voor verzenden"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1203 src/prefs_filtering.c:224
 msgid "Forward as attachment"
 msgstr "Doorsturen als bijvoegsel"
 
@@ -3336,7 +3559,8 @@ msgstr "Berichtenlijst"
 
 #: src/prefs_common.c:1634
 msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Geef ontvanger weer in 'Afzender' kolom wanneer je zelf de afzender bent"
+msgstr ""
+"Geef ontvanger weer in 'Afzender' kolom wanneer je zelf de afzender bent"
 
 #: src/prefs_common.c:1637
 msgid "Display sender using address book"
@@ -3557,7 +3781,7 @@ msgstr "Selecteer kleur voor niveau 3"
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common.c:2493
+#: src/prefs_common.c:2493 src/prefs_matcher.c:1404
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
@@ -3614,7 +3838,7 @@ msgstr ""
 msgid "Set display item"
 msgstr "Kies kolommen"
 
-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2666 src/prefs_filtering.c:219
 msgid "Mark"
 msgstr "Markeer"
 
@@ -3626,19 +3850,19 @@ msgstr "MIME"
 msgid "Number"
 msgstr "Nummer"
 
-#: src/prefs_common.c:2670 src/summaryview.c:496
+#: src/prefs_common.c:2670 src/prefs_scoring.c:252 src/summaryview.c:583
 msgid "Score"
 msgstr "Score"
 
-#: src/prefs_common.c:2672 src/summaryview.c:486
+#: src/prefs_common.c:2672 src/summaryview.c:573
 msgid "Date"
 msgstr "Datum"
 
-#: src/prefs_common.c:2673 src/summaryview.c:487
+#: src/prefs_common.c:2673 src/prefs_matcher.c:140 src/summaryview.c:574
 msgid "From"
 msgstr "Afzender"
 
-#: src/prefs_common.c:2674 src/summaryview.c:488
+#: src/prefs_common.c:2674 src/prefs_matcher.c:139 src/summaryview.c:575
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -3674,6 +3898,44 @@ msgstr "Doorstuurformaat:"
 msgid " Description of symbols "
 msgstr "Beschrijving van speciale tekens "
 
+#: src/prefs_customheader.c:151
+msgid "Custom headers"
+msgstr "Aangepaste headers"
+
+#: src/prefs_customheader.c:153
+msgid "Creating custom header setting window...\n"
+msgstr "Aangepaste header instellingenvenster wordt aangemaakt...\n"
+
+#: src/prefs_customheader.c:171
+msgid "Custom header setting"
+msgstr "Aangepaste header instellingen"
+
+#. value
+#: src/prefs_customheader.c:215 src/prefs_matcher.c:390
+msgid "Value"
+msgstr "Waarde"
+
+#: src/prefs_customheader.c:323
+msgid "Reading custom header configuration...\n"
+msgstr "Inlezen aangepaste header configuratie...\n"
+
+#: src/prefs_customheader.c:368
+msgid "Writing custom header configuration...\n"
+msgstr "Aangepaste header configuratie wordt opgeslagen...\n"
+
+#: src/prefs_customheader.c:493 src/prefs_display_header.c:545
+#: src/prefs_filter.c:628 src/prefs_matcher.c:1008
+msgid "Header name is not set."
+msgstr "Header-naam niet ingevoerd."
+
+#: src/prefs_customheader.c:544
+msgid "Delete header"
+msgstr "Verwijder header"
+
+#: src/prefs_customheader.c:545
+msgid "Do you really want to delete this header?"
+msgstr "Wil je deze header werkelijk verwijderen?"
+
 #: src/prefs_display_header.c:190
 msgid "Creating display header setting window...\n"
 msgstr "Header Weergeven instellingenvenster wordt aangemaakt...\n"
@@ -3682,7 +3944,8 @@ msgstr "Header Weergeven instellingenvenster wordt aangemaakt...\n"
 msgid "Display header setting"
 msgstr "Header Weergeven instellingen"
 
-#: src/prefs_display_header.c:240
+#. header name
+#: src/prefs_display_header.c:240 src/prefs_matcher.c:369
 msgid "Header name"
 msgstr "Header-naam"
 
@@ -3706,15 +3969,12 @@ msgstr "Configuratie voor het weergeven van de headers wordt ingelezen...\n"
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Configuratie voor headerweergave wordt opgeslagen...\n"
 
-#: src/prefs_display_header.c:545 src/prefs_filter.c:628
-msgid "Header name is not set."
-msgstr "Header-naam niet ingevoerd."
-
 #: src/prefs_display_header.c:555
 msgid "This header is already in the list."
 msgstr "Deze header staat al in de lijst."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:189 src/prefs_filtering.c:309 src/prefs_matcher.c:287
+#: src/prefs_scoring.c:185
 msgid "Registered rules"
 msgstr "Gebruikte filters"
 
@@ -3739,12 +3999,13 @@ msgstr "(niets)"
 msgid "Keyword"
 msgstr "Sleutelwoord"
 
-#: src/prefs_filter.c:308
+#: src/prefs_filter.c:308 src/prefs_matcher.c:420
 msgid "Predicate"
 msgstr "Operator"
 
 #: src/prefs_filter.c:320 src/prefs_filter.c:331 src/prefs_filter.c:650
 #: src/prefs_filter.c:653 src/prefs_filter.c:797 src/prefs_filter.c:800
+#: src/prefs_matcher.c:126
 msgid "contains"
 msgstr "bevat"
 
@@ -3753,7 +4014,7 @@ msgstr "bevat"
 msgid "not contain"
 msgstr "bevat niet"
 
-#: src/prefs_filter.c:347
+#: src/prefs_filter.c:347 src/prefs_filtering.c:456
 msgid "Destination"
 msgstr "Doel"
 
@@ -3765,11 +4026,13 @@ msgstr "Gebruik regex"
 msgid "Don't receive"
 msgstr "Ontvangst weigeren"
 
-#: src/prefs_filter.c:400
+#: src/prefs_filter.c:400 src/prefs_filtering.c:516 src/prefs_matcher.c:490
+#: src/prefs_scoring.c:277
 msgid "Register"
 msgstr "Toevoegen"
 
-#: src/prefs_filter.c:406
+#: src/prefs_filter.c:406 src/prefs_filtering.c:522 src/prefs_matcher.c:496
+#: src/prefs_scoring.c:283
 msgid " Substitute "
 msgstr "Vervangen"
 
@@ -3781,22 +4044,267 @@ msgstr "Filterconfiguratie wordt ingelezen...\n"
 msgid "Writing filter configuration...\n"
 msgstr "Filterconfiguratie wordt opgeslagen...\n"
 
-#: src/prefs_filter.c:572
+#: src/prefs_filter.c:572 src/prefs_filtering.c:649 src/prefs_filtering.c:667
+#: src/prefs_matcher.c:610 src/prefs_matcher.c:684 src/prefs_scoring.c:459
+#: src/prefs_scoring.c:491
 msgid "(New)"
 msgstr "(nieuw)"
 
-#: src/prefs_filter.c:623
+#: src/prefs_filter.c:623 src/prefs_filtering.c:760
 msgid "Destination is not set."
 msgstr "Er is geen map gekozen om het heen te verplaatsen."
 
-#: src/prefs_filter.c:734
+#: src/prefs_filter.c:734 src/prefs_filtering.c:834 src/prefs_scoring.c:644
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter.c:735
+#: src/prefs_filter.c:735 src/prefs_filtering.c:835 src/prefs_scoring.c:645
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
+#: src/prefs_filtering.c:216
+msgid "Move"
+msgstr "Verplaats"
+
+#: src/prefs_filtering.c:217
+msgid "Copy"
+msgstr "Kopieer"
+
+#: src/prefs_filtering.c:220
+msgid "Unmark"
+msgstr "Markeer"
+
+#: src/prefs_filtering.c:221
+msgid "Mark as read"
+msgstr "Markeer gelezen"
+
+#: src/prefs_filtering.c:222
+msgid "Mark as unread"
+msgstr "Markeer ongelezen"
+
+#: src/prefs_filtering.c:226 src/prefs_filtering.c:466
+msgid "Color"
+msgstr "Kleur"
+
+#: src/prefs_filtering.c:311
+msgid "Creating filtering setting window...\n"
+msgstr "Venster Geavanceerd Filteren instellingen wordt aangemaakt...\n"
+
+#: src/prefs_filtering.c:330
+msgid "Filtering setting"
+msgstr "Geavanceerd-filtereninstellingen"
+
+#: src/prefs_filtering.c:349 src/prefs_scoring.c:225
+msgid "Condition"
+msgstr "Conditie"
+
+#: src/prefs_filtering.c:364 src/prefs_scoring.c:240
+msgid "Define ..."
+msgstr "Instellen ..."
+
+#: src/prefs_filtering.c:376
+msgid "Action"
+msgstr "Actie"
+
+#: src/prefs_filtering.c:416 src/progressdialog.c:52
+msgid "Account"
+msgstr "Postvak"
+
+#: src/prefs_filtering.c:482
+msgid "Select ..."
+msgstr "Selecteer..."
+
+#: src/prefs_filtering.c:489 src/prefs_matcher.c:402
+msgid "Info ..."
+msgstr "Info ..."
+
+#: src/prefs_filtering.c:714 src/prefs_filtering.c:780 src/prefs_scoring.c:538
+#: src/prefs_scoring.c:576 src/prefs_scoring.c:622
+msgid "Match string is not valid."
+msgstr "Opgegeven tekst niet gevonden"
+
+#: src/prefs_filtering.c:743 src/prefs_scoring.c:561 src/prefs_scoring.c:607
+msgid "Score is not set."
+msgstr "Score niet ingesteld."
+
+#: src/prefs_matcher.c:117
+msgid "or"
+msgstr "of"
+
+#: src/prefs_matcher.c:117
+msgid "and"
+msgstr "en"
+
+#: src/prefs_matcher.c:126
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: src/prefs_matcher.c:135
+msgid "yes"
+msgstr "ja"
+
+#: src/prefs_matcher.c:135
+msgid "no"
+msgstr "nee"
+
+#: src/prefs_matcher.c:139
+msgid "All messages"
+msgstr "Alle berichten"
+
+#: src/prefs_matcher.c:140
+msgid "To"
+msgstr "Aan"
+
+#: src/prefs_matcher.c:140
+msgid "To or Cc"
+msgstr "Geadresseerde of afzender"
+
+#: src/prefs_matcher.c:141
+msgid "Newsgroups"
+msgstr "Nieuwsgroepen"
+
+#: src/prefs_matcher.c:141
+msgid "In reply to"
+msgstr "In antwoord op"
+
+#: src/prefs_matcher.c:141
+msgid "References"
+msgstr "Verwijzingen"
+
+#: src/prefs_matcher.c:142
+msgid "Age greater than"
+msgstr "Ouder dan"
+
+#: src/prefs_matcher.c:142
+msgid "Age lower than"
+msgstr "Jonger dan"
+
+#: src/prefs_matcher.c:143
+msgid "Headers part"
+msgstr "Header-deel"
+
+#: src/prefs_matcher.c:144
+msgid "Body part"
+msgstr "Berichtinhoud"
+
+#: src/prefs_matcher.c:144
+msgid "Whole message"
+msgstr "Hele bericht"
+
+#: src/prefs_matcher.c:145
+msgid "Unread flag"
+msgstr "Ongelezen-vlag"
+
+#: src/prefs_matcher.c:145
+msgid "New flag"
+msgstr "Nieuw-vlag"
+
+#: src/prefs_matcher.c:146
+msgid "Marked flag"
+msgstr "Markeer-vlag"
+
+#: src/prefs_matcher.c:146
+msgid "Deleted flag"
+msgstr "Verwijderd-vlag"
+
+#: src/prefs_matcher.c:147
+msgid "Replied flag"
+msgstr "Beantwoord-vlag"
+
+#: src/prefs_matcher.c:147
+msgid "Forwarded flag"
+msgstr "Doorgestuurd-vlag"
+
+#: src/prefs_matcher.c:148
+msgid "Score greater than"
+msgstr "Score hoger dan"
+
+#: src/prefs_matcher.c:148
+msgid "Score lower than"
+msgstr "Score lager dan"
+
+#: src/prefs_matcher.c:289
+msgid "Creating matcher setting window...\n"
+msgstr "Venster Condities wordt aangemaakt...\n"
+
+#: src/prefs_matcher.c:308
+msgid "Condition setting"
+msgstr "Conditie-instelling"
+
+#. criteria combo box
+#: src/prefs_matcher.c:336
+msgid "Match type"
+msgstr "Type"
+
+#: src/prefs_matcher.c:472 src/summary_search.c:172
+msgid "Case sensitive"
+msgstr "Hoofd / kleine letters onderscheiden"
+
+#: src/prefs_matcher.c:473
+msgid "Use regexp"
+msgstr "Gebruik regex"
+
+#. boolean operation
+#: src/prefs_matcher.c:511
+msgid "Boolean Op"
+msgstr "Logische op"
+
+#: src/prefs_matcher.c:994
+msgid "Value is not set."
+msgstr "Geen waarde ingevoerd."
+
+#: src/prefs_matcher.c:1436
+msgid ""
+"%\n"
+"Subject\n"
+"From\n"
+"To\n"
+"Cc\n"
+"Date\n"
+"Message-ID\n"
+"Newsgroups\n"
+"References\n"
+"Filename - should not be modified\n"
+"new line\n"
+"escape character for quotes\n"
+"quote character\n"
+"%"
+msgstr ""
+"%\n"
+"Onderwerp\n"
+"Afzender\n"
+"Geadresseerde\n"
+"Cc\n"
+"Datum\n"
+"Bericht-ID\n"
+"Nieuwsgroepen\n"
+"Berichtverwijzingen\n"
+"Bestandsnaam·-·bestand niet wijzigen!\n"
+"nieuwe-regel\n"
+"escape-teken·voor·aanhalingstekens\n"
+"aanhalingsteken\n"
+"%"
+
+#: src/prefs_scoring.c:187
+msgid "Creating scoring setting window...\n"
+msgstr "Venster Score-instellingen wordt aangemaakt...\n"
+
+#: src/prefs_scoring.c:206
+msgid "Scoring setting"
+msgstr "Score-instellingen"
+
+#: src/prefs_scoring.c:340
+msgid "Kill score"
+msgstr "Score: Verwijderen"
+
+#: src/prefs_scoring.c:352
+msgid "Important score"
+msgstr "Score: belangrijk"
+
+#: src/prefs_scoring.c:567 src/prefs_scoring.c:613
+msgid "Match string is not set."
+msgstr "Type niet ingesteld."
+
 #: src/procmime.c:687
 msgid "Code conversion failed.\n"
 msgstr "Codeconversie is mislukt\n"
@@ -3805,57 +4313,54 @@ msgstr "Codeconversie is mislukt\n"
 msgid "Cache data is corrupted\n"
 msgstr "Buffergegevens zijn corrupt\n"
 
-#: src/procmsg.c:202
+#: src/procmsg.c:203
 msgid "\tNo cache file\n"
 msgstr "\tGeen bufferbestand\n"
 
-#: src/procmsg.c:209
+#: src/procmsg.c:210
 msgid "\tReading summary cache..."
 msgstr "\tLijstbuffer wordt gelezen..."
 
-#: src/procmsg.c:214
+#: src/procmsg.c:215
 msgid "Cache version is different. Discarding it.\n"
 msgstr "Bufferversie komt niet overeen. De buffer wordt genegeerd.\n"
 
-#: src/procmsg.c:281
+#: src/procmsg.c:283
 msgid "\tMarking the messages..."
 msgstr "\tBerichten worden gemarkeerd..."
 
-#: src/procmsg.c:328
+#: src/procmsg.c:327
 #, c-format
 msgid "\t%d new message(s)\n"
 msgstr "\t%d nieuwe berichten\n"
 
-#: src/procmsg.c:464
+#: src/procmsg.c:463
 msgid "Mark file not found.\n"
 msgstr "Markeerbestand is niet gevonden\n"
 
-#: src/procmsg.c:466
+#: src/procmsg.c:465
 #, c-format
 msgid "Mark version is different (%d != %d). Discarding it.\n"
-msgstr "Markeerversie is ander (%d != %d).  Het markeerbestand wordt genegeerd.\n"
+msgstr ""
+"Markeerversie is ander (%d != %d).  Het markeerbestand wordt genegeerd.\n"
 
-#: src/procmsg.c:482
+#: src/procmsg.c:481
 msgid "Can't open mark file with append mode.\n"
 msgstr "Kan markeerbestand niet openen in de 'append-mode'\n"
 
-#: src/procmsg.c:487
+#: src/procmsg.c:486
 msgid "Can't open mark file with write mode.\n"
 msgstr "Kan het markeerbestand niet openen om te schrijven\n"
 
-#: src/procmsg.c:671
+#: src/procmsg.c:669
 msgid "Sending queued message failed.\n"
 msgstr "Verzenden van berichten uit de wachtrij is mislukt.\n"
 
-#: src/procmsg.c:729
+#: src/procmsg.c:727
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
 
-#: src/progressdialog.c:52
-msgid "Account"
-msgstr "Postvak"
-
 #: src/progressdialog.c:53
 msgid "Status"
 msgstr "Status"
@@ -3864,35 +4369,40 @@ msgstr "Status"
 msgid "Creating progress dialog...\n"
 msgstr "Voortgangdialoog wordt gemaakt...\n"
 
-#: src/recv.c:111
+#: quote_fmt_parse.y:109
+#, c-format
+msgid "Error %s\n"
+msgstr "Fout %s\n"
+
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "er is een fout opgetreden bij het ontvangen van de gegevens.\n"
 
-#: src/recv.c:148 src/recv.c:185 src/recv.c:200
+#: src/recv.c:152 src/recv.c:189 src/recv.c:204
 msgid "Can't write to file.\n"
 msgstr "Het bestand is niet beschrijfbaar.\n"
 
-#: src/rfc2015.c:137 src/rfc2015.c:172
+#: src/rfc2015.c:137 src/rfc2015.c:172 src/sigstatus.c:219
 msgid "Oops: Signature not verified"
 msgstr "Oeps: Handtekening is niet geverifieerd"
 
-#: src/rfc2015.c:140 src/rfc2015.c:175
+#: src/rfc2015.c:140 src/rfc2015.c:175 src/sigstatus.c:222
 msgid "No signature found"
 msgstr "Geen handtekening gevonden"
 
-#: src/rfc2015.c:143
+#: src/rfc2015.c:143 src/sigstatus.c:225
 msgid "Good signature"
 msgstr "Correcte handtekening"
 
-#: src/rfc2015.c:146
+#: src/rfc2015.c:146 src/sigstatus.c:228
 msgid "BAD signature"
 msgstr "SLECHTE handtekening"
 
-#: src/rfc2015.c:149 src/rfc2015.c:184
+#: src/rfc2015.c:149 src/rfc2015.c:184 src/sigstatus.c:231
 msgid "No public key to verify the signature"
 msgstr "Geen publieke key om de handtekening te verifiëren"
 
-#: src/rfc2015.c:152 src/rfc2015.c:187
+#: src/rfc2015.c:152 src/rfc2015.c:187 src/sigstatus.c:234
 msgid "Error verifying the signature"
 msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
 
@@ -3933,6 +4443,20 @@ msgstr "Handtekening gemaakt %s\n"
 msgid "Key fingerprint: %s\n"
 msgstr "Sleutel vingerafdruk: %s\n"
 
+#: src/scoring.c:292
+msgid "Reading headers configuration...\n"
+msgstr "Header configuratie wordt ingelezen...\n"
+
+#. debug
+#: src/scoring.c:344
+#, c-format
+msgid "syntax error : %s\n"
+msgstr "Syntaxisfout: %s\n"
+
+#: src/scoring.c:420
+msgid "Writing scoring configuration...\n"
+msgstr "Scoreconfiguratie wordt opgeslagen...\n"
+
 #: src/select-keys.c:101
 #, c-format
 msgid "Please select key for `%s'"
@@ -4050,6 +4574,10 @@ msgstr ""
 "U kunt een bestaande mailbox in MH formaat gebruiken.\n"
 "Als u twijfelt, dan kunt u het beste gewoon op OK klikken."
 
+#: src/sigstatus.c:129
+msgid "Checking signature"
+msgstr "Handtekening wordt geverifieerd"
+
 #: src/sourcewindow.c:76
 msgid "Creating source window...\n"
 msgstr "Bronvenster wordt aangemaakt...\n"
@@ -4072,10 +4600,6 @@ msgstr "%s - Broncode"
 msgid "Search"
 msgstr "Zoek"
 
-#: src/summary_search.c:172
-msgid "Case sensitive"
-msgstr "Hoofd / kleine letters onderscheiden"
-
 #: src/summary_search.c:178
 msgid "Backward search"
 msgstr "Zoek achteruit"
@@ -4108,319 +4632,283 @@ msgstr "Einde van de lijst bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/summaryview.c:319
+#: src/summaryview.c:324
 msgid "/M_ove..."
 msgstr "/_Verplaats..."
 
-#: src/summaryview.c:320
+#: src/summaryview.c:325
 msgid "/_Copy..."
 msgstr "/_Kopieer..."
 
-#: src/summaryview.c:322
+#: src/summaryview.c:327
 msgid "/E_xecute"
 msgstr "/_Doen!"
 
-#: src/summaryview.c:323
+#: src/summaryview.c:328
 msgid "/_Mark"
 msgstr "/_Markeer"
 
-#: src/summaryview.c:324
+#: src/summaryview.c:329
 msgid "/_Mark/_Mark"
 msgstr "/_Markeer/_Markeer"
 
-#: src/summaryview.c:325
+#: src/summaryview.c:330
 msgid "/_Mark/_Unmark"
 msgstr "/_Markeer/D_emarkeer"
 
-#: src/summaryview.c:326
+#: src/summaryview.c:331
 msgid "/_Mark/---"
 msgstr "/_Markeer/---"
 
-#: src/summaryview.c:327
+#: src/summaryview.c:332
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markeer/Markeer als _ongelezen"
 
-#: src/summaryview.c:328
+#: src/summaryview.c:333
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markeer/Markeer als 'wordt gelezen'"
 
-#: src/summaryview.c:329
-msgid "/_Mark/Ignore thread"
-msgstr "/_Markeer/Markeer als 'Negeren'"
-
-#: src/summaryview.c:330
-msgid "/_Mark/Unignore thread"
-msgstr "/_Markeer/Markeer als 'Niet negeren'"
-
-#: src/summaryview.c:332
-msgid "/_Label"
-msgstr "/_Label"
-
-#: src/summaryview.c:333
-msgid "/_Label/None"
-msgstr "/_Label/Geen"
-
-#: src/summaryview.c:334
-msgid "/_Label/---"
-msgstr "/_Label/---"
-
 #: src/summaryview.c:335
-msgid "/_Label/Orange"
-msgstr "/_Label/Oranje"
-
-#: src/summaryview.c:336
-msgid "/_Label/Red"
-msgstr "/_Label/Rood"
+msgid "/_Mark/Mark all read"
+msgstr "/_Markeer/Markeer alles gelezen"
 
 #: src/summaryview.c:337
-msgid "/_Label/Pink"
-msgstr "/_Label/Roze"
+msgid "/_Mark/Ignore thread"
+msgstr "/_Markeer/Markeer als 'Negeren'"
 
 #: src/summaryview.c:338
-msgid "/_Label/SkyBlue"
-msgstr "/_Label/Hemelsblauw"
-
-#: src/summaryview.c:339
-msgid "/_Label/Blue"
-msgstr "/_Label/Blauw"
-
-#: src/summaryview.c:340
-msgid "/_Label/Green"
-msgstr "/_Label/Groen"
+msgid "/_Mark/Unignore thread"
+msgstr "/_Markeer/Markeer als 'Niet negeren'"
 
 #: src/summaryview.c:341
-msgid "/_Label/Brown"
-msgstr "/_Label/Bruin"
-
-#: src/summaryview.c:344
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/summaryview.c:345
+#: src/summaryview.c:342
 msgid "/Repl_y to sender"
 msgstr "/Antwoord _iedereen"
 
-#: src/summaryview.c:346
+#: src/summaryview.c:343
 msgid "/Follow-up and reply to"
 msgstr "/Doorsturen en beantwoorden"
 
-#: src/summaryview.c:347
+#: src/summaryview.c:344
 msgid "/Reply to a_ll"
 msgstr "/Antwoord _iedereen"
 
-#: src/summaryview.c:348
+#: src/summaryview.c:345
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/summaryview.c:349
+#: src/summaryview.c:346
 msgid "/Forward as a_ttachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/summaryview.c:352
+#: src/summaryview.c:349
 msgid "/Open in new _window"
 msgstr "/Open in _nieuw venster"
 
-#: src/summaryview.c:353
+#: src/summaryview.c:350
 msgid "/View so_urce"
 msgstr "/B_ron weergeven"
 
-#: src/summaryview.c:354
+#: src/summaryview.c:351
 msgid "/Show all _header"
 msgstr "/Vo_lledig header"
 
-#: src/summaryview.c:355
+#: src/summaryview.c:352
 msgid "/Re-_edit"
 msgstr "/Bewerken"
 
-#: src/summaryview.c:358
+#: src/summaryview.c:355
 msgid "/_Print..."
 msgstr "/Afdrukken..."
 
-#: src/summaryview.c:360
+#: src/summaryview.c:357
 msgid "/Select _all"
 msgstr "/Selecteer alles"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:496
+msgid "Label"
+msgstr "Label"
+
+#: src/summaryview.c:542
 msgid "M"
 msgstr "M"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:542
 msgid "U"
 msgstr "O"
 
-#: src/summaryview.c:470
+#: src/summaryview.c:557
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:485
+#: src/summaryview.c:572
 msgid "No."
 msgstr "Nee."
 
-#: src/summaryview.c:788
+#: src/summaryview.c:877
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:789
+#: src/summaryview.c:878
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:814
+#: src/summaryview.c:907
 msgid ""
 "empty folder\n"
 "\n"
 msgstr "lege map\n"
 
-#: src/summaryview.c:826
+#: src/summaryview.c:919
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Map wordt ingelezen (%s)..."
 
-#: src/summaryview.c:949
-msgid "done."
-msgstr "klaar."
-
-#: src/summaryview.c:1117
+#: src/summaryview.c:1213
 msgid "No unread message"
 msgstr "Geen ongelezen berichten"
 
-#: src/summaryview.c:1118
+#: src/summaryview.c:1214
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1142 src/summaryview.c:1172
+#: src/summaryview.c:1238 src/summaryview.c:1268
 msgid "No more marked messages"
 msgstr "Laatste gemarkeerde bericht"
 
-#: src/summaryview.c:1143
+#: src/summaryview.c:1239
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerde berichten gevonden. Opnieuw beginnen?"
 
-#: src/summaryview.c:1151 src/summaryview.c:1181
+#: src/summaryview.c:1247 src/summaryview.c:1277
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1173
+#: src/summaryview.c:1269
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerde berichten gevonden. Opnieuw?"
 
-#: src/summaryview.c:1359 src/summaryview.c:1361
+#: src/summaryview.c:1455 src/summaryview.c:1457
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1504
+#: src/summaryview.c:1600
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1604
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1509 src/summaryview.c:1516
+#: src/summaryview.c:1605 src/summaryview.c:1612
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1514
+#: src/summaryview.c:1610
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1627
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1542
+#: src/summaryview.c:1638
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1548
+#: src/summaryview.c:1644
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:1598 src/summaryview.c:1599
+#: src/summaryview.c:1694 src/summaryview.c:1695
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:1665
+#: src/summaryview.c:1761
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:1667
+#: src/summaryview.c:1763
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:1877
+#: src/summaryview.c:1973
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:1945
+#: src/summaryview.c:2041
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:2256
+#: src/summaryview.c:2350
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2289
+#: src/summaryview.c:2381
 #, c-format
 msgid "Message %d is marked as read\n"
-msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
+msgstr "Bericht %d is gemarkeerd als gelezen.\n"
 
-#: src/summaryview.c:2324
+#: src/summaryview.c:2425
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:2372
+#: src/summaryview.c:2469
 #, c-format
 msgid "Message %s/%d is set to delete\n"
-msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
+msgstr "Bericht %s/%d staat klaar verwijderd te worden\n"
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2483
 msgid "Current folder is Trash."
 msgstr "Huidige map is de Prullenbak"
 
-#: src/summaryview.c:2408 src/summaryview.c:2410
+#: src/summaryview.c:2505 src/summaryview.c:2507
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/summaryview.c:2463
+#: src/summaryview.c:2555
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:2501
+#: src/summaryview.c:2592
 #, c-format
 msgid "Message %d is set to move to %s\n"
-msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
+msgstr "Bericht %d staat klaar verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:2513
+#: src/summaryview.c:2604
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:2563
+#: src/summaryview.c:2653
 #, c-format
 msgid "Message %d is set to copy to %s\n"
-msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
+msgstr "Bericht %d staat klaar gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:2576
+#: src/summaryview.c:2666
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:2608
+#: src/summaryview.c:2698
 msgid "Selecting all messages..."
 msgstr "Alle berichten worden geselecteerd..."
 
-#: src/summaryview.c:2662
+#: src/summaryview.c:2752
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/summaryview.c:2663
+#: src/summaryview.c:2753
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -4429,7 +4917,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/summaryview.c:2669
+#: src/summaryview.c:2759
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4438,41 +4926,41 @@ msgstr ""
 "Afdrukopdracht is ongeldig:\n"
 "'%s'"
 
-#: src/summaryview.c:2906 src/summaryview.c:2907
+#: src/summaryview.c:2995 src/summaryview.c:2996
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:2929 src/summaryview.c:2930
+#: src/summaryview.c:3018 src/summaryview.c:3019
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:2952
+#: src/summaryview.c:3041
 msgid "Unthreading for execution..."
 msgstr "Discussies worden uit elkaar gehaald voor de uitvoering..."
 
-#: src/summaryview.c:3048
+#: src/summaryview.c:3137
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3138
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3181
+#: src/summaryview.c:3270
 #, c-format
 msgid "Go to %s\n"
 msgstr "Ga naar %s\n"
 
-#: src/summaryview.c:3538
+#: src/summaryview.c:3626
 msgid "Add sender to address book"
 msgstr "Afzender toevoegen aan adresboek"
 
-#: src/summaryview.c:3784
+#: src/summaryview.c:3872
 #, c-format
 msgid "Message %d is marked as ignore thread\n"
 msgstr "Bericht %d is gemarkeerd als negeren\n"
 
-#: src/summaryview.c:3815
+#: src/summaryview.c:3903
 #, c-format
 msgid "Message %d is marked as unignore thread\n"
 msgstr "Bericht %d is gemarkeerd als niet negeren\n"
@@ -4529,28 +5017,24 @@ msgstr "Deze handtekening is nog niet gecontroleerd.\n"
 
 #: src/textview.c:399
 msgid "To check it, pop up the context menu with\n"
-msgstr "Om te controleren kunt u met de rechter muisknop het contextmenu oproepen\n"
+msgstr ""
+"Om te controleren kunt u met de rechter muisknop het contextmenu oproepen\n"
 
 #: src/textview.c:400
 msgid "right click and select `Check signature'.\n"
 msgstr "en de optie'Controleer handtekening' selecteren.\n"
 
-#: src/utils.c:1560 src/utils.c:1637
-#, c-format
-msgid "writing to %s failed.\n"
-msgstr "schrijven naar %s is mislukt.\n"
-
-#: src/utils.c:1580
+#: src/utils.c:1591
 #, c-format
 msgid "File copy from %s to %s failed.\n"
 msgstr "Fout bij kopieren van %s naar %s.\n"
 
-#: src/utils.c:1678
+#: src/utils.c:1689
 #, c-format
 msgid "move_file(): file %s already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/utils.c:1819
+#: src/utils.c:1830
 #, c-format
 msgid "Open URI command line is invalid: `%s'"
 msgstr "Open URI opdrachtregel is onjuist: '%s'"
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index c08793451..0abc38e55 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -212,11 +212,18 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
 	}
 }
 
-gchar * action_text [] = {
-	"Move",	"Copy", "Delete",
-	"Mark", "Unmark", "Mark as read", "Mark as unread",
-	"Forward", "Forward as attachment", "Execute",
-	"Color"
+static gchar * action_text [] = {
+	N_("Move"),	
+	N_("Copy"), 
+	N_("Delete"),
+	N_("Mark"), 
+	N_("Unmark"), 
+	N_("Mark as read"), 
+	N_("Mark as unread"),
+	N_("Forward"), 
+	N_("Forward as attachment"), 
+	N_("Execute"),
+	N_("Color")
 };
 
 void prefs_filtering_open(void)
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index df2a165d1..3cd5302ea 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -114,7 +114,7 @@ enum {
 };
 
 gchar * bool_op_text [] = {
-	"or", "and"
+	N_("or"), N_("and")
 };
 
 enum {
@@ -123,7 +123,7 @@ enum {
 };
 
 gchar * predicate_text [] = {
-	"contains", "does not contain"
+	N_("contains"), N_("does not contain")
 };
 
 enum {
@@ -132,21 +132,21 @@ enum {
 };
 
 gchar * predicate_flag_text [] = {
-	"yes", "no"
+	N_("yes"), N_("no")
 };
 
 gchar * criteria_text [] = {
-	"All messages", "Subject",
-	"From", "To", "Cc", "To or Cc",
-	"Newsgroups", "In reply to", "References",
-	"Age greater than", "Age lower than",
-	"Header", "Headers part",
-	"Body part", "Whole message",
-	"Unread flag", "New flag",
-	"Marked flag", "Deleted flag",
-	"Replied flag", "Forwarded flag",
-	"Score greater than", "Score lower than",
-	"Execute"
+	N_("All messages"), N_("Subject"),
+	N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
+	N_("Newsgroups"), N_("In reply to"), N_("References"),
+	N_("Age greater than"), N_("Age lower than"),
+	N_("Header"), N_("Headers part"),
+	N_("Body part"), N_("Whole message"),
+	N_("Unread flag"), N_("New flag"),
+	N_("Marked flag"), N_("Deleted flag"),
+	N_("Replied flag"), N_("Forwarded flag"),
+	N_("Score greater than"), N_("Score lower than"),
+	N_("Execute")
 };
 
 static gint get_sel_from_list(GtkList * list)
-- 
2.25.1