From 0b6ec98b917eb6b2a7e07ddf1a6f352642e202fb Mon Sep 17 00:00:00 2001
From: Vincent van Adrighem <adrighem@gnome.org>
Date: Thu, 1 Apr 2004 06:49:20 +0000
Subject: Translation updated.

2004-04-01  Vincent van Adrighem  <adrighem@gnome.org>

	* nl.po: Translation updated.

svn path=/trunk/; revision=25275
---
 po/nl.po | 2930 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1658 insertions(+), 1272 deletions(-)

(limited to 'po/nl.po')

diff --git a/po/nl.po b/po/nl.po
index a3a0858d4e..c24dd21e78 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -21,13 +21,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-21 03:30+0100\n"
+"POT-Creation-Date: 2004-04-01 03:13+0200\n"
 "PO-Revision-Date: 2004-03-21 11:47+0100\n"
 "Last-Translator: Daniel van Eeden <daniel_e@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+msgid "evolution addressbook"
+msgstr "evolution adresboek"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Lijst met lokale adresboek mappen"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr "hebben "
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr "heeft "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr " kaarten"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " card"
+msgstr " kaart"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Contacten: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution mini-kaart"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -76,19 +113,19 @@ msgstr "Evolution adresboek adrespopup"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresboek adresweergave"
+msgstr "Evolution adresboek adres-weergave"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresboek kaartweergave"
+msgstr "Evolution adresboek kaart-weergave"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
-msgstr "Evolution adresboekcomponent"
+msgstr "Evolution adresboek-component"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adresboek mapweergave"
+msgstr "Evolution adresboek map-weergave"
 
 # vertaling van control hier?
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -97,7 +134,7 @@ msgstr "Evolution S/Mime certificaatbeheer controle"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
-msgstr "Evolution configuratie voor mapinstellingen"
+msgstr "Evolution configuratie voor map-instellingen"
 
 # Fout in het Engels: Manager ipv Manage
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
@@ -110,14 +147,14 @@ msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresboek '%s' zal worden verwijderd. Weet u zeker dat u wilt doorgaan?"
 
-#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/addressbook-component.c:313
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Nieuw adresboek"
 
-#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/component/addressbook-component.c:314
 #: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -125,33 +162,33 @@ msgstr "Nieuw adresboek"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "New Contact"
 msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "_Contact"
 msgstr "C_ontact"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:566
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "Contact _List"
 msgstr "Contacten_lijst"
 
 # een nieuwe contactenlijst aanmaken
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
 
@@ -199,7 +236,7 @@ msgstr ""
 "De lokatie en hiërarchie van het Evolution adresboek is veranderd sinds "
 "Evolution 1.x.\n"
 "\n"
-"Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
+"Een ogenblik geduld. Evolution zal nu uw mappen overzetten..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
 #: calendar/gui/migration.c:175 mail/em-migrate.c:1112
@@ -210,18 +247,20 @@ msgstr "`%s' wordt overgezet:"
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
 #: mail/mail-component.c:236
 msgid "On This Computer"
 msgstr "Op deze computer"
 
 #. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -236,7 +275,7 @@ msgstr "LDAP servers"
 
 #: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
-msgstr "Auto-afmaak instellingen"
+msgstr " instellingen"
 
 #: addressbook/gui/component/addressbook.c:275
 msgid ""
@@ -258,7 +297,7 @@ msgid ""
 msgstr ""
 "Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
 "Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
-"bij de instellingen van de adresboekserver."
+"bij de instellingen van de adresboek-server."
 
 #: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
@@ -295,17 +334,17 @@ msgid ""
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
-"Deze versie van Evolution heeft geen LDAP supportmeegecompileerd.  Als u "
-"LDAP wilt gebruiken in Evolutionmoet u het programma vanuit de CVS sources "
-"meecompilerennadat u OpenLDAP van onderstaande link heeft opgehaald."
+"Deze versie van Evolution heeft geen LDAP ondersteuning mee-gecompileerd.  Als u "
+"LDAP wilt gebruiken in Evolution moet u het programma vanuit de CVS sources "
+"mee-compileren nadat u OpenLDAP van onderstaande link heeft opgehaald."
 
 #: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
-"heeft opgegeven of dat de serveronbereikbaar is."
+"Kan het adresboek niet openen.  Dit kan komen doordat u een ongeldige URI "
+"heeft opgegeven of dat de server onbereikbaar is."
 
 #: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
@@ -334,11 +373,11 @@ msgstr "De URI die het adresboek zal tonen"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
-msgstr "EFolderList xml voor de lijst met autoafmaak uri's"
+msgstr "EFolderList xml voor de lijst met auto-afmaak uri's"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "Position of the vertical pane in main view"
-msgstr "Positie van het vertikale paneel in hoofd weergave"
+msgstr "Positie van het verticale paneel in hoofd weergave"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid ""
@@ -350,11 +389,10 @@ msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
-msgstr "URI voor de laatst gebruikte map in de slecteer namen dialoog"
+msgstr "URI voor de laatst gebruikte map in de selecteer namen dialoog"
 
 #: 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
 msgid "\n"
 msgstr "\n"
 
@@ -377,7 +415,7 @@ msgstr "Ondersteunde bases _weergeven"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -424,7 +462,7 @@ msgid "Address Book Sources"
 msgstr "Adresboek bronnen"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Altijd"
 
@@ -472,7 +510,7 @@ msgstr "Klaar"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Algemeen"
@@ -483,7 +521,7 @@ msgid "Group:"
 msgstr "Groep:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nooit"
 
@@ -497,10 +535,10 @@ msgid ""
 "these protocols."
 msgstr ""
 "U kunt opgeven hoe de verbinding met de LDAP server gemaakt moet worden.\n"
-"De SSL (Secure Sockets Layer) en TLS (Transport Layer Security) protocols "
+"De SSL (Secure Sockets Layer) en TLS (Transport Layer Security) protocollen "
 "worden\n"
 "door sommige servers gebruikt voor het versleutelen van de verbinding.\n"
-"Vraag uw systeembeheerder of uw LDAP server deze protocols gebruikt."
+"Vraag uw systeembeheerder of uw LDAP server deze protocollen gebruikt."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
@@ -579,7 +617,7 @@ msgstr ""
 #: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
-msgstr "Stap 1: Mapeigenschappen"
+msgstr "Stap 1: Map-eigenschappen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
@@ -727,7 +765,7 @@ msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
@@ -739,7 +777,7 @@ msgid ""
 "of this information."
 msgstr ""
 "U hebt gekozen voor het configureren van een LDAP server.  De eerste stap "
-"hiervoor is het opgeven van de naam en uw inlog informatie. Vraag de "
+"hiervoor is het opgeven van de naam en uw aanmeld informatie. Vraag de "
 "systeembeheerder om hulp als u niet zeker bent over deze informatie."
 
 #: addressbook/gui/component/ldap-config.glade.h:89
@@ -754,7 +792,7 @@ msgstr "_Downloadlimiet:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -824,10 +862,10 @@ msgstr "Contactinformatie weergeven"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:228
 #: addressbook/gui/component/select-names/e-select-names-popup.c:338
 msgid "Send HTML Mail?"
-msgstr "HTLM e-mail versturen?"
+msgstr "HTML e-mail versturen?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr "Toevoegen aan contacten"
 
@@ -910,7 +948,7 @@ msgstr "Samenwerking"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2065
+#: addressbook/gui/contact-editor/e-contact-editor.c:1997
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
@@ -919,7 +957,7 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
@@ -1006,13 +1044,13 @@ msgstr "_Categorieën..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-calendar-view.c:1267
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2504
-#: mail/em-folder-view.c:765 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:112
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2503 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:19
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -1044,7 +1082,6 @@ msgstr "Kant_oor:"
 msgid "_Public Calendar URL:"
 msgstr "_Publieke kalender URL:"
 
-# , fuzzy
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_This is the mailing address"
 msgstr "_Dit is het e-mail-adres"
@@ -1067,9 +1104,9 @@ msgstr "Adres"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -2055,7 +2092,7 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: addressbook/gui/contact-editor/e-contact-editor.c:2813
 #: addressbook/gui/widgets/eab-contact-display.c:310
 #: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
