Added Azeri language file

fixed various po files fixed a no-c-format tag svn path=/trunk/; revision=8733
author: Pablo Saratxaga <pablo@src.gnome.org> 2001-03-15 18:42:18 +0800
committer: Pablo Saratxaga <pablo@src.gnome.org> 2001-03-15 18:42:18 +0800
commit: 9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7 (patch)
tree: 957874003612aaafdb3b6bdbc748c99979eb0715 /po/nl.po
parent: ed1060cbfb536be02c0122135d66b71c3f5fb228 (diff)
download: gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.gz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.bz2
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.lz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.xz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.zst
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.zip
1 files changed, 3614 insertions, 2985 deletions
diff --git a/po/nl.po b/po/nl.po
index 8f8f8cbf93..38e2506c79 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,11 +4,10 @@
 # Gerard Oskamp <gerard@linuxfreak.nl>, 2000
 # Dennis Smit <synap@area101.penguin.nl>, 2000
 # Almer S. Tigelaar <almer@gnome.org>, 2000, 2001
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-02-24 19:28+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-02-24 19:27+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer@gnome.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,13 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-# addressbook/contact-editor/e-contact-editor.c:1283
+# addressbook/contact-editor/e-contact-editor.c:1283
 #: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr "Kaart: "
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11
-# composer/e-msg-composer-address-dialog.glade.h:8
+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
@@ -63,7 +62,7 @@ msgstr ""
 "\n"
 "  Familie:      "
 
-# addressbook/contact-editor/fullname-strings.h:12
+# addressbook/contact-editor/fullname-strings.h:12
 #: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
@@ -80,7 +79,7 @@ msgstr ""
 "\n"
 "Geboorte Datum: "
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18
+# addressbook/contact-editor/e-contact-editor-strings.h:18
 #: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
@@ -169,7 +168,7 @@ msgstr ""
 "\n"
 "Telefoon:"
 
-# addressbook/contact-editor/e-contact-editor.c:1341
+# addressbook/contact-editor/e-contact-editor.c:1341
 #: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
@@ -178,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-# addressbook/contact-editor/e-contact-editor.c:1341
+# addressbook/contact-editor/e-contact-editor.c:1341
 #: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
@@ -203,7 +202,7 @@ msgstr ""
 "\n"
 "Tijdzone: "
 
-# addressbook/printing/e-contact-print.glade.h:12
+# addressbook/printing/e-contact-print.glade.h:12
 #: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
@@ -212,7 +211,7 @@ msgstr ""
 "\n"
 "Geografische Locatie: "
 
-# addressbook/contact-editor/e-contact-editor.c:1280
+# addressbook/contact-editor/e-contact-editor.c:1280
 #: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
@@ -229,8 +228,8 @@ msgstr ""
 "\n"
 "Org: "
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11
-# composer/e-msg-composer-address-dialog.glade.h:8
+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
@@ -271,7 +270,7 @@ msgstr ""
 "\n"
 "  Eenheid4: "
 
-# addressbook/contact-editor/categories-strings.h:7
+# addressbook/contact-editor/categories-strings.h:7
 #: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
@@ -280,7 +279,7 @@ msgstr ""
 "\n"
 "Categorieën: "
 
-# calendar/gui/gncal-todo.c:207
+# calendar/gui/gncal-todo.c:207
 #: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
@@ -330,129 +329,13 @@ msgstr "Importeert GnomeCard bestanden naar Evolution."
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Uitgezet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiëren Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiëren Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mengen Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mengen Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Originele Auteur:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-# shell/e-shell-view-menu.c:369
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution Adresboek Kanaal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Configuratie programma voor het evolution adresboek kanaal.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Actie Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Kanaal status"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Niet verbonden met de gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
@@ -478,338 +361,351 @@ msgstr "Kon \"wombat\" niet starten"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configureer het adres kanaal"
-
-# shell/e-shell-view-menu.c:369
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution Adres kanaal"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:11
+# addressbook/contact-editor/e-contact-editor-strings.h:11
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Toevoegen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:39
+# addressbook/contact-editor/e-contact-editor-strings.h:39
 #: addressbook/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "_Verjaardag:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:24
+# addressbook/contact-editor/e-contact-editor-strings.h:24
 #: addressbook/contact-editor/contact-editor.glade.h:3
 msgid "B_usiness"
 msgstr "_Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:21
+# addressbook/contact-editor/e-contact-editor-strings.h:21
 #: addressbook/contact-editor/contact-editor.glade.h:4
 msgid "Business _Fax"
 msgstr "Bedrijfs _Fax"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:26
+# addressbook/contact-editor/e-contact-editor-strings.h:26
 #: addressbook/contact-editor/contact-editor.glade.h:5
 msgid "C_ontacts..."
 msgstr "K_ontakten..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:27
+# addressbook/contact-editor/e-contact-editor-strings.h:27
 #: addressbook/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:3
 #: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieën..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:13
+# addressbook/contact-editor/e-contact-editor-strings.h:13
 #: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Kontaken Bewerken"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:41
+# addressbook/contact-editor/e-contact-editor-strings.h:41
 #: addressbook/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Details"
 msgstr "Details"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:15
+# addressbook/contact-editor/e-contact-editor-strings.h:15
 #: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Opslaan Als:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:30
+# addressbook/contact-editor/e-contact-editor-strings.h:30
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Algemeen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10
-# addressbook/contact-editor/e-contact-editor-strings.h:12
+# addressbook/contact-editor/e-contact-editor-strings.h:10
+# addressbook/contact-editor/e-contact-editor-strings.h:12
 #: addressbook/contact-editor/contact-editor.glade.h:11
 msgid "New phone type"
 msgstr "Nieuw telefoon type"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:40
+# addressbook/contact-editor/e-contact-editor-strings.h:40
 #: addressbook/contact-editor/contact-editor.glade.h:12
 msgid "No_tes:"
 msgstr "Aa_ntekeningen:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:9
+# addressbook/contact-editor/e-contact-editor-strings.h:9
 #: addressbook/contact-editor/contact-editor.glade.h:13
 msgid "Phone Types"
 msgstr "Telefoon Typen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:23
-# addressbook/contact-editor/e-contact-editor.c:1340
+# addressbook/contact-editor/e-contact-editor-strings.h:23
+# addressbook/contact-editor/e-contact-editor.c:1340
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Primaire E-mail"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:17
+# addressbook/contact-editor/e-contact-editor-strings.h:17
 #: addressbook/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Ontvangt liever _HTML berichten"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:16
+# addressbook/contact-editor/e-contact-editor-strings.h:16
 #: addressbook/contact-editor/contact-editor.glade.h:16
 msgid "Web page address:"
 msgstr "Homepage:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:7
+# addressbook/contact-editor/e-contact-editor-strings.h:7
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Toevoegen"
 
-# composer/e-msg-composer-address-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:11
 #: addressbook/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Adres..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:37
+# addressbook/contact-editor/e-contact-editor-strings.h:37
 #: addressbook/contact-editor/contact-editor.glade.h:19
 msgid "_Assistant's name:"
 msgstr "_Assistent:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:36
+# addressbook/contact-editor/e-contact-editor-strings.h:36
 #: addressbook/contact-editor/contact-editor.glade.h:20
 msgid "_Birthday:"
 msgstr "Ge_boortedatum:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:19
+# addressbook/contact-editor/e-contact-editor-strings.h:19
 #: addressbook/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
 msgstr "_Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:29
+# addressbook/contact-editor/e-contact-editor-strings.h:29
 #: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Bedrijf:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:8
-# addressbook/contact-editor/e-contact-editor.c:673
+# addressbook/contact-editor/e-contact-editor-strings.h:8
+# addressbook/contact-editor/e-contact-editor.c:673
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31
+# addressbook/contact-editor/e-contact-editor-strings.h:31
 #: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "Af_deling:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:14
+# addressbook/contact-editor/e-contact-editor-strings.h:14
 #: addressbook/contact-editor/contact-editor.glade.h:25
 msgid "_Full Name..."
 msgstr "_Volledige Naam..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:20
+# addressbook/contact-editor/e-contact-editor-strings.h:20
 #: addressbook/contact-editor/contact-editor.glade.h:26
 msgid "_Home"
 msgstr "T_huis"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:28
+# addressbook/contact-editor/e-contact-editor-strings.h:28
 #: addressbook/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "_Titel:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:38
+# addressbook/contact-editor/e-contact-editor-strings.h:38
 #: addressbook/contact-editor/contact-editor.glade.h:28
 msgid "_Manager's Name:"
 msgstr "_Manager:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:22
+# addressbook/contact-editor/e-contact-editor-strings.h:22
 #: addressbook/contact-editor/contact-editor.glade.h:29
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:34
+# addressbook/contact-editor/e-contact-editor-strings.h:34
 #: addressbook/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:32
+# addressbook/contact-editor/e-contact-editor-strings.h:32
 #: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Kant_oor:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33
+# addressbook/contact-editor/e-contact-editor-strings.h:33
 #: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Beroep:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35
+# addressbook/contact-editor/e-contact-editor-strings.h:35
 #: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_Echtgeno(o)t(e):"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:25
+# addressbook/contact-editor/e-contact-editor-strings.h:25
 #: addressbook/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
 msgstr "Dit is een email-adres"
 
-# addressbook/gui/component/addressbook.c:426
+# addressbook/gui/component/addressbook.c:426
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Contact verwijderen?"
 
-# addressbook/contact-editor/categories-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:574
+# addressbook/contact-editor/categories-strings.h:8
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categoriëen:"
 
-# addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+# addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Assistent"
 
-# addressbook/contact-editor/e-contact-editor.c:1279
-# addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+# addressbook/contact-editor/e-contact-editor.c:1279
+# addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+# addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+# addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Bedrijfs Fax"
 
-# addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/contact-editor/e-contact-editor.c:1281
+# addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Terugbel"
 
-# addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+# addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1283
+# addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+# addressbook/contact-editor/e-contact-editor.c:1285
+# addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Thuis"
 
-# addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+# addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Thuis 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+# addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
-# addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+# addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
-# addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+# addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
-# addressbook/contact-editor/e-contact-editor.c:1290
-# addressbook/contact-editor/e-contact-editor.c:1385
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+# addressbook/contact-editor/e-contact-editor.c:1290
+# addressbook/contact-editor/e-contact-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Overige"
 
-# addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/contact-editor/e-contact-editor.c:1290
+# addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Andere Fax"
 
-# addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+# addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Oppieper"
 
-# addressbook/contact-editor/e-contact-editor.c:1293
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+# addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Eerste"
 
-# addressbook/contact-editor/e-contact-editor.c:1294
-#: addressbook/contact-editor/e-contact-editor.c:1293
+# addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-# addressbook/contact-editor/e-contact-editor.c:1295
-#: addressbook/contact-editor/e-contact-editor.c:1294
+# addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-# addressbook/contact-editor/e-contact-editor.c:1296
-#: addressbook/contact-editor/e-contact-editor.c:1295
+# addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-# addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-mail 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1342
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+# addressbook/contact-editor/e-contact-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-mail 3"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Filters Bewerken"
+
+# mail/mail-config.c:277
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Volledige Naam:"
+
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:18
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -818,7 +714,7 @@ msgstr "Adres _2:"
 msgid "Canada"
 msgstr "Canada"
 
-# composer/e-msg-composer-address-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:11
 #: addressbook/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controleer Adres"
@@ -827,7 +723,7 @@ msgstr "Controleer Adres"
 msgid "Countr_y:"
 msgstr "_Land:"
 
-# addressbook/gui/component/addressbook.c:424
+# addressbook/gui/component/addressbook.c:424
 #: addressbook/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
@@ -836,12 +732,12 @@ msgstr "Finland"
 msgid "USA"
 msgstr "USA"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18
+# addressbook/contact-editor/e-contact-editor-strings.h:18
 #: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adres:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:36
+# addressbook/contact-editor/e-contact-editor-strings.h:36
 #: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Gemeente:"
@@ -858,7 +754,7 @@ msgstr "_Staat/Provincie:"
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-# addressbook/contact-editor/fullname-strings.h:7
+# addressbook/contact-editor/fullname-strings.h:7
 #: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Controleer Volledige Naam"
@@ -871,7 +767,7 @@ msgstr "Dr."
 msgid "Esq."
 msgstr "Mr."
 
-# addressbook/gui/component/alphabet.glade.h:14
+# addressbook/gui/component/alphabet.glade.h:14
 #: addressbook/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
@@ -888,7 +784,7 @@ msgstr "III"
 msgid "Jr."
 msgstr "Jr."
 
-# addressbook/gui/component/alphabet.glade.h:17
+# addressbook/gui/component/alphabet.glade.h:17
 #: addressbook/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Mejuffrouw"
@@ -909,55 +805,55 @@ msgstr "Jfr."
 msgid "Sr."
 msgstr "Hr."
 
-# addressbook/contact-editor/fullname-strings.h:9
+# addressbook/contact-editor/fullname-strings.h:9
 #: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "Voornaam:"
 
-# addressbook/contact-editor/fullname-strings.h:11
+# addressbook/contact-editor/fullname-strings.h:11
 #: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Achternaam:"
 
-# addressbook/contact-editor/fullname-strings.h:10
+# addressbook/contact-editor/fullname-strings.h:10
 #: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Tweede Naa_m:"
 
-# addressbook/contact-editor/fullname-strings.h:12
+# addressbook/contact-editor/fullname-strings.h:12
 #: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-# addressbook/contact-editor/fullname-strings.h:8
+# addressbook/contact-editor/fullname-strings.h:8
 #: addressbook/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-# addressbook/gui/component/addressbook.c:1046
-#: addressbook/gui/component/addressbook.c:230
+# addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Als _Minikaarten"
 
-# addressbook/gui/component/addressbook.c:499
-# addressbook/gui/component/addressbook.c:1039
-#: addressbook/gui/component/addressbook.c:236
+# addressbook/gui/component/addressbook.c:499
+# addressbook/gui/component/addressbook.c:1039
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Als _Tabel"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr "Voer het wachtwoord voor %s in"
 
-# addressbook/gui/component/addressbook.c:593
-#: addressbook/gui/component/addressbook.c:433
+# addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-# addressbook/gui/component/addressbook.c:598
-#: addressbook/gui/component/addressbook.c:438
+# addressbook/gui/component/addressbook.c:598
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -977,34 +873,34 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Allen Weergeven"
 
-# calendar/gui/gncal-todo.c:479
-# composer/e-msg-composer-address-dialog.glade.h:13
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: addressbook/gui/component/addressbook.c:594
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr "Naam bevat"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: addressbook/gui/component/addressbook.c:595
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "E-mail bevat"
 
-# addressbook/gui/component/addressbook.c:1097
-#: addressbook/gui/component/addressbook.c:738
+# addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
@@ -1012,17 +908,17 @@ msgstr "De URI die de Map Bladeraar zal laten zien"
 msgid "Other Contacts"
 msgstr "Andere Contacten"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:8
+# addressbook/gui/component/ldap-server-dialog.glade.h:8
 #: addressbook/gui/component/addressbook-config.c:143
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-# widgets/e-table/e-table-config.glade.h:10
+# widgets/e-table/e-table-config.glade.h:10
 #: addressbook/gui/component/addressbook-config.c:145
 msgid "File"
 msgstr "Bestand"
 
-# addressbook/gui/component/addressbook.c:593
+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "Unknown addressbook type"
 msgstr "Onbekend adresboek type"
@@ -1031,11 +927,11 @@ msgstr "Onbekend adresboek type"
 msgid "None (anonymous mode)"
 msgstr "Geen (anonieme modus)"
 
-# mail/folder-browser-factory.c:101
+# mail/folder-browser-factory.c:101
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1043,13 +939,13 @@ msgstr "Wachtwoord"
 msgid "SASL"
 msgstr "SASL"
 
-# shell/e-storage.c:434
+# shell/e-storage.c:434
 #: addressbook/gui/component/addressbook-config.c:165
 msgid "Unknown auth type"
 msgstr "Onbekende auth type"
 
-# composer/e-msg-composer-address-dialog.c:191
-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+# composer/e-msg-composer-address-dialog.c:191
+# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
 #: addressbook/gui/component/addressbook-config.c:174
 msgid "Base"
 msgstr "Basis"
@@ -1078,9 +974,9 @@ msgstr "FIXME Verbindings DN Help tekst hier"
 msgid "Remember this password"
 msgstr "Onthoud dit wachtwoord"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Computernaam:"
 
@@ -1088,7 +984,7 @@ msgstr "Computernaam:"
 msgid "FIXME Host help text here."
 msgstr "FIXME Computernaam help tekst hier."
 
-# calendar/gui/gncal-todo.c:190
+# calendar/gui/gncal-todo.c:190
 #: addressbook/gui/component/addressbook-config.c:404
 msgid "Port:"
 msgstr "Poort:"
@@ -1097,7 +993,7 @@ msgstr "Poort:"
 msgid "FIXME Port help text here."
 msgstr "FIXME Poort help tekst hier."
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:10
+# addressbook/gui/component/ldap-server-dialog.glade.h:10
 #: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "Stam DN:"
@@ -1106,20 +1002,20 @@ msgstr "Stam DN:"
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Stam DN help tekst hier."
 
-# composer/e-msg-composer-address-dialog.glade.h:9
+# composer/e-msg-composer-address-dialog.glade.h:9
 #: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Zoek Strekking:"
 
-# mail/mail-config.c:739 mail/mail-config.c:819
+# mail/mail-config.c:739 mail/mail-config.c:819
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Authenticatie:"
 
-# mail/mail-config.c:732
+# mail/mail-config.c:732
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Pad:"
 
@@ -1127,17 +1023,17 @@ msgstr "Pad:"
 msgid "FIXME Path Help text here"
 msgstr "FIXME Pad Help tekst hier"
 
-# composer/e-msg-composer.c:676
+# composer/e-msg-composer.c:676
 #: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr "Maak pad als het niet bestaat."
 
-# addressbook/gui/component/addressbook.c:593
+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr "Bewerk Adresboek"
 
-# addressbook/gui/component/addressbook.c:593
+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr "Adresboek Toevoegen"
@@ -1150,10 +1046,10 @@ msgstr ""
 "Selecteer het soort adresboek dat je hebt en voer de relevante informatie "
 "erover in."
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11
-# composer/e-msg-composer-address-dialog.glade.h:8
+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1161,8 +1057,8 @@ msgstr "Naam:"
 msgid "FIXME Name help text here"
 msgstr "FIXME Naam help tekst hier"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7
-# composer/e-msg-composer-attachment.glade.h:9
+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #: addressbook/gui/component/addressbook-config.c:669
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
@@ -1173,34 +1069,34 @@ msgstr "Beschrijving:"
 msgid "FIXME Description help text here"
 msgstr "FIXME Beschrijving help tekst hier"
 
-# mail/mail-config.c:1490
+# mail/mail-config.c:1490
 #: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Adresboek Bronnen"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:696
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Verwijderen"
 
-# calendar/gui/gncal-todo.c:488
+# calendar/gui/gncal-todo.c:488
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:682 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Bewerken"
 
-# composer/e-msg-composer-address-dialog.glade.h:10
+# composer/e-msg-composer-address-dialog.glade.h:10
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Naam"
 
@@ -1208,37 +1104,53 @@ msgstr "Naam"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Andere Contacten"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control dat een Evolution minikaart adresboek weergeeft."
 
-# shell/e-shell-view-menu.c:369
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# shell/e-shell-view-menu.c:369
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adresboek minikaart bekijker"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Een component voor het afhandelen van contacten."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabriek voor het Adresboek Minikaart control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Fabriek voor het Evolution adresboek component."
 
-# composer/e-msg-composer-hdrs.c:174
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# composer/e-msg-composer-hdrs.c:174
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabriek voor het voorbeeld Adresboek control"
 
-# shell/e-shell-view-menu.c:369
+# shell/e-shell-view-menu.c:369
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "De adresboek naam selectie interface van Evolution."
@@ -1247,12 +1159,29 @@ msgstr "De adresboek naam selectie interface van Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-# addressbook/gui/component/addressbook.c:424
+# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Verwijderen"
+
+# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+# addressbook/gui/component/addressbook.c:424
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Vind..."
 
-# composer/e-msg-composer-address-dialog.glade.h:7
+# composer/e-msg-composer-address-dialog.glade.h:7
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Geaddresseerden"
@@ -1265,229 +1194,229 @@ msgstr "Selecteer namen"
 msgid "Select name from:"
 msgstr "Selecteer naam van:"
 
-# composer/e-msg-composer-address-dialog.glade.h:9
+# composer/e-msg-composer-address-dialog.glade.h:9
 #: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Zoeken"
 
-# addressbook/gui/component/alphabet.glade.h:8
+# addressbook/gui/component/alphabet.glade.h:8
 #: addressbook/gui/widgets/alphabet.glade.h:1
 msgid "123"
 msgstr "123"
 
-# addressbook/gui/component/alphabet.glade.h:9
+# addressbook/gui/component/alphabet.glade.h:9
 #: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-# addressbook/gui/component/alphabet.glade.h:10
+# addressbook/gui/component/alphabet.glade.h:10
 #: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-# addressbook/gui/component/alphabet.glade.h:11
+# addressbook/gui/component/alphabet.glade.h:11
 #: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-# addressbook/gui/component/alphabet.glade.h:12
+# addressbook/gui/component/alphabet.glade.h:12
 #: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-# addressbook/gui/component/alphabet.glade.h:13
+# addressbook/gui/component/alphabet.glade.h:13
 #: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-# addressbook/gui/component/alphabet.glade.h:14
+# addressbook/gui/component/alphabet.glade.h:14
 #: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-# addressbook/gui/component/alphabet.glade.h:15
+# addressbook/gui/component/alphabet.glade.h:15
 #: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-# addressbook/gui/component/alphabet.glade.h:16
-# calendar/cal-util/timeutil.c:98
+# addressbook/gui/component/alphabet.glade.h:16
+# calendar/cal-util/timeutil.c:98
 #: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-# addressbook/gui/component/alphabet.glade.h:17
+# addressbook/gui/component/alphabet.glade.h:17
 #: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-# addressbook/gui/component/alphabet.glade.h:18
+# addressbook/gui/component/alphabet.glade.h:18
 #: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-# addressbook/gui/component/alphabet.glade.h:19
+# addressbook/gui/component/alphabet.glade.h:19
 #: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-# addressbook/gui/component/alphabet.glade.h:20
+# addressbook/gui/component/alphabet.glade.h:20
 #: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-# addressbook/gui/component/alphabet.glade.h:21
+# addressbook/gui/component/alphabet.glade.h:21
 #: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-# addressbook/gui/component/alphabet.glade.h:22
+# addressbook/gui/component/alphabet.glade.h:22
 #: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-# addressbook/gui/component/alphabet.glade.h:23
+# addressbook/gui/component/alphabet.glade.h:23
 #: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-# addressbook/gui/component/alphabet.glade.h:24
+# addressbook/gui/component/alphabet.glade.h:24
 #: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-# addressbook/gui/component/alphabet.glade.h:25
+# addressbook/gui/component/alphabet.glade.h:25
 #: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-# addressbook/gui/component/alphabet.glade.h:26
+# addressbook/gui/component/alphabet.glade.h:26
 #: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-# addressbook/gui/component/alphabet.glade.h:27
+# addressbook/gui/component/alphabet.glade.h:27
 #: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-# addressbook/gui/component/alphabet.glade.h:28
+# addressbook/gui/component/alphabet.glade.h:28
 #: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-# addressbook/gui/component/alphabet.glade.h:29
+# addressbook/gui/component/alphabet.glade.h:29
 #: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-# addressbook/gui/component/alphabet.glade.h:30
+# addressbook/gui/component/alphabet.glade.h:30
 #: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-# addressbook/gui/component/alphabet.glade.h:31
+# addressbook/gui/component/alphabet.glade.h:31
 #: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-# addressbook/gui/component/alphabet.glade.h:32
+# addressbook/gui/component/alphabet.glade.h:32
 #: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-# addressbook/gui/component/alphabet.glade.h:33
+# addressbook/gui/component/alphabet.glade.h:33
 #: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-# addressbook/gui/component/alphabet.glade.h:34
+# addressbook/gui/component/alphabet.glade.h:34
 #: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
-# addressbook/gui/component/addressbook.c:943
-# addressbook/gui/minicard/e-minicard.c:330
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+# addressbook/gui/component/addressbook.c:943
+# addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-# addressbook/gui/component/addressbook.c:1010
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+# addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-# addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
 msgstr "E-mail"
 
-# mail/mail-config.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+# mail/mail-config.c:328
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr "Web Site"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+# addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr "Afdeling:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:32
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+# addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr "Kantoor:"
 
-# addressbook/contact-editor/fullname-strings.h:8
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+# addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
 msgstr "Titel:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+# addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr "Beroep:"
 
-# addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+# addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr "Manager"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:34
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+# addressbook/contact-editor/e-contact-editor-strings.h:34
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr "Aliasnaam:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+# addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr "Echtgeno(o)t(e):"
 
-# shell/e-shell-view.c:596
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+# shell/e-shell-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr "Vrij-druk URL"
 
-# addressbook/gui/component/addressbook.c:1010
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+# addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Click here to add a contact"
 msgstr "Klik hier om een contact toe te voegen"
 
-# addressbook/gui/component/addressbook.c:593
+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Opslaan in adresboek"
 
-# addressbook/gui/minicard/e-minicard-view.c:110
-#: addressbook/gui/widgets/e-minicard-view.c:129
+# addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1501,233 +1430,225 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Kaart: "
+
+# addressbook/printing/e-contact-print.glade.h:23
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:25
+# addressbook/printing/e-contact-print.glade.h:25
 #: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 punts Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:18
+# addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Lege formulieren op het einde:"
 
-# addressbook/printing/e-contact-print.glade.h:24
+# addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Inhoud"
 
-# addressbook/printing/e-contact-print.glade.h:38
+# addressbook/printing/e-contact-print.glade.h:38
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Onderkant:"
 
-# addressbook/printing/e-contact-print.glade.h:32
-# addressbook/printing/e-contact-print.glade.h:44
+# addressbook/printing/e-contact-print.glade.h:32
+# addressbook/printing/e-contact-print.glade.h:44
 #: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensies:"
 
-# addressbook/printing/e-contact-print.glade.h:20
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:51
-# addressbook/printing/e-contact-print.glade.h:54
+# addressbook/printing/e-contact-print.glade.h:20
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:51
+# addressbook/printing/e-contact-print.glade.h:54
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "Font..."
 msgstr "Lettertype..."
 
-# addressbook/printing/e-contact-print.glade.h:19
+# addressbook/printing/e-contact-print.glade.h:19
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Lettertypen"
 
-# addressbook/printing/e-contact-print.glade.h:53
+# addressbook/printing/e-contact-print.glade.h:53
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Voet:"
 
-# addressbook/printing/e-contact-print.glade.h:28
+# addressbook/printing/e-contact-print.glade.h:28
 #: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Formaat"
 
-# addressbook/printing/e-contact-print.glade.h:52
+# addressbook/printing/e-contact-print.glade.h:52
 #: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Kop"
 
-# addressbook/printing/e-contact-print.glade.h:56
+# addressbook/printing/e-contact-print.glade.h:56
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Koptekst/Voettekst"
 
-# addressbook/printing/e-contact-print.glade.h:22
+# addressbook/printing/e-contact-print.glade.h:22
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Koppen"
 
-# addressbook/printing/e-contact-print.glade.h:15
+# addressbook/printing/e-contact-print.glade.h:15
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Koppen voor elke letter"
 
-# addressbook/printing/e-contact-print.glade.h:34
-# addressbook/printing/e-contact-print.glade.h:46
+# addressbook/printing/e-contact-print.glade.h:34
+# addressbook/printing/e-contact-print.glade.h:46
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Hoogte:"
 
-# addressbook/printing/e-contact-print.glade.h:13
+# addressbook/printing/e-contact-print.glade.h:13
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Elkaar direct opvolgend"
 
-# addressbook/printing/e-contact-print.glade.h:11
+# addressbook/printing/e-contact-print.glade.h:11
 #: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Insluiten:"
 
-# addressbook/printing/e-contact-print.glade.h:49
+# addressbook/printing/e-contact-print.glade.h:49
 #: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Liggend"
 
-# addressbook/printing/e-contact-print.glade.h:39
+# addressbook/printing/e-contact-print.glade.h:39
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Links:"
 
-# addressbook/printing/e-contact-print.glade.h:14
+# addressbook/printing/e-contact-print.glade.h:14
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Letter tabs aan de kant"
 
-# addressbook/printing/e-contact-print.glade.h:36
+# addressbook/printing/e-contact-print.glade.h:36
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marges"
 
-# addressbook/printing/e-contact-print.glade.h:17
+# addressbook/printing/e-contact-print.glade.h:17
 #: addressbook/printing/e-contact-print.glade.h:22
 #: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-# addressbook/printing/e-contact-print.glade.h:10
+# addressbook/printing/e-contact-print.glade.h:10
 #: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opties"
 
-# addressbook/printing/e-contact-print.glade.h:47
+# addressbook/printing/e-contact-print.glade.h:47
 #: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "Orientatie"
 
-# addressbook/printing/e-contact-print.glade.h:41
+# addressbook/printing/e-contact-print.glade.h:41
 #: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Pagina"
 
-# addressbook/printing/e-contact-print.glade.h:7
+# addressbook/printing/e-contact-print.glade.h:7
 #: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Pagina Instellingen:"
 
-# addressbook/printing/e-contact-print.glade.h:29
-# addressbook/printing/e-contact-print.glade.h:50
+# addressbook/printing/e-contact-print.glade.h:29
+# addressbook/printing/e-contact-print.glade.h:50
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Paper"
 
