Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22964

1 files changed, 3278 insertions, 3592 deletions

diff --git a/po/nl.po b/po/nl.po
index 5895a949bb..6193ebac1a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2003-06-15 14:37+0100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -24,182 +24,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF import assistent"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard import assistent"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution VCard import assistent"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Opslaan als"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Volledige naam"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Naam"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adres"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adres label"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Tel."
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Geboortedatum"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisatie"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisatie"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kantoor"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Functie"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rol"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Manager"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Bijnaam"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Echtgeno(o)t(e)"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Verjaardag"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "E-mailprogramma"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalender URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Vrij/Bezet URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS Kalender"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Opmerkingen"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Gerelateerde contacten"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorieën"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Categorie lijst"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Heeft liever HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Heeft liever HTML is gekozen"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Lijst"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Lijst adressen weergeven"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Arbitrair"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Laatst gebruikt"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Gebruik score"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -209,6 +74,14 @@ msgstr "Eerste"
 msgid "Prim"
 msgstr "1e"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -243,6 +116,12 @@ msgid "Home"
 msgstr "Thuis"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisatie"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -361,9 +240,21 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kantoor"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Knt"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Functie"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -374,6 +265,12 @@ msgid "Prof"
 msgstr "Ber"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Manager"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Man"
 
@@ -382,9 +279,32 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Bijnaam"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Bijnaam"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Echtgeno(o)t(e)"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Opmerkingen"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Kalender URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KALuri"
@@ -407,6 +327,11 @@ msgid "icsCalendar"
 msgstr "icsKalender"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Verjaardag"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Verj"
 
@@ -414,6 +339,12 @@ msgstr "Verj"
 msgid "Birth Date"
 msgstr "Geboortedatum"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorieën"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Achternaam"
@@ -428,29 +359,105 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution LDIF import assistent"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Volledige naam"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adres"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard import assistent"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adres label"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution VCard import assistent"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Tel."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Geboortedatum"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisatie"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rol"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr "E-mailprogramma"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Vrij/Bezet URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS Kalender"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Gerelateerde contacten"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Categorie lijst"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Heeft liever HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Heeft liever HTML is gekozen"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Lijst"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Lijst adressen weergeven"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Arbitrair"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Laatst gebruikt"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Gebruik score"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Kon bonobo niet initialiseren"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -507,14 +514,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Kon wombat server niet starten"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Kon wombat niet starten"
 