@@ -2070,20 +2107,21 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2920
+#: addressbook/gui/contact-editor/e-contact-editor.c:2816
 #: addressbook/gui/widgets/eab-contact-display.c:309
 #: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:741
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Dienst"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Lokatie"
 
@@ -2092,111 +2130,95 @@ msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2585
-#: addressbook/gui/contact-editor/e-contact-editor.c:2881
+#: addressbook/gui/contact-editor/e-contact-editor.c:2481
+#: addressbook/gui/contact-editor/e-contact-editor.c:2777
 msgid "Home"
 msgstr "Thuis"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: addressbook/gui/contact-editor/e-contact-editor.c:2781
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Werk"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2586
-#: addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: addressbook/gui/contact-editor/e-contact-editor.c:2482
+#: addressbook/gui/contact-editor/e-contact-editor.c:2785
 msgid "Other"
 msgstr "Overige"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Bron boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Doel boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Is nieuw contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Veranderd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Accountnaam"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1463
 msgid "Category editor not available."
 msgstr "Categoriebewerker niet beschikbaar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/contact-editor/e-contact-editor.c:1471
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot de categoriëen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1695
 msgid "Save Contact as VCard"
 msgstr "Contact opslaan als VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Weet u zeker dat u deze\n"
-"contacten wilt verwijderen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Weet u zeker dat u dit\n"
-"contact wilt verwijderen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2480
 msgid "Business"
 msgstr "Zakelijk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: addressbook/gui/contact-editor/e-contact-editor.c:2812
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2918
+#: addressbook/gui/contact-editor/e-contact-editor.c:2814
 #: addressbook/gui/widgets/eab-contact-display.c:312
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: addressbook/gui/contact-editor/e-contact-editor.c:2815
 #: addressbook/gui/widgets/eab-contact-display.c:311
 #: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2921
+#: addressbook/gui/contact-editor/e-contact-editor.c:2817
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3208
+#: addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%s'"
@@ -2210,6 +2232,7 @@ msgid "_Edit Full"
 msgstr "Volledig be_werken"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "_Volledige naam:"
 
@@ -2217,6 +2240,22 @@ msgstr "_Volledige naam:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Weet u zeker dat u deze\n"
+"contacten wilt verwijderen?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Weet u zeker dat u dit\n"
+"contact wilt verwijderen?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2354,8 +2393,8 @@ msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 msgid "contact-list-editor"
 msgstr "Contactlijstbewerker"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:209
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
@@ -2363,16 +2402,16 @@ msgstr "Contactlijstbewerker"
 msgid "Book"
 msgstr "Boek"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Is nieuwe lijst"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
@@ -2424,15 +2463,13 @@ msgid "No contacts"
 msgstr "Geen contacten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 contact"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, c-format
-msgid "%d contacts"
-msgstr "%d contacten"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
@@ -2440,7 +2477,7 @@ msgstr "%d contacten"
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
@@ -2477,14 +2514,13 @@ msgstr "Uitgebreid..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:230
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:340
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:497
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "Address Book"
 msgstr "Adresboek"
 
@@ -2556,7 +2592,7 @@ msgid "Cut"
 msgstr "Knippen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:372 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2568,7 +2604,7 @@ msgid "Paste"
 msgstr "Plakken"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1236
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
 msgstr "Huidige weergave"
 
@@ -2619,8 +2655,6 @@ msgid "Car Phone"
 msgstr "Autotelefoon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -2726,7 +2760,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:347
+#: calendar/gui/e-meeting-list-view.c:256
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -2893,40 +2927,41 @@ msgstr "Functie"
 msgid "Home page"
 msgstr "Homepage"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
 # contact niet gevonden?
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Kaart niet gevonden"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Kaart-ID bestaat reeds"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
@@ -2937,61 +2972,61 @@ msgstr "Protocol niet ondersteund"
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Aanmelding mislukt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Aanmelding is vereist"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS is niet beschikbaar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "Adresboek bestaat niet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Verwerpen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Fout bij aanpassen van kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3000,7 +3035,7 @@ msgstr ""
 "Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
 "Wilt u deze kaarten werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3009,49 +3044,49 @@ msgstr ""
 "%s bestaat reeds.\n"
 "Wilt u het overschrijven?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fout bij opslaan %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Kopieer kaarten naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "Selecteer doel adresboek"
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
@@ -3087,33 +3122,31 @@ msgstr "Voeg adres toe aan bestand contact \"%s\""
 msgid "Querying Address Book..."
 msgstr "Adresboek wordt benaderd..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Contactinformatie bewerken"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "E-mailadres samenvoegen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
-msgid "and %d other contacts."
-msgstr "en %d andere kaarten."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
 msgid "and one other contact."
-msgstr "en één andere kaart."
+msgid_plural "and %d other contacts."
+msgstr[0] "en één ander contact."
+msgstr[1] "en %d andere contacten."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr "Volledige VCard tonen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Compacte VCard tonen"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
 
@@ -3261,7 +3294,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opties"
 
@@ -3441,7 +3474,7 @@ msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Wachtwoord invoeren"
 
@@ -3519,7 +3552,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution taken-component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1138 calendar/gui/print.c:1819
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3595,12 +3628,12 @@ msgstr ""
 "Begint om %s\n"
 "Eindigt op %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
-#: calendar/gui/alarm-notify/alarm-queue.c:1109
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3612,7 +3645,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1115
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3629,7 +3662,7 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
@@ -3797,9 +3830,9 @@ msgstr "Lokatie bevat"
 msgid "Unmatched"
 msgstr "Niet passend"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1585
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3832,7 +3865,7 @@ msgstr "%A %d %B %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3854,72 +3887,72 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Agenda '%s' wordt verwijderd. Weet u zeker dat u door wilt gaan?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:928
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:929
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:930
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:935
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:936
 msgid "M_eeting"
 msgstr "Ver_gadering"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:937
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:942
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:943
 msgid "All _Day Appointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:944
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:949
 msgid "New calendar"
 msgstr "Nieuwe kalender"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:950
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:951
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1018
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kan de agenda '%s' niet openen voor het creëren van gebeurtenissen en "
 "afspraken"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1030
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Er is geen agenda beschikbaar voor het creëren van gebeurtenissen en "
@@ -3951,10 +3984,6 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Lijst weergave"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Fout bij openen van de kalender"
@@ -3972,16 +4001,16 @@ msgstr "Toegang geweigerd bij openen van de kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "Het type weergaven"
 
@@ -4072,11 +4101,11 @@ msgstr "Algemeen"
 msgid "Date/Time:"
 msgstr "Datum/Tijd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Een bericht tonen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
@@ -4084,17 +4113,17 @@ msgstr "Speel een geluid af"
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:467
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Verstuur een bericht"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Samenvatting:"
@@ -4126,7 +4155,7 @@ msgstr "u(u)r(en)"
 
 # meervoudsvorm?
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4137,7 +4166,7 @@ msgstr "begin van afspraak"
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
 #: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:493
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
@@ -4153,8 +4182,8 @@ msgstr "Niet verwijderen"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Disable"
 msgstr "Uitzetten"
 
@@ -4162,8 +4191,8 @@ msgstr "Uitzetten"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:401
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Enable"
 msgstr "Aanzetten"
 
@@ -4187,7 +4216,7 @@ msgstr "30 minuten"
 msgid "60 minutes"
 msgstr "60 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
 msgstr "Waarschuwingen"
 
@@ -4212,7 +4241,7 @@ msgid "Days"
 msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Aanzetten"
 
@@ -4352,7 +4381,6 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -4452,7 +4480,7 @@ msgstr ""
 "slaan."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
 msgid "New Task List"
 msgstr "Nieuwe takenlijst"
 
@@ -4674,8 +4702,9 @@ msgstr "Dagboekelement - %s"
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-calendar-view.c:1050
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1145
 msgid "Save as..."
 msgstr "Opslaan als..."
 
@@ -4691,15 +4720,15 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:58
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Kan bron niet openen"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:66
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "Kan doel niet openen"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:75
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "Doel is alleen lezen"
 