-# addressbook/printing/e-contact-print.glade.h:35
+# addressbook/printing/e-contact-print.glade.h:35
 #: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papier bron:"
 
-# addressbook/printing/e-contact-print.glade.h:48
+# addressbook/printing/e-contact-print.glade.h:48
 #: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Staand"
 
-# addressbook/printing/e-contact-print.glade.h:9
+# addressbook/printing/e-contact-print.glade.h:9
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Voorbeeld:"
 
-# addressbook/printing/e-contact-print.glade.h:27
+# addressbook/printing/e-contact-print.glade.h:27
 #: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Maak gebruik van grijze schaduw op de afdruk"
 
-# addressbook/printing/e-contact-print.glade.h:55
+# addressbook/printing/e-contact-print.glade.h:55
 #: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Omgedraaid afdrukken op even pagina's"
 
-# addressbook/printing/e-contact-print.glade.h:40
+# addressbook/printing/e-contact-print.glade.h:40
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Rechts:"
 
-# addressbook/printing/e-contact-print.glade.h:12
+# addressbook/printing/e-contact-print.glade.h:12
 #: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Secties:"
 
-# addressbook/printing/e-contact-print.glade.h:26
+# addressbook/printing/e-contact-print.glade.h:26
 #: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Shaduw"
 
-# addressbook/printing/e-contact-print.glade.h:42
+# addressbook/printing/e-contact-print.glade.h:42
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Grootte:"
 
-# addressbook/printing/e-contact-print.glade.h:16
+# addressbook/printing/e-contact-print.glade.h:16
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Begin op een nieuwe pagina"
 
-# addressbook/printing/e-contact-print.glade.h:8
+# addressbook/printing/e-contact-print.glade.h:8
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stijl Naam:"
 
-# addressbook/printing/e-contact-print.glade.h:37
+# addressbook/printing/e-contact-print.glade.h:37
 #: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Top:"
 
-# addressbook/printing/e-contact-print.glade.h:30
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
+# addressbook/printing/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Type:"
 
-# addressbook/printing/e-contact-print.glade.h:33
-# addressbook/printing/e-contact-print.glade.h:45
+# addressbook/printing/e-contact-print.glade.h:33
+# addressbook/printing/e-contact-print.glade.h:45
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Breedte:"
 
-# addressbook/printing/e-contact-print.glade.h:31
-# addressbook/printing/e-contact-print.glade.h:43
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution Kalender Kanaal"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1738,144 +1659,142 @@ msgstr "Fout tijdens communiceren met kalender server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configureer het GnomeCal kanaal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution Kalender kanaal"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configureer het to-do kanaal"
-
-# shell/e-shell-view-menu.c:369
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo kanaal"
-
-# shell/e-shell-view-menu.c:369
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo Kanaal"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Configuratie programma voor het evolution to-do kanaal.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-# calendar/gui/gnome-cal.c:1120
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van je afspraak op "
-
-# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sluimeren"
-
-# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-# calendar/gui/calendar-commands.c:434
+# calendar/gui/calendar-commands.c:434
 #: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-# calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:456
 #: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Open kalender"
 
-# calendar/gui/calendar-commands.c:495
+# calendar/gui/calendar-commands.c:495
 #: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Kalender opslaan"
 
-#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kon het kalender aanzicht niet maken.  Controleer je ORBit en OAF "
 "instellingen."
 
-# calendar/gui/event-editor.c:1745
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d-%m-%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-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,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d-%m-%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Publiekelijk"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Prive"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-# shell/e-storage.c:434
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+# shell/e-storage.c:434
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-# calendar/gui/print.c:326
-#: calendar/gui/calendar-model.c:473
+# calendar/gui/print.c:326
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "O"
 
-# calendar/gui/print.c:326
-#: calendar/gui/calendar-model.c:475
+# calendar/gui/print.c:326
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "W"
 
-# mail/mail-config.c:1220
-#: calendar/gui/calendar-model.c:547
+# addressbook/printing/e-contact-print.glade.h:34
+# addressbook/printing/e-contact-print.glade.h:46
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Hoog"
+
+# addressbook/printing/e-contact-print.glade.h:28
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normaal"
+
+# calendar/gui/getdate.y:438
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Laag"
+
+# mail/mail-config.c:1220
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Niet Gestart"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "In Uitvoer"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Gedaan"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d-%m-%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1886,36 +1805,25 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d-%m-%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+# shell/e-shell-view.c:596
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1925,96 +1833,142 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-# addressbook/printing/e-contact-print.glade.h:28
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normaal"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Ongedefiniëerd"
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "Ja"
 
-# addressbook/gui/component/addressbook.c:420
-# calendar/gui/calendar-commands.c:544
-#: calendar/gui/calendar-model.c:1558
+# addressbook/gui/component/addressbook.c:420
+# calendar/gui/calendar-commands.c:544
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nee"
 
-# calendar/gui/event-editor.c:1745
-#: calendar/gui/calendar-summary.c:197
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B, %Y"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-# composer/e-msg-composer.c:494
-#: calendar/gui/calendar-summary.c:438
+# composer/e-msg-composer.c:494
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Fout bij laden van kalender</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
 
-#: calendar/gui/calendar-summary.c:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "Weergave"
 
-# calendar/gui/event-editor.c:298
-#: calendar/gui/calendar-summary.c:625
+# calendar/gui/event-editor.c:298
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "Geef afspraken weer"
 
-# composer/e-msg-composer.c:906
-#: calendar/gui/calendar-summary.c:633
+# composer/e-msg-composer.c:906
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "Geef taken weer"
 
-# calendar/gui/print.c:1084
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+# calendar/gui/print.c:1084
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Bezig met laden Kalender"
 
-# calendar/gui/control-factory.c:136
+# calendar/gui/control-factory.c:136
 #: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender weer zal geven"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:181
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Herinnering van je afspraak op "
+
+# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Sluimeren"
+
+# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Fabriek voor de Evolution opsteller."
+
+# addressbook/backend/ebook/load-pine-addressbook.c:41
+# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Kon Gnome niet initialiseren"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:181
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm op %A %b %d %Y %H:%M"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:188
+# calendar/gui/dialogs/alarm-notify-dialog.c:188
 #: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Herinnering van de afspraak op %A %b %d %Y %H:%M"
 
-# calendar/gui/event-editor.c:294
+# calendar/gui/event-editor.c:294
 #: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Geen samenvatting beschikbaar."
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7
+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
 #: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
@@ -2022,57 +1976,57 @@ msgstr "Geen samenvatting beschikbaar."
 msgid "Close"
 msgstr "Sluiten"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:9
+# calendar/gui/dialogs/alarm-notify.glade.h:9
 #: calendar/gui/dialogs/alarm-notify.glade.h:2
 msgid "Edit appointment"
 msgstr "Afspraak bewerken"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:10
+# calendar/gui/dialogs/alarm-notify.glade.h:10
 #: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Sluimer tijd (minuten)"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 minuten"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minuten"
 
-# calendar/gui/prop.c:335
+# calendar/gui/prop.c:335
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "12 hour (am/pm)"
 msgstr "12 uurs (am/pm)"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuten"
 
-# calendar/gui/prop.c:336
+# calendar/gui/prop.c:336
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24 uurs"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minuten"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minuten"
 
-# calendar/gui/prop.c:803
+# calendar/gui/prop.c:803
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Alarms timeout after"
 msgstr "Alarm stopt na"
 
-# calendar/gui/prop.c:780
+# calendar/gui/prop.c:780
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Audio Alarms"
 msgstr "Audio Alarmen"
@@ -2081,18 +2035,18 @@ msgstr "Audio Alarmen"
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
-# calendar/gui/calendar-commands.c:659
+# calendar/gui/calendar-commands.c:659
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalender"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
-# calendar/gui/prop.c:522
+# calendar/gui/prop.c:522
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Kleuren"
@@ -2105,7 +2059,7 @@ msgstr "Weekeinden comprimeren"
 msgid "Date navigator options"
 msgstr "Datum navigator instellingen"
 
-# calendar/gui/prop.c:836
+# calendar/gui/prop.c:836
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Standaard instellingen"
@@ -2114,13 +2068,13 @@ msgstr "Standaard instellingen"
 msgid "Display options"
 msgstr "Weergave instellingen"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Verloop Datum"
 
-# calendar/gui/prop.c:820
+# calendar/gui/prop.c:820
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "Maak sluimeren mogelijk voor"
@@ -2133,23 +2087,23 @@ msgstr "Eind van dag:"
 msgid "First day of week:"
 msgstr "Eerste dag van de week:"
 
-# calendar/gui/gnome-month-item.c:741
+# calendar/gui/gnome-month-item.c:741
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Fri"
 msgstr "Vrij"
 
-# calendar/gui/getdate.y:413
+# calendar/gui/getdate.y:413
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Vrijdag"
 
-# calendar/gui/calendar-commands.c:60
+# calendar/gui/calendar-commands.c:60
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Highlight"
 msgstr "Markeer"
 
-# calendar/gui/prop.c:648
+# calendar/gui/prop.c:648
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
 msgstr "Items die vandaag verlopen"
@@ -2166,18 +2120,18 @@ msgstr "Items die nog niet zijn verlopen"
 msgid "Items Not Yet Due:"
 msgstr "Items die nog niet zijn verlopen:"
 
-# calendar/gui/gnome-month-item.c:737
+# calendar/gui/gnome-month-item.c:737
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Mon"
 msgstr "Maa"
 
-# calendar/gui/prop.c:348
+# calendar/gui/prop.c:348
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Maandag"
 
-# calendar/gui/prop.c:642
+# calendar/gui/prop.c:642
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Overdue Items"
 msgstr "Verlopen items"
@@ -2190,16 +2144,15 @@ msgstr "Verlopen items:"
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605
-# mail/message-list.c:474
+# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605
+# mail/message-list.c:474
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioriteit"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-# calendar/gui/gnome-cal.c:1120
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Remind me of all appointments"
 msgstr "Herinner me van alle afspraken"
@@ -2209,14 +2162,14 @@ msgstr "Herinner me van alle afspraken"
 msgid "Reminders"
 msgstr "Herinneringen"
 
-# calendar/gui/gnome-month-item.c:742
+# calendar/gui/gnome-month-item.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sat"
 msgstr "Zat"
 
-# calendar/gui/getdate.y:414
+# calendar/gui/getdate.y:414
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -2224,29 +2177,29 @@ msgstr "Zaterdag"
 msgid "Show"
 msgstr "Weergeven"
 
-# calendar/gui/event-editor.c:298
+# calendar/gui/event-editor.c:298
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Show appointment end times"
 msgstr "Geef afspraak eindtijden weer"
 
-# calendar/gui/calendar-commands.c:528
+# calendar/gui/calendar-commands.c:528
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week numbers"
 msgstr "Geef weeknummers weer"
 
-# calendar/gui/goto.c:264
+# calendar/gui/goto.c:264
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Start of day:"
 msgstr "Start van dag:"
 
-# calendar/gui/gnome-month-item.c:736
+# calendar/gui/gnome-month-item.c:736
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sun"
 msgstr "Zon"
 
-# calendar/gui/prop.c:347
+# calendar/gui/prop.c:347
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -2254,60 +2207,60 @@ msgstr "Zondag"
 msgid "TaskPad"
 msgstr "TaakBlad"
 
-# calendar/gui/gnome-month-item.c:740
+# calendar/gui/gnome-month-item.c:740
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Thu"
 msgstr "Don"
 
-# calendar/gui/getdate.y:410
+# calendar/gui/getdate.y:410
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Donderdag"
 
-# calendar/gui/prop.c:606
+# calendar/gui/prop.c:606
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Time Until Due"
 msgstr "Tijd Tot Verlooptijd"
 
-# calendar/gui/e-day-view-time-item.c:391
+# calendar/gui/e-day-view-time-item.c:391
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time divisions:"
 msgstr "Tijd delingen:"
 
-# calendar/gui/prop.c:334
+# calendar/gui/prop.c:334
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-# calendar/gui/gnome-month-item.c:738
+# calendar/gui/gnome-month-item.c:738
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Tue"
 msgstr "Din"
 
-# calendar/gui/getdate.y:406
+# calendar/gui/getdate.y:406
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-# calendar/gui/prop.c:780
+# calendar/gui/prop.c:780
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Visual Alarms"
 msgstr "Visuele Alarmen"
 
-# calendar/gui/gnome-month-item.c:739
+# calendar/gui/gnome-month-item.c:739
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Wed"
 msgstr "Woe"
 
-# calendar/gui/getdate.y:408
+# calendar/gui/getdate.y:408
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Woensdag"
 
-# calendar/gui/getdate.y:423
+# calendar/gui/getdate.y:423
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work week"
 msgstr "Werk week"
@@ -2316,7 +2269,7 @@ msgstr "Werk week"
 msgid "minutes before they occur."
 msgstr "minuten voor ze plaatsvinden."
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #: mail/mail-config.glade.h:84
 msgid "seconds."
@@ -2349,7 +2302,7 @@ msgstr "Weet je zeker dat je dagboek entry `%s' wilt verwijderen?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Weet je zeker dat je deze dagboek entry zonder naam wilt verwijderen?"
 
-# composer/e-msg-composer-attachment-bar.c:395
+# composer/e-msg-composer-attachment-bar.c:395
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Wil je de wijzingen opslaan?"
@@ -2359,51 +2312,23 @@ msgstr "Wil je de wijzingen opslaan?"
 msgid "% Comp_lete:"
 msgstr "% Af:"
 
-# filter/filter-editor.c:212
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classificatie"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Gedaan"
-
-# mail/message-list.c:502
+# mail/message-list.c:502
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
 msgstr "Datum & Tijd"
 
-# calendar/gui/gncal-todo.c:207
+# calendar/gui/gncal-todo.c:207
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Date Completed:"
 msgstr "Datum Afgemaakt:"
 
-# addressbook/printing/e-contact-print.glade.h:34
-# addressbook/printing/e-contact-print.glade.h:46
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Hoog"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In Uitvoer"
-
-# calendar/gui/getdate.y:438
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Laag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Niet Gestart"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2422,7 +2347,7 @@ msgstr "Pu_bliekelijk"
 msgid "Sta_rt Date:"
 msgstr "Be_gin Datum:"
 
-# calendar/gui/gncal-todo.c:171
+# calendar/gui/gncal-todo.c:171
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 #: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Su_mmary:"
@@ -2436,32 +2361,28 @@ msgstr "_Taak"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Ongedefiniëerd"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:26
+# addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 #: calendar/gui/event-editor-dialog.glade.h:29
 msgid "_Contacts..."
 msgstr "C_ontacten..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31
+# addressbook/contact-editor/e-contact-editor-strings.h:31
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "_Due Date:"
 msgstr "_Verloop Datum:"
 
-# calendar/gui/gncal-todo.c:190
+# calendar/gui/gncal-todo.c:190
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35
+# addressbook/contact-editor/e-contact-editor-strings.h:35
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Status:"
 msgstr "_Status:"
@@ -2470,198 +2391,256 @@ msgstr "_Status:"
 msgid "Edit Task"
 msgstr "Taak Bewerken"
 
-# calendar/gui/event-editor.c:294
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+# calendar/gui/event-editor.c:294
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Geen opsomming"
 
-# calendar/gui/event-editor.c:298
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+# calendar/gui/event-editor.c:298
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-# calendar/gui/event-editor.c:301
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+# calendar/gui/event-editor.c:301
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-# calendar/gui/event-editor.c:304
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+# calendar/gui/event-editor.c:304
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboek Item - %s"
 
-# addressbook/contact-editor/categories-strings.h:7
-#: calendar/gui/e-calendar-table.c:154
+# addressbook/contact-editor/categories-strings.h:7
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Categorieën"
 
-# calendar/gui/goto.c:264
-#: calendar/gui/e-calendar-table.c:156
+# calendar/gui/goto.c:264
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "Afmaak datum"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Eind Datum"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Begin Datum"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geografische Positie"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
 msgstr "Percentage compleet"
 
-# calendar/gui/gncal-todo.c:425
-#: calendar/gui/e-calendar-table.c:163
+# calendar/gui/gncal-todo.c:425
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Transparantheid"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-# calendar/gui/prop.c:780
-#: calendar/gui/e-calendar-table.c:166
+# calendar/gui/prop.c:780
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmen"
 
-# addressbook/gui/component/addressbook.c:1010
-#: calendar/gui/e-calendar-table.c:167
+# addressbook/gui/component/addressbook.c:1010
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Markeer als Gedaan"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Markeer de taak als gedaan"
 
-# calendar/gui/gncal-todo.c:326
-#: calendar/gui/e-calendar-table.c:404
+# calendar/gui/gncal-todo.c:326
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "Bewerk deze taak..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "Taak Bewerken"
 
-# addressbook/contact-editor/e-contact-editor.c:853
-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
-#: calendar/gui/e-calendar-table.c:407
+# addressbook/contact-editor/e-contact-editor.c:853
+# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Verwijder deze taak"
 
-# addressbook/contact-editor/e-contact-editor.c:853
-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
-#: calendar/gui/e-calendar-table.c:408
+# addressbook/contact-editor/e-contact-editor.c:853
+# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Verwijder de taak"
 
-# calendar/gui/e-day-view-time-item.c:391
+# calendar/gui/e-day-view-time-item.c:391
 #: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
 
-# calendar/gui/event-editor.c:1745
+# calendar/gui/event-editor.c:1745
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-# calendar/gui/event-editor.c:1745
+# calendar/gui/event-editor.c:1745
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
-# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
-# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nieuwe Afspraak..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Afspraak Plannen"
-
-# calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
-# calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Bewerk deze afspraak..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Openen"
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Verwijdert deze afspraak"
 
-# calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Afspraak Plannen"
+
+# calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Maak deze afspraak verplaatsbaar"
 
-# calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+# calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Verwijder deze gebeurtenis"
 
-# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
 #: calendar/gui/e-itip-control.c:153
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kon je kalender bestand niet updaten!\n"
 
-# shell/e-setup.c:88
+# shell/e-setup.c:88
 #: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
 msgid "Component successfully updated."
 msgstr "Component successvol ge-update."
@@ -2694,7 +2673,7 @@ msgstr "Kon je kalender store niet updaten."
 msgid "I couldn't delete the calendar component!\n"
 msgstr "I kon het kalender component niet verwijderen!\n"
 
-# shell/e-setup.c:88
+# shell/e-setup.c:88
 #: calendar/gui/e-itip-control.c:542
 msgid "Component successfully deleted."
 msgstr "Component successvol verwijderd."
@@ -2703,31 +2682,31 @@ msgstr "Component successvol verwijderd."
 msgid "I don't recognize this type of calendar component."
 msgstr "Type kalender component niet herkend."
 
-# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
+# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
 #: calendar/gui/e-itip-control.c:772
 msgid "Add to Calendar"
 msgstr "Toevoegen aan Kalender"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
 #: calendar/gui/e-itip-control.c:806
 msgid "Accept"
 msgstr "Accepteer"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #: calendar/gui/e-itip-control.c:807
 msgid "Decline"
 msgstr "Weiger"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:386
+# widgets/meeting-time-sel/e-meeting-time-sel.c:386
 #: calendar/gui/e-itip-control.c:808
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Experimenteel"
 
-# calendar/gui/calendar-commands.c:663
+# calendar/gui/calendar-commands.c:663
 #: calendar/gui/e-itip-control.c:852
 msgid "Update Calendar"
 msgstr "Kalender updaten"
@@ -2736,7 +2715,7 @@ msgstr "Kalender updaten"
 msgid "Cancel Meeting"
 msgstr "Afspraak annuleren"
 
-# calendar/gui/event-editor.c:1745
+# calendar/gui/event-editor.c:1745
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -2746,33 +2725,32 @@ msgstr "%P %%"
 msgid "--to--"
 msgstr "--naar--"
 
-# calendar/gui/calendar-commands.c:659
+# calendar/gui/calendar-commands.c:659
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalender Bericht"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-# calendar/gui/print.c:1084
+# calendar/gui/print.c:1084
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Bezig met laden kalender..."
 
-# mail/mail-config.c:328
+# mail/mail-config.c:328
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Afzender"
 
-# calendar/gui/gncal-todo.c:171
+# calendar/gui/gncal-todo.c:171
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Opsomming:"
@@ -2781,22 +2759,22 @@ msgstr "Opsomming:"
 msgid "date-end"
 msgstr "einddatum"
 
-# calendar/gui/prop.c:385
+# calendar/gui/prop.c:385
 #: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "begindatum"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738
+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:2
 msgid "Attendee"
 msgstr "Aanwezige"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738
+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:3
 msgid "Attendee address"
 msgstr "Adres aanwezige"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738
+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:4
 msgid "Attendees: "
 msgstr "Aanwezigen: "
@@ -2809,12 +2787,12 @@ msgstr ""
 "Annuleer\n"
 "Afspraak"
 
-# addressbook/contact-editor/e-contact-editor.c:1283
+# addressbook/contact-editor/e-contact-editor.c:1283
 #: calendar/gui/e-meeting-dialog.glade.h:7
 msgid "Chair"
 msgstr "Voorzitter"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601
+# widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #: calendar/gui/e-meeting-dialog.glade.h:10
 msgid "Meeting Invitations"
 msgstr "Vergadering Uitnodigingen"
@@ -2823,12 +2801,12 @@ msgstr "Vergadering Uitnodigingen"
 msgid "Non-Participant"
 msgstr "Niet-Deelnemer"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: calendar/gui/e-meeting-dialog.glade.h:12
 msgid "Optional Participant"
 msgstr "Optionele Deelnemer"
 
-# mail/mail-config.c:328
+# mail/mail-config.c:328
 #: calendar/gui/e-meeting-dialog.glade.h:13
 msgid "Organizer: "
 msgstr "Organizator: "
@@ -2853,12 +2831,12 @@ msgstr ""
 "Verzoek\n"
 "Afspraak"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565
 #: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Required Participant"
 msgstr "Benodigde Deelnemer"
 
-# addressbook/contact-editor/e-contact-editor.c:1289
+# addressbook/contact-editor/e-contact-editor.c:1289
 #: calendar/gui/e-meeting-dialog.glade.h:21
 msgid "Role"
 msgstr "Rol"
@@ -2871,28 +2849,28 @@ msgstr ""
 "Plan\n"
 "Tijd"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+# addressbook/contact-editor/e-contact-editor-strings.h:35
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Allen"
 
-# addressbook/contact-editor/categories-strings.h:7
-#: calendar/gui/e-tasks.c:150
+# addressbook/contact-editor/categories-strings.h:7
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
@@ -2904,16 +2882,22 @@ msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
 msgid "%d %B"
 msgstr "%d %B"
 
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Verwijder alle gebeurtenissen"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Gebeurtenis die de gehele dag plaatsvind"
 
-# calendar/gui/calendar-commands.c:59
+# calendar/gui/calendar-commands.c:59
 #: calendar/gui/event-editor-dialog.glade.h:3
 msgid "Appointment"
 msgstr "Afspraak"
 
-# calendar/gui/calendar-commands.c:59
+# calendar/gui/calendar-commands.c:59
 #: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Appointment Basics"
 msgstr "Afspraak Basis:"
@@ -2930,7 +2914,7 @@ msgstr "Elke"
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-# calendar/gui/prop.c:348
+# calendar/gui/prop.c:348
 #: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Modify"
 msgstr "Aanpassen"
@@ -2940,11 +2924,11 @@ msgid "No recurrence"
 msgstr "Geen herhaling"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-# addressbook/printing/e-contact-print.glade.h:9
+# addressbook/printing/e-contact-print.glade.h:9
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Voorbeeld"
@@ -2962,24 +2946,24 @@ msgid "Reminder"
 msgstr "Herinnering"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "Start een programma"
 
-# mail/mail-ops.c:374
+# mail/mail-ops.c:374
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "Verstuur een e-mail"
 
-# addressbook/printing/e-contact-print.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:24
+# addressbook/printing/e-contact-print.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Instellingen..."
 
-# calendar/gui/calendar-commands.c:522
+# calendar/gui/calendar-commands.c:522
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "Laat een dialoogvenster zien"
 
@@ -2991,40 +2975,37 @@ msgstr "Eenvoudige herhaling"
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601
+# widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-# calendar/gui/goto.c:264
+# calendar/gui/goto.c:264
 #: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Starting date:"
 msgstr "_Begin datum:"
 
-# filter/filter-editor.c:198
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "na"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "voor"
 
-# calendar/gui/getdate.y:424
+# calendar/gui/getdate.y:424
 #: calendar/gui/event-editor-dialog.glade.h:35
 msgid "day(s)"
 msgstr "dag(en)"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-# calendar/gui/gnome-cal.c:1120
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
 #: calendar/gui/event-editor-dialog.glade.h:36
 msgid "end of appointment"
 msgstr "einde van afspraak"
 
-# calendar/gui/getdate.y:445
+# calendar/gui/getdate.y:445
 #: calendar/gui/event-editor-dialog.glade.h:37
 msgid "for"
 msgstr "voor"
@@ -3033,164 +3014,153 @@ msgstr "voor"
 msgid "forever"
 msgstr "oneindig"
 
-# calendar/gui/getdate.y:425
+# calendar/gui/getdate.y:425
 #: calendar/gui/event-editor-dialog.glade.h:39
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-# widgets/e-table/e-table-group.glade.h:9
+# calendar/gui/getdate.y:426
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-# addressbook/printing/e-contact-print.glade.h:31
-# addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-# calendar/gui/getdate.y:426
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "maand(en)"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:44
+# calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
-# shell/e-shell-folder-title-bar.c:355
-#: calendar/gui/event-editor-dialog.glade.h:45
+# shell/e-shell-folder-title-bar.c:355
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "totdat"
 
-# calendar/gui/getdate.y:423
-#: calendar/gui/event-editor-dialog.glade.h:46
+# calendar/gui/getdate.y:423
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "week(en)"
 
-# calendar/gui/getdate.y:420
-#: calendar/gui/event-editor-dialog.glade.h:47
+# calendar/gui/getdate.y:420
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "jar(en)"
 
-# calendar/gui/event-editor.c:289
-#: calendar/gui/event-editor.c:369
+# calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-# calendar/gui/gnome-month-item.c:737
-#: calendar/gui/event-editor.c:447
+# calendar/gui/gnome-month-item.c:737
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "op"
 
-# calendar/gui/getdate.y:424
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+# calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-# calendar/gui/getdate.y:421
-#: calendar/gui/event-editor.c:599
+# calendar/gui/getdate.y:421
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "op de"
 
-# calendar/gui/print.c:265
-#: calendar/gui/event-editor.c:606
+# calendar/gui/print.c:265
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "e"
 
-# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
-#: calendar/gui/event-editor.c:752
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen de Evolution niet kan bewerken."
 
-# calendar/gui/getdate.y:424
-#: calendar/gui/event-editor.c:1521
+# calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr " %d dagen"
 
-# calendar/gui/calendar-commands.c:522
-#: calendar/gui/event-editor.c:1523
+# calendar/gui/calendar-commands.c:522
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr " 1 dag"
 
-# calendar/gui/getdate.y:423
-#: calendar/gui/event-editor.c:1526
+# calendar/gui/getdate.y:423
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr " %d weken"
 
-# calendar/gui/calendar-commands.c:528
-#: calendar/gui/event-editor.c:1528
+# calendar/gui/calendar-commands.c:528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr " 1 week"
 
-# calendar/gui/getdate.y:425
-#: calendar/gui/event-editor.c:1531
+# calendar/gui/getdate.y:425
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr " %d uren"
 
-# calendar/gui/getdate.y:425
-#: calendar/gui/event-editor.c:1533
+# calendar/gui/getdate.y:425
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr " 1 uur"
 
-# calendar/gui/getdate.y:426
-#: calendar/gui/event-editor.c:1536
+# calendar/gui/getdate.y:426
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr " %d minuten"
 
-# calendar/gui/getdate.y:426
-#: calendar/gui/event-editor.c:1538
+# calendar/gui/getdate.y:426
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr " 1 minuut"
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831
-#: calendar/gui/event-editor.c:1541
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr " %d seconden"
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831
-#: calendar/gui/event-editor.c:1543
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr " 1 seconde"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
-#: calendar/gui/event-editor.c:1590
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr " voor het begin van een afspraak"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
-#: calendar/gui/event-editor.c:1592
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr " na het begin van een afspraak"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-# calendar/gui/gnome-cal.c:1120
-#: calendar/gui/event-editor.c:1600
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr " voor het eind van een afspraak"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
-#: calendar/gui/event-editor.c:1602
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr " na het eind van een afspraak"
 
-# calendar/gui/event-editor.c:1745
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3198,7 +3168,7 @@ msgstr "%a %b %d %Y"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Een voorbeeld Bonobo control dat een kalender weergeeft."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution kalender uitvoer samenvattings component."
@@ -3227,358 +3197,382 @@ msgstr "Fabriek voor het kalender iTip bekijk control"
 msgid "Factory for the sample Calendar control"
 msgstr "Fabriek voor het voorbeeld Kalender control"
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-# calendar/gui/getdate.y:394
+# calendar/gui/getdate.y:394
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-# calendar/gui/getdate.y:398
+# calendar/gui/getdate.y:398
 #: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Augustus"
 
-# calendar/gui/getdate.y:403
+# calendar/gui/getdate.y:403
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "December"
 
-# calendar/gui/getdate.y:392
+# calendar/gui/getdate.y:392
 #: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Februari"
 
-# calendar/gui/goto.c:264
+# calendar/gui/goto.c:264
 #: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Ga Naar Datum"
 