@@ -523,6 +530,137 @@ msgstr "Kon wombat niet starten"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier kunt u de toegang tot LDAP servers instellen"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Adresboekservers"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adresboek LDAP-configuratie"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adresboek adrespopup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresboek adresweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresboek kaartweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolution adresboekcomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adresboek mapweergave"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Map met contactinformatie"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP server"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP server met contactinformatie"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Publiekelijk adresboek"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Map met contactinformatie die publiekelijk toegankelijk is"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Nieuw contact"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "C_ontact"
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr "Nieuw contact maken"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nieuwe contactenlijst"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Contacten _lijst"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr "Maak een nieuwe contactenlijst"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Kan geen verbinding krijgen met LDAP server"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Fout bij het aanmelden bij de LDAP server"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Kan geen query uitvoeren op de Root DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "De server antwoordde zonder ondersteunde zoekbasis"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fout bij het laden van schema informatie"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Accountnaam"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servernaam"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wordt niet ondersteund in deze versie van Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andere adresboeken"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -648,101 +786,6 @@ msgstr "Elke categorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de mapbladeraar zal laten zien"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Adresboek"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Map met contactinformatie"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP server"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP server met contactinformatie"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Publiekelijk adresboek"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Map met contactinformatie die publiekelijk toegankelijk is"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Nieuw contact"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "C_ontact"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Nieuw contact maken"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Nieuwe contactenlijst"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "Contacten _lijst"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Maak een nieuwe contactenlijst"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Kan geen verbinding krijgen met LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Fout bij het aanmelden bij de LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Kan geen query uitvoeren op de Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "De server antwoordde zonder ondersteunde zoekbasis"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fout bij het laden van schema informatie"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Accountnaam"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servernaam"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wordt niet ondersteund in deze versie van Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere adresboeken"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -771,69 +814,33 @@ msgstr "Nieuw contact maken \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Voeg adres toe aan bestand contact \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Adresboek wordt benaderd..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Contactinformatie bewerken"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Toevoegen aan contacten"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "E-mailadres samenvoegen"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Zet queries uit"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Queries toestaan (Gevaarlijk!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier kunt u de toegang tot LDAP servers instellen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Adresboekservers"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adresboek LDAP-configuratie"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adresboek adrespopup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresboek adresweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresboek kaartweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolution adresboekcomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adresboek mapweergave"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -982,9 +989,10 @@ msgstr "Één"
 msgid "S_earch scope: "
 msgstr "Zoek_gebied: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Zoeken"
 
@@ -1216,11 +1224,11 @@ msgstr "_Downloadlimiet:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -1260,24 +1268,20 @@ msgstr "Algemeen-tab"
 msgid "searching-tab"
 msgstr "Zoeken-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Selecteer contacten uit het adresboek"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adresboek naamselectie-interface"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Vind contact in"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Alle verwijderen"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Contactenlijst weergeven"
@@ -1300,9 +1304,13 @@ msgstr "Ander contact"
 msgid "Source"
 msgstr "Bron"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adresboek naamselectie-interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Selecteer contacten uit het adresboek"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Vind contact in"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1375,7 +1383,7 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Details"
 
@@ -1443,13 +1451,11 @@ msgid "_Categories..."
 msgstr "_Categorieën..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -1492,15 +1498,15 @@ msgid "_Web page address:"
 msgstr "Homepage:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Bewerkbaar"
 
@@ -2528,17 +2534,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Boek"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Kaart"
 
@@ -2759,7 +2765,7 @@ msgstr "Is nieuwe lijst"
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
@@ -2805,7 +2811,7 @@ msgstr ""
 "in deze map. Wilt u het toch toevoegen?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
@@ -2824,10 +2830,10 @@ msgid "%d cards"
 msgstr "%d kaarten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Zoekopdracht"
 
@@ -2835,113 +2841,113 @@ msgstr "Zoekopdracht"
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kaart niet gevonden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kaart-ID bestaat reeds"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Aanmelding mislukt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Aanmelding is vereist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS is niet beschikbaar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adresboek bestaat niet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Verwerpen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2950,131 +2956,132 @@ msgstr ""
 "Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
 "Wilt u deze kaarten werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr "Nieuw contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr "Nieuwe contactlijst..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "Ga naar map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "Importeren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr "Zoek naar contacten..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr "Adresboekbronnen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr "Pilot instellingen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contact doorsturen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Stuur bericht aan contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Envelop afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Kopiëren naar map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Verplaatsen naar map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Knippen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "Huidige weergave"
 
@@ -3082,7 +3089,7 @@ msgstr "Huidige weergave"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3090,11 +3097,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3166,29 +3173,6 @@ msgstr "Andere telefoon"
 msgid "Primary Phone"
 msgstr "Eerste telefoon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Breedte"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Hoogte"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Heeft focus"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Geselecteerd"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Heeft cursor"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3202,6 +3186,21 @@ msgstr "en één andere kaart."
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Breedte"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Hoogte"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Heeft focus"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Veld"
@@ -3218,6 +3217,10 @@ msgstr "Tekst model"
 msgid "Max field name length"
 msgstr "Maximale veldnaam lengte"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Kolombreedte"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3246,9 +3249,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Kolombreedte"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Geselecteerd"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Heeft cursor"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3258,20 +3265,20 @@ msgstr "Kaartweergave"
 msgid "GTK Tree View"
 msgstr "GTK boomweergave"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Envelop afdrukken"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Kaarten afdrukken"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Kaart afdrukken"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Envelop afdrukken"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
@@ -3441,63 +3448,6 @@ msgstr "Breedte:"
 msgid "_Font..."
 msgstr "_Lettertype..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "met alle lokale en actieve niet-lokale mappen"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "kaarten"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Interne fout"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Afspraak zonder titel"
@@ -3627,30 +3577,28 @@ msgid "31st"
 msgstr "31e"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Hoog"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Laag"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -3658,13 +3606,13 @@ msgstr "Ongedefinieerd"
 msgid "Split Multi-Day Events:"
 msgstr "Meerdaagse gebeurtenissen splitsen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon kalendergegevens niet uit de pilot lezen"
 
@@ -3672,32 +3620,74 @@ msgstr "Kon kalendergegevens niet uit de pilot lezen"
 msgid "Default Priority:"
 msgstr "Standaard prioriteit:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender en Taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender en taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalender en taken-component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenderconfiguratie"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalender planingsberichtenweergave"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalenderweergave"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender- / taakbeheer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution taakbeheer"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalender alarmweergave"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Bezig met starten:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Einde:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "ongeldige tijd"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm op %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "Afsluiten"
 
@@ -3713,25 +3703,16 @@ msgstr "Sluimertijd (minuten)"
 msgid "_Edit appointment"
 msgstr "_Afspraak bewerken"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3743,7 +3724,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3760,84 +3741,69 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmweergave"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Kon bonobo niet initialiseren"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Kon Gnome-vfs niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Creëeren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Deze bewerking zal alle taken die als 'voltooid' gemarkeerd zijn, permanent "
-"verwijderen. Als u doorgaat zult u ze niet meer kunnen herstellen.\n"
-"\n"
-"De taken echt verwijderen?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Samenvatting bevat"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "geeft kleiner dan"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Omschrijving bevat"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dagen"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Commentaar bevat"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Niet passend"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3856,11 +3822,11 @@ msgstr "Publieke kalender"
 msgid "Public folder containing appointments and events"
 msgstr "Map met afspraken en gebeurtenissen"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Taken"
@@ -3925,6 +3891,107 @@ msgstr "_Dag-omvattende afspraak"
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dag-omvattende afspraak"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Privé"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Vertrouwelijk"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Openbaar"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Vrij"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Bezig"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Niet gestart"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "In behandeling"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Voltooid"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"De geografische positie moet ingevoerd worden in het formaat: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Geen"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Herhalend"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Toegewezen"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Nee"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dag weergave"
@@ -3941,69 +4008,48 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "_Aangepaste weergave"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Samenvatting bevat"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Omschrijving bevat"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Commentaar bevat"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Niet passend"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Fout bij openen van de kalender"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Methode niet ondersteund tijdens het openen van de kalender"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Toegang geweigerd bij openen van de kalender"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Het type weergaven"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Geluid Alarm Opties"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Bericht Alarm Opties"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "E-mail alarm opties"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programma Alarmopties"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Onbekende Alarmopties"
 
@@ -4039,6 +4085,10 @@ msgstr "Aan:"
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dagen"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "dialog1"
@@ -4051,8 +4101,7 @@ msgstr "nogmaals"
 msgid "hours"
 msgstr "uren"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minuten"
 
@@ -4066,11 +4115,11 @@ msgstr "Algemeen"
 msgid "Date/Time:"
 msgstr "Datum/Tijd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Een bericht tonen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
@@ -4078,7 +4127,7 @@ msgstr "Speel een geluid af"
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Start een programma"
 
@@ -4088,8 +4137,7 @@ msgstr "Verstuur een e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -4172,7 +4220,7 @@ msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -4186,7 +4234,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Maandag"
 
@@ -4196,7 +4244,7 @@ msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -4210,7 +4258,7 @@ msgstr "Week_nummers tonen in datum navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -4228,7 +4276,7 @@ msgstr "Takenlijst"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -4246,7 +4294,7 @@ msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -4256,12 +4304,12 @@ msgstr "W_eek begint:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Woensdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Werkweek"
 
@@ -4374,53 +4422,78 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Weet u zeker dat u dit dagboek item wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Deze gebeurtenis is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Deze taak is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Dit dagboekitem is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s U heeft veranderingen gemaakt. Deze veranderingen negeren en de editor "
 "sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s U heeft niets veranderd. Editor sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Deze gebeurtenis is veranderd."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Deze taak is veranderd"
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Dit dagboekitem is veranderd"
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s U heeft iets veranderd. Deze veranderingen vergeten en de editor sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Verificatiefout: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " tot "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Verloopt "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Verloopdatum "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Kon ongeldig object niet vernieuwen"
@@ -4466,49 +4539,23 @@ msgid "No summary"
 msgstr "Geen samenvatting"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Verificatiefout: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " tot "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Verloopt "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Verloopdatum "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4613,31 +4660,31 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Bijeenkomstplannen"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
@@ -4673,8 +4720,8 @@ msgid "Classification"
 msgstr "Classificatie"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
 msgstr "Vertrouwelijk"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -4701,6 +4748,7 @@ msgid "Pu_blic"
 msgstr "Open_baar"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Tijd tonen als"
 
@@ -4717,34 +4765,74 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Geen"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Die persoon bezoekt de bijeenkomst reeds!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Aanwezige"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klik hier om een lid toe te voegen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Algemene naam"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Overgedragen van"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Overgedragen aan"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Taal"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Lid"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4755,7 +4843,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _veranderen"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "Anderen uit_nodigen..."
 
@@ -4912,7 +5000,7 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr "Veranderingen verwerpen"
 
@@ -4936,83 +5024,52 @@ msgstr "De taakopdracht informatie is gemaakt. Verzenden?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "De taakgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr "Voltooiingsdatum is ongeldig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% Voltooid:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Voltooid"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "In behandeling"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Niet gestart"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Voltooiingsdatum:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Voortgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Voltooiingsdatum:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Status:"
 
-# , fuzzy
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "Homepage:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is incorrect"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Vertrouwelijk"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Omschrijving:"
@@ -5025,259 +5082,223 @@ msgstr "Be_gindatum:"
 msgid "_Due Date:"
 msgstr "_Verloopdatum:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d dagen"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d weken"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 week"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 uur"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuten"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 minuut"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 seconde"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Verstuur een bericht"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Opdracht om uit te voeren onbekend"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s voor het begin van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s na het begin van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s bij het begin van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s voor het einde van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s na het einde van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s bij het einde van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s bij %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Openbaar"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Privé"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Vertrouwelijk"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Vrij"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Bezig"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "Bericht _openen"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "_Opslaan als..."
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
+msgstr "Op_slaan als..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Voltooid:"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -5286,14 +5307,13 @@ msgid "Completion Date"
 msgstr "Voltooiingsdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Omschrijving:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Verloop Datum"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Einddatum"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografische Positie"
@@ -5302,299 +5322,242 @@ msgstr "Geografische Positie"
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "kleur"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Afspraak"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Herhalend"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Toegewezen"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d-%m-%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ja"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Nee"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"De datum moet ingevoerd worden in het formaat: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuten delingen"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "W"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"De geografische positie moet ingevoerd worden in het formaat: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Nieuwe _Afspraak..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Nieuwe _Afspraak"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Nieuwe taak"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Afdrukken..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Instellingen..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "_Opslaan als..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iKalender"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d-%m-%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d-%m-%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"De datum moet ingevoerd worden in het formaat: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Elke dag"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Elke %d dagen"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Elke week"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Elke %d weken"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Elke week op"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Elke %d weken op"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " en "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "De %s dag van "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "De %s %s van "
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "elke maand"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "elke %d maanden"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Elk jaar"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Elke %d jaar"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr "een totaal van %d keer"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", eindigend op "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Begint:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5602,334 +5565,340 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Lokatie: "
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> verzoekt %s om bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> verzoekt %s om een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is ongeldig en kan niet worden bijgewerkt\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Er is een fout opgetreden in het CORBA-systeem\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "U heeft niet de juiste rechten om de kalender te vernieuwen\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een geregistreerd staand persoon. Toevoegen in "
 "registratie?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "U heeft niet de juiste rechten om de kalender te vernieuwen\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Kies kalendermap"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Kies takenmap"
 
@@ -5970,167 +5939,185 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Voorzitters"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Vereiste Deelnemers"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Optionele Deelnemers"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Hulpbronnen"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Persoon"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Groep"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Hulpbron"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Kamer"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Voorzitter"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Vereiste deelnemer"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Optionele deelnemer"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Niet-deelnemer"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Heeft actie nodig"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Overgedragen"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "In uitvoer"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d-%m-%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d-%m-%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afwezig"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opties"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Alleen kantooruren t_onen"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Uitge_zoomd tonen"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Vrij/Bezet _actualiseren"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Alle mensen en hulpbronnen"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Alle _mensen en één hulpbron"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Vereiste mensen"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Aanvang _bijeenkomst:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d-%m-%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Aanwezige"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klik hier om een lid toe te voegen"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Algemene naam"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Overgedragen van"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Overgedragen aan"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Taal"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Lid"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d-%m-%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "ongeldige tijd"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Be_gindatum:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Verloopdatum:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Prioriteit:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Pagina"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "U heeft niet de juiste rechten om de map '%s' te openen"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6139,110 +6126,68 @@ msgstr ""
 "Fout bij %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Nieuwe _Afspraak..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmen voor %s worden toegevoegd"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"De taak module voor\n"
+"De kalender module voor\n"
 "%s\n"
 " is gecrashed. Herstart Evolution om het opnieuw te kunnen gebruiken."
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"De kalender module voor\n"
+"De taak module voor\n"
 "%s\n"
 " is gecrashed. Herstart Evolution om het opnieuw te kunnen gebruiken."
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Bezig met openen kalender op %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr "Standaard takenmap wordt geopend"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "%s wordt opgezocht"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Turin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender en Taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender en taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution kalender en taken-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenderconfiguratie"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalender planingsberichtenweergave"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalenderweergave"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender- / taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution taakbeheer"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6349,7 +6294,7 @@ msgstr "Vrij/Bezet informatie (%s tot %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informatie"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
@@ -6382,81 +6327,82 @@ msgid "Sa"
 msgstr "Za"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Geselecteerde dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Geselecteerde week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Geselecteerde maand (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Taak"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteit: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent voltooid: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorieën: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Contacten: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Item afdrukken"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
@@ -6464,7 +6410,7 @@ msgstr "Printerinstellingen"
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6476,11 +6422,11 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
@@ -8173,27 +8119,27 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr "U mag geen sleutels importeren met deze sleutel"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr "U mag geen sleutels exporteren met deze sleutel"
 
@@ -8232,11 +8178,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Aan het synchroniseren met de server"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Map '%s' wordt voorbereid voor offline gebruik"
@@ -8257,57 +8199,57 @@ msgstr "Aanmaken van pijp naar '%s' mislukt: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Starten van kindproces '%s' mislukt: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ongeldige berichtenstroom ontvangen van %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen van bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
@@ -8329,35 +8271,7 @@ msgstr "Ongeldige argumenten voor (gebruiker)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Verplaatsen van berichten"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Berichten worden gekopieerd"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Bezig met ophalen van %d bericht(en)"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8366,7 +8280,7 @@ msgstr ""
 "Kan zoekexpressie niet interpreteren: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8375,15 +8289,38 @@ msgstr ""
 "Fout bij uitvoeren zoekexpressie: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met zoeken naar onbekende koptekst: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Verplaatsen van berichten"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Berichten worden gekopieerd"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8414,7 +8351,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
@@ -8473,6 +8410,26 @@ msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ondertekening niet verifiëren: kan geen tijdelijk bestand maken: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kon de 'locking helper pipe' niet maken: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kon locking helper niet forken: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kon niet vergrendelen: '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8495,26 +8452,6 @@ msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kon de 'locking helper pipe' niet maken: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kon locking helper niet forken: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kon niet vergrendelen: '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8581,11 +8518,11 @@ msgstr "Kan MIME-berichtdeel niet decoderen: ongeldige structuur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kan MIME-berichtdeel niet decoderen: analysefout"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "analysefout"
 
@@ -8655,11 +8592,11 @@ msgstr ""
 "Deze optie zal verbinding maken met de server met een veilig CRAM-MD5 "
 "wachtwoord, indien de server dat ondersteund."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8764,7 +8701,7 @@ msgstr "De referentie-informatie is verlopen."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -8826,25 +8763,25 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAT"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Deze optie geeft aan dat eerst POP-verbinding wordt gestart, voordat SMTP "
 "geprobeerd wordt"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "POP Bron URI"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP voor SMTP gebruikmakend van een onbekend transportmedium"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP voor SMTP gebruikmakend van een niet-POP bron"
 
@@ -8853,55 +8790,55 @@ msgstr "POP voor SMTP gebruikmakend van een niet-POP bron"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compileren van reguliere expressie mislukt: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Opzoeken mislukt: onbekende fout"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 msgid "Resolving address"
 msgstr "Adres wordt opgezocht"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr "Opzoeken mislukt: computer niet gevonden"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr "Opzoeken mislukt: onbekende fout"
 
@@ -8913,12 +8850,12 @@ msgstr "Virtuele map e-mail aanbieder"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8964,131 +8901,131 @@ msgstr "Decoderen van bericht mislukt."
 msgid "Failed to verify certificates."
 msgstr "Verifiëren van certificaten mislukt."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Kan certificaat van eigenaar niet ophalen"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Kan certificaat-herroepingslijst niet ophalen"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Kan ondertekening van certificaat niet decoderen"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Kan handtekening van de certificaat-herroepingslijst niet decoderen"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Kan de publieke sleutel niet decoderen"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Certificaatondertekening-fout"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Fout in certificaat-herroepingslijst"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Certificaat nog niet geldig"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certificaat is verlopen"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL nog niet geldig"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL is verlopen"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Fout in CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Geen geheugen meer"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Direct zelfondertekend certificaat"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Zelf-ondertekend certificaat in sleutelbos"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Kan het certificaat niet lokaal vinden"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Kan ondertekening niet verifiëren"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Certificaat sleutelbos te groot"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certificaat herroepen"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ongeldige Certificaat Authoriteit (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Pad lengte overschreden"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Ongeldig doel"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Certificaat is niet te vertrouwen"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certificaat geweigerd"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Onderwerp/eigenaar komt niet overeen"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID komt niet overeen"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Uitgever serienummer komt niet overeen"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Sleutelgebruik ondersteunt geen ondertekenen van certificaten"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Fout bij toepassingsverificatie"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9101,15 +9038,15 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "SLECHT"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9127,7 +9064,7 @@ msgstr ""
 "Wilt u het alsnog accepteren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9142,7 +9079,7 @@ msgstr ""
 "\n"
 "Wilt u dit accepteren?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9151,7 +9088,7 @@ msgstr ""
 "Certificaatprobleem: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9160,7 +9097,7 @@ msgstr ""
 "Slechte certificaatomgeving: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9169,7 +9106,7 @@ msgstr ""
 "Certificaat verlopen op: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9183,17 +9120,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fout bij opslaan van `%s': %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 
@@ -9220,12 +9157,12 @@ msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -9264,38 +9201,38 @@ msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Map is vernietigd en opnieuw gemaakt op de server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ophalen van bericht mislukt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9304,24 +9241,24 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -9371,103 +9308,87 @@ msgstr "Naamruimte:"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pas filters toe op alle nieuwe berichten in de INBOX op deze server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Automatisch controleren op nieuwe post, iedere"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-dienst voor %s op %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extensie niet ondersteund"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Kon niet verbinden met %s (poort %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9478,70 +9399,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat."
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Berichtenopslag"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Kon niet verbinden met POP-server %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Stuur bericht aan contact..."
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postbus: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9600,54 +9493,50 @@ msgstr ""
 "bufferbestanden.\n"
 "Kan ook gebruikt worden om een Elm, Pine of Mutt map in te lezen."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Opslag `%s' is geen normale directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokale opslaglocaties hebben geen postbus-in"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokaal postbusbestand %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kon '%s' niet hernoemen: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
@@ -9661,17 +9550,17 @@ msgstr "Kon samenvatting %s niet opslaan: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Maildir bericht toevoegen geannuleerd"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
@@ -9687,7 +9576,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9750,29 +9639,29 @@ msgstr "Bezig met controleren op nieuwe berichten"
 msgid "Storing folder"
 msgstr "Map wordt opgeslagen"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postbus niet openen: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Mail toevoegen geannuleerd"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9781,15 +9670,15 @@ msgstr ""
 "Kan bericht %s uit folder %s niet verkrijgen\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9798,16 +9687,7 @@ msgstr ""
 "Kon bestand `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Kon de directory %s niet aanmaken:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9816,15 +9696,14 @@ msgstr ""
 "Kon bestand `%s' niet aanmaken:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' is geen normaal bestand."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9833,36 +9712,11 @@ msgstr ""
 "Kon map `%s' niet verwijderen:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Kan geen map met die naam maken"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Kon directory %s niet maken: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Kan map niet verkrijgen: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "De opgegeven mapnaam is niet geldig: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9892,7 +9746,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
@@ -9909,38 +9763,38 @@ msgstr "Kon de naam van de map niet wijzigen: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kon de map niet opslaan: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH bericht toevoegen geannuleerd"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
@@ -10020,67 +9874,6 @@ msgstr ""
 "Synchroniseren spoolmap '%s' is mislukt: %s\n"
 "Map is wellicht beschadigd, kopie opgeslagen in '%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Kan geen verbinding krijgen met LDAP server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan bericht: %s niet verkrijgen: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Gebruiker geannuleerd"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Kon de groep: %s niet verkrijgen"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Kon uitvoerbestand niet maken: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Kon uitvoerbestand niet maken: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-nieuws"
@@ -10091,59 +9884,59 @@ msgstr ""
 "Dit is een provider voor het lezen van en versturen naar USENET "
 "nieuwsgroepen."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kon groet van %s niet lezen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s retourneerde foutcode %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Deze optie zal aanmelden bij de NNTP-server met een wachtwoord platte tekst."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Map: %s bestaat niet"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kon de groep: %s niet verkrijgen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Opdracht mislukt: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: nieuwe berichten doorzoeken"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Onbekend server-antwoord: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Gebruik annuleren"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Bewerking mislukt: %s"
@@ -10152,6 +9945,13 @@ msgstr "Bewerking mislukt: %s"
 msgid "Retrieving POP summary"
 msgstr "POP-samenvatting aan het ophalen"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Gebruiker geannuleerd"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10161,22 +9961,34 @@ msgstr "Kan POP-samenvatting niet verkrijgen: %s"
 msgid "Expunging deleted messages"
 msgstr "Bezit met schrappen van verwijderde berichten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP-bericht %d wordt opgehaald"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan bericht: %s niet verkrijgen: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Berichtenopslag"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Laat de berichten op de server achter"
@@ -10343,140 +10155,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Voor het versturen van e-mail naar een externe mailhub met SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Syntactische fout, opdracht niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntactische fout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Opdracht niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Opdrachtparameter niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Systeem-status, of systeem-hulp-antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Hulpbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Dienst is gereed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Postopdracht geslaagd, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Postopdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Postopdracht afgebroken: gebruikt teveel ruimte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Opdracht niet uitgevoerd: postbusnaam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start postinvoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Veranderen van wachtwoord is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Aanmeldingsmechanisme te zwak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Tijdelijke aanmeldingsfout"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr "Fout in welkomstbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Fout bij opzetten van beveiligde verbinding met SMTP-server %s: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "server lijkt geen SSL te ondersteunen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "STARTTLS-verzoek verlopen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr "Fout in STARTTLS antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10487,87 +10299,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Bericht wordt verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Time-out tijdens HELO-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Fout bij HELO-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -10575,68 +10387,69 @@ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Time-out tijdens QUIT-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "bijlage"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van bijlages"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -10668,11 +10481,90 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+"He, zit je te slapen! Je hebt een account nodig om e-mail te sturen "
+"weetjewel..."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klik hier voor het adresboek"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Antwoordadres:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Van:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Aan:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Geef de geadresseerden"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
+"op de geadresseerden-lijst van het bericht verschijnen."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Versturen naar:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Doel van bericht"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Bestand(en) bijvoegen"
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr "Kon geen PGP handtekening-context maken"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10681,30 +10573,30 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10713,7 +10605,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10722,7 +10614,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10731,7 +10623,7 @@ msgstr ""
 "Kan bestandsbeschrijving niet kopëren: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10740,7 +10632,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10749,7 +10641,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10760,28 +10652,28 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr "Handtekening:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10789,7 +10681,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10801,7 +10693,7 @@ msgstr ""
 "Controleer alstublieft de geïnstalleerde versie  van\n"
 "gtkhtml en libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10810,7 +10702,7 @@ msgstr ""
 "Niet in staat de HTML editor component te activeren."
 
 # # Het origineel heeft <b> in plaats van </b>
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10818,85 +10710,6 @@ msgstr ""
 "<b>(Dit is een berichtinhoud anders dan tekst en kan daarom niet bewerk "
 "worden.)</b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"U dient een account in te stellen\n"
-"voordat u post kunt versturen."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Antwoordadres:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Van:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Aan:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Geef de geadresseerden"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
-"op de geadresseerden-lijst van het bericht verschijnen."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Versturen naar:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Doel van bericht"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Bestand(en) bijvoegen"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "De Evolution werkgroep suite"
@@ -11067,7 +10880,7 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
@@ -11089,210 +10902,90 @@ msgstr "Categorieën Actualiseren:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution samenvatting-component"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan map niet hernoemen:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Fout bij laden %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Selecteer een bestand"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Verstuur een bericht"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Het type weergaven"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Sluiten"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Verplaats deze map naar een andere plaats"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Herconfigureer /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Pagina"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Fout"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Verversen"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Vrij/Bezet _actualiseren"
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 seconde geleden"
@@ -11408,6 +11101,84 @@ msgstr "U moet een map geven."
 msgid "Select Folder"
 msgstr "Map selecteren"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fout in reguliere expressie '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Belangrijk"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Werk"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "Te doen"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Later"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "U moet deze filter een naam geven."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regel naam: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Geen Titel"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Als"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Acties uitvoeren"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "als aan alle criteria wordt voldaan"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "als aan een van de criteria wordt voldaan"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "inkomend"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "uitgaand"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Vergelijk met"
@@ -11508,84 +11279,6 @@ msgstr "met alle lokale folders"
 msgid "years"
 msgstr "jaren"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fout in reguliere expressie '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Belangrijk"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Werk"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Persoonlijk"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Te doen"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Later"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "U moet deze filter een naam geven."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regel naam: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Geen Titel"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Als"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Acties uitvoeren"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "als aan alle criteria wordt voldaan"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "als aan een van de criteria wordt voldaan"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "inkomend"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "uitgaand"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11608,217 +11301,217 @@ msgid "Beep"
 msgstr "Piep"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Naar map kopiëren"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "bestaat niet"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Klad"
+msgid "does not contain"
+msgstr "bevat niet"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Bestaat"
+msgid "does not end with"
+msgstr "eindigt niet op"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Expressie"
+msgid "does not exist"
+msgstr "bestaat niet"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Antwoord"
+msgid "does not return"
+msgstr "komt niet terug"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "klinkt niet als"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Label"
+msgid "does not start with"
+msgstr "begint niet met"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Mailinglijst"
+msgid "Do Not Exist"
+msgstr "bestaat niet"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Berichtinhoud"
+msgid "Draft"
+msgstr "Klad"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Berichtkop"
+msgid "ends with"
+msgstr "eindigt op"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Naar map verplaatsen"
+msgid "Exist"
+msgstr "Bestaat"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Bericht doorvoeren naar shellopdracht"
+msgid "exists"
+msgstr "bestaat"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Geluid afspelen"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Gelezen"
+msgid "Expression"
+msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Geadresseerden"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Antwoord"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Overeenkomende regex"
+msgid "is"
+msgstr "is"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Beantwoord aan"
+msgid "is after"
+msgstr "is na"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "is voor"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Afzender"
+msgid "is Flagged"
+msgstr "is gemarkeerd"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Stel Status in"
+msgid "is greater than"
+msgstr "is groter dan"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Shellopdracht"
+msgid "is less than"
+msgstr "is kleiner dan"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Grootte (kB)"
+msgid "is not"
+msgstr "is niet"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Source-Account"
+msgid "is not Flagged"
+msgstr "Is niet gemarkeerd"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Specifieke kop"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr "Label"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Mailinglijst"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Stop met Verwerken"
+msgid "Message Body"
+msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Onderwerp"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Berichtkop"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Status herstellen"
+msgid "Move to Folder"
+msgstr "Naar map verplaatsen"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "bevat"
+msgid "Pipe Message to Shell Command"
+msgstr "Bericht doorvoeren naar shellopdracht"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "bevat niet"
+msgid "Play Sound"
+msgstr "Geluid afspelen"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "eindigt niet op"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Gelezen"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "bestaat niet"
+msgid "Recipients"
+msgstr "Geadresseerden"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "komt niet terug"
+msgid "Regex Match"
+msgstr "Overeenkomende regex"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "klinkt niet als"
+msgid "Replied to"
+msgstr "Beantwoord aan"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "begint niet met"
+msgid "returns"
+msgstr "komt terug"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "eindigt op"
+msgid "returns greater than"
+msgstr "geeft groter dan"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "bestaat"
+msgid "returns less than"
+msgstr "geeft kleiner dan"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "is gemarkeerd"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "is na"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Afzender"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "is voor"
+msgid "Set Status"
+msgstr "Stel Status in"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "is groter dan"
+msgid "Shell Command"
+msgstr "Shellopdracht"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "is kleiner dan"
+msgid "Size (kB)"
+msgstr "Grootte (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "Is niet gemarkeerd"
+msgid "sounds like"
+msgstr "klinkt als"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "is niet"
+msgid "Source Account"
+msgstr "Source-Account"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "is"
+msgid "Specific header"
+msgstr "Specifieke kop"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "geeft groter dan"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "geeft kleiner dan"
+msgid "starts with"
+msgstr "begint met"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "komt terug"
+msgid "Stop Processing"
+msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "klinkt als"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Onderwerp"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "begint met"
+msgid "Unset Status"
+msgstr "Status herstellen"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "De naam '%s' is niet uniek. Kies een andere naam."
@@ -11886,9 +11579,10 @@ msgid "Scanning %s"
 msgstr "%s wordt doorzocht"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Post"
 
@@ -11974,7 +11668,7 @@ msgstr "Evolution importeert uw oude Netscape informatie"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Prullenbak"
 
@@ -11988,7 +11682,7 @@ msgid "Scanning directory"
 msgstr "Map wordt gescant"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
@@ -12024,39 +11718,99 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Bericht opstellen - Voorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
+"berichten instellen."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier kunt u uw e-mail accounts instellen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-mail accountconfiguratie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-mailcomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution nieuw bericht opstellen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution e-mail configuratie interface"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution postmap-weergave"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-mail voorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-mail accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-mailvoorkeuren"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Map die post bevat"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Openbare e-mail"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Openbare map die e-mail bevat"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtueel afval"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtuele afvalmap"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Deze map kan geen berichten bevatten."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12064,109 +11818,234 @@ msgstr ""
 "Sommige van uw e-mailinstellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Er staan nog berichten in de wachtrij. Wilt u toch afsluiten?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr "Nieuw bericht verstuurd"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr "Bericht _versturen"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr "Een nieuw e-mailbericht versturen"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr "Bezig met verbinden..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Mapinformatie wordt opgezocht"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschappen voor \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Bericht opstellen - Voorkeuren"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Eigenschappen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kon tijdelijke directory niet maken: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
-"berichten instellen."
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr " %d nieuw"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier kunt u uw e-mail accounts instellen"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-mail"
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d verborgen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-mail accountconfiguratie"
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d zichtbaar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-mailcomponent"
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d geselecteerd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution nieuw bericht opstellen"
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d niet verzonden"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d verzonden"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution e-mail configuratie interface"
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d totaal"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution postmap-weergave"
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr "_VMap van zoekopdracht maken..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-mail voorkeuren"
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "VMap op _Onderwerp"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-mail accounts"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "VMap op afze_nder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-mailvoorkeuren"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "VMap op _Geadresseerden"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "VMap op Mailing_Lijst"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Filter op Onderwerp"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Filter op afzen_der"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Filter op Geadresseerden"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Filter op _Mailinglijst"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "B_ewerk als Nieuw Bericht..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "Af_drukken"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "_Afzender beantwoorden"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "_Lijst beantwoorden"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "_Iedereen beantwoorden"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Doorsturen"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr "Vervolg_acties..."
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr "Als voltooid markeren"
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr "Markering wissen"
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Als gelezen mar_keren"
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr "Als o_ngelezen markeren"
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Als belan_grijk markeren"
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr "Als _onbelangrijk markeren"
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "_Herstellen"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr "Naar map _verplaatsen..."
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Naar map _kopiëren..."
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr "Afzender aan adresboe_k toevoegen"
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr "Filters _toepassen"
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr "Regel aanmaken van bericht"
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr "VMap op _discussielijst"
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filteren op discussielijst (%s)"
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VMap op _discussielijst (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Standaard"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Mapinformatie wordt opgezocht"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12251,7 +12130,7 @@ msgstr "Gebruikers_naam:"
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
@@ -12282,16 +12161,16 @@ msgstr "[Standaard]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aangezet"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Accountnaam"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -12334,6 +12213,219 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Dit bericht niet meer weergeven."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"U heeft e-mail nog niet geconfigureerd.\n"
+"Dit moet gebeuren voordat u e-mail berichten kunt opstellen, versturen\n"
+"of ontvangen.\n"
+"Wilt u e-mail nu configureren?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"U dient een account in te stellen\n"
+"voordat u post kunt versturen."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"U dient een identiteit te configuren\n"
+"voordat u post kunt versturen."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"U moet een verzend-wijze instellen\n"
+"voordat u e-mail kunt versturen."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"U verstuurt een HTML-geformatteerd bericht. Controleer alstublieft dat\n"
+"de ontvangers HTML e-mail kunnen en willen ontvangen:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Toch versturen?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Dit bericht heeft geen onderwerp.\n"
+"Weet u zeker dat u het wilt versturen?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
+"adreslijsten zal dit bericht slechts Bcc dressen bevatten."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Dit bericht bevat alleen Bcc-ontvangers."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Mogelijk onthult de mail server de identiteit van de ontvangers door het "
+"toevoegen van een 'Apparently-To' kop.\n"
+"Toch versturen?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+"De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Kan de drafts map voor die account niet openen.\n"
+"Wilt u gebruik maken van de standaardmap?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "een onbekende afzender"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Verplaats bericht(en) naar"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Kopieer bericht(en) naar"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"U kunt alleen berichten bewerken die opgeslagen zijn\n"
+"in de Kladmap."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"U kunt alleen berichten bewerken die opgeslagen zijn\n"
+"in de Kladmap."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Geen bericht geselecteerd"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Kan niet opslaan als '%s'\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s bestaat al\n"
+"Wilt u het overschrijven?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Bericht opslaan als..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Berichten opslaan als..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Deze opdracht zal alle berichten die als 'gewist' gemarkeerd zijn\n"
+"permanent verwijderen, en u kunt ze niet meer herstellen\n"
+"\n"
+"Deze berichten echt verwijderen?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Fout bij het laden van filterinformatie:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Filters"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Pagina %d van %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Bericht afdrukken"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Afdrukken van bericht mislukt"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12359,19 +12451,11 @@ msgstr "Scripthandtekening toevoegen"
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Dienst wordt gecontroleerd"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Verbinden met server..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12381,11 +12465,11 @@ msgstr ""
 "worden ingevuld, tenzij u wilt dat deze informatie wordt meegezonden bij de "
 "berichten die u verzendt."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "E-mail ontvangen"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12394,15 +12478,15 @@ msgstr ""
 "niet weet wat voor servertype u gebruikt, neem dan contact op met uw "
 "systeembeheerder of met uw internet-provider."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "E-mail versturen"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12411,11 +12495,11 @@ msgstr ""
 "niet weet wat voor servertype u gebruikt, neem dan contact op met uw "
 "systeembeheerder of met uw internet-provider."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12429,6 +12513,14 @@ msgstr ""
 "mailaccount. Geef een naam aan dit account in de ruimte hieronder. Deze naam "
 "is alleen nodig voor de lijstweergave."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Dienst wordt gecontroleerd"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Verbinden met server..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Ondersteunde aanmeldingstypes controleren"
@@ -12553,10 +12645,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Standaard"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Standaardgedrag"
@@ -13009,25 +13097,214 @@ msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als de andere programma's"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "kleur"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Kon geen S/MIME ondertekening context maken"
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Kon geen S/MIME certsonly context maken."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Kon geen S/MIME versleutelingscontext maken"
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Kon geen S/MIME envelope context maken"
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Kon geen S/MIME decode context maken"
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Het bestand '%s' bestaat al.\n"
+"Overschrijven?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Bijlage opslaan"
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr "Bijlage opslaan..."
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "In bericht weergeven"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Openen in %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "In bericht weergeven (via %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Verbergen"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Externe weergave"
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr "Afbeeldingen worden gedownload"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Berichtinhoud wordt geladen"
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr "Te laat:"
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "op %B %d, %Y, %l:%M %P"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Verwijzing in browser openen"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Verwijzing kopiëren"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Verwijzing opslaan als (FIXME)"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Afbeelding opslaan als..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "%s wordt opgezocht"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s bijlage"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Ongeldig e-mailadres"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Van"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Antwoordadres"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Aan"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Dit bericht is digitaal ondertekend. Klik op het hangslotpictogram voor meer "
+"informatie."
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr "Kon geen PGP verificatieomgeving maken"
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Dit bericht is digitaal ondertekend en is authentiek."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
+"het authentiek is."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Verwijzing naar FTP site (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Verwijzing naar lokaal bestand (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Verwijzing naar externe gegevens (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Misvormd extern-berichtgedeelte"
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mappen/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Map opnieuw configureren"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13036,22 +13313,22 @@ msgstr ""
 "Kan meta-info van map niet opslaan: deze map kan waarschijnlijk\n"
 "niet meer geopend worden: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan map-matainfo niet opslaan in %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan map-metagegevens %s niet verwijderen: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mapformaat wordt veranderd van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13059,16 +13336,16 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Herconfigureer /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "U kunt het formaat van een niet-lokale map niet veranderen."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13077,7 +13354,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13086,131 +13363,118 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Map wordt gefilterd"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Maar het bericht is wel succesvol verzonden."
 
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
-
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" wordt verzonden"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13219,7 +13483,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13228,11 +13492,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13241,74 +13505,106 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Naamloos Bericht)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Naamloos Bericht"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Leeg Bericht"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Vind in bericht"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Hoofdlettergevoelig"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Zoek doorgestuurde"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Zoek:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Klopt:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Annuleren..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pas: %s, Type: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "E-mail versturen & ontvangen"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Alles annuleren"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "Dit wachtwoord onthouden tot het einde van deze sessie"
 
@@ -13356,17 +13652,21 @@ msgstr "Doorgestuurd bericht - %s"
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Doorgestuurd Bericht"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Bezig met aanmaken vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13379,96 +13679,101 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Poging tot aanpassen van vMap '%s' gedetecteerd terwijl deze niet bestaat."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(geen onderwerp)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Bericht"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Verloopdatum"
@@ -13485,10 +13790,6 @@ msgstr "Gemarkeerd"
 msgid "Follow Up Flag"
 msgstr "Antwoord Markering"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Van"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Originele lokatie"
@@ -13501,10 +13802,6 @@ msgstr "Ontvangen"
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Aan"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Bellen"
@@ -13521,7 +13818,7 @@ msgstr "Vervolg"
 msgid "For Your Information"
 msgstr "Ter informatie"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Doorsturen"
 
@@ -13529,11 +13826,11 @@ msgstr "Doorsturen"
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
@@ -13565,6 +13862,39 @@ msgstr "_Verloopdatum:"
 msgid "_Flag:"
 msgstr "_Vlag:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Bezig met scannen van mappen onder %s op \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Bezig met scannen van root-level mappen op \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Bezig met aanmelden bij map \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Bezig met afmelden van map \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Map"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Geen server geselecteerd"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Selecteer een server"
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Mapabonnementen"
@@ -13578,128 +13908,17 @@ msgid "S_erver:"
 msgstr "_Server:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Mappen worden ingelezen ..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "Abonneren"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "Afmelden"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Mappen met de Evolution Samenvatting"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Even geduld a.u.b..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Samenvatting afdrukken"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Afdrukken van Samenvatting mislukt"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Afspraken"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Geen afspraken."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k %M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M%P %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Geen omschrijving"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Samenvatting Post"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Woord van de Dag"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Quotes van de Dag"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Nieuwe nieuwsbron"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fout bij downloaden van RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nieuwsbron"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alles"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Weergegeven"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Geen taken"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Geen Omschrijving)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Mijn Weer"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Er trad een fout op bij het downloaden van gegevens voor"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Weer"
-
-#  translators: Put a list of codes for locations you want to see in
-#  My Evolution by default here. You can find the list of all
-#  stations and their codes in Evolution sources.
-#  (evolution/my-evolution/Locations)
-#  Codes are seperated with : eg. "KBOS:EGAA"
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Hier kunt u het uiterlijk van de Evolution samenvatting instellen"
@@ -23505,6 +23724,115 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Mappen met de Evolution Samenvatting"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Afspraken"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Geen afspraken."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k %M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M%P %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Geen omschrijving"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Samenvatting Post"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Woord van de Dag"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Quotes van de Dag"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Nieuwe nieuwsbron"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fout bij downloaden van RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nieuwsbron"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alles"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Weergegeven"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Geen taken"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Geen Omschrijving)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mijn Weer"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Er trad een fout op bij het downloaden van gegevens voor"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Weer"
+
+#  translators: Put a list of codes for locations you want to see in
+#  My Evolution by default here. You can find the list of all
+#  stations and their codes in Evolution sources.
+#  (evolution/my-evolution/Locations)
+#  Codes are seperated with : eg. "KBOS:EGAA"
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Even geduld a.u.b..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Samenvatting afdrukken"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Afdrukken van Samenvatting mislukt"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24763,27 +25091,21 @@ msgstr "_Eén dag"
 msgid "_Show full path for folders"
 msgstr "_Volledig pad weergeven voor mappen"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nieuw"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier kunt u speciale mappen en offline gedrag instellen"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Maak een nieuwe map aan"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution shell"
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution configuratie voor mapinstellingen"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Kon bonobo niet initialiseren"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mapinstellingen"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24878,50 +25200,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "U gebracht door"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Kan de component %s niet activeren:\n"
-"De fout van het activeringssysteem is:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan de lokale opslag niet opzetten -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"De Evolutioncompopnent die maptype \"%s\"\n"
-" verwerkt is plotseling\n"
-"gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
-"weer te kunnen benaderen."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ongeldige argumenten"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Kan niet registreren op OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Configuratiedatabase niet gevonden"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Generieke fout"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Extra afmaakmappen"
@@ -25010,31 +25288,26 @@ msgstr ""
 "Kan map niet hernoemen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Hernoem de \"%s\" map naar:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "De opgegeven mapnaam is niet geldig: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr "Gekozen map niet toe aan een andere gebruiker"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25078,19 +25351,11 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25099,21 +25364,21 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr "Importeerder selecteren"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Evolution Fout"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25122,11 +25387,11 @@ msgstr ""
 "Er is geen importeerfunctie die het volgende kan afhandelen\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Bezig met importeren"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25135,17 +25400,17 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25154,35 +25419,31 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Informatie en instellingen importeren van oudere programma's"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Een enkel bestand importeren"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25190,26 +25451,25 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Importeren"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25269,19 +25529,11 @@ msgstr "Kon de gedeelde map niet openen: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan de gegeven gedeelde map niet vinden."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nieuw"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25303,36 +25555,6 @@ msgstr "Mapnaam mag geen \"#\" bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Geen map weergegeven)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Geen)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
-"netwerkverbinding te werken"
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution is bezig offline te gaan."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution is nu offline. Klik op deze knop om online te gaan werken."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Het gereedschap voor GNOME Pilot lijkt niet geïnstalleerd te zijn."
@@ -25382,13 +25604,79 @@ msgstr "Offline _werken"
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fout bij opslaan van snelkoppelingen."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Geen map weergegeven)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Snelkoppelingen"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Geen)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
+"netwerkverbinding te werken"
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution is bezig offline te gaan."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution is nu offline. Klik op deze knop om online te gaan werken."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Kan de component %s niet activeren:\n"
+"De fout van het activeringssysteem is:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan de lokale opslag niet opzetten -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"De Evolutioncompopnent die maptype \"%s\"\n"
+" verwerkt is plotseling\n"
+"gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
+"weer te kunnen benaderen."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ongeldige argumenten"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Kan niet registreren op OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Configuratiedatabase niet gevonden"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Generieke fout"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25503,6 +25791,18 @@ msgstr "Verwijderen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fout bij opslaan van snelkoppelingen."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Snelkoppelingen"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Aankruisvakje"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Geen fout"
@@ -25559,14 +25859,6 @@ msgstr "Kan geen map met die naam maken"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Deze opdracht kan niet uitgevoerd worden in de offline stand"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Aankruisvakje"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Map"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25581,103 +25873,103 @@ msgstr "%s (%d%% voltooid)"
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Onbekende fout."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"De fout van het componentensysteem is:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"De fout van het activeringssysteem is:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "CORBA fout"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Onderbroken"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Ongeldige argument"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Heeft al een eigenaar"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Geen eigenaar"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Niet ondersteund type"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Niet ondersteund schema"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Niet ondersteunde bewerking"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Bestaat"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Heeft submappen"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Geen ruimte over"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Oude eigenaar is gestorven"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Onbekende fout."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"De fout van het componentensysteem is:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"De fout van het activeringssysteem is:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Test type"
@@ -25784,22 +26076,6 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier kunt u speciale mappen en offline gedrag instellen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution configuratie voor mapinstellingen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mapinstellingen"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25840,10 +26116,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeerders"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importeren"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Niet importeren"
@@ -26031,7 +26303,7 @@ msgstr "Contact(en) verplaatsen naar een andere map..."
 msgid "Move to Folder..."
 msgstr "Naar map verplaatsen..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
@@ -26039,9 +26311,9 @@ msgstr "Plak het klembord"
 msgid "Previews the contacts to be printed"
 msgstr "Geeft een voorbeeld van de af te drukken contacten"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Afdruk_voorbeeld"
 
@@ -26085,21 +26357,17 @@ msgstr "Stop met Laden"
 msgid "View the current contact"
 msgstr "Huidige contact weergeven"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Naar map _kopiëren..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Contacten _Doorsturen..."
 
@@ -26167,61 +26435,46 @@ msgstr "Ga naar een specifieke datum"
 msgid "Go to today"
 msgstr "Ga Naar Vandaag"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Maand"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Vrij/Bezig informatie voor deze kalender publiceren"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Bourges"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Map met afspraken en gebeurtenissen"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Details weergeven"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "één dag tonen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "één maand tonen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "één week tonen"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "De werkweek tonen"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Week"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Sluiten"
@@ -26230,7 +26483,7 @@ msgstr "Sluiten"
 msgid "Close this item"
 msgstr "Dit item sluiten"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Dit item verwijderen"
 
@@ -26243,58 +26496,47 @@ msgstr "Hoofdgereedschapsbalk"
 msgid "Preview the printed item"
 msgstr "Een afdrukvoorbeeld maken van het item"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Item afdrukken"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Opslaan _als..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Opslaan"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Opslaan als..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Opslaan en sluiten"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Opslaan en sluiten"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Dit item opslaan en het dialoogvenster sluiten"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Dit item opslaan op de harde schijf"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Bestand"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Opslaan"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Geselecteerde tekst naar klembord kopiëren"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Knippen"
 
@@ -26315,39 +26557,51 @@ msgstr "_Alles selecteren"
 msgid "Select all text"
 msgstr "Alle tekst selecteren"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "En_velop afdrukken..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Opslaan _als..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Dit contact opslaan en het dialoogvenster sluiten"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "_Bericht sturen aan contact..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Opslaan"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Deze lijst verwijderen"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Verwijderen..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Deze lijst opslaan en het dialoogvenster sluiten"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "_Lijst naar ander sturen..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "_Bericht aan lijst sturen..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Verwijderen..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "_Afspraak annuleren"
@@ -26421,8 +26675,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle verwijderde berichten permanent uit alle mappen verwijderen"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Nieuw bericht sturen"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26457,19 +26710,14 @@ msgstr "Voorbeeldvenster"
 msgid "Change the properties of this folder"
 msgstr "Eigenschappen veranderen van deze map"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Geselecteerde bericht(en) naar klembord kopiëren"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Geselecteerde bericht(en) naar klembord knippen"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Wissen"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ge_selecteerde berichten verbergen"
@@ -26490,15 +26738,14 @@ msgstr ""
 "streep erdoor"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Alles als _gelezen markeren"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Alle zichtbare berichten als gelezen markeren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Bericht(en) vanaf het klembord plakken"
 
@@ -26543,37 +26790,26 @@ msgstr "Verberg tijdelijk de geselecteerde berichten"
 msgid "Threaded Message list"
 msgstr "Discussies tonen"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Wissen"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Map"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Selectie in_verteren"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "_Berichtenlijst met discussies"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "Beel_d"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Afzender aan adresboek _toevoegen"
@@ -26591,415 +26827,403 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Pas filter regels toe op geselecteerde berichten"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Tekst model"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Geef een antwoord voor de mailinglijst van het geselecteerde bericht"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Beantwoord dit bericht"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopieer het bericht naar een andere map"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "_VMap van bericht maken"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Maak een regel om de berichten van deze afzender te filteren"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Maak een regel om de berichten van deze afzenders te filteren"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Maak een regel om de berichten naar deze e-maillijst te filteren"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Maak een regel om de berichten met dit onderwerp te filteren"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Maak een Virtueele map voor deze ontvangers"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Maak een virtuele map voor deze e-maillijst"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Maak een virtuele map voor deze afzender"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Maak een virtuele map voor dit onderwerp"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Tekst verkleinen"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Toon het volgende belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Toon het volgende bericht"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Toon het volgende ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Toon de volgende ongelezen discussieboom zien"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Toon het vorige belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Toon het vorige bericht"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Toon het vorige ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "D_oorsturen"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter op Mailing_lijst..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter op _Afzender..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter op _Geadresseerden..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter op _Onderwerp..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Geselecteerde berichten markeren om te beantwoorden"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Antwoord..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forceer het laden van plaatjes in HTML-berichten"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 "Stuur het geselecteerde bericht door in de inhoud van een nieuw bericht"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Stuur het bericht geciteerd door alsof het een antwoord is"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Stuur het bericht door naar iemand"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Stuur het bericht door naar iemand als bijlage"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Tekstweergave vergroten"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Toon _Afbeeldingen"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Als gelezen mar_keren"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Als _belangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Als o_ngelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Als _onbelangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Geselecteerde berichten als gelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Geselecteerde berichten als belangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Geselecteerde berichten als ongelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Geselecteerde berichten als onbelangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Geselecteerde berichten om te verwijderen markeren"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Geselecteerde berichten verplaatsen naar een andere map"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Volgende"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Volgende belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Volgende dis_cussie"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Volgende _ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Geselecteerde bericht openen in een nieuw venster"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Geselecteerde bericht openen als nieuw bericht om het opnieuw te zenden"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Originele groo_tte"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr "Antwoord sturen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
 msgstr "Antwoord sturen op een bericht in een openbare map"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Vori_ge belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Vorige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Druk dit bericht af"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Doorsturen"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Stuur het geselecteerde bericht door naar iemand"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "_Iedereen beantwoorden"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "_Lijst beantwoorden"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "De tekst zijn originele grootte geven"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "B_ericht zoeken..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr "Pagina-instellingen configureren voor de huidige printer"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Toon broncode van _Bericht"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Toon alle _Koppen"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Zoek voor tekst in de body van het weergegeven bericht"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Laat berichten zien met alle e-mail headers"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Laat de ruwe e-mailbron van het bericht zien"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Tekstgroo_tte"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Maak verwijderen ongedaan van de geselecteerde berichten"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VMap op mailing_lijst..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VMap op _afzender..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VMap op _geadresseerden..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VMap op _onderwerp..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Bijgevoegd"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Filter maken van bericht"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Bericht _doorsturen"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Ga naar"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Ingebonden"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Groter"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Berichtweergave"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Volgend bericht"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normale weergave"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Bericht _openen"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "Vo_rig bericht"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "_Afzender beantwoorden"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "_Opnieuw sturen..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Herstellen"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Dit venster sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "Beel_d"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage toevoegen"
@@ -27008,7 +27232,7 @@ msgstr "Bijlage toevoegen"
 msgid "Attach a file"
 msgstr "Een bestand toevoegen als bijlage"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Huidige bestand sluiten"
 
@@ -27024,7 +27248,7 @@ msgstr "Dit bericht versleutelen met PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Dit bericht versleutelen met uw S/MIME versleutelingscertificaat"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "Op_maak"
 
@@ -27056,11 +27280,6 @@ msgstr "Versleutelen met S/MIME"
 msgid "S/MIME Sign"
 msgstr "S/MIME Ondertekening"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Opslaan"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Opslaan als"
@@ -27074,7 +27293,7 @@ msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
@@ -27091,7 +27310,7 @@ msgid "Send"
 msgstr "Versturen"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Stuur het bericht in HTML-formaat"
 
@@ -27156,7 +27375,7 @@ msgid "_From Field"
 msgstr "_Van-veld"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -27172,11 +27391,11 @@ msgstr "Antwoordadres-veld:"
 msgid "_Security"
 msgstr "_Beveiliging"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Het huidige bestand opslaan en het venster sluiten"
 
@@ -27252,20 +27471,15 @@ msgstr "Verwijder de geselecteerde taken"
 msgid "Mar_k as Complete"
 msgstr "Als voltooid mar_keren"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Geselecteerde taken als voltooid markeren"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Plak taak vanaf het klembord"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Geeft een voorbeeld van de af te drukken taken"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "De takenlijst afdrukken"
 
@@ -27516,33 +27730,27 @@ msgid "_Work Week View"
 msgstr "_Werkweekweergave"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Als map voor verzonden berichten"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Op status"
+msgid "By Follow Up Flag"
+msgstr "Op opvolgingsmarkering"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Op afzender"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Op onderwerp"
+msgid "By Status"
+msgstr "Op status"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Op opvolgingsmarkering"
+msgid "By Subject"
+msgstr "Op onderwerp"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Berichten"
 
 #: views/tasks/galview.xml.h:1
@@ -27599,20 +27807,20 @@ msgstr "Weergaven definiëren..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Vandaag"
 
@@ -27729,6 +27937,22 @@ msgstr "Opgeslagen zoekopdrachten be_werken..."
 msgid "_Advanced..."
 msgstr "_Geavanceerd..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Informatie"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Fout"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Vraag"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Bericht"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Zoeken"
@@ -27773,541 +27997,3 @@ msgstr "Evolution kalender backend voor lokale bestanden"
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution adresboek backend voor lokale bestanden"
-
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Die persoon bezoekt de bijeenkomst reeds!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "_Save as..."
-#~ msgstr "Op_slaan als..."
-
-#~ msgid "End Date"
-#~ msgstr "Einddatum"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Nieuwe _Afspraak"
-
-#~ msgid "Print..."
-#~ msgstr "Afdrukken..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Voorzitters"
-
-#~ msgid "Required Participants"
-#~ msgstr "Vereiste Deelnemers"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Optionele Deelnemers"
-
-#~ msgid "Resources"
-#~ msgstr "Hulpbronnen"
-
-#~ msgid "Individual"
-#~ msgstr "Persoon"
-
-#~ msgid "Group"
-#~ msgstr "Groep"
-
-#~ msgid "Resource"
-#~ msgstr "Hulpbron"
-
-#~ msgid "Room"
-#~ msgstr "Kamer"
-
-#~ msgid "Chair"
-#~ msgstr "Voorzitter"
-
-#~ msgid "Required Participant"
-#~ msgstr "Vereiste deelnemer"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Optionele deelnemer"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Niet-deelnemer"
-
-#~ msgid "Needs Action"
-#~ msgstr "Heeft actie nodig"
-
-#~ msgid "Delegated"
-#~ msgstr "Overgedragen"
-
-#~ msgid "In Process"
-#~ msgstr "In uitvoer"
-
-#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
-#~ msgstr ""
-#~ "He, zit je te slapen! Je hebt een account nodig om e-mail te sturen "
-#~ "weetjewel..."
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Eigenschappen voor \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Eigenschappen"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Kon tijdelijke directory niet maken: %s"
-
-#~ msgid "%d new"
-#~ msgstr " %d nieuw"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d verborgen"
-
-#~ msgid "%d visible"
-#~ msgstr "%d zichtbaar"
-
-#~ msgid "%d selected"
-#~ msgstr "%d geselecteerd"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d niet verzonden"
-
-#~ msgid "%d sent"
-#~ msgstr "%d verzonden"
-
-#~ msgid "%d total"
-#~ msgstr "%d totaal"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "_VMap van zoekopdracht maken..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "VMap op _Onderwerp"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VMap op afze_nder"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VMap op _Geadresseerden"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "VMap op Mailing_Lijst"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filter op Onderwerp"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filter op afzen_der"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filter op Geadresseerden"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filter op _Mailinglijst"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "B_ewerk als Nieuw Bericht..."
-
-#~ msgid "_Print"
-#~ msgstr "Af_drukken"
-
-#~ msgid "_Forward"
-#~ msgstr "_Doorsturen"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Vervolg_acties..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Als voltooid markeren"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Markering wissen"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Als o_ngelezen markeren"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Als belan_grijk markeren"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Als _onbelangrijk markeren"
-
-#~ msgid "U_ndelete"
-#~ msgstr "_Herstellen"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Naar map _verplaatsen..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Afzender aan adresboe_k toevoegen"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Filters _toepassen"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Regel aanmaken van bericht"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "VMap op _discussielijst"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filteren op discussielijst (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "VMap op _discussielijst (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Dit bericht niet meer weergeven."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "U heeft e-mail nog niet geconfigureerd.\n"
-#~ "Dit moet gebeuren voordat u e-mail berichten kunt opstellen, versturen\n"
-#~ "of ontvangen.\n"
-#~ "Wilt u e-mail nu configureren?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "U dient een identiteit te configuren\n"
-#~ "voordat u post kunt versturen."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "U moet een verzend-wijze instellen\n"
-#~ "voordat u e-mail kunt versturen."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "U verstuurt een HTML-geformatteerd bericht. Controleer alstublieft dat\n"
-#~ "de ontvangers HTML e-mail kunnen en willen ontvangen:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Toch versturen?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Dit bericht heeft geen onderwerp.\n"
-#~ "Weet u zeker dat u het wilt versturen?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
-#~ "adreslijsten zal dit bericht slechts Bcc dressen bevatten."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Dit bericht bevat alleen Bcc-ontvangers."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Mogelijk onthult de mail server de identiteit van de ontvangers door het "
-#~ "toevoegen van een 'Apparently-To' kop.\n"
-#~ "Toch versturen?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr ""
-#~ "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Kan de drafts map voor die account niet openen.\n"
-#~ "Wilt u gebruik maken van de standaardmap?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "een onbekende afzender"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Verplaats bericht(en) naar"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Kopieer bericht(en) naar"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "U kunt alleen berichten bewerken die opgeslagen zijn\n"
-#~ "in de Kladmap."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "U kunt alleen berichten bewerken die opgeslagen zijn\n"
-#~ "in de Kladmap."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Geen bericht geselecteerd"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Kan niet opslaan als '%s'\n"
-#~ "  %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "%s bestaat al\n"
-#~ "Wilt u het overschrijven?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Bericht opslaan als..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Berichten opslaan als..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Deze opdracht zal alle berichten die als 'gewist' gemarkeerd zijn\n"
-#~ "permanent verwijderen, en u kunt ze niet meer herstellen\n"
-#~ "\n"
-#~ "Deze berichten echt verwijderen?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fout bij het laden van filterinformatie:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Filters"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Pagina %d van %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Bericht afdrukken"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Afdrukken van bericht mislukt"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Kon geen S/MIME ondertekening context maken"
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Kon geen S/MIME certsonly context maken."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Kon geen S/MIME versleutelingscontext maken"
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Kon geen S/MIME envelope context maken"
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Kon geen S/MIME decode context maken"
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Het bestand '%s' bestaat al.\n"
-#~ "Overschrijven?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Bijlage opslaan"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Bijlage opslaan..."
-
-#~ msgid "View Inline"
-#~ msgstr "In bericht weergeven"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Openen in %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "In bericht weergeven (via %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Verbergen"
-
-#~ msgid "External Viewer"
-#~ msgstr "Externe weergave"
-
-#~ msgid "Downloading images"
-#~ msgstr "Afbeeldingen worden gedownload"
-
-#~ msgid "Loading message content"
-#~ msgstr "Berichtinhoud wordt geladen"
-
-#~ msgid "Overdue:"
-#~ msgstr "Te laat:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "op %B %d, %Y, %l:%M %P"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Verwijzing in browser openen"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Verwijzing kopiëren"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Verwijzing opslaan als (FIXME)"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Afbeelding opslaan als..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s bijlage"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
-
-#~ msgid "Bad Address"
-#~ msgstr "Ongeldig e-mailadres"
-
-#~ msgid "Reply-To"
-#~ msgstr "Antwoordadres"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Dit bericht is digitaal ondertekend. Klik op het hangslotpictogram voor "
-#~ "meer informatie."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Kon geen PGP verificatieomgeving maken"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Dit bericht is digitaal ondertekend en is authentiek."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond "
-#~ "dat het authentiek is."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Verwijzing naar FTP site (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Verwijzing naar lokaal bestand (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Verwijzing naar externe gegevens (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Misvormd extern-berichtgedeelte"
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Maar het bericht is wel succesvol verzonden."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Naamloos Bericht)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Naamloos Bericht"
-
-#~ msgid "Empty Message"
-#~ msgstr "Leeg Bericht"
-
-#~ msgid "Find in Message"
-#~ msgstr "Vind in bericht"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Hoofdlettergevoelig"
-
-#~ msgid "Search Forward"
-#~ msgstr "Zoek doorgestuurde"
-
-#~ msgid "Find:"
-#~ msgstr "Zoek:"
-
-#~ msgid "Matches:"
-#~ msgstr "Klopt:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Doorgestuurd Bericht"
-
-#~ msgid "(No subject)"
-#~ msgstr "(geen onderwerp)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Bericht"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Bezig met scannen van mappen onder %s op \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Bezig met scannen van root-level mappen op \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Bezig met aanmelden bij map \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Bezig met afmelden van map \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Geen server geselecteerd"
-
-#~ msgid "Please select a server."
-#~ msgstr "Selecteer een server"
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Mappen worden ingelezen ..."
-
-#~ msgid "Save As..."
-#~ msgstr "Opslaan als..."
-
-#~ msgid "Information"
-#~ msgstr "Informatie"
-
-#~ msgid "Question"
-#~ msgstr "Vraag"
-
-#~ msgid "Message"
-#~ msgstr "Bericht"