@@ -4731,19 +4760,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Weet u zeker dat u dit naamloze dagboekelement wilt verwijderen?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Weet u zeker dat u %d afspraken wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
-
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] "Weet u zeker dat u %d afspraken wilt verwijderen?"
+msgstr[1] "Weet u zeker dat u %d afspraken wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:138
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] "Weet u zeker dat u de %d taken wilt verwijderen?"
+msgstr[1] "Weet u zeker dat u de %d taken wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:145
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
+msgstr[1] "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4879,8 +4914,6 @@ msgstr "K_alender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificatie"
 
@@ -4936,10 +4969,10 @@ msgstr "_Begintijd:"
 #. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2083
 #: mail/em-account-prefs.c:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1310 mail/mail-account-gui.c:1838
-#: mail/mail-config.glade.h:80
+#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4963,7 +4996,7 @@ msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:331
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Aanwezige"
@@ -4999,14 +5032,14 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:354
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: 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:14
-#: calendar/gui/e-meeting-list-view.c:361
+#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
@@ -5224,7 +5257,7 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1562
 msgid "_Discard Changes"
 msgstr "Veranderingen verwerpen"
 
@@ -5232,9 +5265,28 @@ msgstr "Veranderingen verwerpen"
 msgid "Save Event"
 msgstr "Gebeurtenis opslaan"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+msgid "Select source"
+msgstr "Selecteer bron"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr "Selecteer doel %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "kalender"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "takenlijst"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
-msgstr "De vergaderingsgegevens zijn gamaakt. Verzenden?"
+msgstr "De vergaderingsgegevens zijn gemaakt. Verzenden?"
 
 #: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
@@ -5285,7 +5337,7 @@ msgid "Low"
 msgstr "Laag"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:864 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
 #: calendar/gui/e-tasks.c:229 mail/message-list.c:938
 msgid "Normal"
 msgstr "Normaal"
@@ -5318,10 +5370,9 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
-# , fuzzy
 #: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
-msgstr "Homepage:"
+msgstr "_Webpagina:"
 
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
@@ -5351,9 +5402,9 @@ msgstr "Kan taken in '%s' niet openen."
 msgid "Con_fidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -5419,130 +5470,111 @@ msgstr "Wekelijks"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
-msgid "%d days"
-msgstr "%d dagen"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dagen"
 
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/e-alarm-list.c:403
+#: calendar/gui/e-alarm-list.c:400
 #, c-format
-msgid "%d weeks"
-msgstr "%d weken"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 week"
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d week"
+msgstr[1] "%d weken"
 
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
-msgid "%d hours"
-msgstr "%d uren"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uur"
+msgstr[1] "%d uren"
 
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 uur"
-
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:410
 #, c-format
-msgid "%d minutes"
-msgstr "%d minuten"
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuut"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuut"
+msgstr[1] "%d minuten"
 
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:415
 #, c-format
-msgid "%d seconds"
-msgstr "%d seconden"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d seconde"
+msgstr[1] "%d seconden"
 
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 seconde"
-
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Opdracht om uit te voeren onbekend"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, 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:492
+#: calendar/gui/e-alarm-list.c:477
 #, 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:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s bij het begin van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, 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:509
+#: calendar/gui/e-alarm-list.c:494
 #, 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:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s bij het einde van de afspraak"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s bij %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:312
-#: calendar/gui/e-cal-model.c:319 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Openbaar"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:321
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:323
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Beschrijving"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Einddatum"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "kleur"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "component"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Vrij"
@@ -5578,141 +5610,44 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:259 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:260 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nee"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:325 calendar/gui/e-cal-model.c:328
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-list-view.c:249 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap-engine.c:1525
+#: camel/providers/imap4/camel-imap-engine.c:1552
+#: camel/providers/imap4/camel-imap-engine.c:1582
+#: camel/providers/imap4/camel-imap-engine.c:1622
+#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/e-cal-model.c:866
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/e-cal-model.c:868
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/e-calendar-view.c:670 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Geselecteerde objecten verwijderen"
-
-#: calendar/gui/e-calendar-view.c:771 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Objecten worden ververst"
-
-#: calendar/gui/e-calendar-view.c:1221 calendar/gui/e-calendar-view.c:1306
-msgid "New _Appointment..."
-msgstr "Nieuwe _Afspraak..."
-
-#: calendar/gui/e-calendar-view.c:1222 calendar/gui/e-calendar-view.c:1308
-msgid "New All Day _Event"
-msgstr "Gebeurtenis voor de hele dag"
-
-#: calendar/gui/e-calendar-view.c:1223 calendar/gui/e-calendar-view.c:1310
-msgid "New Meeting"
-msgstr "Nieuwe bijeenkomst"
-
-#: calendar/gui/e-calendar-view.c:1224 calendar/gui/e-calendar-view.c:1312
-msgid "New Task"
-msgstr "Nieuwe taak"
-
-#: calendar/gui/e-calendar-view.c:1228 calendar/gui/e-calendar-view.c:1251
-#: calendar/gui/e-calendar-view.c:1318 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "Af_drukken..."
-
-#: calendar/gui/e-calendar-view.c:1232 calendar/gui/e-calendar-view.c:1258
-#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Plakken"
-
-#: calendar/gui/e-calendar-view.c:1238 calendar/gui/e-calendar-view.c:1302
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Ga Naar _Vandaag"
-
-#: calendar/gui/e-calendar-view.c:1239 calendar/gui/e-calendar-view.c:1304
-msgid "_Go to Date..."
-msgstr "_Ga Naar Datum..."
-
-#: calendar/gui/e-calendar-view.c:1243 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publiceer Beschikbaarheidsinformatie"
-
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Openen"
-
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1320
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:128
-msgid "_Save As..."
-msgstr "_Opslaan als..."
-
-#: calendar/gui/e-calendar-view.c:1256 calendar/gui/e-calendar-view.c:1296
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: 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-view.c:1257 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2497 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Kopiëren"
-
-#: calendar/gui/e-calendar-view.c:1262
-msgid "_Schedule Meeting..."
-msgstr "_Bijeenkomst Plannen..."
-
-#: calendar/gui/e-calendar-view.c:1263
-msgid "_Forward as iCalendar..."
-msgstr "_Doorsturen als iKalender"
-
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1299
-msgid "Delete this _Occurrence"
-msgstr "Verwijder deze Gebeurtenis"
-
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1300
-msgid "Delete _All Occurrences"
-msgstr "Verwijder alle Gebeurtenissen"
-
-#: calendar/gui/e-calendar-view.c:1322 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Instellingen..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5757,32 +5692,85 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
+msgstr "Geselecteerde objecten verwijderen"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Objecten worden ververst"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Openen"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
 msgstr "Open _website"
 
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "_Opslaan als..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:23
+msgid "_Print..."
+msgstr "Af_drukken..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: 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:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2496 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
+msgid "_Copy"
+msgstr "_Kopiëren"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
+msgid "_Paste"
+msgstr "_Plakken"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
@@ -5791,51 +5779,107 @@ msgstr "Klik hier om een taak toe te voegen"
 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:1167
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
 #: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Voltooid"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Due date"
 msgstr "Verloop datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical position"
-msgstr "Geografische positie"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Start date"
 msgstr "Begindatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "Nieuwe _Afspraak..."
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "Gebeurtenis voor de hele dag"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "Nieuwe bijeenkomst"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "Nieuwe taak"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Select _Today"
+msgstr "_Discussie selecteren"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Selecteer..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:40
+msgid "_Publish Free/Busy Information"
+msgstr "_Publiceer Beschikbaarheidsinformatie"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Naar map kopiëren..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Naar map _verplaatsen..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Bijeenkomst Plannen..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Doorsturen als iKalender"
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Verwijder deze Gebeurtenis"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Verwijder alle Gebeurtenissen"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Ga Naar _Vandaag"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Ga Naar Datum..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Instellingen..."
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: calendar/gui/e-cell-date-edit-text.c:117 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.
@@ -5870,7 +5914,7 @@ msgstr "%02i minuten delingen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -5880,19 +5924,19 @@ msgstr "%A %d %B"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:822 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:825 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5901,106 +5945,98 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Elke dag"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Elke %d dagen"
+msgid_plural "Every %d days"
+msgstr[0] "Elke dag"
+msgstr[1] "Elke dag"
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Elke week"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Elke %d weken"
+msgid_plural "Every %d weeks"
+msgstr[0] "Elke week"
+msgstr[1] "Elke week"
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "Elke week op"
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Elke %d weken op"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Elke week op"
+msgstr[1] "Elke week op"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " en "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "De %s dag van "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "De %s %s van "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
 msgid "every month"