-# calendar/gui/goto.c:312
+# calendar/gui/goto.c:312
 #: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Ga Naar Vandaag"
 
-# calendar/gui/getdate.y:391
+# calendar/gui/getdate.y:391
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januari"
 
-# calendar/gui/getdate.y:397
+# calendar/gui/getdate.y:397
 #: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juli"
 
-# calendar/gui/getdate.y:396
+# calendar/gui/getdate.y:396
 #: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juni"
 
-# calendar/gui/getdate.y:393
+# calendar/gui/getdate.y:393
 #: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Maart"
 
-# calendar/gui/prop.c:348
+# calendar/gui/prop.c:348
 #: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mei"
 
-# calendar/gui/getdate.y:402
+# calendar/gui/getdate.y:402
 #: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "November"
 
-# calendar/gui/getdate.y:401
+# calendar/gui/getdate.y:401
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktober"
 
-# calendar/gui/getdate.y:399
+# calendar/gui/getdate.y:399
 #: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kon Gnome niet initialiseren"
-
-# calendar/gui/print.c:265
-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1e"
 
-# calendar/gui/print.c:265
-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2e"
 
-# calendar/gui/print.c:265
-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3e"
 
-# calendar/gui/print.c:265
-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4e"
 
-# calendar/gui/print.c:265
-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5e"
 
-# calendar/gui/print.c:266
-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6e"
 
-# calendar/gui/print.c:266
-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7e"
 
-# calendar/gui/print.c:266
-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8e"
 
-# calendar/gui/print.c:266
-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9e"
 
-# calendar/gui/print.c:266
-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10e"
 
-# calendar/gui/print.c:267
-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11e"
 
-# calendar/gui/print.c:267
-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12e"
 
-# calendar/gui/print.c:267
-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13e"
 
-# calendar/gui/print.c:267
-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14e"
 
-# calendar/gui/print.c:267
-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15e"
 
-# calendar/gui/print.c:268
-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16e"
 
-# calendar/gui/print.c:268
-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17e"
 
-# calendar/gui/print.c:268
-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18e"
 
-# calendar/gui/print.c:268
-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19e"
 
-# calendar/gui/print.c:268
-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20ste"
 
-# calendar/gui/print.c:269
-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21ste"
 
-# calendar/gui/print.c:269
-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22ste"
 
-# calendar/gui/print.c:269
-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23ste"
 
-# calendar/gui/print.c:269
-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24ste"
 
-# calendar/gui/print.c:269
-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25ste"
 
-# calendar/gui/print.c:270
-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26ste"
 
-# calendar/gui/print.c:270
-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27ste"
 
-# calendar/gui/print.c:270
-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28ste"
 
-# calendar/gui/print.c:270
-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29ste"
 
-# calendar/gui/print.c:270
-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30ste"
 
-# calendar/gui/print.c:271
-#: calendar/gui/print.c:301
+# calendar/gui/print.c:271
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31ste"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Zo"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Ma"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Di"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Wo"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Do"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Vr"
 
-# calendar/gui/print.c:326
-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "_Taken"
 
-# calendar/gui/print.c:980
+# calendar/gui/print.c:980
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dag van vandaag (%a %b %d %Y)"
 
-# calendar/gui/event-editor.c:1745
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-# calendar/gui/event-editor.c:1745
-#: calendar/gui/print.c:1088
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-# calendar/gui/print.c:1004
-#: calendar/gui/print.c:1099
+# calendar/gui/print.c:1004
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Huidige week (%s - %s)"
 
-# calendar/gui/print.c:1040
+# calendar/gui/print.c:1040
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Huidige maand (%b %Y)"
 
-# calendar/gui/print.c:1047
+# calendar/gui/print.c:1047
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Huidig jaar (%Y)"
 
-# calendar/gui/print.c:1084
-#: calendar/gui/print.c:1151
+# calendar/gui/print.c:1084
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
-# calendar/gui/print.c:1249
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+# calendar/gui/print.c:1249
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-# calendar/gui/control-factory.c:136
+# calendar/gui/control-factory.c:136
 #: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de takenmap om weer te geven"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
-# composer/e-msg-composer.c:474
+# composer/e-msg-composer.c:474
 #: camel/camel-filter-driver.c:790
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij taalkunding ontleden bestand: %s: %s"
 
-# composer/e-msg-composer.c:474
+# composer/e-msg-composer.c:474
 #: camel/camel-filter-driver.c:795
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-# composer/e-msg-composer.c:474
+# composer/e-msg-composer.c:474
 #: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filter zoekactie: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3587,7 +3581,7 @@ msgstr ""
 "Kan zoek expressie niet taalkunding ontleden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3596,16 +3590,16 @@ msgstr ""
 "Fout bij uitvoeren zoek expressie: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(past-allen) heeft een enkel bool resultaat nodig"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met uitvoeren van query op onbekende kop: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
@@ -3653,13 +3647,13 @@ msgstr "Kon tijdelijk post bestand %s niet openen: %s"
 msgid "Could not test lock file for %s: %s"
 msgstr "Kon het vergrendelings bestand voor %s niet testen: %s"
 
-# composer/e-msg-composer.c:494
+# composer/e-msg-composer.c:494
 #: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fout bij het lezen van post bestand: %s"
 
-# composer/e-msg-composer.c:474
+# composer/e-msg-composer.c:474
 #: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
@@ -3685,54 +3679,179 @@ msgstr "Kon niet starten: %s"
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma mislukt: %s"
 
-# shell/e-storage.c:434
+# shell/e-storage.c:434
 #: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Onbekende fout)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kon %s niet laden: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kon %s niet laden: Geen initialisatie code in de module."
 
-# mail/mail-config.c:1658
-#: camel/camel-remote-store.c:176
+# mail/mail-config.c:1658
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-# filter/filter-editor.c:212
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-# calendar/gui/calendar-commands.c:456
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+# calendar/gui/calendar-commands.c:456
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operatie Geannuleerd"
 
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "Server verbrak de verbinding."
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authenticatie"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+# composer/e-msg-composer.c:494
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Fout bij het laden van filter informatie:\n"
+"%s"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "kalender informatie"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Deze optie zal verbinden met de SMTP server gebruik makend van CRAM-MD5 "
+"authenticatie."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
+"als platte tekst."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "De respons van de IMAP server bevatte geen %s informatie"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Het antwoord van de server eindigde te snel."
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
+"Kerberos 4 authenticatie."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kon Kerberos ticket niet vergaren:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr "Slechte authenticatie respons van server."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
+"als platte tekst."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3763,7 +3882,7 @@ msgstr "Computer %s niet gevonden."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
 
-# mail/folder-browser-factory.c:89
+# mail/folder-browser-factory.c:89
 #: camel/camel-session.c:54
 msgid "Virtual folder email provider"
 msgstr "Virtuele map e-mail aanbieder"
@@ -3773,13 +3892,13 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Voor het lezen van post als een query of een andere verzameling van mappen"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-# shell/e-setup.c:69
-#: camel/camel-session.c:418
+# shell/e-setup.c:69
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3788,33 +3907,32 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "vPrullenbak"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL `%s' bevat geen protocol"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL `%s' bevat een ongeldig protocol"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Poort nummer in URL `%s' is niet numeriek"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kon Kerberos ticket niet vergaren:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Slechte authenticatie respons van server."
+msgid "No such message: %s"
+msgstr "Een dergelijk bericht bestaat niet: %s"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3826,8 +3944,8 @@ msgstr "Onverwachte respons van IMAP server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP commando mislukt: %s"
 
-# shell/e-storage.c:434
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
+# shell/e-storage.c:434
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -3854,12 +3972,8 @@ msgstr "Kon samenvatting voor %s niet laden"
 msgid "Scanning IMAP folder"
 msgstr "Bezig met scannen IMAP map"
 
-#: camel/providers/imap/camel-imap-folder.c:457
-msgid "Synchronising IMAP folder"
-msgstr "Bezig met Synchronizeren IMAP map"
-
-#: camel/providers/imap/camel-imap-folder.c:726
-#: camel/providers/imap/camel-imap-folder.c:888
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3871,29 +3985,47 @@ msgstr "IMAPv4"
 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:252
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Voor het lezen en opslaan van post op IMAP servers."
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
-"Kerberos 4 authenticatie."
+"Fout bij verbinden met de POP server.\n"
+"Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/imap/camel-imap-store.c:369
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Geen authenticatie vereist"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:397
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3904,8 +4036,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-# shell/e-setup.c:69
-#: camel/providers/imap/camel-imap-store.c:674
+# shell/e-setup.c:69
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
@@ -3939,7 +4071,7 @@ msgstr "Voor het opslaan van lokale post in qmail maildir directories"
 msgid "Store root %s is not an absolute path"
 msgstr "Opslag locatie %s is geen absoluut pad"
 
-# composer/e-msg-composer.c:686
+# composer/e-msg-composer.c:686
 #: camel/providers/local/camel-local-store.c:135
 #, c-format
 msgid "Store root %s is not a regular directory"
@@ -3955,7 +4087,7 @@ msgstr "Kan map niet vergaren: %s: %s"
 msgid "Local stores do not have an inbox"
 msgstr "Lokale opslag locaties hebben geen postvak in"
 
-# composer/e-msg-composer.c:474
+# composer/e-msg-composer.c:474
 #: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
@@ -3983,7 +4115,7 @@ msgstr "Kon index bestand van map `%s' niet verwijderen: %s"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #: camel/providers/local/camel-maildir-folder.c:195
 #: camel/providers/local/camel-maildir-folder.c:207
 #: camel/providers/local/camel-maildir-folder.c:215
@@ -4005,7 +4137,7 @@ msgstr ""
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-# addressbook/contact-editor/e-contact-editor.c:782
+# addressbook/contact-editor/e-contact-editor.c:782
 #: camel/providers/local/camel-maildir-folder.c:216
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
@@ -4021,7 +4153,7 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:676
+# composer/e-msg-composer.c:676
 #: camel/providers/local/camel-maildir-store.c:98
 #: camel/providers/local/camel-mbox-store.c:99
 #: camel/providers/local/camel-mh-store.c:95
@@ -4065,7 +4197,7 @@ msgstr "Kon postvak niet openen: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox bestand toevoegen: %s: %s"
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #: camel/providers/local/camel-mbox-folder.c:333
 #: camel/providers/local/camel-mbox-folder.c:365
 #: camel/providers/local/camel-mbox-folder.c:378
@@ -4103,7 +4235,7 @@ msgstr ""
 "Kon bestand `%s' niet aanmaken:\n"
 "%s"
 
-# composer/e-msg-composer.c:686
+# composer/e-msg-composer.c:686
 #: camel/providers/local/camel-mbox-store.c:117
 #: camel/providers/local/camel-mbox-store.c:144
 #, c-format
@@ -4147,7 +4279,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1279
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Bezig met synchronizeren map"
 
@@ -4195,7 +4327,7 @@ msgstr "Kon de tijdelijke map niet sluiten: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-# shell/e-storage.c:434
+# shell/e-storage.c:434
 #: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
@@ -4229,7 +4361,7 @@ msgstr "Fout bij het versturen van de gebruikersnaam naar de server"
 msgid "Server rejected username/password"
 msgstr "Volgens de server is de gebruikernaam en/of het wachtwoord ongeldig"
 
-# calendar/gui/calendar-commands.c:434
+# calendar/gui/calendar-commands.c:434
 #: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
@@ -4283,7 +4415,7 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #: camel/providers/pop3/camel-pop3-folder.c:145
 msgid "Retrieving POP summary"
 msgstr "Bezig met ophalen POP samenvatting"
@@ -4297,7 +4429,7 @@ msgstr "Kon map niet openen: berichtenlijst was niet compleet."
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #: camel/providers/pop3/camel-pop3-folder.c:286
 #, c-format
 msgid "Retrieving POP message %d"
@@ -4320,7 +4452,21 @@ msgstr ""
 "Voor het verbinden met POP servers. Het POP protocol kan ook gebruikt worden "
 "om post te halen van bepaalde 'web mail' providers en gesloten post systemen."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Voor het verbinden met POP servers. Het POP protocol kan ook gebruikt worden "
+"om post te halen van bepaalde 'web mail' providers en gesloten post systemen."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4329,7 +4475,7 @@ msgstr ""
 "vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
 "servers."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4339,29 +4485,29 @@ msgstr ""
 "wachtwoord via het APOP protocol. Deze optie zal niet werken voor alle "
 "gebruikers op servers die te kennen geven het te ondersteunen."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dit zal verbinden met de POP server en gebruik maken van Kerberos 4 bij het "
 "aanmelden."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kon niet aanmelden bij KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kon niet verbinden met POP server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVoer het POP3 wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4370,13 +4516,13 @@ msgstr ""
 "Fout bij het verbinden met de POP server.\n"
 "Fout bij versturen van gebruikersnaam: %s"
 
-# shell/e-storage.c:434
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+# shell/e-storage.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4384,7 +4530,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4393,14 +4539,14 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4422,7 +4568,7 @@ msgstr "Kon kanaal naar sendmail niet maken: %s: bericht niet verstuurt"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kon sendmail niet starten: %s: bericht niet verstuurt"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #: camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not send message: %s"
@@ -4443,16 +4589,21 @@ msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail stopte met staat %d: bericht niet verstuurt."
 
-# mail/folder-browser-factory.c:29
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Kon bericht inhoud niet vinden in FETCH respons."
+
+# mail/folder-browser-factory.c:29
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Post aflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4462,99 +4613,145 @@ msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand gebruik makend van SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
+"afstand gebruik makend van SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Spelfout, commando niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Spelfout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Commando niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Commando parameter niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Systeem status, of systeem help antwoord"
 
-# composer/e-msg-composer.c:894
-#: camel/providers/smtp/camel-smtp-transport.c:151
+# composer/e-msg-composer.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Help bericht"
 
-# addressbook/printing/e-contact-print.glade.h:52
-#: camel/providers/smtp/camel-smtp-transport.c:153
+# addressbook/printing/e-contact-print.glade.h:52
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Dienst klaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissie kanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissie kanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Verzochte post actie oke, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Verzochte mail actie niet genomen: mailbox niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Verzochte actie niet genomen: mailbox niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Verzochte actie niet genomen: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Verzochte post actie afgebroken: ruimte allocatie overschreden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Verzochte actie niet genomen: mailbox naam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start post invoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Geen wachtwoord ingevoerd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Fout bij verbinden met de POP server.\n"
+"Geen ondersteuning voor de ingestelde aanmeldings methode."
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Geen authenticatie vereist"
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Geen authenticatie vereist"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Welkom respons fout: %s: waarschijnlijk niet-fataal"
 
-# mail/mail-config.c:739 mail/mail-config.c:819
-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Geen authenticatie vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -4562,250 +4759,257 @@ msgstr ""
 "Deze optie zal verbinden met de SMTP server zonder gebruik te maken van "
 "authenticatie. Dit werkt prima met de meeste SMTP servers."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Deze optie zal verbinden met de SMTP server gebruik makend van CRAM-MD5 "
-"authenticatie."
-
-# mail/mail-config.c:1658
-#: camel/providers/smtp/camel-smtp-transport.c:378
+# mail/mail-config.c:1658
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Post aflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan bericht niet versturen: afzender niet gedefiniëerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO respons fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Time-out tijdens RSET verzoek: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Slechte authenticatie respons van server."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens MAIL FROM verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM respons fout: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens RCPT TO  verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO respons fout: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA verzoek: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA respons fout: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA respons fout: bericht afgebroken: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET verzoek: %s"
 
-# shell/e-storage.c:434
-#: camel/providers/smtp/camel-smtp-transport.c:786
+# shell/e-storage.c:434
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET respons fout: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Time-out tijdens QUIT verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT respons fout: %s: niet-fataal"
 
-# composer/e-msg-composer-attachment-bar.c:76
+# composer/e-msg-composer-attachment-bar.c:76
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-# composer/e-msg-composer-attachment-bar.c:78
+# composer/e-msg-composer-attachment-bar.c:78
 #: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-# composer/e-msg-composer-attachment-bar.c:85
+# composer/e-msg-composer-attachment-bar.c:85
 #: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-# composer/e-msg-composer-attachment-bar.c:89
+# composer/e-msg-composer-attachment-bar.c:89
 #: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-# composer/e-msg-composer-attachment-bar.c:93
+# composer/e-msg-composer-attachment-bar.c:93
 #: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-# composer/e-msg-composer-attachment-bar.c:299
+# composer/e-msg-composer-attachment-bar.c:299
 #. This is a filename. Translators take note.
 #: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "bijvoegsel"
 
-# composer/e-msg-composer.c:951
+# composer/e-msg-composer.c:951
 #: composer/e-msg-composer-attachment-bar.c:413
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Voeg een bestand bij"
 
-# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Verwijderen"
-
-# composer/e-msg-composer-attachment-bar.c:363
+# composer/e-msg-composer-attachment-bar.c:363
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van attachments"
 
-# composer/e-msg-composer-attachment-bar.c:394
+# composer/e-msg-composer-attachment-bar.c:394
 #: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-# composer/e-msg-composer-attachment-bar.c:395
+# composer/e-msg-composer-attachment-bar.c:395
 #: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
-# composer/e-msg-composer-attachment-bar.c:299
+# composer/e-msg-composer-attachment-bar.c:299
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Bijvoegsel"
 
-# composer/e-msg-composer-attachment.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:7
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment properties"
 msgstr "Attachment eigenschappen"
 
-# composer/e-msg-composer-attachment.glade.h:10
+# composer/e-msg-composer-attachment.glade.h:10
 #: composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
-# composer/e-msg-composer-attachment-bar.c:299
+# composer/e-msg-composer-attachment-bar.c:299
 #: composer/e-msg-composer-attachment.glade.h:5
 msgid "Inline attachment"
 msgstr "Ingebonden bijvoegsel"
 
-# composer/e-msg-composer-attachment.glade.h:8
+# composer/e-msg-composer-attachment.glade.h:8
 #: composer/e-msg-composer-attachment.glade.h:6
 msgid "MIME type:"
 msgstr "MIME type:"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Send as:"
 msgstr "Verstuur als:"
 
-# mail/message-list.c:488
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+# composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Klik hier voor het adresboek"
+
+# mail/message-list.c:488
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Van:"
 
-# composer/e-msg-composer-hdrs.c:174
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
+# mail/folder-browser-factory.c:34
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Antwoord-Naar:"
 
-# composer/e-msg-composer-hdrs.c:217
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Geef de identiteit waarvan je dit bericht wilt versturen"
+# composer/e-msg-composer-hdrs.c:234
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Onderwerp:"
 
-# composer/e-msg-composer-hdrs.c:216
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+# composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Aan:"
 
-# composer/e-msg-composer-hdrs.c:217
-#: composer/e-msg-composer-hdrs.c:392
+# composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Geef de geaddresseerden"
 
-# composer/e-msg-composer-hdrs.c:221
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+# composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-# composer/e-msg-composer-hdrs.c:222
-#: composer/e-msg-composer-hdrs.c:397
+# composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:381
 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:227
-#: composer/e-msg-composer-hdrs.c:402
+# composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-# composer/e-msg-composer-hdrs.c:228
-#: composer/e-msg-composer-hdrs.c:403
+# composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4813,17 +5017,7 @@ msgstr ""
 "Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
 "op de geadresseerden-lijst van het bericht verschijnen."
 
-# composer/e-msg-composer-hdrs.c:234
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-# composer/e-msg-composer-hdrs.c:235
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Geef het onderwerp van het bericht"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4832,30 +5026,30 @@ msgstr ""
 "Kon handtekenings bestand %s niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:463
-#: composer/e-msg-composer.c:680
+# composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-# composer/e-msg-composer.c:474
-#: composer/e-msg-composer.c:691
+# composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-# composer/e-msg-composer.c:494
-#: composer/e-msg-composer.c:711
+# composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-# shell/e-shell-view-menu.c:159
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:159
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4865,33 +5059,33 @@ msgstr ""
 "\n"
 "Wil je je wijzingen opslaan?"
 
-# composer/e-msg-composer.c:561
-#: composer/e-msg-composer.c:822
+# composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Bestand openen"
 
-# composer/e-msg-composer.c:676
-#: composer/e-msg-composer.c:948
+# composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Het bestand bestaat niet."
 
-# composer/e-msg-composer.c:686
-#: composer/e-msg-composer.c:958
+# composer/e-msg-composer.c:686
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Het is geen gewoon bestand."
 
-# composer/e-msg-composer.c:696
-#: composer/e-msg-composer.c:968
+# composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Het bestand bestaat maar is niet leesbaar."
 
-# composer/e-msg-composer.c:707
-#: composer/e-msg-composer.c:978
+# composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Het bestand is toegangelijk maar open(2) mislukte."
 
-# composer/e-msg-composer.c:729
-#: composer/e-msg-composer.c:1000
+# composer/e-msg-composer.c:729
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4899,39 +5093,100 @@ msgstr ""
 "Het bestand is zeer groot (groter dan 100K).\n"
 "Weet u zeker dat u het wil invoegen?"
 
-# composer/e-msg-composer.c:748
-#: composer/e-msg-composer.c:1021
+# composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Een fout trad op tijdens het openen van het bestand."
 
-# composer/e-msg-composer.c:1127
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
+# composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
-# mail/mail-threads.c:814
-#: composer/e-msg-composer.c:1580
+# mail/mail-threads.c:814
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
 "aanmaken."
 
-# mail/component-factory.c:196
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+# mail/component-factory.c:196
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de post samensteller van Evolution niet initialiseren."
 
-# composer/e-msg-composer-address-dialog.glade.h:11
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "De Evolution werkgroep suite"
+
+# composer/e-msg-composer-address-dialog.glade.h:11
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adres kaart"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "kalender informatie"
 
-# mail/component-factory.c:196
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%d-%m-%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+# calendar/gui/event-editor.c:1745
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+msgstr "%a %d-%m-%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d-%m-%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+# mail/component-factory.c:196
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution component voor de uitvoer samenvatting."
@@ -4940,7 +5195,7 @@ msgstr "Evolution component voor de uitvoer samenvatting."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabriek voor het Evolution uitvoer samenvattings component."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
@@ -4970,7 +5225,7 @@ msgstr "Open %s met de standaard Gnome applicatie"
 msgid "Open %s with the default GNOME web browser"
 msgstr "Open %s met de standaard Gnome web browser"
 
-# mail/mail-ops.c:374
+# mail/mail-ops.c:374
 #: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Send an email to %s"
@@ -4986,13 +5241,13 @@ msgstr "Verander het aanzicht naar %s"
 msgid "Run %s"
 msgstr "Start %s"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7
+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #: executive-summary/component/e-summary-url.c:75
 #, c-format
 msgid "Close %s"
 msgstr "Sluiten %s"
 
-# shell/e-shell-view-menu.c:402
+# shell/e-shell-view-menu.c:402
 #: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Move %s to the left"
@@ -5003,15 +5258,15 @@ msgstr "Verplaats %s naar links"
 msgid "Move %s to the right"
 msgstr "Verplaats %s naar rechts"
 
-# addressbook/contact-editor/e-contact-editor.c:857
-# calendar/gui/event-editor.c:1340
+# addressbook/contact-editor/e-contact-editor.c:857
+# calendar/gui/event-editor.c:1340
 #: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Verplaats %s naar de vorige rij"
 
-# addressbook/contact-editor/e-contact-editor.c:860
-# calendar/gui/event-editor.c:1342
+# addressbook/contact-editor/e-contact-editor.c:860
+# calendar/gui/event-editor.c:1342
 #: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the next row"
@@ -5031,7 +5286,7 @@ msgstr ""
 "Kan HTML bestand niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:494
+# composer/e-msg-composer.c:494
 #: executive-summary/component/e-summary.c:932
 #, c-format
 msgid ""
@@ -5068,7 +5323,7 @@ msgstr ""
 msgid "Factory for the RDF summary."
 msgstr "Fabriek voor de RDF samenvatting."
 
-# calendar/gui/gncal-todo.c:425
+# calendar/gui/gncal-todo.c:425
 #: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
 msgid "RDF Summary"
 msgstr "RDF Samenvatting"
@@ -5089,7 +5344,7 @@ msgstr "Test bonobo dienst"
 msgid "Test service"
 msgstr "Test dienst"
 
-# shell/e-storage.c:412
+# shell/e-storage.c:412
 #: executive-summary/test-service/rdf-summary.c:509
 #: executive-summary/test-service/rdf-summary.c:546
 #: executive-summary/test-service/rdf-summary.c:591
@@ -5105,73 +5360,73 @@ msgstr "Update automatisch"
 msgid "Update now"
 msgstr "Update nu"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #: executive-summary/test-service/rdf-summary.c:785
 msgid "Update every "
 msgstr "Update elke "
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: executive-summary/test-service/rdf-summary.c:793
 #: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuten"
 
-# calendar/gui/getdate.y:420
+# calendar/gui/getdate.y:420
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "jaar"
 
-# calendar/gui/getdate.y:420
+# calendar/gui/getdate.y:420
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "jaren"
 
-# calendar/gui/getdate.y:421
+# calendar/gui/getdate.y:421
 #: filter/filter-datespec.c:63
 msgid "month"
 msgstr "maand"
 
-# calendar/gui/getdate.y:421
+# calendar/gui/getdate.y:421
 #: filter/filter-datespec.c:63
 msgid "months"
 msgstr "maanden"
 
-# calendar/gui/getdate.y:423
+# calendar/gui/getdate.y:423
 #: filter/filter-datespec.c:64
 msgid "week"
 msgstr "week"
 
-# calendar/gui/getdate.y:423
+# calendar/gui/getdate.y:423
 #: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "weken"
 
-# calendar/gui/getdate.y:424
+# calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dagen"
 
-# calendar/gui/getdate.y:425
+# calendar/gui/getdate.y:425
 #: filter/filter-datespec.c:66
 msgid "hour"
 msgstr "uur"
 
-# calendar/gui/getdate.y:425
+# calendar/gui/getdate.y:425
 #: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "uren"
 
-# calendar/gui/getdate.y:426
+# calendar/gui/getdate.y:426
 #: filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minuut"
 
-# calendar/gui/getdate.y:428
+# calendar/gui/getdate.y:428
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "seconde"
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
 #: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " seconden"
@@ -5212,7 +5467,7 @@ msgstr ""
 "een tijd relatief aan het moment dat de filter word gestart;\n"
 "\"een week geleden\", bijvoorbeeld."
 
-# calendar/gui/calendar-commands.c:553
+# calendar/gui/calendar-commands.c:553
 #. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:357
 msgid "the current time"
@@ -5231,55 +5486,34 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
-# calendar/gui/getdate.y:438
+# calendar/gui/getdate.y:438
 #: filter/filter-datespec.c:533 filter/filter-datespec.c:693
 msgid "now"
 msgstr "nu"
 
-# addressbook/gui/component/addressbook.c:1010
+# addressbook/gui/component/addressbook.c:1010
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
-# mail/mail-config.c:1490
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Filter Regel Toevoegen"
-
-# filter/filter-editor.c:198
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Bewerk VMap Regel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "inkomend"
-
-# calendar/gui/calendar-commands.c:56
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "uitgaand"
-
-# filter/filter-editor.c:198
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filters Bewerken"
+# mail/mail-config.c:1490
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filter Regels"
 
-# calendar/gui/print.c:326
+# calendar/gui/print.c:326
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Dan"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: filter/filter-filter.c:416
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Actie Toevoegen"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Deze Actie Verwijderen"
 
@@ -5291,7 +5525,7 @@ msgstr ""
 "Oops, je bent vergeten een map te kiezen.\n"
 "Ga terug en specificeer een geldige map om mail in af te leveren."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -5316,495 +5550,442 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-# composer/e-msg-composer-attachment.glade.h:10
-#: filter/filter-rule.c:530
+# composer/e-msg-composer-attachment.glade.h:10
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Regel naam: "
 
-# shell/e-shell-folder-title-bar.c:355
-#: filter/filter-rule.c:534
+# shell/e-shell-folder-title-bar.c:355
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Geen Titel"
 
-# addressbook/gui/component/alphabet.glade.h:14
-#: filter/filter-rule.c:550
+# addressbook/gui/component/alphabet.glade.h:14
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: filter/filter-rule.c:587
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
-# mail/folder-browser-factory.c:35
+# mail/folder-browser-factory.c:35
 #: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Belangrijk"
 
-# addressbook/contact-editor/e-contact-editor.c:1294
+# addressbook/contact-editor/e-contact-editor.c:1294
 #: filter/filter-system-flag.c:71
 msgid "Read"
 msgstr "Gelezen"
 
-# filter/filter-editor.c:198
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filters Bewerken"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
-# mail/mail-config.c:1490
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filter Regels"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Inkomend"
 
-# calendar/gui/calendar-commands.c:56
+# calendar/gui/calendar-commands.c:56
 #: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Uitgaand"
 
-# mail/folder-browser-factory.c:89
-#: filter/filter.glade.h:10
+# mail/folder-browser-factory.c:89
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
-# mail/mail-config.c:1199
+# shell/e-storage.c:424
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "De opgegeven folder was niet gevonden"
+
+# mail/mail-config.c:1199
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "VMap Bronnen"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Beantwoord"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+# shell/e-shell-view-menu.c:404
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Registreren lokale map"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Geef Score"
 
-# shell/e-shell-view-menu.c:402
-#: filter/libfilter-i18n.h:16
+# composer/e-msg-composer-attachment-bar.c:299
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Bijvoegsel"
+
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+# shell/e-shell-view-menu.c:402
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieër naar Map"
 