-msgstr "elke maand"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "elke %d maanden"
+msgid_plural "every %d months"
+msgstr[0] "elke maand"
+msgstr[1] "elke maand"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Elk jaar"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Elke %d jaar"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr "een totaal van %d keer"
-
-#: calendar/gui/e-itip-control.c:685
+msgid_plural "Every %d years"
+msgstr[0] "Elk jaar"
+msgstr[1] "Elk jaar"
+
+#: calendar/gui/e-itip-control.c:659
+#, fuzzy, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] "een totaal van %d keer"
+msgstr[1] "een totaal van %d keer"
+
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", eindigend op "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Begint:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6008,318 +6044,318 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Lokatie: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:272
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, 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:1211
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, 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:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, 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:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, 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:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, 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:1279
+#: calendar/gui/e-itip-control.c:1262
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, 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:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 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:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 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:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 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:1833
+#: calendar/gui/e-itip-control.c:1816
 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:1845
+#: calendar/gui/e-itip-control.c:1828
 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:1864
+#: calendar/gui/e-itip-control.c:1847
 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:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 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:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
@@ -6365,7 +6401,7 @@ msgid "Chair Persons"
 msgstr "Voorzitters"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:570
+#: calendar/gui/e-meeting-list-view.c:479
 msgid "Required Participants"
 msgstr "Vereiste Deelnemers"
 
@@ -6377,57 +6413,57 @@ msgstr "Optionele Deelnemers"
 msgid "Resources"
 msgstr "Hulpbronnen"
 
-#: calendar/gui/e-meeting-list-view.c:231 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Persoon"
 
-#: calendar/gui/e-meeting-list-view.c:232 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Groep"
 
-#: calendar/gui/e-meeting-list-view.c:233 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: calendar/gui/e-meeting-list-view.c:234 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Kamer"
 
-#: calendar/gui/e-meeting-list-view.c:245 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Voorzitter"
 
-#: calendar/gui/e-meeting-list-view.c:246 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:247 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optionele deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:248 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Niet-deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:270 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Heeft actie nodig"
 
-#: calendar/gui/e-meeting-list-view.c:273 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: calendar/gui/e-meeting-list-view.c:274 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Overgedragen"
@@ -6549,7 +6585,7 @@ msgstr "Website:"
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1903
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6559,7 +6595,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792 calendar/gui/gnome-cal.c:1924
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6596,37 +6632,42 @@ msgstr "Bezig met afronden van taken..."
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:1062
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/gnome-cal.c:1738
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "Bezig met het laden van taken uit %s"
-
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1758
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Bezig met het laden van afspraken uit %s"
 
-#: calendar/gui/gnome-cal.c:1783
+#: calendar/gui/gnome-cal.c:1777
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Bezig met het laden van taken uit %s"
+
+#: calendar/gui/gnome-cal.c:1797
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: calendar/gui/gnome-cal.c:1932
+#: calendar/gui/gnome-cal.c:1926
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
 msgstr ""
-"De achterligende agenda voor\n"
-"%s\n"
+"De achterligende agenda voor"
+" '%s'"
+" is vastgelopen."
+
+#: calendar/gui/gnome-cal.c:1938
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+"De achterliggende takenlijst voor "
+"'%s'"
 " is vastgelopen."
 
-#: calendar/gui/gnome-cal.c:2776
+#: calendar/gui/gnome-cal.c:2752
 msgid "Purging"
 msgstr "Legen"
 
@@ -6647,44 +6688,45 @@ msgid "February"
 msgstr "Februari"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Ga Naar Datum"
-
-#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "Januari"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Maart"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mei"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktober"
 
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr "Selecteer datum"
+
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Ga Naar Vandaag"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Map selecteren"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6774,7 +6816,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Verjaardagen & gedenkdagen"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
 msgstr "Op het web"
 
@@ -7015,38 +7057,38 @@ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Takenlijst '%s' zal worden verwijderd. Weet u zeker dat u door wilt gaan?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
 msgstr "Nieuwe takenlijst"
 
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
 msgstr "_Takenlijst"
 
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
 msgstr "Nieuwe takenlijst toevoegen"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Kan de takenlijst '%s' niet openen voor het creëren van gebeurtenissen en "
 "afspraken"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
 msgstr "Er is geen agenda beschikbaar voor het aanmaken van taken"
 
@@ -9288,7 +9330,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:1193
+#: camel/providers/imap/camel-imap-store.c:1198
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -9511,7 +9553,8 @@ msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Troep"
@@ -9785,31 +9828,32 @@ msgstr "Pas filters toe op alle nieuwe berichten in de inbox op deze server"
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatisch controleren op nieuwe post, iedere"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP Servernaam"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Adresboek"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Zoek basis:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr "Voor benadering van Novell Groupwise servers"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9817,20 +9861,20 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2860
+#: camel/providers/imap/camel-imap-store.c:2984
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2863
+#: camel/providers/imap/camel-imap-store.c:2987
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -9888,12 +9932,12 @@ msgstr "Map is vernietigd en opnieuw gemaakt op de server."
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1926
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ophalen van bericht mislukt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9909,25 +9953,25 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-#: camel/providers/imap/camel-imap-folder.c:1995
-#: camel/providers/imap/camel-imap-folder.c:2591
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:2255
-#: camel/providers/imap/camel-imap-folder.c:2325
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2629
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -9999,17 +10043,21 @@ 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-store.c:425
+#: camel/providers/imap4/camel-imap-store.c:166
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
 #: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap4/camel-imap-store.c:168
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-dienst voor %s op %s"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap-store.c:209
+#: camel/providers/imap4/camel-imap-store.c:226
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10020,13 +10068,15 @@ 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:549
+#: camel/providers/imap4/camel-imap-store.c:211
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL is niet beschikbaar"
 
 #: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:796
+#: camel/providers/imap/camel-imap-store.c:801
+#: camel/providers/imap4/camel-imap-store.c:223
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10034,49 +10084,50 @@ msgstr "SSL is niet beschikbaar"
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
-#: camel/providers/imap/camel-imap-store.c:630
-#: camel/providers/imap/camel-imap-store.c:661
+#: camel/providers/imap/camel-imap-store.c:635
+#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap4/camel-imap-store.c:287
 #, 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:631
+#: camel/providers/imap/camel-imap-store.c:636
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extensie niet ondersteund"
 
-#: camel/providers/imap/camel-imap-store.c:662
+#: camel/providers/imap/camel-imap-store.c:667
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:804
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kon niet verbinden met commando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1223
+#: camel/providers/imap/camel-imap-store.c:1228
 #, 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:1233
+#: camel/providers/imap/camel-imap-store.c:1238
 #: 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:1256