-# mail/message-list.c:509
-#: filter/libfilter-i18n.h:17
+# mail/message-list.c:509
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangst datum"
 
-# mail/message-list.c:502
-#: filter/libfilter-i18n.h:18
+# mail/message-list.c:502
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzend datum"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Verwijderd"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "bevat niet"
 
-# filter/filter-editor.c:198
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Klad"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+# composer/e-msg-composer.c:676
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "begint niet met"
+
+# composer/e-msg-composer.c:676
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "bestaat niet"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "eindigt op"
+
+# calendar/gui/gncal-todo.c:488
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Stoppen"
+
+# calendar/gui/getdate.y:441
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "bestaat"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:33
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Gevlagd"
-
-# mail/folder-browser-factory.c:37
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+# mail/folder-browser-factory.c:37
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Doorsturen naar Adres"
 
-#: filter/libfilter-i18n.h:31
+# addressbook/gui/component/alphabet.glade.h:17
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "is"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "is grote dan"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "is niet"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Mailing lijst"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Bericht"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Bericht Kop"
 
-# composer/e-msg-composer-address-dialog.glade.h:7
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+# composer/e-msg-composer-address-dialog.glade.h:7
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Bericht ontvangen"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Bericht verzonden"
 
-# shell/e-shell-view-menu.c:402
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+# shell/e-shell-view-menu.c:402
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-# composer/e-msg-composer-address-dialog.glade.h:7
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "op of na"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "op of voor"
+
+# composer/e-msg-composer-address-dialog.glade.h:7
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Geaddresseerden"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Gelezen"
-
-# calendar/gui/print.c:326
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+# calendar/gui/print.c:326
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Stel Vlag in"
-
-# mail/message-list.c:460
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+# mail/message-list.c:460
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Stel Status in"
 
-# mail/mail-config.c:1490
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "klinkt als"
+
+# mail/mail-config.c:1490
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Bron"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "begint met"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-# mail/message-list.c:495
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+# mail/message-list.c:495
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Onderwerp"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-# composer/e-msg-composer.c:676
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "eindigt op"
-
-# calendar/gui/getdate.y:441
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "bestaat"
-
-# addressbook/gui/component/alphabet.glade.h:17
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "is grote dan"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "is gelijk aan reguliere expressie"
-
-# filter/filter-editor.c:198
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "op of na"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "op of voor"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "begint met"
-
-# filter/filter-editor.c:198
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "was na"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "was voor"
 
-# mail/mail-config.c:1490
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Regel Toevoegen"
-
-# mail/mail-config.c:1488
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+# mail/mail-config.c:1488
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Bewerk Score Regel"
 
-# filter/filter-editor.c:198
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VMap Regel Toevoegen"
-
-# filter/filter-editor.c:198
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Bewerk VMap Regel"
-
-#. add the vTrash folder
-#: mail/component-factory.c:219 mail/component-factory.c:447
-msgid "vTrash"
-msgstr "vPrullenbak"
-
-# mail/component-factory.c:196
-#: mail/component-factory.c:302
+# mail/component-factory.c:196
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het post gedeelte van Evolution niet initialiseren."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Sla op als vFolder"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Bericht of onderwerp bevat"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Bericht bevat"
-
-# mail/message-list.c:495
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Onderwerp bevat"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Bericht bevat niet"
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Onderwerp bevat niet"
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Eigenschappen"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Afzender bevat"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr "Sla op als vFolder"
 
-#: mail/folder-browser.c:667
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:670 mail/folder-browser.c:788
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "VFolder op Mailing Lijst"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:673
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:675 mail/folder-browser.c:787
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:681 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Openen"
-
-# composer/e-msg-composer.c:463
-#: mail/folder-browser.c:683
+# composer/e-msg-composer.c:463
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Opslaan Als..."
 
-# addressbook/gui/component/addressbook.c:425
-# addressbook/gui/component/addressbook.c:492
-# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
-#: mail/folder-browser.c:684 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+# addressbook/gui/component/addressbook.c:425
+# addressbook/gui/component/addressbook.c:492
+# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Afdrukken"
 
-# mail/folder-browser-factory.c:35
-#: mail/folder-browser.c:686
+# mail/folder-browser-factory.c:35
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-# mail/folder-browser-factory.c:35
-#: mail/folder-browser.c:687 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+# mail/folder-browser-factory.c:35
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
-# mail/folder-browser-factory.c:37
-#: mail/folder-browser.c:688 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+# mail/folder-browser-factory.c:37
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Doorsturen"
 
-# calendar/gui/calendar-commands.c:554
-#: mail/folder-browser.c:689 ui/evolution-mail.xml.h:13
+# calendar/gui/calendar-commands.c:554
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Ingebonden doorsturen"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Markeer Als Gelezen"
 
-# addressbook/contact-editor/e-contact-editor.c:704
-# calendar/gui/event-editor.c:1179
-#: mail/folder-browser.c:692
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
-# shell/e-shell-view-menu.c:402
-#: mail/folder-browser.c:694
+# shell/e-shell-view-menu.c:402
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Verplaats naar Map..."
 
-# shell/e-shell-view-menu.c:402
-#: mail/folder-browser.c:695
+# shell/e-shell-view-menu.c:402
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopiëer naar Map..."
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
-#: mail/folder-browser.c:697
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Terughalen"
 
-# addressbook/contact-editor/e-contact-editor.c:745
-# calendar/gui/event-editor.c:1222
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:701
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-#: mail/folder-browser.c:790
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailing Lijst (%s)"
 
-#: mail/folder-browser.c:791
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder op Mailing Lijst (%s)"
@@ -5813,22 +5994,22 @@ msgstr "VFolder op Mailing Lijst (%s)"
 msgid "Evolution component for handling mail."
 msgstr "Evolution component voor het afhandelen van mail"
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Evolution bericht opsteller."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr "Evolution post uitvoer samenvattings component."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Evolution post map weergave component."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Evolution post map factory component."
@@ -5845,34 +6026,17 @@ msgstr "Fabriek voor het Evolution post component."
 msgid "Factory for the Mail Summary component."
 msgstr "Fabriek voor het Post Samenvattings component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importeert mbox bestanden naar Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Huidig opslagformaat:"
 
-# calendar/gui/event-editor.c:294
+# calendar/gui/event-editor.c:294
 #: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Mailbox Formaat"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10
-# addressbook/contact-editor/e-contact-editor-strings.h:12
+# addressbook/contact-editor/e-contact-editor-strings.h:10
+# addressbook/contact-editor/e-contact-editor-strings.h:12
 #: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nieuw opslagformaat:"
@@ -5887,7 +6051,7 @@ msgstr ""
 "zoals te weinig diskruimte, wellicht niet automatisch herstelbaar zijn.\n"
 "Wees voorzichtig met het gebruiken van deze optie."
 
-# addressbook/contact-editor/e-contact-editor.c:1341
+# addressbook/contact-editor/e-contact-editor.c:1341
 #: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
@@ -5896,33 +6060,33 @@ msgstr "maildir"
 msgid "mbox"
 msgstr "mbox"
 
-# addressbook/gui/component/alphabet.glade.h:16
-# calendar/cal-util/timeutil.c:98
+# addressbook/gui/component/alphabet.glade.h:16
+# calendar/cal-util/timeutil.c:98
 #: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-# shell/e-shell-view.c:596
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Geen"
-
-# calendar/gui/prop.c:836
+# calendar/gui/prop.c:836
 #: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (standaard)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "Weet je zeker dat je deze taak zonder naam wilt verwijderen?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "Weet je zeker dat je deze afspraak zonder naam wilt verwijderen?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:389
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr "Evolution Account Beheer"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5930,36 +6094,46 @@ msgstr ""
 "Een of meer servers zijn niet correct geconfigureerd.\n"
 "Wil je toch opslaan?"
 
-# shell/e-shell-view-menu.c:369
+# shell/e-shell-view-menu.c:369
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Bewerker"
 
-# mail/mail-config.c:1199
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Ongedefiniëerd"
+
+# mail/mail-config.c:1199
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
-# mail/message-list.c:495
+# mail/message-list.c:495
 #: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-# mail/mail-ops.c:374
+# mail/mail-ops.c:374
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing lijst"
 
-#: mail/mail-callbacks.c:83
+# mail/mail-config.c:1490
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Filter Regel Toevoegen"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5971,7 +6145,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil je nu het programma configureren?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5979,7 +6153,7 @@ msgstr ""
 "Je moet een identiteit configuren\n"
 "voordat je post kunt versturen."
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5987,12 +6161,12 @@ msgstr ""
 "Je moet een post transport configuren\n"
 "voordat je een e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post transport methode ingesteld"
 
-# mail/mail-ops.c:386
-#: mail/mail-callbacks.c:223
+# mail/mail-ops.c:386
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6000,36 +6174,36 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr "Je moet een account configureren voordat je deze e-mail kan versturen."
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:571
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-callbacks.c:727
+# mail/folder-browser-factory.c:37
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Doorgestuurd bericht:\n"
 
-# mail/folder-browser-factory.c:41
-#: mail/mail-callbacks.c:812
+# mail/folder-browser-factory.c:41
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-# composer/e-msg-composer.c:1127
-#: mail/mail-callbacks.c:814
+# composer/e-msg-composer.c:1127
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopiëer bericht(en) naar"
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6037,12 +6211,12 @@ msgstr ""
 "Je mag alleen berichten bewerken die opgeslagen zijn\n"
 "in de Klad map."
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-# shell/e-storage.c:416
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+# shell/e-storage.c:416
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6050,16 +6224,16 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-# composer/e-msg-composer.c:494
-#: mail/mail-callbacks.c:1140
+# composer/e-msg-composer.c:494
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6068,21 +6242,21 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
 #: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Account"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: mail/mail-config.glade.h:2
 msgid "Account Information"
 msgstr "Account Informatie"
@@ -6091,36 +6265,31 @@ msgstr "Account Informatie"
 msgid "Account Management"
 msgstr "Account Beheer"
 
-# composer/e-msg-composer-attachment.glade.h:7
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Account Eigenschappen"
-
-# calendar/gui/gncal-todo.c:479
-# composer/e-msg-composer-address-dialog.glade.h:13
-#: mail/mail-config.glade.h:6
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-# mail/mail-config.c:739 mail/mail-config.c:819
-#: mail/mail-config.glade.h:7
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Authenticatie"
 
-# mail/mail-config.c:739 mail/mail-config.c:819
-#: mail/mail-config.glade.h:8
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Authenticatie Type:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automatisch controleren op nieuwe post elke"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Test instellingen"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6136,221 +6305,218 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om je instellingen op te slaan."
 
+# calendar/gui/prop.c:836
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-# calendar/gui/prop.c:836
-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "Standaard"
 
-# shell/e-shell-view.c:596
-#: mail/mail-config.glade.h:22
+# shell/e-shell-view.c:596
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Klaar"
 
-# mail/mail-config.c:305
+# mail/mail-config.c:305
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-Mail Adres:"
-
-# mail/mail-config.c:305
-#: mail/mail-config.glade.h:25
 msgid "Email Address:"
 msgstr "E-mail Adres:"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
-#: mail/mail-config.glade.h:26
+# mail/mail-config.c:305
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "E-mail adres:"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Evolution Post Configuratie"
 
-# mail/mail-config.c:277
-#: mail/mail-config.glade.h:27
+# mail/mail-config.c:277
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Volledige Naam:"
 
-# mail/mail-config.c:725
-#: mail/mail-config.glade.h:30
+# mail/mail-config.c:725
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Computernaam:"
 
-# mail/mail-config.c:1180
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
+# mail/mail-config.c:1180
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identiteit"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Opnemen in \"Get Mail\" bewerkingen."
+msgid "Include this account when receiving mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Inkomende E-Mail Server"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Houdt e-mails op de server"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "Post"
 
-# addressbook/contact-editor/e-contact-editor.c:808
-# calendar/gui/event-editor.c:1282
-#: mail/mail-config.glade.h:37
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Post Account"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
-#: mail/mail-config.glade.h:38
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Post Configuratie"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
-#: mail/mail-config.glade.h:39
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Post Configuratie Druide"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Stel dit in als standaard account"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Markeer berichten als \"Gelezen\" na: "
 
+# shell/e-shell-view-menu.c:398
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Andere"
-
-# shell/e-shell-view-menu.c:398
-#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "Nieuws"
 
-# addressbook/printing/e-contact-print.glade.h:10
-#: mail/mail-config.glade.h:46
+# addressbook/printing/e-contact-print.glade.h:10
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Optioneel"
 
-# mail/mail-config.c:328
-#: mail/mail-config.glade.h:47
+# mail/mail-config.c:328
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Uitgaande E-Mail Server"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "PGP binary path:"
 msgstr "Locatie van PGP:"
 
-# mail/folder-browser-factory.c:101
-#: mail/mail-config.glade.h:51
+# mail/folder-browser-factory.c:101
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Platte Tekst"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Bezig met ontvangen E-mail"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Onthoud mijn wachtwoord"
 
-# mail/folder-browser-factory.c:34
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Antwoord-Naar:"
+# mail/mail-config.c:305
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "E-mail adres:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565
-#: mail/mail-config.glade.h:57
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Benodigd"
 
-# addressbook/gui/component/addressbook.c:943
-# addressbook/gui/minicard/e-minicard.c:330
-#: mail/mail-config.glade.h:59
+# addressbook/gui/component/addressbook.c:943
+# addressbook/gui/minicard/e-minicard.c:330
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "Selecteer lokatie PGP"
 
-# mail/mail-config.c:340
-#: mail/mail-config.glade.h:61
+# mail/mail-config.c:340
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Selecteer signatuur bestand"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "Stuur post standaard in HTML formaat."
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-#: mail/mail-config.glade.h:63
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Bezig met versturen E-mail"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
-#: mail/mail-config.glade.h:65
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Server Configuratie"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
-#: mail/mail-config.glade.h:66
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Server Type: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Server vereist authenticatie"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Servers"
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Server Type: "
 
-# mail/mail-config.c:340
-#: mail/mail-config.glade.h:69
+# mail/mail-config.c:340
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Signatuur bestand:"
 
-# mail/mail-config.c:340
-#: mail/mail-config.glade.h:70
+# mail/mail-config.c:340
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Signatuur:"
 
-# mail/mail-config.c:1490
-#: mail/mail-config.glade.h:72
+# mail/mail-config.c:1490
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Deze server heeft een beveiligde verbinding (SSL) nodig"
 
-# mail/mail-config.c:1220
-#: mail/mail-config.glade.h:74
+# mail/mail-config.c:1220
+#: mail/mail-config.glade.h:71
 msgid "Transport"
 msgstr "Transport"
 
-# addressbook/printing/e-contact-print.glade.h:30
-#: mail/mail-config.glade.h:75
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Authenticatie"
+
+# addressbook/printing/e-contact-print.glade.h:30
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -6358,17 +6524,17 @@ msgstr ""
 "Type de naam waarmee je wilt referen naar deze servers. Bijvoorbeeld: "
 "\"Thuis\" of \"Werk\"."
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
-#: mail/mail-config.glade.h:78
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Gebruikers Informatie"
 
-# mail/mail-config.c:725
-#: mail/mail-config.glade.h:79
+# mail/mail-config.c:725
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6378,12 +6544,19 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-# calendar/gui/getdate.y:426
+# calendar/gui/gncal-todo.c:488
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "B_ewerken..."
+
+# calendar/gui/getdate.y:426
 #: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minuten."
 
-#: mail/mail-config-druid.c:401
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -6392,13 +6565,13 @@ msgstr ""
 "Fout bij het verifiëren van de inkomende post configuratie.\n"
 "Je zou problemen kunnen ondervinden tijdens het ophalen van je post van %s"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11
-# composer/e-msg-composer-address-dialog.glade.h:8
-#: mail/mail-config-druid.c:495
+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Benoemingsruimte:"
 
-#: mail/mail-config-druid.c:683
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -6408,12 +6581,12 @@ msgstr ""
 "Je zou problemen kunnen ondervinden tijdens het versturen van je post via %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1042
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution Account Wizard"
 
-# addressbook/contact-editor/e-contact-editor.c:671
-# calendar/gui/event-editor.c:1146
+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
 #: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
@@ -6423,7 +6596,7 @@ msgstr "Aanhangsel Opslaan"
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
-# composer/e-msg-composer.c:463
+# composer/e-msg-composer.c:463
 #: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
@@ -6446,109 +6619,114 @@ msgstr "Extern Weergave Programma"
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-# addressbook/printing/e-contact-print.glade.h:52
+# addressbook/printing/e-contact-print.glade.h:52
 #: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Verbergen"
 
-# composer/e-msg-composer-attachment-bar.c:299
+# composer/e-msg-composer-attachment-bar.c:299
 #: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijvoegsel"
 
-# addressbook/contact-editor/e-contact-editor.c:782
-#: mail/mail-format.c:654
+# addressbook/contact-editor/e-contact-editor.c:782
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Bezig met laden bericht inhoud"
 
-# calendar/gui/prop.c:519
-#: mail/mail-format.c:943
+# calendar/gui/prop.c:519
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
-# composer/e-msg-composer.c:894
-#: mail/mail-format.c:949
+# composer/e-msg-composer.c:894
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal gesigneerd en is authentiek."
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal gesigneerd, maar er kan niet worden bewezen dat het "
 "authentiek is."
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wijzer naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-local.c:454
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Map `%s' bestaat niet."
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "Bezig met openen '%s'"
 
-#: mail/mail-local.c:727
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:731
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Herconfigureer map"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:784
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:816
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Naam oude map gewijzigd en map geopend"
 
-# shell/e-shell-view-menu.c:404
-#: mail/mail-local.c:834
+# shell/e-shell-view-menu.c:404
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
-# composer/e-msg-composer.c:1127
-#: mail/mail-local.c:848
+# composer/e-msg-composer.c:1127
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Bezig met het kopiëren van berichten"
 
-#: mail/mail-local.c:869
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6557,7 +6735,7 @@ msgstr ""
 "Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6565,7 +6743,7 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "allicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-mt.c:137
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6574,7 +6752,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:139
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6583,101 +6761,105 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-# calendar/gui/gnome-month-item.c:737
-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
+# calendar/gui/gnome-month-item.c:737
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Bezig"
 
-# shell/e-shell-view-menu.c:159
-#: mail/mail-mt.c:707
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+# shell/e-shell-view-menu.c:159
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Evolution voortgang"
 
-#: mail/mail-ops.c:519
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:518
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht naar map"
 
-#: mail/mail-ops.c:820
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-# composer/e-msg-composer.c:1127
-#: mail/mail-ops.c:820
+# composer/e-msg-composer.c:1127
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopiëren van berichten naar %s"
 
-# calendar/gui/gnome-month-item.c:737
-#: mail/mail-ops.c:837
+# calendar/gui/gnome-month-item.c:737
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
-#: mail/mail-ops.c:840
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Bezig met kopiëren"
 
-#: mail/mail-ops.c:851
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s bericht %d van %d (uid \"%s\")"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-ops.c:1036
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1077 mail/mail-ops.c:1215
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1144
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1331
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-ops.c:1380
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-ops.c:1447
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Bezig met ophalen berichten"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
 
-# composer/e-msg-composer.c:1127
-#: mail/mail-ops.c:1531
+# composer/e-msg-composer.c:1127
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Bezig met het opslaan van berichten"
 
-#: mail/mail-ops.c:1610
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6686,13 +6868,13 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
 
-# composer/e-msg-composer.c:474
-#: mail/mail-ops.c:1637
+# composer/e-msg-composer.c:474
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6701,13 +6883,13 @@ msgstr ""
 "Fout bij opslaan berichten naar: %s:\n"
 " %s"
 
-# addressbook/contact-editor/e-contact-editor.c:671
-# calendar/gui/event-editor.c:1146
-#: mail/mail-ops.c:1711
+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijvoegsel"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6716,148 +6898,153 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-# mail/mail-threads.c:814
-#: mail/mail-ops.c:1754
+# mail/mail-threads.c:814
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-# composer/e-msg-composer-address-dialog.glade.h:9
+# composer/e-msg-composer-address-dialog.glade.h:9
 #: mail/mail-search-dialogue.c:107
 msgid "_Search"
 msgstr "_Zoeken"
 
-# filter/filter-editor.c:212
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr "Bezig met annuleren ..."
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr "Verstuur & Ontvang e-mail"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr "Bezig met ontvangen"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr "Bezig met Updaten ..."
 
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr "Bezig met wachten ..."
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-# filter/filter-editor.c:212
-#: mail/mail-send-recv.c:484
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "Klaar."
 
-# mail/mail-threads.c:621
+# mail/mail-threads.c:621
 #: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
-#: mail/mail-tools.c:197
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-tools.c:255
+# mail/folder-browser-factory.c:37
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (doorgestuurd bericht)"
 
-#: mail/mail-tools.c:265
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (geen onderwerp)"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-tools.c:282
+# mail/folder-browser-factory.c:37
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-tools.c:284
+# mail/folder-browser-factory.c:37
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:366
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Kan locatie `%s' niet openen:\n"
-"%s"
 
-# shell/e-shell-view.c:208
-#: mail/mail-vfolder.c:170
+# shell/e-shell-view.c:208
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:321
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-# mail/folder-browser-factory.c:34
+# mail/folder-browser-factory.c:34
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Beantwoorden"
 
-# mail/folder-browser-factory.c:34
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+# mail/folder-browser-factory.c:34
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Beantwoord dit bericht"
 
-# mail/folder-browser-factory.c:35
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+# mail/folder-browser-factory.c:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
-# mail/folder-browser-factory.c:37
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+# mail/folder-browser-factory.c:37
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Dit bericht doorsturen"
 
-# mail/folder-browser-factory.c:43
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+# mail/folder-browser-factory.c:43
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Druk dit bericht af"
 
-# mail/folder-browser-factory.c:45
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+# mail/folder-browser-factory.c:45
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Verwijdert dit bericht"
 
-# calendar/gui/getdate.y:448
+# calendar/gui/getdate.y:448
 #: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Ongelezen"
 
-# mail/folder-browser-factory.c:37
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Gelezen"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Beantwoord"
+
+# mail/folder-browser-factory.c:37
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-# composer/e-msg-composer.c:894
+# composer/e-msg-composer.c:894
 #: mail/message-list.c:630
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-# calendar/gui/calendar-commands.c:746
+# calendar/gui/calendar-commands.c:746
 #: mail/message-list.c:952
 #, c-format
 msgid "[ %s ]"
@@ -6869,12 +7056,12 @@ msgstr "[ %s ]"
 msgid "%s, et al."
 msgstr "%s, en dergelijke."
 
-# shell/e-storage.c:434
+# shell/e-storage.c:434
 #: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
+# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
 #: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
@@ -6895,78 +7082,82 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-# calendar/gui/event-editor.c:1745
+# calendar/gui/event-editor.c:1745
 #: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-# mail/message-list.c:488
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Gevlagd"
+
+# mail/message-list.c:488
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Van"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: mail/message-list.c:1172
 msgid "Date"
 msgstr "Datum"
 
-# mail/message-list.c:509
+# mail/message-list.c:509
 #: mail/message-list.c:1172
 msgid "Received"
 msgstr "Ontvangen"
 
-# mail/message-list.c:516
+# mail/message-list.c:516
 #: mail/message-list.c:1173
 msgid "To"
 msgstr "Aan"
 
-# mail/message-list.c:523
+# mail/message-list.c:523
 #: mail/message-list.c:1173
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/openpgp-utils.c:84
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Voer je %s passphrase voor %s in"
 
-#: mail/openpgp-utils.c:87
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Voer je %s passphrase in."
 
-# calendar/gui/event-editor.c:294
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
+# calendar/gui/event-editor.c:294
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
 
-#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr "Geen ontvangers gespecifieerd"
 
-#: mail/openpgp-utils.c:1067
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kon tijdelijk bestand niet maken: %s"
 
-# shell/e-shell-view.c:208
+# shell/e-shell-view.c:208
 #: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Map"
 
-# calendar/gui/print.c:326
+# calendar/gui/print.c:326
 #: mail/subscribe-dialog.c:65
 msgid "Store"
 msgstr "Opslag"
@@ -6990,17 +7181,17 @@ msgstr "Bezig met aanmelden bij map \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
-# composer/e-msg-composer-attachment.glade.h:10
+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Map naam:"
 
-# shell/e-shell-view.c:208
+# shell/e-shell-view.c:208
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Map type:"
 
-# shell/e-storage.c:422
+# shell/e-storage.c:422
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
@@ -7036,7 +7227,7 @@ msgstr ""
 "Er is geen importeerder die het volgende kan afhandelen\n"
 "%s"
 
-# calendar/gui/gnome-month-item.c:737
+# calendar/gui/gnome-month-item.c:737
 #: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "Bezig met importeren"
@@ -7050,7 +7241,7 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-# composer/e-msg-composer.c:494
+# composer/e-msg-composer.c:494
 #: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
@@ -7065,27 +7256,27 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508
+# widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "Automatisch"
 
-# composer/e-msg-composer-attachment.glade.h:10
+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-# mail/mail-config.c:340
+# mail/mail-config.c:340
 #: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-# composer/e-msg-composer-attachment.glade.h:10
+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "Bestandstype:"
 
-# widgets/e-table/e-table-config.glade.h:9
+# widgets/e-table/e-table-config.glade.h:9
 #: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "Importeer"
@@ -7110,12 +7301,12 @@ msgstr ""
 "Klik op \"Importeren\" om te beginnen met het importeren van het bestand "
 "naar Evolution."
 
-# shell/e-shell-view-menu.c:369
+# shell/e-shell-view-menu.c:369
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
 msgstr "Evolution Importeer Hulpmiddel"
 
-# shell/e-shell-view-menu.c:369
+# shell/e-shell-view-menu.c:369
 #: shell/importer/import.glade.h:3
 msgid "Evolution Importer Utility"
 msgstr "Evolution Importeer Hulpmiddel"
@@ -7130,7 +7321,7 @@ msgstr ""
 "Deze wizard zal je begeleiden door het proces van het importeren\n"
 "van externe bestanden naar Evolution."
 
-# shell/e-setup.c:47
+# shell/e-setup.c:47
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installatie"
@@ -7143,34 +7334,34 @@ msgstr ""
 "Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
 "in je persoonlijke Evolutie directory"
 
-# shell/e-setup.c:52
+# shell/e-setup.c:52
 #: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
-# mail/mail-threads.c:814
+# mail/mail-threads.c:814
 #: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct updaten"
 
-# shell/e-setup.c:88
+# shell/e-setup.c:88
 #: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolution bestanden succesvol geinstalleerd."
 
-# shell/e-setup.c:51
+# shell/e-setup.c:51
 #: shell/e-setup.c:189
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Het lijkt erop dat dit de eerste keer is dat je Evolution draait."
 
-# shell/e-setup.c:52
+# shell/e-setup.c:52
 #: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Klik op \"OK\" om de Evolution files te installeren in"
 
-# shell/e-setup.c:69
+# shell/e-setup.c:69
 #: shell/e-setup.c:209
 #, c-format
 msgid ""
@@ -7182,7 +7373,7 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-# shell/e-setup.c:84
+# shell/e-setup.c:84
 #: shell/e-setup.c:224
 #, c-format
 msgid ""
@@ -7192,7 +7383,7 @@ msgstr ""
 "Kan de bestanden niet kopieren naar\n"
 "`%s'."
 
-# shell/e-setup.c:108
+# shell/e-setup.c:108
 #: shell/e-setup.c:249
 #, c-format
 msgid ""
@@ -7204,7 +7395,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-# shell/e-setup.c:108
+# shell/e-setup.c:108
 #: shell/e-setup.c:261
 #, c-format
 msgid ""
@@ -7216,7 +7407,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-# shell/e-shell-folder-creation-dialog.c:81
+# shell/e-shell-folder-creation-dialog.c:81
 #: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
@@ -7226,17 +7417,17 @@ msgstr ""
 "Kan de gespecificeerde folder niet aanmaken:\n"
 "%s"
 
-# shell/e-shell-folder-creation-dialog.c:133
+# shell/e-shell-folder-creation-dialog.c:133
 #: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven folder-naam is niet geldig."
 
-# shell/e-shell-folder-creation-dialog.c:223
+# shell/e-shell-folder-creation-dialog.c:223
 #: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe folder maken"
 
-# shell/e-shell-folder-selection-dialog.c:95
+# shell/e-shell-folder-selection-dialog.c:95
 #: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
@@ -7245,32 +7436,32 @@ msgstr ""
 "Het type van de geselecteerde folder is niet geldig\n"
 "voor de opdracht."
 
-# shell/e-shell-folder-selection-dialog.c:236
+# shell/e-shell-folder-selection-dialog.c:236
 #: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nieuw..."
 
-# shell/e-shell-folder-title-bar.c:355
+# shell/e-shell-folder-title-bar.c:355
 #: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Geen)"
 
-# shell/e-shell-view-menu.c:110
+# shell/e-shell-view-menu.c:110
 #: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy kon niet worden gevonden in het $PATH."
 
-# shell/e-shell-view-menu.c:116
+# shell/e-shell-view-menu.c:116
 #: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kon niet worden gestart."
 
-# shell/e-shell-view-menu.c:161
+# shell/e-shell-view-menu.c:161
 #: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-# shell/e-shell-view-menu.c:163
+# shell/e-shell-view-menu.c:163
 #: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
@@ -7281,40 +7472,40 @@ msgstr ""
 "programma's voor post, planning en kontakt beheer\n"
 "in de GNOME werkomgeving."
 
-# shell/e-shell-view-menu.c:301
+# shell/e-shell-view-menu.c:301
 #: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
-# shell/e-shell-view.c:113
+# shell/e-shell-view.c:113
 #: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-# shell/e-shell-view.c:208
+# shell/e-shell-view.c:208
 #: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Mappen"
 
-# shell/e-shell-view.c:600
+# shell/e-shell-view.c:600
 #: shell/e-shell-view.c:1124
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-# shell/e-shell-view.c:600
+# shell/e-shell-view.c:600
 #: shell/e-shell-view.c:1126
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-# shell/e-shell.c:299
+# shell/e-shell.c:299
 #: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7323,12 +7514,12 @@ msgstr ""
 "Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
 "Dit betekent waarschijnlijk dat het %s component is gecrashed"
 
-# addressbook/gui/component/addressbook.c:420
+# addressbook/gui/component/addressbook.c:420
 #: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelings groep aanmaken"
 
-# mail/mail-config.c:277
+# mail/mail-config.c:277
 #: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Groep:"
@@ -7346,22 +7537,22 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-# shell/e-shortcuts-view.c:235
+# shell/e-shortcuts-view.c:235
 #: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Kleine Iconen"
 
-# shell/e-shortcuts-view.c:236
+# shell/e-shortcuts-view.c:236
 #: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine iconen"
 
-# shell/e-shortcuts-view.c:238
+# shell/e-shortcuts-view.c:238
 #: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Grote Iconen"
 
-# shell/e-shortcuts-view.c:239
+# shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote iconen"
@@ -7370,7 +7561,7 @@ msgstr "Toont de snelkoppelingen als grote iconen"
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-# addressbook/gui/component/addressbook.c:420
+# addressbook/gui/component/addressbook.c:420
 #: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
@@ -7379,139 +7570,138 @@ msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 msgid "_Remove This Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-# shell/e-shortcuts-view.c:333
+# shell/e-shortcuts-view.c:333
 #: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-# shell/e-shell-view-menu.c:419
+# shell/e-shell-view-menu.c:419
 #: shell/e-shortcuts-view.c:289
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingenbalk"
 
-# shell/e-shell-view-menu.c:419
+# shell/e-shell-view-menu.c:419
 #: shell/e-shortcuts-view.c:290
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-# shell/e-shortcuts-view.c:330
+# shell/e-shortcuts-view.c:330
 #: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activeren"
 
-# shell/e-shortcuts-view.c:330
+# shell/e-shortcuts-view.c:330
 #: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activeer deze snelkoppeling"
 
-# shell/e-shortcuts-view.c:333
+# shell/e-shortcuts-view.c:333
 #: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-# shell/e-shortcuts.c:358
+# shell/e-shortcuts.c:358
 #: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
-# shell/e-shell-view-menu.c:398
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+# shell/e-shell-view-menu.c:398
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "Weerga_ve"
 
-# mail/folder-browser-factory.c:43
-#: shell/e-storage-set-view.c:345
+# mail/folder-browser-factory.c:43
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Geef de geselecteerde map weer"
 
-# shell/e-storage.c:217
-#: shell/e-storage.c:176
+# shell/e-storage.c:217
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Geen naam)"
 
-# shell/e-storage.c:412
-#: shell/e-storage.c:427
+# shell/e-storage.c:412
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Geen fout"
 
-# shell/e-storage.c:414
-#: shell/e-storage.c:429
+# shell/e-storage.c:414
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Generieke fout"
 
-# shell/e-storage.c:416
-#: shell/e-storage.c:431
+# shell/e-storage.c:416
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat al"
 
-# shell/e-storage.c:418
-#: shell/e-storage.c:433
+# shell/e-storage.c:418
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde folder type is niet geldig"
 
-# shell/e-storage.c:420
-#: shell/e-storage.c:435
+# shell/e-storage.c:420
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "I/O fout"
 
-# shell/e-storage.c:422
-#: shell/e-storage.c:437
+# shell/e-storage.c:422
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-# shell/e-storage.c:424
-#: shell/e-storage.c:439
+# shell/e-storage.c:424
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder was niet gevonden"
 
-# shell/e-storage.c:426
-#: shell/e-storage.c:441
+# shell/e-storage.c:426
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geimplementeerd voor deze opslag"
 
-# shell/e-storage.c:428
-#: shell/e-storage.c:443
+# shell/e-storage.c:428
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
-# shell/e-storage.c:430
-#: shell/e-storage.c:445
+# shell/e-storage.c:430
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-# shell/e-storage.c:432
-#: shell/e-storage.c:447
+# shell/e-storage.c:432
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-# shell/main.c:172
+# shell/main.c:172
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "De Evolution schil."
 
-# shell/main.c:99
-#: shell/main.c:74
+# shell/main.c:99
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hallo. Bedankt voor het nemen van de tijd voor het downloaden van deze\n"
 "preview release van de Evolution werkgroep suite.\n"
@@ -7533,8 +7723,8 @@ msgstr ""
 "wachten\n"
 "met smart je bijdrages af!\n"
 
-# shell/main.c:126
-#: shell/main.c:101
+# shell/main.c:126
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7542,297 +7732,314 @@ msgstr ""
 "Bedankt\n"
 "Het Evolution Team\n"
 
-# shell/main.c:172
-#: shell/main.c:132
+# shell/main.c:172
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan de Evolution shell niet initialiseren."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Uitzetten."
 
-# shell/main.c:220
-#: shell/main.c:198
+# shell/main.c:220
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-# shell/e-shell-view-menu.c:404
+# shell/e-shell-view-menu.c:404
 #: ui/evolution-addressbook.xml.h:2
 msgid "Create new contact"
 msgstr "Nieuw contact maken"
 
-# addressbook/gui/component/addressbook.c:426
+# addressbook/gui/component/addressbook.c:426
 #: ui/evolution-addressbook.xml.h:4
 msgid "Delete a contact"
 msgstr "Selecteer een contact"
 
-# addressbook/gui/component/addressbook.c:424
+# addressbook/gui/component/addressbook.c:424
 #: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 msgid "Find"
 msgstr "Vinden"
 
-# addressbook/gui/component/addressbook.c:424
+# addressbook/gui/component/addressbook.c:424
 #: ui/evolution-addressbook.xml.h:6
 msgid "Find a contact"
 msgstr "Zoek een contact"
 
-# addressbook/gui/component/addressbook.c:506
+# addressbook/gui/component/addressbook.c:506
 #: ui/evolution-addressbook.xml.h:7
 msgid "New contact"
 msgstr "Nieuw contact"
 
-# addressbook/gui/component/addressbook.c:425
-#: ui/evolution-addressbook.xml.h:9
+# composer/e-msg-composer.c:894
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Geeft een voorbeeld van het af te drukken bericht"
+
+# addressbook/gui/component/addressbook.c:425
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Stoppen"
 
-# addressbook/printing/e-contact-print.glade.h:26
-#: ui/evolution-addressbook.xml.h:11
+# addressbook/printing/e-contact-print.glade.h:26
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Allen Weergeven"
 
-# addressbook/gui/component/addressbook.c:424
-#: ui/evolution-addressbook.xml.h:13
+# addressbook/gui/component/addressbook.c:424
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Geef alle kontaken weer"
 
-# mail/folder-browser-factory.c:95
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Adresboek Configuratie..."
+# mail/mail-config.c:1490
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Adresboek Bronnen"
 
-# addressbook/gui/component/addressbook.c:425
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Druk Kontakten af..."
+# addressbook/contact-editor/e-contact-editor-strings.h:26
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "C_ontacten..."
 
-#: ui/evolution-addressbook.xml.h:16
+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Afdrukken..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_Zoek naar kontakten"
 
-# addressbook/contact-editor/e-contact-editor.c:807
-# calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+# addressbook/contact-editor/e-contact-editor.c:807
+# calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-# calendar/gui/calendar-commands.c:525
+# calendar/gui/calendar-commands.c:525
 #: ui/evolution-calendar.xml.h:1
 msgid "5 Days"
 msgstr "5 Dagen"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
 msgid "Alter preferences"
 msgstr "Instellingen Wijzigen"
 
-# calendar/gui/calendar-commands.c:659
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Kalender Instellingen..."
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
-#: ui/evolution-calendar.xml.h:6
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-# calendar/gui/calendar-commands.c:660
-#: ui/evolution-calendar.xml.h:7
+# calendar/gui/calendar-commands.c:660
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe kalender"
 
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
-# calendar/gui/gncal-todo.c:717
-#: ui/evolution-calendar.xml.h:8
+# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
+# calendar/gui/gncal-todo.c:717
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Dag"
 
-# calendar/gui/calendar-commands.c:552
-#: ui/evolution-calendar.xml.h:9
+# calendar/gui/calendar-commands.c:558
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Ga naar"
+
+# calendar/gui/calendar-commands.c:552
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Ga terug in tijd"
 
-# calendar/gui/calendar-commands.c:554
-#: ui/evolution-calendar.xml.h:10
+# calendar/gui/calendar-commands.c:554
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Ga vooruit in tijd"
 
-# calendar/gui/calendar-commands.c:558
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Ga naar"
-
-# calendar/gui/calendar-commands.c:558
-#: ui/evolution-calendar.xml.h:12
+# calendar/gui/calendar-commands.c:558
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Ga naar specifieke datum"
 
-# calendar/gui/calendar-commands.c:553
-#: ui/evolution-calendar.xml.h:13
+# calendar/gui/calendar-commands.c:553
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Ga naar huidig moment"
 
-# calendar/gui/calendar-commands.c:531
-#: ui/evolution-calendar.xml.h:14
+# calendar/gui/calendar-commands.c:531
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Maand"
 
-# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
-# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
-# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+# calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+# calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
 msgstr "Nieuwe afspraak"
 
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Volgende"
 
-# calendar/gui/calendar-commands.c:663
-#: ui/evolution-calendar.xml.h:18
+# calendar/gui/calendar-commands.c:663
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Open Kalender"
 
-# calendar/gui/calendar-commands.c:552
-#: ui/evolution-calendar.xml.h:19
+# calendar/gui/calendar-commands.c:552
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Vorige"
 
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+# calendar/gui/print.c:1084
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Druk Kalender af"
+
+# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Druk deze Kalender af"
 
-# composer/e-msg-composer.c:463
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+# composer/e-msg-composer.c:463
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Opslaan Als"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
-#: ui/evolution-calendar.xml.h:23
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Kalender bewaren als iets anders"
 
-# calendar/gui/calendar-commands.c:522
-#: ui/evolution-calendar.xml.h:24
+# calendar/gui/calendar-commands.c:522
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Laat 1 dag zien"
 
-# calendar/gui/calendar-commands.c:531
-#: ui/evolution-calendar.xml.h:25
+# calendar/gui/calendar-commands.c:531
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Toon 1 maand"
 
-# calendar/gui/calendar-commands.c:528
-#: ui/evolution-calendar.xml.h:26
+# calendar/gui/calendar-commands.c:528
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Laat 1 week zien"
 
-# calendar/gui/calendar-commands.c:525
-#: ui/evolution-calendar.xml.h:27
+# calendar/gui/calendar-commands.c:525
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Laat de werkweek zien"
 
-# calendar/gui/calendar-commands.c:553
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+# calendar/gui/calendar-commands.c:553
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Vandaag"
 
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
-#: ui/evolution-calendar.xml.h:29
+# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Week"
 
-# shell/e-shell-view-menu.c:398
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+# calendar/gui/calendar-commands.c:59
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Afspraak"
+
+# shell/e-shell-view-menu.c:398
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Nieuw"
 
-# calendar/gui/calendar-commands.c:663
-#: ui/evolution-calendar.xml.h:31
+# calendar/gui/calendar-commands.c:663
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "Open Ka_lender"
 
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Druk deze kalender af"
-
-# composer/e-msg-composer.c:463
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+# composer/e-msg-composer.c:463
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-# addressbook/contact-editor/e-contact-editor.c:853
-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+# addressbook/contact-editor/e-contact-editor.c:853
+# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Verwijderd dit item"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #: ui/evolution-contact-editor.xml.h:3
 msgid "Delete..."
 msgstr "Verwijderen..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:20
+# addressbook/contact-editor/e-contact-editor-strings.h:20
 #: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Help"
 
-# addressbook/contact-editor/e-contact-editor.c:844
-# calendar/gui/calendar-commands.c:673
+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
-# addressbook/contact-editor/e-contact-editor.c:845
-# calendar/gui/event-editor.c:1326
+# addressbook/contact-editor/e-contact-editor.c:845
+# calendar/gui/event-editor.c:1326
 #: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
 #: ui/evolution-task-editor-dialog.xml.h:40
 msgid "Print this item"
 msgstr "Item afdrukken"
 
-# addressbook/contact-editor/e-contact-editor.c:844
-# calendar/gui/calendar-commands.c:673
+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Afdrukken..."
 
-# composer/e-msg-composer.c:463
+# composer/e-msg-composer.c:463
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
 #: ui/evolution-message-composer.xml.h:16
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
-# addressbook/contact-editor/e-contact-editor.c:839
+# addressbook/contact-editor/e-contact-editor.c:839
 #: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:52
 msgid "Save and Close"
 msgstr "Opslaan en Sluiten"
 
-# addressbook/contact-editor/e-contact-editor.c:840
-# calendar/gui/event-editor.c:1321
+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
@@ -7841,33 +8048,27 @@ msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
 msgid "Se_nd contact to other..."
 msgstr "Stu_ur contact naar ander..."
 
-# addressbook/contact-editor/e-contact-editor.c:863
-# calendar/gui/event-editor.c:1344
+# addressbook/contact-editor/e-contact-editor.c:863
+# calendar/gui/event-editor.c:1344
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr "Zie help"
 
-# addressbook/contact-editor/e-contact-editor.c:782
+# addressbook/contact-editor/e-contact-editor.c:782
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Nieuw _bericht naar contact..."
 
-# widgets/e-table/e-table-config.glade.h:10
+# widgets/e-table/e-table-config.glade.h:10
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Bestand"
 
-# addressbook/contact-editor/e-contact-editor.c:844
-# calendar/gui/calendar-commands.c:673
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Afdrukken..."
-
-# calendar/gui/print.c:326
+# calendar/gui/print.c:326
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Opslaan"
@@ -7876,40 +8077,40 @@ msgstr "_Opslaan"
 msgid "About this application"
 msgstr "Over deze applicatie"
 
-# addressbook/printing/e-contact-print.glade.h:20
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:51
-# addressbook/printing/e-contact-print.glade.h:54
+# addressbook/printing/e-contact-print.glade.h:20
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:51
+# addressbook/printing/e-contact-print.glade.h:54
 #: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
 msgid "About..."
 msgstr "Over..."
 
-# shell/e-shell-view-menu.c:474
+# shell/e-shell-view-menu.c:474
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-# calendar/gui/event-editor.c:1251
+# calendar/gui/event-editor.c:1251
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 msgid "Address _Book... (FIXME)"
 msgstr "Adres _Boek... (FIXME)"
 
-# calendar/gui/calendar-commands.c:659
+# calendar/gui/calendar-commands.c:659
 #: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 msgid "C_lear"
 msgstr "W_issen"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 msgid "C_ut"
 msgstr "K_nippen"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 msgid "Chec_k Names (FIXME)"
 msgstr "Contro_leer Namen (FIXME)"
 
-# calendar/gui/calendar-commands.c:659
+# calendar/gui/calendar-commands.c:659
 #: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
 msgid "Clear"
 msgstr "Wissen"
@@ -7918,18 +8119,18 @@ msgstr "Wissen"
 msgid "Clear the selection"
 msgstr "Selectie wissen"
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #: ui/evolution-event-editor.xml.h:11
 msgid "Close this appointment"
 msgstr "Deze afspraak sluiten"
 
-# shell/e-shell-view-menu.c:402
+# shell/e-shell-view-menu.c:402
 #: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopiëer naar Map... (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopiëren"
@@ -7938,7 +8139,7 @@ msgstr "Kopiëren"
 msgid "Copy the selection"
 msgstr "Kopiëer de selectie"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 msgid "Cut"
 msgstr "Knippen"
@@ -7947,6 +8148,11 @@ msgstr "Knippen"
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Verwijdert deze afspraak"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "XML Dumpen"
@@ -7955,116 +8161,107 @@ msgstr "XML Dumpen"
 msgid "Dump the UI Xml description"
 msgstr "Dump de UI Xml omschrijving"
 
-# addressbook/contact-editor/e-contact-editor.c:715
-# calendar/gui/event-editor.c:1190
+# addressbook/contact-editor/e-contact-editor.c:715
+# calendar/gui/event-editor.c:1190
 #: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 msgid "Fi_rst Item in Folder (FIXME)"
 msgstr "Ee_rste Item in Folder (FIXME)"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 msgid "For_ward (FIXME)"
 msgstr "_Doorsturen (FIXME)"
 
-# calendar/gui/event-editor.c:1265
+# calendar/gui/event-editor.c:1265
 #: ui/evolution-event-editor.xml.h:23
 msgid "Forward as v_Calendar (FIXME)"
 msgstr "Doorsturen als v_Calendar (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:860
-# calendar/gui/event-editor.c:1342
+# addressbook/contact-editor/e-contact-editor.c:860
+# calendar/gui/event-editor.c:1342
 #: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 msgid "Go to the next item"
 msgstr "Ga naar het volgende item"
 
-# addressbook/contact-editor/e-contact-editor.c:857
-# calendar/gui/event-editor.c:1340
+# addressbook/contact-editor/e-contact-editor.c:857
+# calendar/gui/event-editor.c:1340
 #: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 msgid "Go to the previous item"
 msgstr "Ga naar het vorige item"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
 msgid "In_complete Task (FIXME)"
 msgstr "On_afgemaakte Taak (FIXME)"
 
-# calendar/gui/prop.c:678
+# calendar/gui/prop.c:678
 #: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 msgid "Modify the file's properties"
 msgstr "De bestandseigenschappen wijzigen"
 
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
 #: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
 msgid "N_ext"
 msgstr "V_olgende"
 
-# composer/e-msg-composer-address-dialog.c:191
-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+# composer/e-msg-composer-address-dialog.c:191
+# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
 #: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
 msgid "Paste"
 msgstr "Plakken"
 
-# composer/e-msg-composer-address-dialog.c:192
-# composer/e-msg-composer-address-dialog.c:200
+# composer/e-msg-composer-address-dialog.c:192
+# composer/e-msg-composer-address-dialog.c:200
 #: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-# addressbook/contact-editor/e-contact-editor.c:737
-# calendar/gui/event-editor.c:1212
+# addressbook/contact-editor/e-contact-editor.c:737
+# calendar/gui/event-editor.c:1212
 #: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "_Vorige"
 
-# addressbook/contact-editor/e-contact-editor.c:737
-# calendar/gui/event-editor.c:1212
+# addressbook/contact-editor/e-contact-editor.c:737
+# calendar/gui/event-editor.c:1212
 #: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Vorige"
 
-# calendar/gui/print.c:1249
+# calendar/gui/print.c:1249
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Afdruk_voorbeeld"
 
-# addressbook/contact-editor/e-contact-editor.c:844
-# calendar/gui/calendar-commands.c:673
+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
 msgid "Print S_etup..."
 msgstr "Afdruk In_stellingen..."
 
-# addressbook/printing/e-contact-print.glade.h:7
+# addressbook/printing/e-contact-print.glade.h:7
 #: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
 msgid "Print Setup"
 msgstr "Printer Instellingen"
 
-# composer/e-msg-composer-address-dialog.glade.h:12
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Eigenschappen"
-
-# calendar/gui/print.c:326
+# calendar/gui/print.c:326
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Opslaan"
 
-# addressbook/contact-editor/e-contact-editor.c:840
-# calendar/gui/event-editor.c:1321
+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-event-editor.xml.h:43
 msgid "Save the appointment and close the dialog box"
 msgstr "Bewaar de afspraak en sluit dit venster"
 
-# calendar/gui/calendar-commands.c:553
+# calendar/gui/calendar-commands.c:553
 #: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Afspraak Plannen"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "_Afspraak Plannen"
@@ -8085,99 +8282,93 @@ msgstr "Selecteer alles"
 msgid "Setup the page settings for your current printer"
 msgstr "Stel de pagina instellingen in voor de huidige printer"
 
-# shell/e-shell-view-menu.c:387
+# shell/e-shell-view-menu.c:387
 #: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
 msgid "Task _Request (FIXME)"
 msgstr "Taak Ve_rzoek (FIXME)"
 
-# shell/e-shell-view-menu.c:159
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+# shell/e-shell-view-menu.c:159
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Over..."
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+# calendar/gui/dialogs/alarm-notify.glade.h:7
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Sluiten"
 
-# shell/e-shell-view-menu.c:381
+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
 #: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Debug"
 
-# calendar/gui/gncal-todo.c:488
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "B_ewerken..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+# addressbook/contact-editor/e-contact-editor-strings.h:20
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Help"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
 msgid "_Item (FIXME)"
 msgstr "_Item (FIXME)"
 
-# shell/e-shell-view-menu.c:381
+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
 msgid "_Journal Entry (FIXME)"
 msgstr "_Dagboek Entry (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:722
-# calendar/gui/event-editor.c:1197
+# addressbook/contact-editor/e-contact-editor.c:722
+# calendar/gui/event-editor.c:1197
 #: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
 msgid "_Last Item in Folder (FIXME)"
 msgstr "_Laatste Item in Folder (FIXME)"
 
-# shell/e-shell-view-menu.c:375
+# shell/e-shell-view-menu.c:375
 #: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
 msgid "_Mail Message (FIXME)"
 msgstr "_Bericht Versturen (FIXME)"
 
-# shell/e-shell-view-menu.c:402
+# shell/e-shell-view-menu.c:402
 #: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
 msgid "_Move to Folder... (FIXME)"
 msgstr "_Verplaatsen naar Map... (FIXME)"
 
-# shell/e-shell-view-menu.c:381
+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
 msgid "_Note (FIXME)"
 msgstr "_Notitie (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:191
-# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+# composer/e-msg-composer-address-dialog.c:191
+# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
 #: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
 msgid "_Paste"
 msgstr "_Plakken"
 
-# addressbook/gui/component/addressbook.c:425
-# addressbook/gui/component/addressbook.c:492
-# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+# addressbook/gui/component/addressbook.c:425
+# addressbook/gui/component/addressbook.c:492
+# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
 #: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
 #: ui/evolution-tasks.xml.h:7
 msgid "_Print"
 msgstr "_Afdrukken"
 
-# composer/e-msg-composer-address-dialog.glade.h:12
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -8185,18 +8376,18 @@ msgstr "_Eigenschappen..."
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
 #: ui/evolution.xml.h:40
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
-# shell/e-shell-view-menu.c:381
+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
 msgid "_Unread Item (FIXME)"
 msgstr "_Ongelezen Item (FIXME)"
 
-# mail/mail-config.c:1490
+# mail/mail-config.c:1490
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Dienst Toevoegen"
@@ -8205,7 +8396,7 @@ msgstr "Dienst Toevoegen"
 msgid "Add a new service to the Executive Summary"
 msgstr "Voeg een nieuwe dienst toe aan de Uitvoer Samenvatting"
 
-# shell/e-shell-view-menu.c:404
+# shell/e-shell-view-menu.c:404
 #: ui/evolution-executive-summary.xml.h:3
 msgid "Create a new email"
 msgstr "Nieuwe e-mail opstellen"
@@ -8214,265 +8405,320 @@ msgstr "Nieuwe e-mail opstellen"
 msgid "Executive Summary Settings..."
 msgstr "Uitvoer Samenvattings Instellingen..."
 
-# mail/folder-browser-factory.c:29
+# mail/folder-browser-factory.c:29
 #: ui/evolution-executive-summary.xml.h:5
 msgid "New Mail"
 msgstr "Nieuwe E-Mail"
 
-# mail/folder-browser-factory.c:30
-#: ui/evolution-mail.xml.h:1
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Opstellen"
 
-# mail/folder-browser-factory.c:30
-#: ui/evolution-mail.xml.h:2
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Stel een nieuw bericht op"
 
-# mail/folder-browser-factory.c:41
-#: ui/evolution-mail.xml.h:4
+# mail/folder-browser-factory.c:41
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kopiëer het bericht naar een nieuwe map"
 
-# filter/filter-editor.c:198
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Maak Regel"
-
-# shell/e-shell-view-menu.c:365
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Map"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Maak Regel Van Bericht"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filteren op Afzender"
+msgid "Display all of the message headers"
+msgstr ""
 
+# calendar/gui/calendar-commands.c:58
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filteren op Geadresseerden"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Lege dagen:"
 
-# mail/folder-browser-factory.c:101
 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filter op Afzender"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filter op Geadresseerden"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filter op Onderwerp"
+
+# mail/folder-browser-factory.c:101
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
-# mail/folder-browser-factory.c:29
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Post Ophalen"
-
-# mail/folder-browser-factory.c:43
+# mail/folder-browser-factory.c:37
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Verberg G_eselecteerde Berichten"
-
-# mail/folder-browser-factory.c:45
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Verberg Verwij_derde Berichten"
+#, fuzzy
+msgid "Forward As"
+msgstr "Doorsturen"
 
-# mail/folder-browser-factory.c:37
+# composer/e-msg-composer-address-dialog.glade.h:9
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Verberg _Gelezen Berichten"
+#, fuzzy
+msgid "Full Headers"
+msgstr "Volledige Zoekactie"
 
-# addressbook/contact-editor/e-contact-editor.c:745
-# calendar/gui/event-editor.c:1222
+# mail/folder-browser-factory.c:43
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Post _Filters..."
+msgid "Hide S_elected Messages"
+msgstr "Verberg G_eselecteerde Berichten"
 
+# mail/folder-browser-factory.c:45
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Aanmeldingen Beheren..."
+msgid "Hide _Deleted Messages"
+msgstr "Verberg Verwij_derde Berichten"
 
+# mail/folder-browser-factory.c:37
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "_Markeer Als Gelezen"
+msgid "Hide _Read messages"
+msgstr "Verberg _Gelezen Berichten"
 
-# addressbook/contact-editor/e-contact-editor.c:704
-# calendar/gui/event-editor.c:1179
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
+#, fuzzy
+msgid "Inline"
+msgstr "Geef Ingebonden Weer"
 
-# calendar/gui/print.c:326
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Verplaatsen"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Aanmeldingen Beheren..."
 
-# mail/folder-browser-factory.c:41
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Sla het bericht op in een bepaalde folder"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Markeer Als Gelezen"
 
-# composer/e-msg-composer.c:894
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Geeft een voorbeeld van het af te drukken bericht"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Markeer Als Gelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Markeer Als Ongelezen"
 
-# calendar/gui/print.c:1249
+# calendar/gui/prop.c:519
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Afdrukvoorbeeld van bericht..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Maak berichtweergave leeg"
 
+# calendar/gui/print.c:326
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
+msgid "Move"
+msgstr "Verplaatsen"
 
+# mail/folder-browser-factory.c:41
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Bericht afdrukken..."
+msgid "Move message to a new folder"
+msgstr "Sla het bericht op in een bepaalde folder"
 
-# mail/folder-browser-factory.c:35
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Iedereen Be_antwoorden"
+msgid "Print message to the printer"
+msgstr "Bericht afdrukken naar de printer"
 
-# mail/folder-browser-factory.c:35
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Af_zender beantwoorden"
+# shell/e-shell-view.c:596
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Opmerkingen"
 
-# mail/mail-config.c:1490
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+# mail/folder-browser-factory.c:35
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Iedereen Be_antwoorden"
+
+# mail/mail-config.c:1490
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "Br_on"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "_Alles Selecteren"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "Verstuur & Ontvang e-mail"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Geef _Alle Berichten weer"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Allen Weergeven"
 
-# mail/folder-browser-factory.c:37
-#: ui/evolution-mail.xml.h:42
+# mail/folder-browser-factory.c:37
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-# mail/mail-config.c:1490
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "VMap op Onderwerp"
+
+# mail/mail-config.c:1490
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Bekijk Pure Bericht Bron"
 
-# addressbook/contact-editor/e-contact-editor.c:745
-# calendar/gui/event-editor.c:1222
-#: ui/evolution-mail.xml.h:46
+# mail/folder-browser-factory.c:89
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtuele Map Bewerker..."
+
+# shell/e-shell-view-menu.c:474
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Acties"
+
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-# shell/e-shell-view-menu.c:402
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configureer Map..."
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Opstellen"
 
-# shell/e-shell-view-menu.c:402
-#: ui/evolution-mail.xml.h:48
+# shell/e-shell-view-menu.c:402
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopiëren naar Map..."
 
-# composer/e-msg-composer.c:894
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "Bericht _Bewerken"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Maak Regel Van Bericht"
 
-# mail/folder-browser-factory.c:77
-#: ui/evolution-mail.xml.h:51
+# mail/folder-browser-factory.c:77
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Legen"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filteren op Onderwerp"
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "Post _Filters..."
 
-# mail/folder-browser-factory.c:37
-#: ui/evolution-mail.xml.h:53
+# shell/e-shell-view-menu.c:365
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Map"
+
+# mail/folder-browser-factory.c:37
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
-# mail/folder-browser-factory.c:95
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Mail Configuratie..."
+# shell/e-shell-view-menu.c:375
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Bericht versturen"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+# addressbook/printing/e-contact-print.glade.h:12
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "Instellingen..."
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Bericht"
 
-# shell/e-shell-view-menu.c:402
-#: ui/evolution-mail.xml.h:57
+# shell/e-shell-view-menu.c:402
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Openen in Nieuw Venster"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Bericht A_fdrukken"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Open de taak"
 