+#: camel/providers/imap/camel-imap-store.c:1261
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, 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:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1299
+#: camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10087,13 +10138,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1717
-#: camel/providers/imap/camel-imap-store.c:1798
+#: camel/providers/imap/camel-imap-store.c:1791
+#: camel/providers/imap/camel-imap-store.c:1885
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1739
+#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:2091
+#: camel/providers/imap4/camel-imap-store.c:636
+#, 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:1826
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10101,21 +10160,124 @@ msgstr "Map `%s' bestaat niet."
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan map `%s' niet aanmaken: map bestaat reeds."
 
-#: camel/providers/imap/camel-imap-store.c:1999
-#, 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:2011
+#: camel/providers/imap/camel-imap-store.c:2103
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2047
+#: camel/providers/imap/camel-imap-store.c:2153
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
+#: camel/providers/imap4/camel-imap-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP server %s: %s"
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap-engine.c:411
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-engine.c:417
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap-engine.c:1135
+#: camel/providers/imap4/camel-imap-engine.c:1524
+#: camel/providers/imap4/camel-imap-engine.c:1551
+#: camel/providers/imap4/camel-imap-engine.c:1581
+#: camel/providers/imap4/camel-imap-engine.c:1621
+#: camel/providers/imap4/camel-imap-utils.c:289
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server verbrak onverwacht de verbinding: %s"
+
+#: camel/providers/imap4/camel-imap-engine.c:1136
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap-store.c:262
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
+
+#: camel/providers/imap4/camel-imap-store.c:374
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kon niet verbinden met POP-server %s: Geen ondersteuning voor de ingestelde "
+"aanmeldingsmethode."
+
+#: camel/providers/imap4/camel-imap-store.c:419
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVoer het SMTP wachtwoord in voor %s op host %s"
+
+#: camel/providers/imap4/camel-imap-store.c:493
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Identificatie op POP-server %s mislukt: %s"
+
+#: camel/providers/imap4/camel-imap-store.c:672
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-store.c:677
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap-store.c:699
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kon map: %s niet verwijderen: map bestaat niet"
+
+#: camel/providers/imap4/camel-imap-store.c:728
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-store.c:733
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-store.c:791
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-store.c:796
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap-store.c:835
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap-store.c:840
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap-utils.c:83
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap-utils.c:106
+#, fuzzy
+msgid "No data"
+msgstr "Geen taken"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10148,20 +10310,20 @@ msgid "Index message body data"
 msgstr "Indexeer bericht body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
-#: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postbus: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10344,21 +10506,21 @@ msgstr "geen maildir-directory"
 msgid "Could not scan folder `%s': %s"
 msgstr "Kon map `%s' niet scannen: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kon maildir directory path niet openen: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Mapconsistentie wordt gecontroleerd"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Bezig met controleren op nieuwe berichten"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10503,7 +10665,7 @@ msgstr "Kon de bronmap %s niet sluiten: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2459
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2458
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
@@ -10840,46 +11002,46 @@ msgstr ""
 "Het is niet mogelijk om een map in een nieuws opslag te verwijderen, in "
 "plaats hiervan kunt u uitschrijven."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
 #, c-format
 msgid "Connection error: %s"
 msgstr "Verbindings fout: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
 #, c-format
 msgid "No such folder: %s"
 msgstr "Map: %s bestaat niet"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kon de groep: %s niet verkrijgen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
 msgstr "Kan berichten niet verkrijgen: ongespecificeerde fout"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Opdracht mislukt: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: nieuwe berichten doorzoeken"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Onbekend server-antwoord: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
 msgstr "Gebruik annuleren"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Bewerking mislukt: %s"
@@ -10926,7 +11088,7 @@ msgstr "Verwijder na %s dag(en)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Ondersteuning voor POP3-extensies uitschakelen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11017,7 +11179,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11071,12 +11233,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Voor het versturen van e-mail naar een externe mailhub met SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11403,15 +11566,15 @@ msgstr "Probeer bijlage automatisch weer te geven"
 msgid "You need to configure an account before you can compose mail."
 msgstr "U dient een account in te stellen voordat u post kunt versturen."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:508
 msgid "Posting destination"
 msgstr "Doel van bericht"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:509
 msgid "Choose folders to post the message to."
 msgstr "Kies een map waar het bericht geplaatst moet worden."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:543
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -11422,45 +11585,45 @@ msgstr "Klik hier voor het adresboek"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:573
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:579
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:585
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:594
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:595
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:599
 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:601
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:603
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11471,11 +11634,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:610
 msgid "Post To:"
 msgstr "Versturen naar:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:615
 msgid "Click here to select folders to post to"
 msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 
@@ -11507,30 +11670,30 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1160
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1171 composer/e-msg-composer.c:1187
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1211
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1249
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1257
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11539,7 +11702,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11548,7 +11711,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1280
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11557,7 +11720,7 @@ msgstr ""
 "Kan bestandsbeschrijving niet kopëren: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1289
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11566,7 +11729,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1393
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11575,7 +11738,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1557
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11586,45 +11749,47 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1559
 msgid "Untitled Message"
 msgstr "Naamloos Bericht"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1566
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1599
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2044
 msgid "Signature:"
 msgstr "Handtekening:"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:2084 mail/mail-account-gui.c:1317
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: composer/e-msg-composer.c:2263
-#, c-format
+#: composer/e-msg-composer.c:2262
+#, fuzzy, c-format
 msgid "<b>%d</b> File Attached"
-msgstr "<b>%d</b> Bestand bijgevoegd"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Bestand bijgevoegd"
+msgstr[1] "<b>%d</b> Bestand bijgevoegd"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2291
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Verberg bijl_agen-balk (drop bijlagen hier)"
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2294 composer/e-msg-composer.c:3170
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Toon bijl_agen-balk (drop bijlagen hier)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2311 composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:3053
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3082
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11632,7 +11797,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3111
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11644,7 +11809,7 @@ msgstr ""
 "Controleer alstublieft de geïnstalleerde versie  van\n"
 "gtkhtml en libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3215
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11653,7 +11818,7 @@ msgstr ""
 "Niet in staat de HTML editor component te activeren."
 
 # # Het origineel heeft <b> in plaats van </b>
-#: composer/e-msg-composer.c:4234
+#: composer/e-msg-composer.c:4238
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11910,39 +12075,53 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
-#, c-format
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "1 seconde geleden"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 seconde geleden"
+msgstr[1] "1 seconde geleden"
 
 #: filter/filter-datespec.c:74
-#, c-format
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "1 minuut geleden"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minuut geleden"
+msgstr[1] "1 minuut geleden"
 
 #: filter/filter-datespec.c:75
-#, c-format
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "1 uur geleden"
+msgid_plural "%d hours ago"
+msgstr[0] "1 uur geleden"
+msgstr[1] "1 uur geleden"
 
 #: filter/filter-datespec.c:76
-#, c-format
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "1 dag geleden"
+msgid_plural "%d days ago"
+msgstr[0] "1 dag geleden"
+msgstr[1] "1 dag geleden"
 
 #: filter/filter-datespec.c:77
-#, c-format
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "1 week geleden"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 week geleden"
+msgstr[1] "1 week geleden"
 
 #: filter/filter-datespec.c:78
-#, c-format
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "1 maand geleden"
+msgid_plural "%d months ago"
+msgstr[0] "1 maand geleden"
+msgstr[1] "1 maand geleden"
 
 #: filter/filter-datespec.c:79
-#, c-format
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "1 jaar geleden"
+msgid_plural "%d years ago"
+msgstr[0] "1 jaar geleden"
+msgstr[1] "1 jaar geleden"
 
 #: filter/filter-datespec.c:187
 msgid "You must choose a date."
@@ -11988,7 +12167,7 @@ msgid "You must specify a folder."
 msgstr "U moet een map geven."
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1147
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Map selecteren"
 
@@ -12002,19 +12181,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:63 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Belangrijk"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Later"
 
@@ -12329,8 +12508,9 @@ msgid "Move to Folder"
 msgstr "Naar map verplaatsen"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Bericht doorvoeren naar shellopdracht"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Programma verlaten"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12364,23 +12544,24 @@ msgstr "geeft groter dan"
 msgid "returns less than"
 msgstr "geeft kleiner dan"
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Start een programma:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Shellopdracht"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
@@ -12406,8 +12587,8 @@ msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
 #: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Onderwerp"
@@ -12540,7 +12721,7 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "E-mail accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "E-mailvoorkeuren"
 
@@ -12565,28 +12746,28 @@ msgstr "Accountnaam"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
 #: mail/mail-config.c:1252
 msgid "Unnamed"
 msgstr "Naamloos"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:336
 msgid "You must specify a valid script name."
 msgstr "U moet een geldige scriptnaam opgeven."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
+#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:878
 msgid "Language(s)"
 msgstr "Taal / Talen"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:926
 msgid "Add script signature"
 msgstr "Scripthandtekening toevoegen"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:946
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
@@ -12678,7 +12859,7 @@ msgstr "<klik hier om een map te selecteren>"
 msgid "Create New Folder"
 msgstr "Nieuwe map aanmaken"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2217
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2218
 #: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
@@ -12736,7 +12917,7 @@ msgstr "Kan bericht(en) niet droppen in hoogste nivo opslag."
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kan map `%s' niet verplaatsen: ongeldige operatie"
 
-#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2152
+#: mail/em-folder-tree.c:1976 mail/em-folder-tree.c:2153
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -12752,73 +12933,73 @@ msgstr "Map selecteren"
 msgid "Creating folder `%s'"
 msgstr "Bezig met aanmaken map `%s'"
 
-#: mail/em-folder-tree.c:2217 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2218 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "Map aanmaken"
 
-#: mail/em-folder-tree.c:2336
+#: mail/em-folder-tree.c:2335
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kon map %s niet verwijderen"
 
-#: mail/em-folder-tree.c:2361
+#: mail/em-folder-tree.c:2360
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Kan lokale map %s niet verwijderen."
 
-#: mail/em-folder-tree.c:2367
+#: mail/em-folder-tree.c:2366
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "De map \"%s\" en alle submappen echt verwijderen?"
 
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2376
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" verwijderen"
 
-#: mail/em-folder-tree.c:2411
+#: mail/em-folder-tree.c:2410
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Kan lokale map %s niet hernoemmen."
 
-#: mail/em-folder-tree.c:2420
+#: mail/em-folder-tree.c:2419
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2421
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: mail/em-folder-tree.c:2446
+#: mail/em-folder-tree.c:2445
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Een map genaamd \"%s\" bestaat reeds. Gebruik een andere naam."
 
-#: mail/em-folder-tree.c:2492 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2491 ui/evolution-addressbook.xml.h:45
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "Beel_d"
 
-#: mail/em-folder-tree.c:2493
+#: mail/em-folder-tree.c:2492
 msgid "Open in _New Window"
 msgstr "Open in _Nieuw Venster"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2497
 msgid "_Move"
 msgstr "_Verplaatsen"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2501
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: mail/em-folder-tree.c:2505
+#: mail/em-folder-tree.c:2504
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: mail/em-folder-tree.c:2508 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2507 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -12956,7 +13137,7 @@ msgstr "Filter op draad"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Standaard"
 
@@ -13151,35 +13332,35 @@ msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 msgid "Formatting message"
 msgstr "Bezig met opmaken van bericht"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "Van"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
 #: mail/em-format-html.c:1516 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:768
+#: mail/em-mailer-prefs.c:769
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
@@ -13194,47 +13375,51 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1556 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:985
+#: mail/em-format-html.c:1577 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/em-format.c:1064 mail/em-format.c:1186
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
 
-#: mail/em-format.c:1084 mail/em-format.c:1104 mail/em-format.c:1128
-#: mail/em-format.c:1221
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
 #, c-format
 msgid "Internal error: expecting CamelMultipart, got \"%s\""
 msgstr "Interne fout: verwacht CamelMultipart, kreeg \"%s\""
 
-#: mail/em-format.c:1176
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
 
-#: mail/em-format.c:1323
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
 
-#: mail/em-format.c:1342
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
 msgstr "Handtekening in niet ondersteund formaat"
 
-#: mail/em-format.c:1350
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
 msgstr "Fout bij het verifiëren van ondertekening"
 
-#: mail/em-format.c:1350
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
 msgstr "Onbekende fout bij het verifiëren van ondertekening"
 
-#: mail/em-format.c:1370
+#: mail/em-format.c:1372
 #, c-format
 msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
 msgstr "Interne foute: verwacht CamelMimeMessage, kreeg \"%s\""
@@ -13243,19 +13428,19 @@ msgstr "Interne foute: verwacht CamelMimeMessage, kreeg \"%s\""
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ingebouwd)"
 
-#: mail/em-mailer-prefs.c:84
+#: mail/em-mailer-prefs.c:85
 msgid "Every time"
 msgstr "Elke keer"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:86
 msgid "Once per day"
 msgstr "Een keer per dag"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:87
 msgid "Once per week"
 msgstr "Een keer per week"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:88
 msgid "Once per month"
 msgstr "Een keer per maand"
 
@@ -13341,11 +13526,11 @@ msgid "Folder"
 msgstr "Map"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:831
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:852
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
@@ -13502,7 +13687,8 @@ msgstr "Standaard doorstuurstijl"
 
 #: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr "Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
+msgstr ""
+"Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
 
 #: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
@@ -13515,7 +13701,8 @@ msgstr "Standaard antwoordstijl"
 
 #: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
-msgstr "Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
+msgstr ""
+"Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
 
 #: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
@@ -13556,8 +13743,9 @@ msgid ""
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 "Als er geen ingebouwde weergave is voor een bepaald mime-type in Evolution, "
-"dan kan elk mime-type wat in deze lijst overeenkomt met een bonobo-component weergave "
-"in de GNOME mime-type database gebruikt worden voor weergave van de inhoud."
+"dan kan elk mime-type wat in deze lijst overeenkomt met een bonobo-component "
+"weergave in de GNOME mime-type database gebruikt worden voor weergave van de "
+"inhoud."
 
 #: mail/evolution-mail.schemas.in.in.h:26
 msgid "Last time empty trash was run"
@@ -13577,8 +13765,8 @@ msgid ""
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Lijst met accounts die de mail component van Evolution herkent. De lijst "
-"bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan "
-"/apps/evolution/mail/accounts."
+"bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan /"
+"apps/evolution/mail/accounts."
 
 #: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of custom headers and whether they are enabled."
@@ -13740,11 +13928,11 @@ msgstr "S3kr3t 0pt10n."
 
 #: mail/evolution-mail.schemas.in.in.h:63
 msgid "Send HTML mail by default"
-msgstr "Standaard HTLM e-mail versturen"
+msgstr "Standaard HTML e-mail versturen"
 
 #: mail/evolution-mail.schemas.in.in.h:64
 msgid "Send HTML mail by default."
-msgstr "Standaard HTLM e-mail versturen."
+msgstr "Standaard HTML e-mail versturen."
 
 # filmpjes weergeven
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13811,9 +13999,9 @@ msgid ""
 "mail view."
 msgstr ""
 "Deze sleuten zou een lijst met XML structuren moeten bevatten die aangepaste "
-"koppen speciferen en of ze weergeven dienen te worden. Het formaat van de XML"
-"structuur is &lt;kop enabled&gt;- stel enabled in als de kop weergeven moet worden "
-"in de mail weergave."
+"koppen speciferen en of ze weergeven dienen te worden. Het formaat van de "
+"XMLstructuur is &lt;kop enabled&gt;- stel enabled in als de kop weergeven "
+"moet worden in de mail weergave."
 
 # boomstructuur voor berichtenlijst
 #: mail/evolution-mail.schemas.in.in.h:79
@@ -14114,62 +14302,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Huidig opslagformaat:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Berichtinoud indexeren"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nieuw opslagformaat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Opmerking: Bij het converteren tussen mailbox formaten zal een fout,\n"
-"zoals te weinig diskruimte, wellicht niet automatisch herstelbaar zijn.\n"
-"Wees voorzichtig met het gebruiken van deze optie."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
 #: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:145
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:790 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:794 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: mail/mail-account-gui.c:798 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:2074
+#: mail/mail-account-gui.c:2086
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
@@ -14249,7 +14403,7 @@ msgstr "Maak een berichten map aan"
 msgid "URI of the mail source that the view will display"
 msgstr "De URI van de mail bron die de weergave zal tonen"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteit"
 
@@ -14264,6 +14418,7 @@ msgstr ""
 "berichten die u verzendt."
 
 #: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "E-mail ontvangen"
 
@@ -14280,7 +14435,7 @@ msgstr ""
 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:387 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "E-mail versturen"
 
@@ -14293,7 +14448,7 @@ 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:11
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Accountbeheer"
 