-# composer/e-msg-composer.c:463
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Bericht Op_slaan als..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "Verstuur & Ontvang e-mail"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "Rela_ties weergeven"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:8
-# addressbook/contact-editor/e-contact-editor.c:673
-#: ui/evolution-mail.xml.h:62
+# addressbook/contact-editor/e-contact-editor-strings.h:8
+# addressbook/contact-editor/e-contact-editor.c:673
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMap op Onderwerp"
-
-# mail/folder-browser-factory.c:89
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtuele Map Bewerker..."
-
-# composer/e-msg-composer.c:951
+# composer/e-msg-composer.c:951
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijvoegen"
 
-# calendar/gui/calendar-commands.c:553
+# calendar/gui/calendar-commands.c:553
 #: ui/evolution-message-composer.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
-# composer/e-msg-composer.c:894
+# composer/e-msg-composer.c:894
 #: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
 msgstr "Versleutel dit bericht met PGP"
 
-# addressbook/contact-editor/e-contact-editor.c:806
-# calendar/gui/event-editor.c:1280
+# addressbook/contact-editor/e-contact-editor.c:806
+# calendar/gui/event-editor.c:1280
 #: ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
 msgstr "_Opmaak"
@@ -8481,17 +8727,17 @@ msgstr "_Opmaak"
 msgid "HTML"
 msgstr "HTML"
 
-# composer/e-msg-composer.c:891
+# composer/e-msg-composer.c:891
 #: ui/evolution-message-composer.xml.h:8
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
-# composer/e-msg-composer.c:891
+# composer/e-msg-composer.c:891
 #: ui/evolution-message-composer.xml.h:9
 msgid "Insert text file..."
 msgstr "Tekst bestand invoegen..."
 
-# composer/e-msg-composer.c:561
+# composer/e-msg-composer.c:561
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Bestand openen"
@@ -8504,42 +8750,39 @@ msgstr "PGP Versleutelen"
 msgid "PGP Sign"
 msgstr "PGP Signeren"
 
-# filter/filter-editor.c:198
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save _Draft"
 msgstr "Kla_d Opslaan"
 
-# composer/e-msg-composer.c:888
+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save in _folder... (FIXME)"
 msgstr "Opslaan in _map... (FIXME)"
 
-# composer/e-msg-composer.c:888
+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
-# composer/e-msg-composer.c:888
+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save the current file with a different name"
 msgstr "Sla het huidige bestand op onder een andere naam"
 
-# composer/e-msg-composer.c:888
+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save the message in a specified folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:23
 msgid "Send"
 msgstr "Versturen"
 
-# filter/filter-editor.c:198
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send _Later"
 msgstr "_Later Versturen"
 
-# filter/filter-editor.c:198
 #: ui/evolution-message-composer.xml.h:25
 msgid "Send _later"
 msgstr "_Later versturen"
@@ -8548,32 +8791,32 @@ msgstr "_Later versturen"
 msgid "Send the mail in HTML format"
 msgstr "Stuur de mail in HTML formaat"
 
-# composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:27
 msgid "Send the message later"
 msgstr "Dit bericht later versturen"
 
-# composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:28
 msgid "Send the message now"
 msgstr "Dit bericht nu versturen"
 
-# composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:29
 msgid "Send this message now"
 msgstr "Dit bericht nu versturen"
 
-# composer/e-msg-composer.c:907
+# composer/e-msg-composer.c:907
 #: ui/evolution-message-composer.xml.h:30
 msgid "Show / hide attachments"
 msgstr "Toon / Verberg bijvoegsels"
 
-# composer/e-msg-composer.c:906
+# composer/e-msg-composer.c:906
 #: ui/evolution-message-composer.xml.h:31
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
-# composer/e-msg-composer.c:906
+# composer/e-msg-composer.c:906
 #: ui/evolution-message-composer.xml.h:32
 msgid "Show attachments"
 msgstr "Bekijk bijvoegsels"
@@ -8582,16 +8825,66 @@ msgstr "Bekijk bijvoegsels"
 msgid "Sign this message with your PGP key"
 msgstr "Signeer dit bericht met je PGP sleutel"
 
-# composer/e-msg-composer.c:891
+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Toont de mapbalk"
+
+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Toont de mapbalk"
+
+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Toont de mapbalk"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+# widgets/e-table/e-table-config.glade.h:7
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "_Bcc Field"
+msgstr "Velden"
+
+# widgets/e-table/e-table-config.glade.h:7
 #: ui/evolution-message-composer.xml.h:40
+#, fuzzy
+msgid "_Cc Field"
+msgstr "Velden"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:805
+# calendar/gui/event-editor.c:1279
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Invoegen"
+
+# composer/e-msg-composer.c:891
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:43
+# mail/folder-browser-factory.c:34
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Antwoord-Naar:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Beveiliging"
 
@@ -8599,6 +8892,11 @@ msgstr "_Beveiliging"
 msgid "Add folder to your list of subscribed folders"
 msgstr "map toevoegen aan de lijst van aangemelde mappen"
 
+# shell/e-shell-view-menu.c:365
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Map"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Lijst Verfrissen"
@@ -8619,7 +8917,7 @@ msgstr "Aanmelden"
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-task-editor-dialog.xml.h:5
 msgid "Assig_n Task (FIXME)"
 msgstr "Taak Toewijze_n (FIXME)"
@@ -8628,12 +8926,12 @@ msgstr "Taak Toewijze_n (FIXME)"
 msgid "Find Again"
 msgstr "Opnieuw Zoeken"
 
-# shell/e-shell-view-menu.c:387
+# shell/e-shell-view-menu.c:387
 #: ui/evolution-task-editor-dialog.xml.h:29
 msgid "Meeting Re_quest (FIXME)"
 msgstr "Ve_rzoek Vergadering (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:1294
+# addressbook/contact-editor/e-contact-editor.c:1294
 #: ui/evolution-task-editor-dialog.xml.h:43
 msgid "Redo"
 msgstr "Herhalen"
@@ -8642,7 +8940,7 @@ msgstr "Herhalen"
 msgid "Redo the undone action"
 msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
-# mail/folder-browser-factory.c:34
+# mail/folder-browser-factory.c:34
 #: ui/evolution-task-editor-dialog.xml.h:45
 msgid "Replace"
 msgstr "Vervangen"
@@ -8651,25 +8949,25 @@ msgstr "Vervangen"
 msgid "Replace a string"
 msgstr "Tekenreeks vervangen"
 
-# mail/folder-browser-factory.c:35
+# mail/folder-browser-factory.c:35
 #: ui/evolution-task-editor-dialog.xml.h:47
 msgid "Reply to A_ll (FIXME)"
 msgstr "Iedereen _beantwoorden (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:667
-# calendar/gui/event-editor.c:1142
+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #: ui/evolution-task-editor-dialog.xml.h:48
 msgid "S_end Status Report (FIXME)"
 msgstr "Verstuur een _status rapport (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:667
-# calendar/gui/event-editor.c:1142
+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #: ui/evolution-task-editor-dialog.xml.h:49
 msgid "S_kip Occurrence (FIXME)"
 msgstr "Sla Voorkomst over (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:840
-# calendar/gui/event-editor.c:1321
+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-task-editor-dialog.xml.h:54
 msgid "Save the task and close the dialog box"
 msgstr "Bewaar deze taak en sluit het dialoogvenster"
@@ -8682,18 +8980,18 @@ msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 msgid "Search for a string"
 msgstr "Zoek naar een tekenreeks"
 
-# composer/e-msg-composer.c:948
+# composer/e-msg-composer.c:948
 #: ui/evolution-task-editor-dialog.xml.h:61
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-# composer/e-msg-composer.c:948
+# composer/e-msg-composer.c:948
 #: ui/evolution-task-editor-dialog.xml.h:62
 msgid "Undo the last action"
 msgstr "Maak de laatste bewerking ongedaan"
 
-# shell/e-shell-view-menu.c:378
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+# shell/e-shell-view-menu.c:378
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
@@ -8701,48 +8999,52 @@ msgstr "_Afspraak (FIXME)"
 msgid "_Mark Complete (FIXME)"
 msgstr "_Markeer als Gedaan (FIXME)"
 
-# shell/e-shell-view-menu.c:384
+# shell/e-shell-view-menu.c:384
 #: ui/evolution-task-editor-dialog.xml.h:84
 msgid "_Reply (FIXME)"
 msgstr "_Beantwoorden (FIXME)"
 
-# shell/e-shell-view-menu.c:404
+# shell/e-shell-view-menu.c:404
 #: ui/evolution-tasks.xml.h:2
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-# shell/e-shell-view-menu.c:398
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nieuw"
+#, fuzzy
+msgid "New Task"
+msgstr "_Taak"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
 msgstr "Stuur taak als iets anders"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: ui/evolution-tasks.xml.h:6
 msgid "Tasks Preferences..."
 msgstr "Taak Voorkeuren..."
 
-# shell/e-shell-view-menu.c:159
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "_Taak"
+
+# shell/e-shell-view-menu.c:159
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Over Evolution..."
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #: ui/evolution.xml.h:3
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-# addressbook/contact-editor/e-contact-editor.c:732
-# calendar/gui/event-editor.c:1207
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Aan_passen..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Toolbalken aanpassen"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution.xml.h:5
 msgid "Customize"
 msgstr "Aanpassen"
@@ -8751,12 +9053,12 @@ msgstr "Aanpassen"
 msgid "Customize toolbars"
 msgstr "Toolbalken aanpassen"
 
-# shell/e-shell-view-menu.c:402
+# shell/e-shell-view-menu.c:402
 #: ui/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-# calendar/gui/gncal-todo.c:488
+# calendar/gui/gncal-todo.c:488
 #: ui/evolution.xml.h:8
 msgid "E_xit"
 msgstr "Stop_pen"
@@ -8765,118 +9067,116 @@ msgstr "Stop_pen"
 msgid "Evolution bar _shortcut"
 msgstr "Evolution balk _snelkoppeling"
 
-# calendar/gui/gncal-todo.c:488
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Stoppen"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-# shell/e-shell-view-menu.c:443
-#: ui/evolution.xml.h:12
+# shell/e-shell-view-menu.c:443
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importeer een extern bestandsformaat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hoofd toolbalk"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Geef informatie over Evolution weer"
 
-# shell/e-shell-view-menu.c:422
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "_Mapbalk Tonen"
-
-# shell/e-shell-view-menu.c:419
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "_Snelkoppelingenbalk Tonen"
-
-# shell/e-shell-view-menu.c:457
-#: ui/evolution.xml.h:18
+# shell/e-shell-view-menu.c:457
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Bug Report Insturen"
 
-# shell/e-shell-view-menu.c:457
-#: ui/evolution.xml.h:19
+# shell/e-shell-view-menu.c:457
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-# shell/e-shell-view-menu.c:458
-#: ui/evolution.xml.h:20
+# shell/e-shell-view-menu.c:458
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Report insturen met Bug Buddy."
 
-# shell/e-shell-view-menu.c:423
-#: ui/evolution.xml.h:21
+# shell/e-shell-view-menu.c:423
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mapbalk"
 
-# shell/e-shell-view-menu.c:420
-#: ui/evolution.xml.h:22
+# shell/e-shell-view-menu.c:420
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-# shell/e-shell-view-menu.c:452
-#: ui/evolution.xml.h:23
+# shell/e-shell-view-menu.c:452
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Kont_akt Beheerder"
 
-# shell/e-shell-view-menu.c:449
-#: ui/evolution.xml.h:24
+# shell/e-shell-view-menu.c:449
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
-# shell/e-shell-view-menu.c:446
-#: ui/evolution.xml.h:25
+# shell/e-shell-view-menu.c:446
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "De _Mailer Gebruiken"
 
-# shell/e-shell-view-menu.c:159
-#: ui/evolution.xml.h:26
+# calendar/gui/gnome-month-item.c:737
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Bezig"
+
+# shell/e-shell-view-menu.c:159
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
-# shell/e-shell-view-menu.c:365
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+# shell/e-shell-view-menu.c:365
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Map"
 
-# shell/e-shell-view-menu.c:402
-#: ui/evolution.xml.h:33
+# shell/e-shell-view-menu.c:402
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-# composer/e-msg-composer.c:891
-#: ui/evolution.xml.h:35
+# composer/e-msg-composer.c:891
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importeer bestand..."
 
-# shell/e-shell-view-menu.c:440
-#: ui/evolution.xml.h:36
+# shell/e-shell-view-menu.c:440
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-# shell/e-shell-view-menu.c:375
-#: ui/evolution.xml.h:37
+# shell/e-shell-view-menu.c:375
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Bericht versturen"
 
-# addressbook/printing/e-contact-print.glade.h:12
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nieuwe VMap"
+
+# shell/e-shell-view-menu.c:419
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "In_stellingen:"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "_Verberg de Snelkoppelingenbalk"
 
-# calendar/gui/event-editor.c:1745
+# calendar/gui/event-editor.c:1745
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
@@ -8884,96 +9184,101 @@ msgstr "In_stellingen:"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:387
+# widgets/meeting-time-sel/e-meeting-time-sel.c:387
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Bezig"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:388
+# widgets/meeting-time-sel/e-meeting-time-sel.c:388
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:388
 msgid "Out of Office"
 msgstr "Uit het Kantoor"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 msgid "No Information"
 msgstr "Geen informatie"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:405
+# widgets/meeting-time-sel/e-meeting-time-sel.c:405
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 msgid "_Invite Others..."
 msgstr "Nod_ig anderen uit..."
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:425
+# widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 msgid "_Options"
 msgstr "_Opties"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:442
+# widgets/meeting-time-sel/e-meeting-time-sel.c:442
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:442
 msgid "Show _Only Working Hours"
 msgstr "T_oon alleen werkuren"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:455
+# widgets/meeting-time-sel/e-meeting-time-sel.c:455
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:455
 msgid "Show _Zoomed Out"
 msgstr "Toon Uitge_zoomd"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 msgid "_Update Free/Busy"
 msgstr "_Update Vrij/Druk"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:491
+# widgets/meeting-time-sel/e-meeting-time-sel.c:491
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508
+# widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:522
+# widgets/meeting-time-sel/e-meeting-time-sel.c:522
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:539
+# widgets/meeting-time-sel/e-meeting-time-sel.c:539
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 msgid "_All People and Resources"
 msgstr "_Alle mensen en bronnen"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:552
+# widgets/meeting-time-sel/e-meeting-time-sel.c:552
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:552
 msgid "All _People and One Resource"
 msgstr "Alle _mensen en een bron"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "_Benodigde Mensen"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:578
+# widgets/meeting-time-sel/e-meeting-time-sel.c:578
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:578
 msgid "Required People and _One Resource"
 msgstr "Vereiste mensen en een br_on"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601
+# widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 msgid "Meeting _start time:"
 msgstr "Begintijd _vergadering:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:625
+# widgets/meeting-time-sel/e-meeting-time-sel.c:625
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 msgid "Meeting _end time:"
 msgstr "_Eindtijd vergadering:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738
+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "Huidige Weergave Aanpassen..."
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -8985,41 +9290,88 @@ msgstr "MDWDVZZ"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-# widgets/misc/e-clipped-label.c:106
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-# addressbook/gui/component/addressbook.c:420
-# calendar/gui/calendar-commands.c:544
-#: widgets/misc/e-dateedit.c:407
+# addressbook/gui/component/addressbook.c:420
+# calendar/gui/calendar-commands.c:544
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Nu"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
 #: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
 #: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+# widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+# composer/e-msg-composer-address-dialog.glade.h:9
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Zoeken"
+
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Geavanceerd"
+
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Geavanceerd..."
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Informatie"
 
-# calendar/gui/gnome-month-item.c:737
+# calendar/gui/gnome-month-item.c:737
 #: widgets/misc/e-messagebox.c:148
 msgid "Warning"
 msgstr "Waarschuwing"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7
-# composer/e-msg-composer-attachment.glade.h:9
+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #: widgets/misc/e-messagebox.c:162
 msgid "Question"
 msgstr "Vraag"
@@ -9028,14 +9380,14 @@ msgstr "Vraag"
 msgid "Message"
 msgstr "Bericht"
 
-# composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:942
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:213
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-# composer/e-msg-composer-address-dialog.glade.h:9
-#: widgets/misc/e-search-bar.c:135
+# composer/e-msg-composer-address-dialog.glade.h:9
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "_Zoeken"
 
@@ -9065,14 +9417,343 @@ msgstr "init_corba: kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "De Evolution werkgroep suite"
+#~ msgid "Disabled"
+#~ msgstr "Uitgezet"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronizeren"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopiëren Uit Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopiëren Naar Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mengen Uit Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mengen Naar Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Originele Auteur:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolution Adresboek Kanaal"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution adresboek kanaal.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Actie Synchronizeren"
+
+#~ msgid "Conduit state"
+#~ msgstr "Kanaal status"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Niet verbonden met de gnome-pilot daemon"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Configureer het adres kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Evolution Adres kanaal"
+
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution Kalender Kanaal"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Configureer het GnomeCal kanaal"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Evolution Kalender kanaal"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Configureer het to-do kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Evolution ToDo kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution ToDo Kanaal"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution to-do kanaal.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
+
+#~ msgid "Schedule meeting"
+#~ msgstr "Afspraak Plannen"
+
+# calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+# calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
+#~ msgid "Edit this appointment..."
+#~ msgstr "Bewerk deze afspraak..."
+
+# widgets/e-table/e-table-group.glade.h:9
+#~ msgid "label21"
+#~ msgstr "label21"
+
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Synchronising IMAP folder"
+#~ msgstr "Bezig met Synchronizeren IMAP map"
+
+# composer/e-msg-composer-hdrs.c:217
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Geef de identiteit waarvan je dit bericht wilt versturen"
+
+# composer/e-msg-composer-hdrs.c:235
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Geef het onderwerp van het bericht"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Bewerk VMap Regel"
+
+#~ msgid "incoming"
+#~ msgstr "inkomend"
+
+# calendar/gui/calendar-commands.c:56
+#~ msgid "outgoing"
+#~ msgstr "uitgaand"
+
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
+#~ msgid "Deleted"
+#~ msgstr "Verwijderd"
+
+#~ msgid "Draft"
+#~ msgstr "Klad"
+
+#~ msgid "Set Flag"
+#~ msgstr "Stel Vlag in"
+
+#~ msgid "matches regex"
+#~ msgstr "is gelijk aan reguliere expressie"
+
+# mail/mail-config.c:1490
+#~ msgid "Add Rule"
+#~ msgstr "Regel Toevoegen"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "VMap Regel Toevoegen"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Bewerk VMap Regel"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Bericht of onderwerp bevat"
+
+#~ msgid "Body contains"
+#~ msgstr "Bericht bevat"
+
+# mail/message-list.c:495
+#~ msgid "Subject contains"
+#~ msgstr "Onderwerp bevat"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Bericht bevat niet"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Onderwerp bevat niet"
+
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#~ msgid "Sender contains"
+#~ msgstr "Afzender bevat"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importeert mbox bestanden naar Evolution"
+
+# composer/e-msg-composer-attachment.glade.h:7
+#~ msgid "Account Properties"
+#~ msgstr "Account Eigenschappen"
+
+# mail/mail-config.c:305
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-Mail Adres:"
+
+#~ msgid "Include in \"Get Mail\" operations."
+#~ msgstr "Opnemen in \"Get Mail\" bewerkingen."
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Inkomende E-Mail Server"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Andere"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Uitgaande E-Mail Server"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#~ msgid "Servers"
+#~ msgstr "Servers"
+
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan locatie `%s' niet openen:\n"
+#~ "%s"
+
+# mail/folder-browser-factory.c:95
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_Adresboek Configuratie..."
+
+# addressbook/gui/component/addressbook.c:425
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Druk Kontakten af..."
+
+# calendar/gui/calendar-commands.c:659
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Kalender Instellingen..."
+
+# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#~ msgid "_Print this calendar"
+#~ msgstr "_Druk deze kalender af"
+
+#~ msgid "Create Rule"
+#~ msgstr "Maak Regel"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filteren op Afzender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filteren op Geadresseerden"
+
+# mail/folder-browser-factory.c:29
+#~ msgid "Get Mail"
+#~ msgstr "Post Ophalen"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "_Markeer Als Gelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markeer Als _Ongelezen"
+
+# calendar/gui/print.c:1249
+#~ msgid "Print Preview of message..."
+#~ msgstr "Afdrukvoorbeeld van bericht..."
+
+#~ msgid "Print message..."
+#~ msgstr "Bericht afdrukken..."
+
+# mail/folder-browser-factory.c:35
+#~ msgid "Reply to _Sender"
+#~ msgstr "Af_zender beantwoorden"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Geef _Alle Berichten weer"
+
+# shell/e-shell-view-menu.c:402
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Configureer Map..."
+
+# composer/e-msg-composer.c:894
+#~ msgid "_Edit Message"
+#~ msgstr "Bericht _Bewerken"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filteren op Onderwerp"
+
+# mail/folder-browser-factory.c:95
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mail Configuratie..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Openen in Nieuw Venster"
+
+#~ msgid "_Print Message"
+#~ msgstr "Bericht A_fdrukken"
+
+# composer/e-msg-composer.c:463
+#~ msgid "_Save Message As..."
+#~ msgstr "Bericht Op_slaan als..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VMap op Onderwerp"
+
+# shell/e-shell-view-menu.c:398
+#~ msgid "New"
+#~ msgstr "Nieuw"
+
+# addressbook/contact-editor/e-contact-editor.c:732
+# calendar/gui/event-editor.c:1207
+#~ msgid "Customi_ze..."
+#~ msgstr "Aan_passen..."
+
+# shell/e-shell-view-menu.c:422
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "_Mapbalk Tonen"
+
+# shell/e-shell-view-menu.c:419
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "_Snelkoppelingenbalk Tonen"
+
+# addressbook/printing/e-contact-print.glade.h:12
+#~ msgid "_Settings"
+#~ msgstr "In_stellingen:"
 
 #~ msgid "Reflow Test"
 #~ msgstr "Reflow Test"
 
-# shell/e-shell-view-menu.c:161
+# shell/e-shell-view-menu.c:161
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
@@ -9089,21 +9770,18 @@ msgstr "De Evolution werkgroep suite"
 #~ "Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
 #~ "het opslaan van post op de lokale schijf."
 
-#~ msgid "No such message: %s"
-#~ msgstr "Een dergelijk bericht bestaat niet"
-
 #~ msgid "Connect to server"
 #~ msgstr "Kon niet verbinden met POP server op %s."
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
 
-# mail/main.c:62
+# mail/main.c:62
 #~ msgid "Notes Component: Could not initialize bonobo"
 #~ msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
 
-# addressbook/contact-editor/fullname-strings.h:13
+# addressbook/contact-editor/fullname-strings.h:13
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -9117,7 +9795,7 @@ msgstr "De Evolution werkgroep suite"
 #~ "Mvr.\n"
 #~ "Dr.\n"
 
-# addressbook/contact-editor/fullname-strings.h:18
+# addressbook/contact-editor/fullname-strings.h:18
 #~ msgid ""
 #~ "\n"
 #~ "Sr.\n"
@@ -9138,9 +9816,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Open..."
 #~ msgstr "_Openen"
 
-#~ msgid "Open the task"
-#~ msgstr "Open de taak"
-
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Lokale opslag locaties hebben geen standaard map"
 
@@ -9169,24 +9844,20 @@ msgstr "De Evolution werkgroep suite"
 #~ "Kon bestand %s niet openen:\n"
 #~ "%s"
 
-# shell/e-shell-view-menu.c:404
+# shell/e-shell-view-menu.c:404
 #~ msgid "Registering local folder"
 #~ msgstr "Bezig met registreren lokale map"
 
-# shell/e-shell-view-menu.c:404
-#~ msgid "Register local folder"
-#~ msgstr "Registreren lokale map"
-
 #~ msgid ""
 #~ "Unable to register folder '%s':\n"
 #~ "%s"
 #~ msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
 
-# mail/mail-ops.c:374
+# mail/mail-ops.c:374
 #~ msgid "Fetching email from %s"
 #~ msgstr "Bezig met ophalen post van %s"
 
-# mail/mail-ops.c:374
+# mail/mail-ops.c:374
 #~ msgid "Fetch email from %s"
 #~ msgstr "Post ophalen van %s"
 
@@ -9220,8 +9891,8 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Copy messages from \"%s\" into \"%s\""
 #~ msgstr "Kopiëer berichten van \"%s\" naar \"%s\""
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7
-# composer/e-msg-composer-attachment.glade.h:9
+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #~ msgid "(No description)"
 #~ msgstr "(Geen beschrijving)"
 
@@ -9245,20 +9916,20 @@ msgstr "De Evolution werkgroep suite"
 #~ "Fout tijdens `%s':\n"
 #~ "%s"
 
-# mail/mail-threads.c:623
+# mail/mail-threads.c:623
 #~ msgid "Error reading commands from dispatching thread."
 #~ msgstr ""
 #~ "Fout tijdens het lezen van commando's van het verzendende parallele proces"
 
-# mail/mail-threads.c:712
+# mail/mail-threads.c:712
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Verminkt bericht van het verzend parallel proces?"
 
-# mail/mail-threads.c:814
+# mail/mail-threads.c:814
 #~ msgid "Could not create dialog box."
 #~ msgstr "Kon dialoog venster niet aanmaken."
 
-# mail/mail-threads.c:849
+# mail/mail-threads.c:849
 #~ msgid "User cancelled query."
 #~ msgstr "Gebruiker heeft vraag afgebroken."
 
@@ -9274,7 +9945,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Bezig met ophalen bericht %d van %d"
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #~ msgid "Writing message %d of %d"
 #~ msgstr "Bezig met wegschrijven bericht %d van %d"
 
@@ -9290,267 +9961,262 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Afmelden bij map \"%s\""
 
-# addressbook/contact-editor/e-contact-editor.c:643
-# calendar/gui/event-editor.c:1118
+# addressbook/contact-editor/e-contact-editor.c:643
+# calendar/gui/event-editor.c:1118
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "FIXME: _Afspraak"
 
-# addressbook/contact-editor/e-contact-editor.c:644
-# calendar/gui/event-editor.c:1119
+# addressbook/contact-editor/e-contact-editor.c:644
+# calendar/gui/event-editor.c:1119
 #~ msgid "FIXME: Meeting Re_quest"
 #~ msgstr "FIXME: Verzoek tot Vergadering"
 
-# addressbook/contact-editor/e-contact-editor.c:646
-# calendar/gui/event-editor.c:1121
+# addressbook/contact-editor/e-contact-editor.c:646
+# calendar/gui/event-editor.c:1121
 #~ msgid "FIXME: _Mail Message"
 #~ msgstr "FIXME: _Mail bericht"
 
-# addressbook/contact-editor/e-contact-editor.c:647
-# calendar/gui/event-editor.c:1122
+# addressbook/contact-editor/e-contact-editor.c:647
+# calendar/gui/event-editor.c:1122
 #~ msgid "FIXME: _Contact"
 #~ msgstr "FIXME: _Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:648
-# calendar/gui/event-editor.c:1123
+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: _Task"
 #~ msgstr "FIXME: _Taak"
 
-# addressbook/contact-editor/e-contact-editor.c:649
-# calendar/gui/event-editor.c:1124
+# addressbook/contact-editor/e-contact-editor.c:649
+# calendar/gui/event-editor.c:1124
 #~ msgid "FIXME: Task _Request"
 #~ msgstr "FIXME: Taak Verzoek"
 
-# addressbook/contact-editor/e-contact-editor.c:650
-# calendar/gui/event-editor.c:1125
+# addressbook/contact-editor/e-contact-editor.c:650
+# calendar/gui/event-editor.c:1125
 #~ msgid "FIXME: _Journal Entry"
 #~ msgstr "FIXME: Dagboek Item"
 
-# addressbook/contact-editor/e-contact-editor.c:651
-# calendar/gui/event-editor.c:1126
+# addressbook/contact-editor/e-contact-editor.c:651
+# calendar/gui/event-editor.c:1126
 #~ msgid "FIXME: _Note"
 #~ msgstr "FIXME: Aanteke_ning"
 
-# addressbook/contact-editor/e-contact-editor.c:653
-# addressbook/contact-editor/e-contact-editor.c:758
-# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+# addressbook/contact-editor/e-contact-editor.c:653
+# addressbook/contact-editor/e-contact-editor.c:758
+# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
 #~ msgid "FIXME: Ch_oose Form..."
 #~ msgstr "FIXME: Seleecteer F_ormulier"
 
-# addressbook/contact-editor/e-contact-editor.c:658
-# calendar/gui/event-editor.c:1133
+# addressbook/contact-editor/e-contact-editor.c:658
+# calendar/gui/event-editor.c:1133
 #~ msgid "FIXME: _Memo Style"
 #~ msgstr "FIXME: _Memo Stijl"
 
-# addressbook/contact-editor/e-contact-editor.c:660
-# calendar/gui/event-editor.c:1135
+# addressbook/contact-editor/e-contact-editor.c:660
+# calendar/gui/event-editor.c:1135
 #~ msgid "FIXME: Define Print _Styles..."
 #~ msgstr "FIXME: Definiëer Print _Stijlen..."
 
-# addressbook/contact-editor/e-contact-editor.c:667
-# calendar/gui/event-editor.c:1142
+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #~ msgid "FIXME: S_end"
 #~ msgstr "FIXME: V_ersturen"
 
-# calendar/gui/event-editor.c:1333
+# calendar/gui/event-editor.c:1333
 #~ msgid "FIXME: Save Attac_hments..."
 #~ msgstr "FIXME: Aanhangels Opslaan..."
 