@@ -14319,119 +14474,254 @@ msgstr "Dienst wordt gecontroleerd"
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr "_Ondersteunde aanmeldingstypes controleren"
 
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Voorbeeld"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>_Toon mail koppen</b>"
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Status:</b>"
+
+#: mail/mail-config.glade.h:7
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
-"Berichten ook naar _mijzelf versleutelen bij het versturen van versleutelde "
-"berichten"
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Accountbeheer"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Accountinformatie"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Controleren voor Nieuwe Berichten"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Script _toevoegen"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Nieuwe handtekening toevoegen..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "<b>_Toon mail koppen</b>"
+
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "Weer te geven bericht:"
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "Nieuwe Mail Notificatie"
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "Verzonden en Klad Berichten"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr ""
+"Berichten ook naar _mijzelf versleutelen bij het versturen van versleutelde "
+"berichten"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Accountbeheer"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Nieuwe handtekening toevoegen..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Script _toevoegen"
+
+#: mail/mail-config.glade.h:38
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Berichten naar _mijzelf versleutelen bij het versturen van versleutelde "
 "berichten"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Altijd een kopie (Cc) naar:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Altijd een geheime kopie (Bcc) naar:"
 
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Altijd een kopie (Cc) naar:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr ""
+"Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sleutels in mijn sleutelbos altijd _vertrouwen bij versleutelen"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Originele bericht bijvoegen"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Aanmelding"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Automatisch smileys invoegen"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Automatisch controleren op nieuwe post, iedere"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "Piepen bij binnenkomst van nieuwe e-mail"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "_tekencodering:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "_Kleuren"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "_Ondersteunde aanmeldingstypes controleren"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Controleren voor N_ieuwe Berichten"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Spelling controleren terwijl ik _tik"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Controleren voor Nieuwe Berichten"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Controleer binnenkomende mail berichten op troep"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Kleur voor _spelfouten:"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Berichten Opstellen"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "_Kleuren"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Configuratie"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "Bevestigen bij het legen van een map"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14446,137 +14736,116 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Standaardgedrag"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "Standaard teken_codering:"
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Verwijderen van e-mail"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Uitgaande berichten _altijd ondertekenen"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Standaardinstellingen"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Originele bericht niet citeren"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Aanvragen voor bijeenkomsten _niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "_Klad-map:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-mail accounts"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
 msgstr "E-mail_adres:"
 
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Empty trash folders on e_xit"
 msgstr "_Prullenbakken legen bij afsluiten"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Encry_ptie certificaat:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "_Vaste breedte:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Filter opties"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Lettertype-eigenschappen"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Berichten opmaken met _HTML"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML e-mail"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
 msgstr "Kopp_en"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Citaten _accentueren met"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr "Labels en kleuren"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Afbeeldingen laden"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Berichten opstellen"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Berichtweergave"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Berichtlettertype"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Nieuwe Mail Notificatie"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14584,140 +14853,149 @@ msgstr ""
 "Opmerking: U wordt pas om uw wachtwoord gevraagd wanneer uw voor het eerst "
 "contact maakt"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Optionele Informatie"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganisatie:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "Afgedrukte lettertypes"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "Originele bericht citeren"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Ant_woordadres:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "E-mail ontvangen"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
 msgstr "_Ontvangst-instellingen"
 
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "_Wachtwoord onthouden"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Vereiste informatie"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Standaardinstellingen herstellen"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "B_eveiliging"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "Standaardlettertype"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Beveiligde MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Kies HTML lettertype met gelijke breedte"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Kies HTML lettertype met gelijke breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Kies HTML lettertype met variabele breedte"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Selecteer..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "E-mail versturen"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Verzonden en Klad Berichten"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Serverconfiguratie"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Ondertekenin_gs certificaat:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Handtekening:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Handtekeningen"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Geef _bestandsnaam:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
 msgstr "Spellings_controle"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminal-lettertype:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Type:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14727,7 +15005,7 @@ msgstr ""
 "uw ondertekening. De naam die u hier geeft zal\n"
 "uitsluitend voor weergavedoeleinden gebruikt worden."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:144
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -14737,7 +15015,7 @@ msgstr ""
 "lijst van beschikbare talen komt overeen met de waarvoor een woordenboek "
 "geïnstalleerd is."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14745,15 +15023,15 @@ msgstr ""
 "Geef de naam die u aan dit account wilt geven.\n"
 "Bijvoorbeeld: \"zakelijk\" of \"persoonlijk\""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Gebruik _Daemon"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_ariabele breedte:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14763,170 +15041,103 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "Handtekening _toevoegen"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Always load images from the Internet"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr ""
-"Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Aanmeldingstype:"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Aanmeldingstype:"
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "_Automatisch controleren op nieuwe post, iedere"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Automatisch smileys invoegen"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "Piepen bij binnenkomst van nieuwe e-mail"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "Bevestigen bij het legen van een map"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Standaardhandtekening:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Standaardinstellingen"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Uitgaande berichten _altijd ondertekenen"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Geen melding bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Gebruiken"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "V_ersleutel uitgaande berichten (standaard)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Doorstuurstijl:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Volledige Naam:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML e-mail"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identiteit"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Troep"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "Afbee_ldingen tonen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "Enkel _locale testen"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Dit instellen als standaardaccount"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "Berichten als gelezen markeren na "
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Never load images from the Internet"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Waarschuwen wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Berichten ontvangen"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "_Antwoordstijl:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Standaardinstellingen herstellen"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Selecteer..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "E-mail ver_sturen"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Bewegende afbeeldingen _weergeven"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Handtekeningen"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "Standaardlettertype"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminal-lettertype:"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als de andere programma's"
 
+# meervoudsvorm?
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minuten"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "kleur"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "omschrijving"
 
@@ -15074,16 +15285,20 @@ msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
 #: mail/mail-ops.c:1838
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Bezig met ophalen van %d bericht(en)"
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Bezig met ophalen van %d bericht(en)"
+msgstr[1] "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Bezig met het opslaan van %d bericht(en)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Bezig met het opslaan van %d bericht(en)"
+msgstr[1] "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15092,7 +15307,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15101,11 +15316,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15114,17 +15329,17 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
@@ -15141,17 +15356,13 @@ msgstr "Vind in bericht"
 msgid "Find:"
 msgstr "Zoek:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Zoeken"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Digitale Handtekening"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Versleuteling"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
@@ -15458,7 +15669,8 @@ msgstr ""
 "Kies een vervolgactie uit het \"Vlag\"-menu."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
 msgstr "_Verloopdatum:"
 
 #: mail/message-tags.glade.h:7
@@ -15527,7 +15739,8 @@ msgstr "Evolution configuratie versie"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID of alias van het component dat bij het opstarten moet worden weergegeven."
+msgstr ""
+"ID of alias van het component dat bij het opstarten moet worden weergegeven."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
@@ -15784,7 +15997,7 @@ msgstr "_Importeren"
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Evolution instellingen"
 
@@ -16162,7 +16375,7 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Hoi. Bedankt voor het downloaden en uitproberen van deze proefversie\n"
+"Hoi. Bedankt voor het ophalen en uitproberen van deze proefversie\n"
 "van het Ximian Evolution softwarepakket.\n"
 "\n"
 "Deze versie van Ximian Evolution is nog niet helemaal af. We zijn er bijna,\n"
@@ -16171,7 +16384,7 @@ msgstr ""
 "Als u een stabiele versie van Evolution wilt gebruiken, kunt u beter deze\n"
 "versie verwijderen en versie %s installeren.\n"
 "\n"
-"Wilt ut, als u bugs tegenkomt, deze alstublieft rapporteren aan bugzilla."
+"Wilt u, als u bugs tegenkomt, deze alstublieft rapporteren aan bugzilla."
 "ximian.com.\n"
 "Dit produkt komt zonder enige garantie en is niet bedoeld voor mensen\n"
 "die licht ontvlambaar en agressief zijn.\n"
@@ -16238,30 +16451,30 @@ msgstr ""
 "%s: --online en --offline kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr "Selecteer een cert om te importeren"
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:545
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "Certificaat naam"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 msgid "Purposes"
 msgstr "Doelen"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Serie nummer"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Verloopt"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "E-mailadres"
 