-# addressbook/contact-editor/e-contact-editor.c:674
-# calendar/gui/event-editor.c:1149
+# addressbook/contact-editor/e-contact-editor.c:674
+# calendar/gui/event-editor.c:1149
 #~ msgid "FIXME: _Move to Folder..."
 #~ msgstr "FIXME: Verplaats naar Folder..."
 
-# addressbook/contact-editor/e-contact-editor.c:675
-# calendar/gui/event-editor.c:1150
+# addressbook/contact-editor/e-contact-editor.c:675
+# calendar/gui/event-editor.c:1150
 #~ msgid "FIXME: Cop_y to Folder..."
 #~ msgstr "FIXME: Kopieer naar Folder..."
 
-# addressbook/contact-editor/e-contact-editor.c:677
-# calendar/gui/event-editor.c:1152
+# addressbook/contact-editor/e-contact-editor.c:677
+# calendar/gui/event-editor.c:1152
 #~ msgid "Page Set_up"
 #~ msgstr "Pagina instellingen"
 
-# addressbook/contact-editor/e-contact-editor.c:678
-# calendar/gui/event-editor.c:1153
+# addressbook/contact-editor/e-contact-editor.c:678
+# calendar/gui/event-editor.c:1153
 #~ msgid "FIXME: Print Pre_view"
 #~ msgstr "FIXME: Afdruk_voorbeeld"
 
-# addressbook/contact-editor/e-contact-editor.c:699
-# calendar/gui/event-editor.c:1174
+# addressbook/contact-editor/e-contact-editor.c:699
+# calendar/gui/event-editor.c:1174
 #~ msgid "FIXME: Paste _Special..."
 #~ msgstr "FIXME: Plakken _Speciaal..."
 
-# addressbook/contact-editor/e-contact-editor.c:704
-# calendar/gui/event-editor.c:1179
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
 #~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "Markeer Als Ongelezen"
 
-# addressbook/contact-editor/e-contact-editor.c:708
-# calendar/gui/event-editor.c:1183
+# addressbook/contact-editor/e-contact-editor.c:708
+# calendar/gui/event-editor.c:1183
 #~ msgid "_Object"
 #~ msgstr "_Object"
 
-# addressbook/contact-editor/e-contact-editor.c:713
-# addressbook/contact-editor/e-contact-editor.c:720
-# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+# addressbook/contact-editor/e-contact-editor.c:713
+# addressbook/contact-editor/e-contact-editor.c:720
+# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
 #~ msgid "FIXME: _Item"
 #~ msgstr "FIXME: _Item"
 
-# addressbook/contact-editor/e-contact-editor.c:714
-# addressbook/contact-editor/e-contact-editor.c:721
-# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+# addressbook/contact-editor/e-contact-editor.c:714
+# addressbook/contact-editor/e-contact-editor.c:721
+# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
 #~ msgid "FIXME: _Unread Item"
 #~ msgstr "FIXME: Ongelezen Item"
 
-# addressbook/contact-editor/e-contact-editor.c:727
-# calendar/gui/event-editor.c:1202
+# addressbook/contact-editor/e-contact-editor.c:727
+# calendar/gui/event-editor.c:1202
 #~ msgid "FIXME: _Standard"
 #~ msgstr "FIXME: _Standaard"
 
-# addressbook/contact-editor/e-contact-editor.c:729
-# calendar/gui/event-editor.c:1204
+# addressbook/contact-editor/e-contact-editor.c:729
+# calendar/gui/event-editor.c:1204
 #~ msgid "FIXME: __Formatting"
 #~ msgstr "FIXME: Opmaak"
 
-# addressbook/contact-editor/e-contact-editor.c:738
-# calendar/gui/event-editor.c:1213
+# addressbook/contact-editor/e-contact-editor.c:738
+# calendar/gui/event-editor.c:1213
 #~ msgid "Ne_xt"
 #~ msgstr "Volgende"
 
-# addressbook/contact-editor/e-contact-editor.c:740
-# calendar/gui/event-editor.c:1217
+# addressbook/contact-editor/e-contact-editor.c:740
+# calendar/gui/event-editor.c:1217
 #~ msgid "_Toolbars"
 #~ msgstr "_Werkbalk"
 
-# addressbook/contact-editor/e-contact-editor.c:745
-# calendar/gui/event-editor.c:1222
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
 #~ msgid "FIXME: _File..."
 #~ msgstr "FIXME: Bestand..."
 
-# addressbook/contact-editor/e-contact-editor.c:746
-# calendar/gui/event-editor.c:1223
+# addressbook/contact-editor/e-contact-editor.c:746
+# calendar/gui/event-editor.c:1223
 #~ msgid "FIXME: It_em..."
 #~ msgstr "FIXME: It_em..."
 
-# addressbook/contact-editor/e-contact-editor.c:747
-# calendar/gui/event-editor.c:1224
+# addressbook/contact-editor/e-contact-editor.c:747
+# calendar/gui/event-editor.c:1224
 #~ msgid "FIXME: _Object..."
 #~ msgstr "FIXME: _Object..."
 
-# addressbook/contact-editor/e-contact-editor.c:752
-# calendar/gui/event-editor.c:1229
+# addressbook/contact-editor/e-contact-editor.c:752
+# calendar/gui/event-editor.c:1229
 #~ msgid "FIXME: _Font..."
 #~ msgstr "FIXME: _Font..."
 
-# addressbook/contact-editor/e-contact-editor.c:753
-# calendar/gui/event-editor.c:1230
+# addressbook/contact-editor/e-contact-editor.c:753
+# calendar/gui/event-editor.c:1230
 #~ msgid "FIXME: _Paragraph..."
 #~ msgstr "FIXME: _Paragraaf..."
 
-# addressbook/contact-editor/e-contact-editor.c:760
-# calendar/gui/event-editor.c:1237
+# addressbook/contact-editor/e-contact-editor.c:760
+# calendar/gui/event-editor.c:1237
 #~ msgid "FIXME: Desi_gn This Form"
 #~ msgstr "FIXME: Ontwerp dit Formulier"
 
-# addressbook/contact-editor/e-contact-editor.c:761
-# calendar/gui/event-editor.c:1238
+# addressbook/contact-editor/e-contact-editor.c:761
+# calendar/gui/event-editor.c:1238
 #~ msgid "FIXME: D_esign a Form..."
 #~ msgstr "FIXME: Ontw_erp een Formulier..."
 
-# addressbook/contact-editor/e-contact-editor.c:763
-# calendar/gui/event-editor.c:1240
+# addressbook/contact-editor/e-contact-editor.c:763
+# calendar/gui/event-editor.c:1240
 #~ msgid "FIXME: Publish _Form..."
 #~ msgstr "FIXME: Publiceer een _Formulier..."
 
-# addressbook/contact-editor/e-contact-editor.c:764
-# calendar/gui/event-editor.c:1241
+# addressbook/contact-editor/e-contact-editor.c:764
+# calendar/gui/event-editor.c:1241
 #~ msgid "FIXME: Pu_blish Form As..."
 #~ msgstr "FIXME: Pu_bliceer een Formulier als..."
 
-# addressbook/contact-editor/e-contact-editor.c:766
-# calendar/gui/event-editor.c:1243
+# addressbook/contact-editor/e-contact-editor.c:766
+# calendar/gui/event-editor.c:1243
 #~ msgid "FIXME: Script _Debugger"
 #~ msgstr "FIXME: Script _Debugger"
 
-# addressbook/contact-editor/e-contact-editor.c:771
-# calendar/gui/event-editor.c:1248
+# addressbook/contact-editor/e-contact-editor.c:771
+# calendar/gui/event-editor.c:1248
 #~ msgid "FIXME: _Spelling..."
 #~ msgstr "FIXME: _Spelling..."
 
-# addressbook/contact-editor/e-contact-editor.c:773
-# calendar/gui/event-editor.c:1253
+# addressbook/contact-editor/e-contact-editor.c:773
+# calendar/gui/event-editor.c:1253
 #~ msgid "_Forms"
 #~ msgstr "_Formulier"
 
-# addressbook/contact-editor/e-contact-editor.c:778
+# addressbook/contact-editor/e-contact-editor.c:778
 #~ msgid "FIXME: _New Contact"
 #~ msgstr "FIXME: _Nieuw Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:779
+# addressbook/contact-editor/e-contact-editor.c:779
 #~ msgid "FIXME: New _Contact from Same Company"
 #~ msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor.c:781
+# addressbook/contact-editor/e-contact-editor.c:781
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Nieuwe Brief naar Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:781
+# addressbook/contact-editor/e-contact-editor.c:781
 #~ msgid "FIXME: New _Message to Contact"
 #~ msgstr "FIXME: Nieuwe Brief naar Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:783
+# addressbook/contact-editor/e-contact-editor.c:783
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nieuwe Afspraak met Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:784
+# addressbook/contact-editor/e-contact-editor.c:784
 #~ msgid "FIXME: _Plan a Meeting..."
 #~ msgstr "FIXME: Een Afspraak _Plannen..."
 
-# addressbook/contact-editor/e-contact-editor.c:785
+# addressbook/contact-editor/e-contact-editor.c:785
 #~ msgid "FIXME: New _Task for Contact"
 #~ msgstr "FIXME: Nieuwe _Taak for contact"
 
-# addressbook/contact-editor/e-contact-editor.c:786
+# addressbook/contact-editor/e-contact-editor.c:786
 #~ msgid "FIXME: New _Journal Entry for Contact"
 #~ msgstr "FIXME: Nieuwe Dagboek "
 
-# addressbook/contact-editor/e-contact-editor.c:788
+# addressbook/contact-editor/e-contact-editor.c:788
 #~ msgid "FIXME: _Flag for Follow Up..."
 #~ msgstr "FIXME: _Vlag voor Vervolg..."
 
-# addressbook/contact-editor/e-contact-editor.c:789
+# addressbook/contact-editor/e-contact-editor.c:789
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: Toon Folder met Adressen"
 
-# addressbook/contact-editor/e-contact-editor.c:790
+# addressbook/contact-editor/e-contact-editor.c:790
 #~ msgid "FIXME: _Open Web Page"
 #~ msgstr "FIXME: Pagina Bekijken"
 
-# addressbook/contact-editor/e-contact-editor.c:792
+# addressbook/contact-editor/e-contact-editor.c:792
 #~ msgid "FIXME: Forward as _vCard"
 #~ msgstr "FIXME: Doorsturen als _vCard"
 
-# addressbook/contact-editor/e-contact-editor.c:793
-# calendar/gui/event-editor.c:1266
+# addressbook/contact-editor/e-contact-editor.c:793
+# calendar/gui/event-editor.c:1266
 #~ msgid "FIXME: For_ward"
 #~ msgstr "FIXME: Doorsturen"
 
-# addressbook/contact-editor/e-contact-editor.c:805
-# calendar/gui/event-editor.c:1279
-#~ msgid "_Insert"
-#~ msgstr "_Invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:856
-# calendar/gui/event-editor.c:1339
+# addressbook/contact-editor/e-contact-editor.c:856
+# calendar/gui/event-editor.c:1339
 #~ msgid "FIXME: Previous"
 #~ msgstr "FIXME: Vorige"
 
-# addressbook/contact-editor/e-contact-editor.c:859
-# calendar/gui/event-editor.c:1341
+# addressbook/contact-editor/e-contact-editor.c:859
+# calendar/gui/event-editor.c:1341
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Volgende"
 
-# widgets/shortcut-bar/e-group-bar.c:632
+# widgets/shortcut-bar/e-group-bar.c:632
 #~ msgid "Group %i"
 #~ msgstr "Group %i"
 
@@ -9560,27 +10226,27 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "task-editor-dialog"
 #~ msgstr "taak-bewerkings-dialoogvenster"
 
-# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
+# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
 #~ msgid "Days"
 #~ msgstr "Dagen"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #~ msgid "Hours"
 #~ msgstr "Uren"
 
-# mail/mail-config.c:1199
+# mail/mail-config.c:1199
 #~ msgid "Mail _to:"
 #~ msgstr "Post _naar:"
 
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
 #~ msgid "Minutes"
 #~ msgstr "Minuten"
 
-# calendar/gui/gncal-todo.c:428
+# calendar/gui/gncal-todo.c:428
 #~ msgid "Time"
 #~ msgstr "Resterende tijd"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:7
+# addressbook/contact-editor/e-contact-editor-strings.h:7
 #~ msgid "_Audio"
 #~ msgstr "_Geluid"
 
@@ -9593,9 +10259,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "event-editor-dialog"
 #~ msgstr "gebeurtenis-bewerkings-dialoog"
 
-#~ msgid "Server disconnected."
-#~ msgstr "Server verbrak de verbinding."
-
 #~ msgid "UNIX MH-format mail directories (CamelLocal version)"
 #~ msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
 
@@ -9608,26 +10271,26 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Show all hidden"
 #~ msgstr "Allen Weergeven"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #~ msgid "Hide selected"
 #~ msgstr "Verwijderd"
 
-# addressbook/contact-editor/e-contact-editor.c:852
-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-# mail/folder-browser-factory.c:45
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #~ msgid "Hide deleted"
 #~ msgstr "Verwijderd"
 
-# mail/message-list.c:495
+# mail/message-list.c:495
 #~ msgid "Hide Subject"
 #~ msgstr "Onderwerp"
 
 #~ msgid "Hide from Sender"
 #~ msgstr "Filter op Afzender"
 
-# mail/message-list.c:495
+# mail/message-list.c:495
 #~ msgid "Hide Subject \"%s\""
 #~ msgstr "Onderwerp is %s"
 
@@ -9637,18 +10300,15 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Congratulations, your mail configuration is complete.\n"
 #~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-# mail/folder-browser-factory.c:34
+# mail/folder-browser-factory.c:34
 #~ msgid "Reply-to:"
 #~ msgstr "Antwoord-naar:"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
 #~ msgid "Server Timeouts"
 #~ msgstr "Server Type: "
 
-# mail/mail-config.c:262
+# mail/mail-config.c:262
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
 #~ "optionally, enter the name of your organization, and the name of a file to "
@@ -9658,34 +10318,30 @@ msgstr "De Evolution werkgroep suite"
 #~ "het het bedrijf oppgeven, en de naam van het bestand waar je signature in "
 #~ "staat."
 
-# mail/mail-config.c:277
+# mail/mail-config.c:277
 #~ msgid "Full name:"
 #~ msgstr "Volledige naam:"
 
-# mail/mail-config.c:305
-#~ msgid "Email address:"
-#~ msgstr "E-mail adres:"
-
-# mail/mail-config.c:345
+# mail/mail-config.c:345
 #~ msgid "Signature File"
 #~ msgstr "Signatuur Bestand"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-# mail/mail-config.c:751 mail/mail-config.c:831
+# mail/mail-config.c:751 mail/mail-config.c:831
 #~ msgid "Detect supported types..."
 #~ msgstr "Detecteer ondersteunde types..."
 
 #~ msgid "Don't delete messages from server"
 #~ msgstr "Verwijder de berichten niet van de server"
 
-# mail/mail-config.c:1220
+# mail/mail-config.c:1220
 #~ msgid "Mail source type:"
 #~ msgstr "Post bron type:"
 
-# mail/mail-config.c:960
+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9698,12 +10354,12 @@ msgstr "De Evolution werkgroep suite"
 #~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
 #~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10
-# addressbook/contact-editor/e-contact-editor-strings.h:12
+# addressbook/contact-editor/e-contact-editor-strings.h:10
+# addressbook/contact-editor/e-contact-editor-strings.h:12
 #~ msgid "News source type:"
 #~ msgstr "Nieuws bron type:"
 
-# mail/mail-config.c:960
+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of news server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9716,11 +10372,11 @@ msgstr "De Evolution werkgroep suite"
 #~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
 #~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
 
-# mail/mail-config.c:1220
+# mail/mail-config.c:1220
 #~ msgid "Mail transport type:"
 #~ msgstr "Mail transport type:"
 
-# mail/mail-config.c:960
+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9732,23 +10388,23 @@ msgstr "De Evolution werkgroep suite"
 #~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
 #~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
 
-# mail/mail-config.c:1345
+# mail/mail-config.c:1345
 #~ msgid "Add Identity"
 #~ msgstr "Identiteit Toevoegen"
 
-# mail/mail-config.c:1343
+# mail/mail-config.c:1343
 #~ msgid "Edit Identity"
 #~ msgstr "Identiteit Bewerken"
 
-# mail/mail-config.c:1488
+# mail/mail-config.c:1488
 #~ msgid "Edit Source"
 #~ msgstr "Bron Bewerken"
 
-# mail/mail-config.c:1658
+# mail/mail-config.c:1658
 #~ msgid "Add News Server"
 #~ msgstr "Nieuwe Nieuws Server Toevoegen"
 
-# mail/mail-config.c:1656
+# mail/mail-config.c:1656
 #~ msgid "Edit News Server"
 #~ msgstr "Bewerk Nieuws Server"
 
@@ -9764,23 +10420,23 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Query authorization at \"%s\""
 #~ msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
-# mail/mail-config.c:1180
+# mail/mail-config.c:1180
 #~ msgid "Identities"
 #~ msgstr "Identiteiten"
 
-# mail/mail-config.c:1199
+# mail/mail-config.c:1199
 #~ msgid "Mail Sources"
 #~ msgstr "Post Bronnen"
 
-# mail/mail-config.c:1220
+# mail/mail-config.c:1220
 #~ msgid "Mail Transport"
 #~ msgstr "Post Transport"
 
-# mail/mail-config.c:1658
+# mail/mail-config.c:1658
 #~ msgid "News Servers"
 #~ msgstr "Nieuws Servers"
 
-# mail/mail-config.c:1490
+# mail/mail-config.c:1490
 #~ msgid "News Sources"
 #~ msgstr "Nieuws Bronnen"
 
@@ -9791,253 +10447,249 @@ msgstr "De Evolution werkgroep suite"
 #~ msgstr ""
 #~ "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
 
-# calendar/gui/calendar-commands.c:664
+# calendar/gui/calendar-commands.c:664
 #~ msgid "Open a calendar"
 #~ msgstr "Open een kalender"
 
-# calendar/gui/event-editor.c:1250
+# calendar/gui/event-editor.c:1250
 #~ msgid "FIXME: Chec_k Names"
 #~ msgstr "FIXME: Controleer Namen"
 
-# addressbook/contact-editor/e-contact-editor.c:862
-# calendar/gui/event-editor.c:1343
+# addressbook/contact-editor/e-contact-editor.c:862
+# calendar/gui/event-editor.c:1343
 #~ msgid "FIXME: Help"
 #~ msgstr "FIXME: Help"
 
-# addressbook/contact-editor/e-contact-editor.c:648
-# calendar/gui/event-editor.c:1123
+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: In_complete Task"
 #~ msgstr "FIXME: Niet complete taak"
 
-# addressbook/contact-editor/e-contact-editor.c:848
-# calendar/gui/event-editor.c:1327
+# addressbook/contact-editor/e-contact-editor.c:848
+# calendar/gui/event-editor.c:1327
 #~ msgid "FIXME: Insert File"
 #~ msgstr "FIXME: Bestand Bijvoegen"
 
-# calendar/gui/event-editor.c:1260
+# calendar/gui/event-editor.c:1260
 #~ msgid "FIXME: Rec_urrence..."
 #~ msgstr "FIXME: _Herhaling..."
 
-# addressbook/contact-editor/e-contact-editor.c:729
-# calendar/gui/event-editor.c:1204
+# addressbook/contact-editor/e-contact-editor.c:729
+# calendar/gui/event-editor.c:1204
 #~ msgid "FIXME: _Formatting"
 #~ msgstr "FIXME: _Opmaak"
 
-# calendar/gui/event-editor.c:1258
+# calendar/gui/event-editor.c:1258
 #~ msgid "FIXME: _New Appointment"
 #~ msgstr "FIXME: _Nieuwe Afspraak"
 
 #~ msgid "Find _Again"
 #~ msgstr "Opnieuw _Vinden"
 
-# addressbook/gui/component/addressbook.c:424
+# addressbook/gui/component/addressbook.c:424
 #~ msgid "_Find..."
 #~ msgstr "_Vind..."
 
-# addressbook/contact-editor/e-contact-editor.c:1294
+# addressbook/contact-editor/e-contact-editor.c:1294
 #~ msgid "_Redo"
 #~ msgstr "_Herhalen"
 
-# composer/e-msg-composer.c:463
+# composer/e-msg-composer.c:463
 #~ msgid "_Replace..."
 #~ msgstr "Ve_rvangen..."
 
-# composer/e-msg-composer.c:948
+# composer/e-msg-composer.c:948
 #~ msgid "_Undo"
 #~ msgstr "_Ongedaan maken"
 
-# mail/mail-config.c:1490
+# mail/mail-config.c:1490
 #~ msgid "_Source"
 #~ msgstr "_Bron"
 
-# addressbook/contact-editor/categories-strings.h:9
+# addressbook/contact-editor/categories-strings.h:9
 #~ msgid "Available Categories:"
 #~ msgstr "Beschikbare Categorieën:"
 
 #~ msgid "External Directories"
 #~ msgstr "Externe Directories"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:9
+# addressbook/gui/component/ldap-server-dialog.glade.h:9
 #~ msgid "Port Number:"
 #~ msgstr "Poort:"
 
-# calendar/gui/calendar-commands.c:56
+# calendar/gui/calendar-commands.c:56
 #~ msgid "Outline:"
 #~ msgstr "Buitenlijn:"
 
-# calendar/gui/calendar-commands.c:57
+# calendar/gui/calendar-commands.c:57
 #~ msgid "Headings:"
 #~ msgstr "Koppen:"
 
-# calendar/gui/calendar-commands.c:58
-#~ msgid "Empty days:"
-#~ msgstr "Lege dagen:"
-
-# calendar/gui/calendar-commands.c:60
+# calendar/gui/calendar-commands.c:60
 #~ msgid "Highlighted day:"
 #~ msgstr "Gemarkeerde dag:"
 
-# calendar/gui/calendar-commands.c:61
+# calendar/gui/calendar-commands.c:61
 #~ msgid "Day numbers:"
 #~ msgstr "Dag nummers:"
 
-# calendar/gui/calendar-commands.c:62
+# calendar/gui/calendar-commands.c:62
 #~ msgid "Current day's number:"
 #~ msgstr "Nummer van vandaag:"
 
-# calendar/gui/calendar-commands.c:63
+# calendar/gui/calendar-commands.c:63
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "To-Do item dat nog niet verlopen is:"
 
-# calendar/gui/calendar-commands.c:64
+# calendar/gui/calendar-commands.c:64
 #~ msgid "To-Do item that is due today:"
 #~ msgstr "To-Do item dat vandaag af moet:"
 
-# calendar/gui/calendar-commands.c:65
+# calendar/gui/calendar-commands.c:65
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "To-Do item dat af moest zijn:"
 
-# calendar/gui/getdate.y:395
+# calendar/gui/getdate.y:395
 #~ msgid "may"
 #~ msgstr "may"
 
-# calendar/gui/getdate.y:400
+# calendar/gui/getdate.y:400
 #~ msgid "sept"
 #~ msgstr "sept"
 
-# calendar/gui/getdate.y:404
+# calendar/gui/getdate.y:404
 #~ msgid "sunday"
 #~ msgstr "zondag"
 
-# calendar/gui/getdate.y:405
+# calendar/gui/getdate.y:405
 #~ msgid "monday"
 #~ msgstr "maandag"
 
-# calendar/gui/getdate.y:406
+# calendar/gui/getdate.y:406
 #~ msgid "tuesday"
 #~ msgstr "dinsdag"
 
-# calendar/gui/getdate.y:407
+# calendar/gui/getdate.y:407
 #~ msgid "tues"
 #~ msgstr "di"
 
-# calendar/gui/getdate.y:408
+# calendar/gui/getdate.y:408
 #~ msgid "wednesday"
 #~ msgstr "woensdag"
 
-# calendar/gui/getdate.y:409
+# calendar/gui/getdate.y:409
 #~ msgid "wednes"
 #~ msgstr "woe"
 
-# calendar/gui/getdate.y:410
+# calendar/gui/getdate.y:410
 #~ msgid "thursday"
 #~ msgstr "donderdag"
 
-# calendar/gui/getdate.y:411
+# calendar/gui/getdate.y:411
 #~ msgid "thur"
 #~ msgstr "do"
 
-# calendar/gui/getdate.y:412
+# calendar/gui/getdate.y:412
 #~ msgid "thurs"
 #~ msgstr "don"
 
-# calendar/gui/getdate.y:413
+# calendar/gui/getdate.y:413
 #~ msgid "friday"
 #~ msgstr "vrijdag"
 
-# calendar/gui/getdate.y:414
+# calendar/gui/getdate.y:414
 #~ msgid "saturday"
 #~ msgstr "zaterdag"
 
-# calendar/gui/getdate.y:422
+# calendar/gui/getdate.y:422
 #~ msgid "fortnight"
 #~ msgstr "twee weken"
 
-# calendar/gui/getdate.y:427
+# calendar/gui/getdate.y:427
 #~ msgid "min"
 #~ msgstr "min"
 
-# calendar/gui/getdate.y:429
+# calendar/gui/getdate.y:429
 #~ msgid "sec"
 #~ msgstr "sec"
 
-# calendar/gui/getdate.y:435
+# calendar/gui/getdate.y:435
 #~ msgid "tomorrow"
 #~ msgstr "morgen"
 
-# calendar/gui/getdate.y:436
+# calendar/gui/getdate.y:436
 #~ msgid "yesterday"
 #~ msgstr "gisteren"
 
-# calendar/gui/getdate.y:437
+# calendar/gui/getdate.y:437
 #~ msgid "today"
 #~ msgstr "vandaag"
 
-# calendar/gui/getdate.y:439
+# calendar/gui/getdate.y:439
 #~ msgid "last"
 #~ msgstr "afgelopen"
 
-# calendar/gui/getdate.y:440
+# calendar/gui/getdate.y:440
 #~ msgid "this"
 #~ msgstr "deze"
 
-# calendar/gui/getdate.y:441
+# calendar/gui/getdate.y:441
 #~ msgid "next"
 #~ msgstr "volgende"
 
-# calendar/gui/getdate.y:442
+# calendar/gui/getdate.y:442
 #~ msgid "first"
 #~ msgstr "eerste"
 
-# calendar/gui/getdate.y:444
+# calendar/gui/getdate.y:444
 #~ msgid "third"
 #~ msgstr "derde"
 
-# calendar/gui/getdate.y:445
+# calendar/gui/getdate.y:445
 #~ msgid "fourth"
 #~ msgstr "vierde"
 
-# calendar/gui/getdate.y:446
+# calendar/gui/getdate.y:446
 #~ msgid "fifth"
 #~ msgstr "vijfde"
 
-# calendar/gui/getdate.y:447
+# calendar/gui/getdate.y:447
 #~ msgid "sixth"
 #~ msgstr "zesde"
 
-# calendar/gui/getdate.y:448
+# calendar/gui/getdate.y:448
 #~ msgid "seventh"
 #~ msgstr "sevende"
 
-# calendar/gui/getdate.y:449
+# calendar/gui/getdate.y:449
 #~ msgid "eighth"
 #~ msgstr "achtste"
 
-# calendar/gui/getdate.y:450
+# calendar/gui/getdate.y:450
 #~ msgid "ninth"
 #~ msgstr "negende"
 
-# calendar/gui/getdate.y:451
+# calendar/gui/getdate.y:451
 #~ msgid "tenth"
 #~ msgstr "tiende"
 
-# calendar/gui/getdate.y:452
+# calendar/gui/getdate.y:452
 #~ msgid "eleventh"
 #~ msgstr "elfde"
 
-# calendar/gui/getdate.y:453
+# calendar/gui/getdate.y:453
 #~ msgid "twelfth"
 #~ msgstr "twaalfde"
 
-# calendar/gui/getdate.y:454
+# calendar/gui/getdate.y:454
 #~ msgid "ago"
 #~ msgstr "geleden"
 
-# calendar/gui/goto.c:82
+# calendar/gui/goto.c:82
 #~ msgid "Year:"
 #~ msgstr "Jaar:"
 
-# calendar/gui/goto.c:275
+# calendar/gui/goto.c:275
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -10047,26 +10699,26 @@ msgstr "De Evolution werkgroep suite"
 #~ "Wanneer op je die dag klikt, ga je naar die\n"
 #~ "dag toe."
 
-# mail/mail-config.c:1199
+# mail/mail-config.c:1199
 #~ msgid "Mail Source"
 #~ msgstr "Post Bron"
 
 #~ msgid "Send a message without a subject"
 #~ msgstr "Stuur een bericht zonder onderwerp"
 
-# mail/folder-browser-factory.c:77
+# mail/folder-browser-factory.c:77
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Legen \"%s\""
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #~ msgid "Marking messages in folder \"%s\""
 #~ msgstr "Bezig met Markeren berichten in map \"%s\""
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Markeer berichten in map \"%s\""
 
-# mail/folder-browser-factory.c:41
+# mail/folder-browser-factory.c:41
 #~ msgid "Marking message %d of %d"
 #~ msgstr "Bezig met markeren bericht %d van %d"
 
@@ -10079,14 +10731,14 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Attach messages from \"%s\""
 #~ msgstr "Voeg berichten van \"%s\" bij"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Forwarding messages \"%s\""
 #~ msgstr "Bezig met Doorsturen berichten \"%s\""
 
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "Bezig met doorsturen berichten zonder onderwerp"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Bericht \"%s\" doorsturen"
 
@@ -10128,10 +10780,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Display message UID \"%s\""
 #~ msgstr "Geef UID van bericht \"%s\" weer"
 