@@ -16270,17 +16483,17 @@ msgstr "E-mailadres"
 msgid "Certificate Viewer: %s"
 msgstr "Certificaat weergave: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Voer uw Wachtwoord in voor `%s'"
 
 #. we're setting the password initially
-#: smime/gui/component.c:64
+#: smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Voer een nieuw wachtwoord in voor de certificaat database"
 
-#: smime/gui/component.c:66
+#: smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Voer nieuw wachtwoord in"
 
@@ -16476,7 +16689,8 @@ msgstr "U hebt certificaten in uw bestand dat deze personen indentificeren."
 msgid "Your Certificates"
 msgstr "Uw certificaten"
 
-#: smime/lib/e-cert-db.c:582
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
 msgstr "Certificaat bestaat reeds"
 
@@ -16750,7 +16964,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:14
 msgid "Paste the clipboard"
 msgstr "Plakken vanuit klembord"
 
@@ -16758,7 +16972,7 @@ msgstr "Plakken vanuit 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-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -16879,45 +17093,48 @@ msgid "Go forward"
 msgstr "Ga vooruit in de tijd"
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Ga Naar Datum"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ga naar een specifieke datum"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Ga Naar Vandaag"
-
-#: ui/evolution-calendar.xml.h:16
 msgid "List"
 msgstr "Lijst"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Maand"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 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:17
 msgid "Print this calendar"
 msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 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
+#: ui/evolution-calendar.xml.h:19 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "L_egen"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:20
 msgid "Purge old appointments and meetings"
 msgstr "Verwijder oude afspraken en gebeurtenissen"
 
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Select _Date"
+msgstr "Selecteer namen"
+
+#: ui/evolution-calendar.xml.h:23
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Ga naar een specifieke datum"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Select today"
+msgstr "Map selecteren"
+
 #: ui/evolution-calendar.xml.h:25
 msgid "Show as list"
 msgstr "Weergeven als lijst"
@@ -18431,6 +18648,210 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#~ msgid "1 contact"
+#~ msgstr "1 contact"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "en %d andere kaarten."
+
+#~ msgid "List View"
+#~ msgstr "Lijst weergave"
+
+#~ msgid "1 day"
+#~ msgstr "1 dag"
+
+#~ msgid "1 week"
+#~ msgstr "1 week"
+
+#~ msgid "1 hour"
+#~ msgstr "1 uur"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuut"
+
+#~ msgid "1 second"
+#~ msgstr "1 seconde"
+
+#~ msgid "Description"
+#~ msgstr "Beschrijving"
+
+#~ msgid "component"
+#~ msgstr "component"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmen"
+
+#~ msgid "Geographical position"
+#~ msgstr "Geografische positie"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Elke %d dagen"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Elke %d weken"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Elke %d weken op"
+
+#~ msgid "every %d months"
+#~ msgstr "elke %d maanden"
+
+#~ msgid "Every %d years"
+#~ msgstr "Elke %d jaar"
+
+#~ msgid "Go To Date"
+#~ msgstr "Ga Naar Datum"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Ga Naar Vandaag"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP Servernaam"
+
+#~ msgid "Search base:"
+#~ msgstr "Zoek basis:"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Bericht doorvoeren naar shellopdracht"
+
+#~ msgid "Shell Command"
+#~ msgstr "Shellopdracht"
+
+#~ msgid "Current store format:"
+#~ msgstr "Huidig opslagformaat:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Berichtinoud indexeren"
+
+#~ msgid "New store format:"
+#~ msgstr "Nieuw opslagformaat:"
+
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure\n"
+#~ "(such as lack of disk space) may not be automatically\n"
+#~ "recoverable.  Please use this feature with care."
+#~ msgstr ""
+#~ "Opmerking: Bij het converteren tussen mailbox formaten zal een fout,\n"
+#~ "zoals te weinig diskruimte, wellicht niet automatisch herstelbaar zijn.\n"
+#~ "Wees voorzichtig met het gebruiken van deze optie."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Accountinformatie"
+
+#~ msgid "Authentication"
+#~ msgstr "Aanmelding"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Berichten Opstellen"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuratie"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Standaardgedrag"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Verwijderen van e-mail"
+
+#~ msgid "Filter Options"
+#~ msgstr "Filter opties"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Labels en kleuren"
+
+#~ msgid "Loading Images"
+#~ msgstr "Afbeeldingen laden"
+
+#~ msgid "Message Display"
+#~ msgstr "Berichtweergave"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Berichtlettertype"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optionele Informatie"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Afgedrukte lettertypes"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Onthoud dit wachtwoord"
+
+#~ msgid "Remember this _password"
+#~ msgstr "_Wachtwoord onthouden"
+
+#~ msgid "Required Information"
+#~ msgstr "Vereiste informatie"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Standaardinstellingen herstellen"
+
+#~ msgid "S_ecurity"
+#~ msgstr "B_eveiliging"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Beveiligde MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Serverconfiguratie"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Aanmeldingstype:"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Aanmeldingstype:"
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Standaardhandtekening:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Volledige Naam:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identiteit"
+
+#~ msgid "_Junk"
+#~ msgstr "_Troep"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Berichten ontvangen"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Standaardinstellingen herstellen"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "E-mail ver_sturen"
+
+#~ msgid "Search"
+#~ msgstr "Zoeken"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Digitale Handtekening"
+
+#~ msgid "Encryption"
+#~ msgstr "Versleuteling"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Ga Naar Datum"
+
+#~ msgid "Go to today"
+#~ msgstr "Ga Naar Vandaag"
+
 #~ msgid "%d seconds ago"
 #~ msgstr "%d seconden geleden"
 
@@ -18452,15 +18873,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "%d years ago"
 #~ msgstr "%d jaren geleden"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Selecteer doel %s"
-
-#~ msgid "calendar"
-#~ msgstr "kalender"
-
-#~ msgid "task list"
-#~ msgstr "takenlijst"
-
 #~ msgid "STARTTLS request timed out: %s"
 #~ msgstr "STARTTLS-verzoek verlopen: %s"
 
@@ -18879,9 +19291,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Edit LDAP Server"
 #~ msgstr "LDAP server bewerken"
 
-#~ msgid "Select Names"
-#~ msgstr "Selecteer namen"
-
 #~ msgid "Selected Contacts:"
 #~ msgstr "Geselecteerde contacten:"
 
@@ -18917,10 +19326,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "Kalenderinformatie"
 
-#, fuzzy
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "Weer te geven bericht:"
-
 #, fuzzy
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Status:</b>"
@@ -18973,10 +19378,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Could not create directory for new task list"
 #~ msgstr "Kon directory %s niet maken: %s"
 
-#, fuzzy
-#~ msgid "<b>Preview</b>"
-#~ msgstr "Voorbeeld"
-
 #, fuzzy
 #~ msgid "<b>Progress</b>"
 #~ msgstr "Voortgang"
@@ -19283,9 +19684,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "New _Task"
 #~ msgstr "Nieuwe taak"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "Evolution Venster"
-
 #, fuzzy
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Evolution Venster"
@@ -19680,9 +20078,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "No cards"
 #~ msgstr "Geen kaarten"
 
-#~ msgid "1 card"
-#~ msgstr "1 kaart"
-
 #~ msgid "%d cards"
 #~ msgstr "%d kaarten"
 
@@ -19748,9 +20143,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "_Save as..."
 #~ msgstr "Op_slaan als..."
 
-#~ msgid "End Date"
-#~ msgstr "Einddatum"
-
 #~ msgid "Print..."
 #~ msgstr "Afdrukken..."
 
@@ -27369,9 +27761,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Shown"
 #~ msgstr "Weergegeven"
 
-#~ msgid "No tasks"
-#~ msgstr "Geen taken"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Geen Omschrijving)"
 
@@ -28286,9 +28675,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Temperaturen weergeven in:"
 
-#~ msgid "Tasks "
-#~ msgstr "Taken"
-
 #~ msgid "Weather Settings"
 #~ msgstr "Weerinstellingen"
 
-- 
cgit v1.2.3