-# calendar/gui/prop.c:519
-#~ msgid "Clear message display"
-#~ msgstr "Maak berichtweergave leeg"
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Bezig met openen berichten uit map \"%s\""
 
@@ -10150,35 +10798,31 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Bezig met opslaan berichten uit map \"%s\""
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Rebuilding message view"
 #~ msgstr "Bezig met herstructureren van bericht weergave"
 
-# composer/e-msg-composer.c:894
+# composer/e-msg-composer.c:894
 #~ msgid "Rebuild message view"
 #~ msgstr "Herstructureer bericht weergave"
 
-# addressbook/gui/component/addressbook.c:514
+# addressbook/gui/component/addressbook.c:514
 #~ msgid "N_ew Directory Server"
 #~ msgstr "Ni_euwe Directory Server"
 
-# shell/e-shell-view-menu.c:474
-#~ msgid "_Actions"
-#~ msgstr "_Acties"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Bewaar Kalender Als"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
+# mail/mail-config.c:1163 mail/mail-config.c:1242
 #~ msgid "_Mail Configuration"
 #~ msgstr "_Post Configuratie"
 
-# mail/mail-threads.c:814
+# mail/mail-threads.c:814
 #~ msgid "Could not create summary"
 #~ msgstr "Kon samenvatting niet maken"
 
-# shell/e-shell.c:299
+# shell/e-shell.c:299
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan bericht niet vergaren: %s"
 
@@ -10198,7 +10842,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Summary mismatch, X-Evolution header missing"
 #~ msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
 
-# shell/e-setup.c:84
+# shell/e-setup.c:84
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan de gegevens niet naar het uitvoerbestand kopiëren: %s"
 
@@ -10220,12 +10864,12 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Local mail directory %s"
 #~ msgstr "Directory voor lokale post %s"
 
-# mail/component-factory.c:196
+# mail/component-factory.c:196
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
 #~ "Kan het post \"hash\" opslag gedeelte van Evolution niet initialiseren."
 
-# composer/e-msg-composer.c:906
+# composer/e-msg-composer.c:906
 #~ msgid "Forward as Attachment"
 #~ msgstr "Bekijk als Bijvoegsel"
 
@@ -10238,33 +10882,33 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Cannot fork %s: %s"
 #~ msgstr "Kan %s niet starten: %s"
 
-# addressbook/printing/e-contact-print.glade.h:24
+# addressbook/printing/e-contact-print.glade.h:24
 #~ msgid "Bold"
 #~ msgstr "Vet"
 
 #~ msgid "Sets something as bold"
 #~ msgstr "Stelt iets in als vet"
 
-# addressbook/gui/component/alphabet.glade.h:7
+# addressbook/gui/component/alphabet.glade.h:7
 #~ msgid "window2"
 #~ msgstr "venster2"
 
 #~ msgid "does not match regex"
 #~ msgstr "niet gelijk aan reguliere expressie"
 
-# calendar/gui/gncal-todo.c:325
+# calendar/gui/gncal-todo.c:325
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Optionele Velden Toevoegen..."
 
-# mail/mail-config.c:1345
+# mail/mail-config.c:1345
 #~ msgid "Additional Identity Fields"
 #~ msgstr "Optionele Identiteits Velden"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7
+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #~ msgid "Browse..."
 #~ msgstr "Bladeren..."
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242
+# mail/mail-config.c:1163 mail/mail-config.c:1242
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Bewerk Post Configuratie Instellingen"
 
@@ -10291,7 +10935,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Preferred type: "
 #~ msgstr "Voorkeurstype:"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #~ msgid "Sending Mail"
 #~ msgstr "Bezig met versturen Post"
 
@@ -10307,66 +10951,66 @@ msgstr "De Evolution werkgroep suite"
 #~ msgstr ""
 #~ "Je mail server ondersteund de volgende authenticatie typen. Alsjeblieft"
 
-# calendar/gui/calendar-commands.c:659
+# calendar/gui/calendar-commands.c:659
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nieuwe Ka_lender"
 
-# calendar/gui/calendar-commands.c:682
+# calendar/gui/calendar-commands.c:682
 #~ msgid "_New appointment..."
 #~ msgstr "_Nieuwe Afspraak..."
 
 #~ msgid "_Open"
 #~ msgstr "_Openen"
 
-# shell/e-shell-view-menu.c:404
+# shell/e-shell-view-menu.c:404
 #~ msgid "_Create New Folder..."
 #~ msgstr "Nieu_we map aanmaken..."
 
-# calendar/gui/gncal-todo.c:137
+# calendar/gui/gncal-todo.c:137
 #~ msgid "Create to-do item"
 #~ msgstr "Maak een To-Do item aan"
 
-# calendar/gui/gncal-todo.c:137
+# calendar/gui/gncal-todo.c:137
 #~ msgid "Edit to-do item"
 #~ msgstr "Bewerk To-Do item"
 
-# calendar/gui/gncal-todo.c:181
+# calendar/gui/gncal-todo.c:181
 #~ msgid "Due Date:"
 #~ msgstr "Verloop Datum:"
 
-# calendar/gui/gncal-todo.c:190
+# calendar/gui/gncal-todo.c:190
 #~ msgid "Priority:"
 #~ msgstr "Prioriteit:"
 
-# calendar/gui/gncal-todo.c:207
+# calendar/gui/gncal-todo.c:207
 #~ msgid "Item Comments:"
 #~ msgstr "Item Commentaar:"
 
-# calendar/gui/prop.c:330
+# calendar/gui/prop.c:330
 #~ msgid "Time display"
 #~ msgstr "Tijd weergave"
 
-# calendar/gui/prop.c:334
+# calendar/gui/prop.c:334
 #~ msgid "Time format"
 #~ msgstr "Tijdsformaat"
 
-# calendar/gui/prop.c:335
+# calendar/gui/prop.c:335
 #~ msgid "12-hour (AM/PM)"
 #~ msgstr "12-uurs (AM/PM)"
 
-# calendar/gui/prop.c:336
+# calendar/gui/prop.c:336
 #~ msgid "24-hour"
 #~ msgstr "24-uurs"
 
-# calendar/gui/prop.c:346
+# calendar/gui/prop.c:346
 #~ msgid "Weeks start on"
 #~ msgstr "Week begint op"
 
-# calendar/gui/prop.c:358
+# calendar/gui/prop.c:358
 #~ msgid "Day range"
 #~ msgstr "Dag bereik"
 
-# calendar/gui/prop.c:369
+# calendar/gui/prop.c:369
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10377,59 +11021,59 @@ msgstr "De Evolution werkgroep suite"
 #~ "in het dag en week overzicht. Tijden buiten dit bereik\n"
 #~ "zullen niet automatisch worden weergegeven."
 
-# calendar/gui/prop.c:396
+# calendar/gui/prop.c:396
 #~ msgid "Day end:"
 #~ msgstr "Einddag:"
 
-# calendar/gui/prop.c:519
+# calendar/gui/prop.c:519
 #~ msgid "Colors for display"
 #~ msgstr "Kleuren voor beeld"
 
-# calendar/gui/prop.c:599
+# calendar/gui/prop.c:599
 #~ msgid "Show on TODO List:"
 #~ msgstr "Weergeven op To-Do Lijst:"
 
-# calendar/gui/prop.c:637
+# calendar/gui/prop.c:637
 #~ msgid "To Do List style options:"
 #~ msgstr "To-Do lijst stijl opties:"
 
-# calendar/gui/prop.c:642
+# calendar/gui/prop.c:642
 #~ msgid "Highlight overdue items"
 #~ msgstr "Markeer items die zijn verlopen"
 
-# calendar/gui/prop.c:645
+# calendar/gui/prop.c:645
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Markeer items die nog niet zijn verlopen"
 
-# calendar/gui/prop.c:648
+# calendar/gui/prop.c:648
 #~ msgid "Highlight items due today"
 #~ msgstr "Markeer items die vandaag verlopen"
 
-# calendar/gui/prop.c:678
+# calendar/gui/prop.c:678
 #~ msgid "To Do List Properties"
 #~ msgstr "To-Do lijst Eigenschappen"
 
-# calendar/gui/prop.c:681
+# calendar/gui/prop.c:681
 #~ msgid "To Do List"
 #~ msgstr "To-Do Lijst"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #~ msgid "Preferences"
 #~ msgstr "Instellingen"
 
-# calendar/gui/prop.c:783
+# calendar/gui/prop.c:783
 #~ msgid "Alarm Properties"
 #~ msgstr "Alarm Eigenschappen"
 
-# calendar/gui/prop.c:793
+# calendar/gui/prop.c:793
 #~ msgid "Beep on display alarms"
 #~ msgstr "Piep bij weergave alarm"
 
-# calendar/gui/prop.c:803
+# calendar/gui/prop.c:803
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Geluid alarm stopt na"
 
-# calendar/gui/prop.c:820
+# calendar/gui/prop.c:820
 #~ msgid "Enable snoozing for "
 #~ msgstr "Maak sluimeren mogelijk voor "
 
@@ -10439,18 +11083,18 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Bekijk bericht bronnen uit \"%s\""
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Threading message list"
 #~ msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Thread message list"
 #~ msgstr "Berichtenlijst weergeven met onderlinge relaties"
 
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-# composer/e-msg-composer-address-dialog.glade.h:9
+# composer/e-msg-composer-address-dialog.glade.h:9
 #~ msgid "Quick Search"
 #~ msgstr "Snel Zoeken"
 
@@ -10481,10 +11125,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Custom search"
 #~ msgstr "Aangepast zoeken"
 
-# composer/e-msg-composer-address-dialog.glade.h:9
-#~ msgid "Full Search"
-#~ msgstr "Volledige Zoekactie"
-
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
 #~ "By filling in some information about your email\n"
@@ -10505,14 +11145,14 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Open in New Window"
 #~ msgstr "Open in Nieuw Venster"
 
-# mail/folder-browser-factory.c:37
+# mail/folder-browser-factory.c:37
 #~ msgid "Forward Message"
 #~ msgstr "Bericht Doorsturen"
 
 #~ msgid "Move Message"
 #~ msgstr "Bericht Verplaatsen"
 
-# composer/e-msg-composer.c:1127
+# composer/e-msg-composer.c:1127
 #~ msgid "Copy Message"
 #~ msgstr "Bericht Kopiëren"
 
@@ -10528,59 +11168,59 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Error while communicating with address server"
 #~ msgstr "Fout bij communiceren met adres server"
 
-# addressbook/contact-editor/e-contact-editor.c:648
-# calendar/gui/event-editor.c:1123
+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: _New Task"
 #~ msgstr "FIXME: _Nieuwe Taak"
 
-# calendar/gui/event-editor.c:1148
+# calendar/gui/event-editor.c:1148
 #~ msgid "FIXME: _Mark Complete"
 #~ msgstr "FIXME: _Markeer Volledig"
 
-# addressbook/contact-editor/e-contact-editor.c:648
-# calendar/gui/event-editor.c:1123
+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: Assig_n Task"
 #~ msgstr "FIXME: Ken Taak Toe"
 
-# addressbook/contact-editor/e-contact-editor.c:862
-# calendar/gui/event-editor.c:1343
+# addressbook/contact-editor/e-contact-editor.c:862
+# calendar/gui/event-editor.c:1343
 #~ msgid "FIXME: _Reply"
 #~ msgstr "FIXME: Beantwoorden"
 
-# mail/folder-browser-factory.c:35
+# mail/folder-browser-factory.c:35
 #~ msgid "FIXME: Reply to A_ll"
 #~ msgstr "FIXME: Iedereen beantwoorden"
 
-# calendar/gui/event-editor.c:1325
+# calendar/gui/event-editor.c:1325
 #~ msgid "FIXME: Print..."
 #~ msgstr "FIXME: Afdrukken"
 
-# addressbook/contact-editor/e-contact-editor.c:849
-# calendar/gui/event-editor.c:1328
+# addressbook/contact-editor/e-contact-editor.c:849
+# calendar/gui/event-editor.c:1328
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Bestand als attachmente invoegen"
 
-# addressbook/contact-editor/e-contact-editor.c:761
-# calendar/gui/event-editor.c:1238
+# addressbook/contact-editor/e-contact-editor.c:761
+# calendar/gui/event-editor.c:1238
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "FIXME: Ken Taak Toe..."
 
 #~ msgid "Assign the task to someone"
 #~ msgstr "Ken de taak aan iemand toe"
 
-# calendar/gui/event-editor.c:1215
+# calendar/gui/event-editor.c:1215
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ka_lender..."
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #~ msgid "Save and close this appointment"
 #~ msgstr "Deze afspraak opslaan en sluiten"
 
-# calendar/gui/event-editor.c:1334
+# calendar/gui/event-editor.c:1334
 #~ msgid "Invite attendees to a meeting"
 #~ msgstr "Nodig gasten uit op een afspraak"
 
-# calendar/gui/gncal-todo.c:171
+# calendar/gui/gncal-todo.c:171
 #~ msgid "_Summary:"
 #~ msgstr "_Samenvatting:"
 
@@ -10593,33 +11233,33 @@ msgstr "De Evolution werkgroep suite"
 #~ "Uren\n"
 #~ "Dagen\n"
 
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
-# calendar/gui/gncal-todo.c:717
+# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
+# calendar/gui/gncal-todo.c:717
 #~ msgid "Daily"
 #~ msgstr "Dagelijks"
 
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
 #~ msgid "Weekly"
 #~ msgstr "Weekelijks"
 
-# calendar/gui/calendar-commands.c:531
+# calendar/gui/calendar-commands.c:531
 #~ msgid "Monthly"
 #~ msgstr "Maandelijks"
 
-# calendar/gui/calendar-commands.c:535
+# calendar/gui/calendar-commands.c:535
 #~ msgid "Yearly"
 #~ msgstr "Jaarlijks"
 
-# addressbook/printing/e-contact-print.glade.h:31
-# addressbook/printing/e-contact-print.glade.h:43
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
 #~ msgid "label23"
 #~ msgstr "label23"
 
 #~ msgid "Every "
 #~ msgstr "Elke "
 
-# addressbook/printing/e-contact-print.glade.h:31
-# addressbook/printing/e-contact-print.glade.h:43
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
 #~ msgid "label24"
 #~ msgstr "label24"
 
@@ -10653,7 +11293,7 @@ msgstr "De Evolution werkgroep suite"
 #~ "Zaterdag\n"
 #~ "Zondag\n"
 
-# composer/e-msg-composer-address-dialog.glade.h:18
+# composer/e-msg-composer-address-dialog.glade.h:18
 #~ msgid "label27"
 #~ msgstr "label27"
 
@@ -10663,58 +11303,58 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Change"
 #~ msgstr "Veranderen"
 
-# composer/e-msg-composer-address-dialog.c:184
+# composer/e-msg-composer-address-dialog.c:184
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Knip het geselecteerde item naar het klembord"
 
-# composer/e-msg-composer-address-dialog.c:188
+# composer/e-msg-composer-address-dialog.c:188
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Kopieer het geselecteerde item naar het klembord"
 
-# composer/e-msg-composer-address-dialog.c:528
+# composer/e-msg-composer-address-dialog.c:528
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Selecteer de geadresseerden"
 
-# composer/e-msg-composer-address-dialog.glade.h:9
+# composer/e-msg-composer-address-dialog.glade.h:9
 #~ msgid "Search..."
 #~ msgstr "Zoeken..."
 
-# composer/e-msg-composer-address-dialog.glade.h:14
+# composer/e-msg-composer-address-dialog.glade.h:14
 #~ msgid "To: >>"
 #~ msgstr "Aan: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:15
+# composer/e-msg-composer-address-dialog.glade.h:15
 #~ msgid "Cc: >>"
 #~ msgstr "Cc: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:16
+# composer/e-msg-composer-address-dialog.glade.h:16
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:17
+# composer/e-msg-composer-address-dialog.glade.h:17
 #~ msgid "label9"
 #~ msgstr "label9"
 
-# composer/e-msg-composer-address-dialog.glade.h:18
+# composer/e-msg-composer-address-dialog.glade.h:18
 #~ msgid "label7"
 #~ msgstr "label7"
 
-# composer/e-msg-composer-address-dialog.glade.h:19
+# composer/e-msg-composer-address-dialog.glade.h:19
 #~ msgid "label8"
 #~ msgstr "label8"
 
 #~ msgid "Load a previously saved message"
 #~ msgstr "Laad een eerder opgeslagen bericht"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #~ msgid "Send _Now"
 #~ msgstr "_Nu Versturen"
 
 #~ msgid "Quit the message composer"
 #~ msgstr "Sluit het bericht venster"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7
-# composer/e-msg-composer-attachment.glade.h:9
+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #~ msgid "More criterion"
 #~ msgstr "Meer criteria:"
 
@@ -10727,51 +11367,51 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Could not read pilot's DateBook application block"
 #~ msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
 
-# calendar/gui/calendar-commands.c:175
+# calendar/gui/calendar-commands.c:175
 #~ msgid "Gnome Calendar"
 #~ msgstr "Gnome Kalender"
 
-# calendar/gui/calendar-commands.c:178
+# calendar/gui/calendar-commands.c:178
 #~ msgid "The GNOME personal calendar and schedule manager."
 #~ msgstr "Het GNOME persoonlijke kalender en rooster beheer."
 
-# calendar/gui/calendar-commands.c:535
+# calendar/gui/calendar-commands.c:535
 #~ msgid "Year"
 #~ msgstr "Jaar"
 
-# calendar/gui/calendar-commands.c:535
+# calendar/gui/calendar-commands.c:535
 #~ msgid "Show 1 year"
 #~ msgstr "Toon 1 jaar"
 
-# calendar/gui/calendar-commands.c:746
+# calendar/gui/calendar-commands.c:746
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
-# calendar/gui/calendar-commands.c:746
+# calendar/gui/calendar-commands.c:746
 #~ msgid "'s calendar"
 #~ msgstr "'s zijn kalender"
 
-# calendar/gui/event-editor.c:1148
+# calendar/gui/event-editor.c:1148
 #~ msgid "FIXME: _Delete"
 #~ msgstr "FIXME: Verwij_deren"
 
-# calendar/gui/event-editor.c:1320
+# calendar/gui/event-editor.c:1320
 #~ msgid "FIXME: Save and Close"
 #~ msgstr "FIXME: Opslaan en sluiten"
 
-# calendar/gui/event-editor.c:1330
+# calendar/gui/event-editor.c:1330
 #~ msgid "FIXME: Recurrence..."
 #~ msgstr "FIXME: Herhaling..."
 
-# calendar/gui/event-editor.c:1331
+# calendar/gui/event-editor.c:1331
 #~ msgid "Configure recurrence rules"
 #~ msgstr "Configureer herhalings regels"
 
-# calendar/gui/event-editor.c:1336
+# calendar/gui/event-editor.c:1336
 #~ msgid "FIXME: Delete"
 #~ msgstr "FIXME: Verwijderen"
 
-# composer/e-msg-composer-hdrs.c:234
+# composer/e-msg-composer-hdrs.c:234
 #~ msgid "S_ubject:"
 #~ msgstr "Onderwerp:"
 
@@ -10795,85 +11435,85 @@ msgstr "De Evolution werkgroep suite"
 #~ "Normaal\n"
 #~ "Laag\n"
 
-# addressbook/printing/e-contact-print.glade.h:35
+# addressbook/printing/e-contact-print.glade.h:35
 #~ msgid "Resources:"
 #~ msgstr "Bronnen:"
 
-# mail/message-list.c:502
+# mail/message-list.c:502
 #~ msgid "Due date"
 #~ msgstr "Verloop Datum"
 
-# addressbook/contact-editor/e-contact-editor.c:671
-# calendar/gui/event-editor.c:1146
+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
 #~ msgid "FIXME: Invite _Attendees..."
 #~ msgstr "FIXME: Nodig _Gasten Uit..."
 
-# calendar/gui/event-editor.c:1263
+# calendar/gui/event-editor.c:1263
 #~ msgid "FIXME: C_ancel Invitation..."
 #~ msgstr "FIXME: _Annuleer Uitnodiging..."
 
-# calendar/gui/gncal-todo.c:428
+# calendar/gui/gncal-todo.c:428
 #~ msgid "Time Left"
 #~ msgstr "Resterende tijd"
 
-# calendar/gui/gncal-todo.c:440
+# calendar/gui/gncal-todo.c:440
 #~ msgid "To-do list"
 #~ msgstr "To-Do lijst"
 
-# calendar/gui/gncal-todo.c:488
+# calendar/gui/gncal-todo.c:488
 #~ msgid "Edit..."
 #~ msgstr "Bewerken..."
 
-# calendar/gui/gncal-todo.c:712
+# calendar/gui/gncal-todo.c:712
 #~ msgid "Weeks"
 #~ msgstr "Weken"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #~ msgid "Hour"
 #~ msgstr "Uur"
 
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
 #~ msgid "Minute"
 #~ msgstr "Minuut"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #~ msgid "Seconds"
 #~ msgstr "Seconden"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #~ msgid "Second"
 #~ msgstr "Seconde"
 
-# calendar/gui/print.c:868
+# calendar/gui/print.c:868
 #~ msgid "TODO Items"
 #~ msgstr "TODO Items"
 
-# calendar/gui/print.c:1000 calendar/gui/print.c:1014
-# calendar/gui/print.c:1015
+# calendar/gui/print.c:1000 calendar/gui/print.c:1014
+# calendar/gui/print.c:1015
 #~ msgid "%a"
 #~ msgstr "%a"
 
-# calendar/gui/print.c:1001 calendar/gui/print.c:1002
-# calendar/gui/print.c:1016 calendar/gui/print.c:1017
+# calendar/gui/print.c:1001 calendar/gui/print.c:1002
+# calendar/gui/print.c:1016 calendar/gui/print.c:1017
 #~ msgid "%b"
 #~ msgstr "%b"
 
-# calendar/gui/print.c:1021
+# calendar/gui/print.c:1021
 #~ msgid "Current week (%s %s %d - %s %s %d %d)"
 #~ msgstr "Current week (%s %s %d - %s %s %d %d)"
 
-# calendar/gui/print.c:1027
+# calendar/gui/print.c:1027
 #~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
 #~ msgstr "Current week (%s %s %d %d - %s %s %d %d)"
 
-# addressbook/printing/e-contact-print.glade.h:28
+# addressbook/printing/e-contact-print.glade.h:28
 #~ msgid "_Format"
 #~ msgstr "_Formaat"
 
 #~ msgid "Less"
 #~ msgstr "Minder"
 
-# mail/folder-browser-factory.c:29
+# mail/folder-browser-factory.c:29
 #~ msgid "Check for new mail"
 #~ msgstr "Controleer op nieuwe mail"
 
@@ -10907,27 +11547,23 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "Het %s component ondersteund geen PersistStream!\n"
 
-# composer/e-msg-composer.c:894
+# composer/e-msg-composer.c:894
 #~ msgid "Open Mime Message"
 #~ msgstr "Open Mime Bericht"
 
-# widgets/e-table/e-table-config.glade.h:7
-#~ msgid "Fields"
-#~ msgstr "Velden"
-
-# widgets/e-table/e-table-config.glade.h:8
+# widgets/e-table/e-table-config.glade.h:8
 #~ msgid "Grouping"
 #~ msgstr "Groeperen"
 
-# widgets/e-table/e-table-config.glade.h:10
+# widgets/e-table/e-table-config.glade.h:10
 #~ msgid "Filter"
 #~ msgstr "Filter"
 
-# widgets/e-table/e-table-field-chooser.glade.h:7
+# widgets/e-table/e-table-field-chooser.glade.h:7
 #~ msgid "Field Chooser"
 #~ msgstr "Veld Kiezer"
 
-# widgets/e-table/e-table-field-chooser.glade.h:8
+# widgets/e-table/e-table-field-chooser.glade.h:8
 #~ msgid ""
 #~ "To add a column to your table, drag it into\n"
 #~ "the location in which you want it to appear."
@@ -10935,27 +11571,27 @@ msgstr "De Evolution werkgroep suite"
 #~ "Om een kolom toe te voegen in de tabel, moet je\n"
 #~ "het slepen naar de plaats waar je de kolum wilt."
 
-# widgets/e-table/e-table-group.glade.h:7
+# widgets/e-table/e-table-group.glade.h:7
 #~ msgid "window1"
 #~ msgstr "window1"
 
-# widgets/e-table/e-table-group.glade.h:8
+# widgets/e-table/e-table-group.glade.h:8
 #~ msgid "Available fields"
 #~ msgstr "Beschikbare velden"
 
-# widgets/e-table/e-table-group.glade.h:10
+# widgets/e-table/e-table-group.glade.h:10
 #~ msgid "Show in this order"
 #~ msgstr "Toon in deze volgorde"
 
-# widgets/e-table/e-table-group.glade.h:11
+# widgets/e-table/e-table-group.glade.h:11
 #~ msgid "label2"
 #~ msgstr "label2"
 
-# widgets/e-table/e-table-group.glade.h:12
+# widgets/e-table/e-table-group.glade.h:12
 #~ msgid "Add >>"
 #~ msgstr "Toevoegen >>"
 
-# widgets/e-table/e-table-group.glade.h:13
+# widgets/e-table/e-table-group.glade.h:13
 #~ msgid "<< Remove"
 #~ msgstr "<< Verwijderen"
 
@@ -10965,19 +11601,19 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Sort Descending"
 #~ msgstr "Sorteer Aflopend"
 
-# addressbook/contact-editor/e-contact-editor.c:805
-# calendar/gui/event-editor.c:1279
+# addressbook/contact-editor/e-contact-editor.c:805
+# calendar/gui/event-editor.c:1279
 #~ msgid "Unsort"
 #~ msgstr "Sortering Opheffen"
 
 #~ msgid "Group By This Field"
 #~ msgstr "Groeperen Op Dit Veld"
 
-# widgets/shortcut-bar/e-group-bar.c:632
+# widgets/shortcut-bar/e-group-bar.c:632
 #~ msgid "Group By Box"
 #~ msgstr "Grouperen Per Vak"
 
-# calendar/gui/calendar-commands.c:59
+# calendar/gui/calendar-commands.c:59
 #~ msgid "Alignment"
 #~ msgstr "Uitlijning:"
 
@@ -10987,42 +11623,35 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Format Columns..."
 #~ msgstr "Kolom Opmaak..."
 
-#~ msgid "Customize Current View..."
-#~ msgstr "Huidige Weergave Aanpassen..."
-
-# calendar/gui/calendar-commands.c:687
+# calendar/gui/calendar-commands.c:687
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nieuwe afspraak voor vandaag..."
 
-# calendar/gui/calendar-commands.c:688
+# calendar/gui/calendar-commands.c:688
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Maak een nieuwe afspraak voor vandaag"
 
-# composer/e-msg-composer.c:945
+# composer/e-msg-composer.c:945
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Knip het geselecteerde gebied naar het klembord"
 
-# composer/e-msg-composer.c:946
+# composer/e-msg-composer.c:946
 #~ msgid "Copy selected region into the clipboard"
 #~ msgstr "Kopieer het geselecteerde gebied naar het klembord"
 
-# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:947
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Plak het geselecteerde gebied vanuit het klembord"
 
-# filter/filter-editor.c:209
 #~ msgid "Back"
 #~ msgstr "Terug"
 
-# filter/filter-editor.c:211
 #~ msgid "Finish"
 #~ msgstr "Afmaken"
 
-# filter/filter-editor.c:216
 #~ msgid "Apply"
 #~ msgstr "Toepassen"
 
-# filter/filter-editor.c:233
 #~ msgid ""
 #~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 #~ "continue forwards to customise it.</p>"
@@ -11030,31 +11659,31 @@ msgstr "De Evolution werkgroep suite"
 #~ "<h2>Cre-eer Filter Regel</h2><p>Selecteer een van de basis-regels hierboven, "
 #~ "en ga dan door om hem aan te passen.</p>"
 
-# mail/folder-browser-factory.c:83
+# mail/folder-browser-factory.c:83
 #~ msgid "_Filter Druid ..."
 #~ msgstr "_Filter Wizard..."
 
-# mail/mail-config.c:777 mail/mail-config.c:853
+# mail/mail-config.c:777 mail/mail-config.c:853
 #~ msgid "Test these values before continuing"
 #~ msgstr "Controleer deze waarden voordat je doorgaat"
 
-# mail/mail-config.c:978
+# mail/mail-config.c:978
 #~ msgid "Select the method you would like to use to deliver your mail."
 #~ msgstr "Selecteer de methode die je wil gebruiken om de mail te bezorgen."
 
-# mail/mail-config.c:1600
+# mail/mail-config.c:1600
 #~ msgid "Enter the hostname of the News Server you have."
 #~ msgstr "Geef de hostname van uw News Server."
 
-# mail/mail-threads.c:483
+# mail/mail-threads.c:483
 #~ msgid "Currently pending operations:"
 #~ msgstr "Opdrachten die nog uitgevoerd moeten worden:"
 
-# shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
+# shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
 #~ msgid "Composes a new mail message"
 #~ msgstr "Stelt een nieuw bericht op"
 
-# shell/main.c:214
+# shell/main.c:214
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Kan het configuratie-systeem niet initialiseren."
author	Pablo Saratxaga <pablo@src.gnome.org>	2001-03-15 18:42:18 +0800
committer	Pablo Saratxaga <pablo@src.gnome.org>	2001-03-15 18:42:18 +0800
commit	9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7 (patch)
tree	957874003612aaafdb3b6bdbc748c99979eb0715 /po/nl.po
parent	ed1060cbfb536be02c0122135d66b71c3f5fb228 (diff)
download	gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.gz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.bz2 gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.lz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.xz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.zst gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.zip