Updated Norwegian (bokmål) translation.

2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=7317

1 files changed, 2646 insertions, 1955 deletions

diff --git a/po/nl.po b/po/nl.po
index b88731507c..63c84def5f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,10 +4,11 @@
 # Gerard Oskamp <gerard@linuxfreak.nl>, 2000
 # Dennis Smit <synap@area101.penguin.nl>, 2000
 # Almer S. Tigelaar <almer1@dds.nl>, 2000
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-12-02 15:02+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -320,10 +321,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -444,57 +445,37 @@ msgid ""
 "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:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
-# addressbook/contact-editor/categories-strings.h:7

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "Categorieën"
-
-# addressbook/contact-editor/categories-strings.h:8

-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Item(s) die tot deze categorie behoren:"
-
-# addressbook/contact-editor/categories-strings.h:9

-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Beschikbare Categorieën:"
-
 # addressbook/gui/component/addressbook.c:426

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Contact verwijderen?"
 
@@ -511,7 +492,7 @@ msgstr "_Toevoegen"
 # 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
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -529,12 +510,13 @@ msgstr "Nieuw telefoon type"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:11

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
-#: po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -586,7 +568,7 @@ msgstr "_Mobiele Telefoon"
 # 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:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "Primaire E-mail"
 
@@ -607,7 +589,7 @@ msgstr "K_ontakten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:27

 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieën..."
 
@@ -628,7 +610,8 @@ msgstr "_Adres..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:30

 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Algemeen"
 
@@ -684,172 +667,172 @@ msgstr "Aa_ntekeningen:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:41

 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Details"
 
 # addressbook/contact-editor/e-contact-editor.c:1278

-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 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:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1281

-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Bedrijfs Fax"
 
 # addressbook/contact-editor/e-contact-editor.c:1282

-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Terugbel"
 
 # addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Auto"
 
 # addressbook/contact-editor/e-contact-editor.c:1284

-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 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:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1286

-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Thuis 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1287

-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1288

-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
 # addressbook/contact-editor/e-contact-editor.c:1289

-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 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:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Overige"
 
 # addressbook/contact-editor/e-contact-editor.c:1291

-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Andere Fax"
 
 # addressbook/contact-editor/e-contact-editor.c:1292

-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Oppieper"
 
 # addressbook/contact-editor/e-contact-editor.c:1293

-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Eerste"
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
 # addressbook/contact-editor/e-contact-editor.c:1295

-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
 # addressbook/contact-editor/e-contact-editor.c:1296

-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "E-mail 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1342

-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E-mail 3"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canada"
 
 # composer/e-msg-composer-address-dialog.glade.h:11

-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Controleer Adres"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Land:"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adres:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:36

-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Gemeente:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
@@ -865,10 +848,13 @@ msgstr "Controleer Volledige Naam"
 
 # addressbook/contact-editor/fullname-strings.h:13

 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -877,7 +863,7 @@ msgstr ""
 "Dr.\n"
 
 # addressbook/contact-editor/fullname-strings.h:18

-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -896,53 +882,58 @@ msgstr ""
 "Esq.\n"
 
 # addressbook/contact-editor/fullname-strings.h:9

-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "Voornaam:"
 
 # addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Titel:"
 
 # addressbook/contact-editor/fullname-strings.h:10

-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "Tweede Naa_m:"
 
 # addressbook/contact-editor/fullname-strings.h:11

-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "Achternaam:"
 
 # addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
 # addressbook/gui/component/addressbook.c:1046

-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Als _Minikaarten"
 
 # addressbook/gui/component/addressbook.c:499

 # addressbook/gui/component/addressbook.c:1039

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als _Tabel"
 
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Voer het NNTP wachtwoord voor %s@%s in"
+
 # addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
 # addressbook/gui/component/addressbook.c:598

-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -962,93 +953,242 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 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:534
+#: addressbook/gui/component/addressbook.c:561
 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:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-mail bevat"
 
 # addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Externe Directories"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Beschrijving:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Andere Snelkoppelingen"
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:8

-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP Server:"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Naam:"
+# widgets/e-table/e-table-config.glade.h:10

+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Bestand"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Kan het adresboek niet openen"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr ""
+
+# mail/folder-browser-factory.c:101

+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+# shell/e-storage.c:434

+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Onbekende fout"
+
+# 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:169
+#, fuzzy
+msgid "Base"
+msgstr "Plakken"
+
+#: addressbook/gui/component/addressbook-config.c:171
+#, fuzzy
+msgid "One"
+msgstr "Eigenaar:"
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Aanmelden"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "Onthoud dit wachtwoord"
+
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Uren"
+
+# calendar/gui/gncal-todo.c:190

+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
 msgstr "Poort:"
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:10

-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Wortel DN:"
 
+# composer/e-msg-composer-address-dialog.glade.h:9

+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Zoeken"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Authenticatie:"
+
+# mail/mail-config.c:732

+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Pad:"
+
+# composer/e-msg-composer.c:676

+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Het bestand bestaat niet."
+
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Opslaan in adresboek"
+
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Opslaan in adresboek"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:11

+# composer/e-msg-composer-address-dialog.glade.h:8

+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
+msgid "Name:"
+msgstr "Naam:"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:7

+# composer/e-msg-composer-attachment.glade.h:9

+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Beschrijving:"
+
+# mail/mail-config.c:1490

+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Bron Toevoegen"
+
+# 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:8
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+msgid "Delete"
+msgstr "Verwijderen"
+
+# calendar/gui/gncal-todo.c:488

+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: filter/filter.glade.h:8 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+msgid "Edit"
+msgstr "Bewerken"
+
+# composer/e-msg-composer-address-dialog.glade.h:10

+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Naam"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
 # addressbook/gui/component/addressbook.c:424

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Find..."
 msgstr "Vind..."
 
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Geaddresseerden"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Selecteer namen"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
 msgstr "Selecteer naam uit lijst:"
 
 # composer/e-msg-composer-address-dialog.glade.h:9

@@ -1059,148 +1199,148 @@ msgstr "Zoeken"
 
 # addressbook/gui/component/alphabet.glade.h:8

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
 # addressbook/gui/component/alphabet.glade.h:9

-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
 # addressbook/gui/component/alphabet.glade.h:10

-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
 # addressbook/gui/component/alphabet.glade.h:11

-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
 # addressbook/gui/component/alphabet.glade.h:12

-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
 # addressbook/gui/component/alphabet.glade.h:13

-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
 # addressbook/gui/component/alphabet.glade.h:14

-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
 # addressbook/gui/component/alphabet.glade.h:15

-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
 # addressbook/gui/component/alphabet.glade.h:16

 # calendar/cal-util/timeutil.c:98

-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
 # addressbook/gui/component/alphabet.glade.h:17

-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
 # addressbook/gui/component/alphabet.glade.h:18

-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
 # addressbook/gui/component/alphabet.glade.h:19

-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
 # addressbook/gui/component/alphabet.glade.h:20

-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
 # addressbook/gui/component/alphabet.glade.h:21

-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
 # addressbook/gui/component/alphabet.glade.h:22

-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
 # addressbook/gui/component/alphabet.glade.h:23

-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
 # addressbook/gui/component/alphabet.glade.h:24

-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
 # addressbook/gui/component/alphabet.glade.h:25

-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
 # addressbook/gui/component/alphabet.glade.h:26

-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
 # addressbook/gui/component/alphabet.glade.h:27

-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
 # addressbook/gui/component/alphabet.glade.h:28

-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
 # addressbook/gui/component/alphabet.glade.h:29

-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
 # addressbook/gui/component/alphabet.glade.h:30

-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
 # addressbook/gui/component/alphabet.glade.h:31

-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
 # addressbook/gui/component/alphabet.glade.h:32

-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
 # addressbook/gui/component/alphabet.glade.h:33

-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
 # addressbook/gui/component/alphabet.glade.h:34

-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
 # addressbook/gui/component/addressbook.c:943

 # addressbook/gui/minicard/e-minicard.c:330

-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
@@ -1226,36 +1366,36 @@ msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:23

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
 
 # addressbook/printing/e-contact-print.glade.h:25

-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 punts Tahoma"
 
 # addressbook/printing/e-contact-print.glade.h:18

-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Lege formulieren op het einde:"
 
 # addressbook/printing/e-contact-print.glade.h:24

-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Inhoud"
 
 # addressbook/printing/e-contact-print.glade.h:38

-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Onderkant:"
 
 # addressbook/printing/e-contact-print.glade.h:32

 # addressbook/printing/e-contact-print.glade.h:44

-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensies:"
 
@@ -1263,203 +1403,190 @@ msgstr "Dimensies:"
 # addressbook/printing/e-contact-print.glade.h:21

 # addressbook/printing/e-contact-print.glade.h:51

 # addressbook/printing/e-contact-print.glade.h:54

-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Lettertype..."
 
 # addressbook/printing/e-contact-print.glade.h:19

-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Lettertypen"
 
 # addressbook/printing/e-contact-print.glade.h:53

-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Voet:"
 
 # addressbook/printing/e-contact-print.glade.h:28

-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formaat"
 
 # addressbook/printing/e-contact-print.glade.h:52

-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Kop"
 
 # addressbook/printing/e-contact-print.glade.h:56

-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Koptekst/Voettekst"
 
 # addressbook/printing/e-contact-print.glade.h:22

-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Koppen"
 
 # addressbook/printing/e-contact-print.glade.h:15

-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 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

-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Hoogte:"
 
 # addressbook/printing/e-contact-print.glade.h:13

-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Elkaar direct opvolgend"
 
 # addressbook/printing/e-contact-print.glade.h:11

-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Insluiten:"
 
 # addressbook/printing/e-contact-print.glade.h:49

-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggend"
 
 # addressbook/printing/e-contact-print.glade.h:39

-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Links:"
 
 # addressbook/printing/e-contact-print.glade.h:14

-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Letter tabs aan de kant"
 
 # addressbook/printing/e-contact-print.glade.h:36

-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marges"
 
 # addressbook/printing/e-contact-print.glade.h:17

-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
 # addressbook/printing/e-contact-print.glade.h:10

-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opties"
 
 # addressbook/printing/e-contact-print.glade.h:47

-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientatie"
 
 # addressbook/printing/e-contact-print.glade.h:41

-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Pagina"
 
 # addressbook/printing/e-contact-print.glade.h:7

-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Pagina Instellingen:"
 
 # addressbook/printing/e-contact-print.glade.h:29

 # addressbook/printing/e-contact-print.glade.h:50

-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Paper"
 
 # addressbook/printing/e-contact-print.glade.h:35

-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papier bron:"
 
 # addressbook/printing/e-contact-print.glade.h:48

-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Staand"
 
 # addressbook/printing/e-contact-print.glade.h:9

-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Voorbeeld:"
 
 # addressbook/printing/e-contact-print.glade.h:27

-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Maak gebruik van grijze schaduw op de afdruk"
 
 # addressbook/printing/e-contact-print.glade.h:55

-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Omgedraaid afdrukken op even pagina's"
 
 # addressbook/printing/e-contact-print.glade.h:40

-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Rechts:"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Secties:"
 
 # addressbook/printing/e-contact-print.glade.h:26

-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Shaduw"
 
 # addressbook/printing/e-contact-print.glade.h:42

-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Grootte:"
 
 # addressbook/printing/e-contact-print.glade.h:16

-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Begin op een nieuwe pagina"
 
 # addressbook/printing/e-contact-print.glade.h:8

-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stijl Naam:"
 
 # addressbook/printing/e-contact-print.glade.h:37

-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Top:"
 
 # addressbook/printing/e-contact-print.glade.h:30

-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:45
+#: mail/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "Type:"
 
 # addressbook/printing/e-contact-print.glade.h:33

 # addressbook/printing/e-contact-print.glade.h:45

-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breedte:"
 
 # addressbook/printing/e-contact-print.glade.h:31

 # addressbook/printing/e-contact-print.glade.h:43

-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-# 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/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-# 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/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution Kalender Kanaal"
@@ -1468,13 +1595,13 @@ msgstr "Evolution Kalender Kanaal"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
@@ -1487,141 +1614,176 @@ msgstr "Evolution ToDo Kanaal"
 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:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: 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/calendar-commands.c:56

-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Buitenlijn:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-# calendar/gui/calendar-commands.c:57

-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "Koppen:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
-# calendar/gui/calendar-commands.c:58

-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Lege dagen:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
+msgid "Calendar Repository"
+msgstr ""
 
-# calendar/gui/calendar-commands.c:59

-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Afspraaken:"
+# calendar/gui/calendar-commands.c:659

+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Kalender"
 
-# calendar/gui/calendar-commands.c:60

-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Gemarkeerde dag:"
+# mail/component-factory.c:196

+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
 
-# calendar/gui/calendar-commands.c:61

-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Dag nummers:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Kalender Kanaal"
 
-# calendar/gui/calendar-commands.c:62

-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Nummer van vandaag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-# calendar/gui/calendar-commands.c:63

-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "To-Do item dat nog niet verlopen is:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
 
-# calendar/gui/calendar-commands.c:64

-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "To-Do item dat vandaag af moet:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
 
-# calendar/gui/calendar-commands.c:65

-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "To-Do item dat af moest zijn:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+# 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:8
+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
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Ok"
 
 # calendar/gui/calendar-commands.c:434

-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
 # calendar/gui/calendar-commands.c:456

-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Open kalender"
 
 # calendar/gui/calendar-commands.c:495

-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Kalender opslaan"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
 # calendar/gui/event-editor.c:1745

 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#: 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:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 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:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Publiekelijk"
 
-#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Prive"
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
 # shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
 # calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "O"
 
 # calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "W"
 
 # mail/mail-config.c:1220

-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1633,35 +1795,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+#: 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:863
+#: calendar/gui/calendar-model.c:865
 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:866
+#: calendar/gui/calendar-model.c:868
 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:870
+#: calendar/gui/calendar-model.c:872
 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1671,14 +1833,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 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:1073
+#: calendar/gui/calendar-model.c:1075
 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/event-editor.c:1745

+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d %B, %Y"
+
+# composer/e-msg-composer.c:494

+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Error bij openen bestand: %s"
+
+#: calendar/gui/calendar-summary.c:229
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:235
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
+
+# calendar/gui/print.c:1084

+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Druk Kalender af"
+
 # calendar/gui/control-factory.c:136

 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
@@ -1701,410 +1889,461 @@ msgstr "Geen samenvatting beschikbaar."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:6
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Sluiten"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:9

-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Afspraak bewerken"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Sluimeren"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:10

-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Sluimer tijd (minuten)"
 
 # calendar/gui/getdate.y:426

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 minuten"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuten"
 
 # calendar/gui/prop.c:335

-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 uurs (am/pm)"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuten"
 
 # calendar/gui/prop.c:336

-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 uurs"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuten"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuten"
 
 # calendar/gui/prop.c:803

-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Alarm stopt na"
 
 # calendar/gui/prop.c:780

-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Audio Alarmen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
 # calendar/gui/prop.c:522

-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Kleuren"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Weekeinden comprimeren"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Datum navigator instellingen"
 
 # calendar/gui/prop.c:836

-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Weergave instellingen"
 
 # calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Verloop Datum"
 
 # calendar/gui/prop.c:820

-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Maak sluimeren mogelijk voor"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Eind van dag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 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 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Vrij"
 
 # calendar/gui/getdate.y:413

-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:433
 msgid "Friday"
 msgstr "Vrijdag"
 
 # calendar/gui/calendar-commands.c:60

-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markeer"
 
 # calendar/gui/prop.c:648

-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Items die vandaag verlopen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Items die vandaag verlopen:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Items die nog niet zijn verlopen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Maa"
 
 # calendar/gui/prop.c:348

-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429
 msgid "Monday"
 msgstr "Maandag"
 
 # calendar/gui/prop.c:642

-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Verlopen items"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Verlopen items:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
 # calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

 # mail/message-list.c:474

-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioriteit"
 
 # calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

 # calendar/gui/gnome-cal.c:1120

-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Herinner me van alle afspraken"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Herinneringen"
 
 # calendar/gui/gnome-month-item.c:742

-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "Zat"
 
 # calendar/gui/getdate.y:414

-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:434
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Weergeven"
 
 # calendar/gui/event-editor.c:298

-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Geef eindtijden afspraken weer"
 
 # calendar/gui/calendar-commands.c:528

-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Geef weeknummers weer"
 
 # calendar/gui/goto.c:264

-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Start van dag:"
 
 # calendar/gui/gnome-month-item.c:736

 #. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Zon"
 
 # calendar/gui/prop.c:347

-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435
 msgid "Sunday"
 msgstr "Zondag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaakBlad"
 
 # calendar/gui/gnome-month-item.c:740

-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Don"
 
 # calendar/gui/getdate.y:410

-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:432
 msgid "Thursday"
 msgstr "Donderdag"
 
 # calendar/gui/prop.c:606

-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tijd Tot Verlooptijd"
 
 # calendar/gui/e-day-view-time-item.c:391

-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Tijd delingen:"
 
 # calendar/gui/prop.c:334

-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 # calendar/gui/gnome-month-item.c:738

-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Din"
 
 # calendar/gui/getdate.y:406

-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:430
 msgid "Tuesday"
 msgstr "Dinsdag"
 
 # calendar/gui/prop.c:780

-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuele Alarmen"
 
 # calendar/gui/gnome-month-item.c:739

-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Woe"
 
 # calendar/gui/getdate.y:408

-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:431
 msgid "Wednesday"
 msgstr "Woensdag"
 
 # calendar/gui/getdate.y:423

-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Werk week"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuten voor ze plaatsvinden."
 
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "seconden."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% Af:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lassificatie:"
 
 # filter/filter-editor.c:212

-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Gedaan"
 
 # calendar/gui/gncal-todo.c:207

-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Datum Afgemaakt:"
 
 # addressbook/printing/e-contact-print.glade.h:34

 # addressbook/printing/e-contact-print.glade.h:46

-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Hoog"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "In Uitvoer"
 
 # calendar/gui/getdate.y:438

-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Laag"
 
 # shell/e-shell-view.c:596

 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Geen"
 
 # addressbook/printing/e-contact-print.glade.h:28

-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normaal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Niet Gestart"
 
 # calendar/gui/gncal-todo.c:425

-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "S_amenvatting"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Sta_rt Datum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "_Taak"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:26

-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "C_ontacten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:31

-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "_Verloop Datum:"
 
 # calendar/gui/gncal-todo.c:190

-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:35

-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "taak-bewerkings-dialoogvenster"
 
@@ -2113,30 +2352,30 @@ msgid "Edit Task"
 msgstr "Taak Bewerken"
 
 # calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
 msgid "No summary"
 msgstr "Geen opsomming"
 
 # calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
 # calendar/gui/event-editor.c:301

-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
 # calendar/gui/event-editor.c:304

-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboek Item - %s"
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
@@ -2157,17 +2396,6 @@ msgstr "Markeer als Gedaan"
 msgid "Mark the task complete"
 msgstr "Markeer de taak als gedaan"
 
-# 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-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "Verwijderen"
-
 # 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:343
@@ -2183,7 +2411,7 @@ msgstr "%02i minuten delingen"
 # 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:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -2191,52 +2419,66 @@ msgstr "%A %d %B"
 # 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:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 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:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
+# 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:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/print.c:610
+msgid "am"
+msgstr "am"
+
+# 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:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/print.c:609
+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:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nieuwe Afspraak..."
 
 # 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:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Bewerk deze afspraak..."
 
 # calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 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:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment 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:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 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:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
@@ -2248,787 +2490,572 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "_Gebeurtenis die de gehele dag plaatsvind"
 
 # calendar/gui/calendar-commands.c:59

-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Afspraak Basis:"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Classificatie"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Aangepaste herhaling"
 
 # calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dagen"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Elke"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
 # calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Uren"
 
 # mail/mail-config.c:1199

-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Post _naar:"
 
 # calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minuten"
 
 # calendar/gui/prop.c:348

-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Aanpassen"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Geen herhaling"
 
 # addressbook/printing/e-contact-print.glade.h:9

-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vé"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pu_bliekelijk"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Herhalings Regel"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Eenvoudige herhaling"
 
 # calendar/gui/gncal-todo.c:171

-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Opso_mming:"
 
 # calendar/gui/gncal-todo.c:428

-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Resterende tijd"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:7

-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Geluid"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Weergave"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programma"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "P_rogramma starten:"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
 # calendar/gui/goto.c:264

-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_Begin datum:"
 
 # calendar/gui/getdate.y:424

-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag(en)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "gebeurtenis-bewerkings-dialoog"
 
 # calendar/gui/getdate.y:445

-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "voor"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "oneindig"
 
 # widgets/e-table/e-table-group.glade.h:9

-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "maand(en)"
 
 # shell/e-shell-folder-title-bar.c:355

-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "totdat"
 
 # calendar/gui/getdate.y:423

-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "week(en)"
 
 # calendar/gui/getdate.y:420

-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "jar(en)"
 
 # calendar/gui/event-editor.c:289

-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
 # calendar/gui/gnome-month-item.c:737

-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "op"
 
 # calendar/gui/getdate.y:424

-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
 # calendar/gui/getdate.y:421

-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr "op de"
 
 # calendar/gui/print.c:265

-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr "e"
 
 # calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657

-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen de Evolution niet kan bewerken."
 
 # calendar/gui/event-editor.c:1745

-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-# calendar/gui/getdate.y:391

-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "januari"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Kon de kalender in `%s' niet laden"
 
-# calendar/gui/getdate.y:392

-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "februari"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Kon kalender niet in aanmaken in `%s'"
 
-# calendar/gui/getdate.y:393

-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "maart"
+#: calendar/gui/gnome-cal.c:698
+#, 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"
 
 # calendar/gui/getdate.y:394

-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "April"
 msgstr "april"
 
-# calendar/gui/getdate.y:395

-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "may"
-
-# calendar/gui/getdate.y:396

-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "juni"
-
-# calendar/gui/getdate.y:397

-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "juli"
-
 # calendar/gui/getdate.y:398

-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "augustus"
 
-# calendar/gui/getdate.y:399

-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "september"
-
-# calendar/gui/getdate.y:400

-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "sept"
-
-# calendar/gui/getdate.y:401

-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "oktober"
-
-# calendar/gui/getdate.y:402

-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "november"
-
 # calendar/gui/getdate.y:403

-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "december"
 
-# 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:420

-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "jaar"
-
-# calendar/gui/getdate.y:421

-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "maand"
-
-# calendar/gui/getdate.y:422

-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "twee weken"
-
-# calendar/gui/getdate.y:423

-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "week"
-
-# calendar/gui/getdate.y:425

-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "uur"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuut"
-
-# calendar/gui/getdate.y:427

-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-# calendar/gui/getdate.y:428

-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "seconde"
-
-# 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:438

-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "nu"
-
-# 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

-#. { N_("second"),		tUNUMBER,	2 },
-#: 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:392

+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februari"
 
-# calendar/gui/getdate.y:453

-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "twaalfde"
+# calendar/gui/goto.c:264

+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ga naar datum"
 
-# calendar/gui/getdate.y:454

-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "geleden"
+# calendar/gui/goto.c:312

+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ga naar vandaag"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van je afspraak op "
+# calendar/gui/getdate.y:391

+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januari"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kon de kalender in `%s' niet laden"
+# calendar/gui/getdate.y:397

+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "juli"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kon kalender niet in aanmaken in `%s'"
+# calendar/gui/getdate.y:396

+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "juni"
 
-#: calendar/gui/gnome-cal.c:1174
-#, 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"
+# calendar/gui/getdate.y:393

+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "maart"
 
-# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124

-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+# calendar/gui/prop.c:348

+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Maandag"
 
-# calendar/gui/goto.c:82

-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Jaar:"
+# calendar/gui/getdate.y:402

+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
 
-# calendar/gui/goto.c:264

-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Ga naar datum"
+# calendar/gui/getdate.y:401

+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktober"
 
-# calendar/gui/goto.c:275

-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Selecteer de datum waar je naar toe wil.\n"
-"Wanneer op je die dag klikt, ga je naar die\n"
-"dag toe."
+# calendar/gui/getdate.y:399

+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "september"
 
-# calendar/gui/goto.c:312

-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Ga naar vandaag"
+# 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
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Kon Bonobo niet initialiseren"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30ste"
 
 # calendar/gui/print.c:271

-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31ste"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Zo"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Ma"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Di"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Wo"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Do"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Vr"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "_Taken"
 
 # calendar/gui/print.c:980

 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 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:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/event-editor.c:1745

-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
 # calendar/gui/print.c:1004

-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Huidige week (%s - %s)"
 
 # calendar/gui/print.c:1040

 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Huidige maand (%b %Y)"
 
 # calendar/gui/print.c:1047

 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Huidig jaar (%Y)"
 
 # calendar/gui/print.c:1084

-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 # calendar/gui/print.c:1249

-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MDWDVZZ"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
@@ -3124,61 +3151,62 @@ 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:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, 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:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "Server verbrak de verbinding."
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaam gedeelte nodig"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een computernaam gedeelte nodig"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een pad gedeelte nodig"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Computer %s niet gevonden."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, 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:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3202,7 +3230,7 @@ msgstr "URL `%s' bevat een ongeldig protocol"
 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:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3211,45 +3239,45 @@ msgstr ""
 "Kon Kerberos ticket niet vergaren:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr "Slechte authenticatie respons van server."
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwachte respons van IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP commando mislukt: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "De respons van de IMAP server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP Server gaf onverwacht een 'OK' respons: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3261,36 +3289,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-# mail/folder-browser-factory.c:101

-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 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:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
 "Kerberos 4 authenticatie."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, 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:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3302,7 +3323,7 @@ msgstr ""
 "\n"
 
 # shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
@@ -3390,12 +3411,12 @@ msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
 
 # mail/folder-browser-factory.c:41

 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3405,14 +3426,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
 # addressbook/contact-editor/e-contact-editor.c:782

-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "Ongeldige bericht inhoud"
 
@@ -3460,20 +3481,20 @@ msgstr "Kon map `%s' niet verwijderen: %s"
 msgid "not a maildir directory"
 msgstr "geen maildir directory"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postvak niet openen: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 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

-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3482,11 +3503,11 @@ msgstr ""
 "Kan bericht %s uit folder %s niet vergaren\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigt te zijn."
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -3540,57 +3561,57 @@ msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale e-mail ontleed fout op positie %ld in map %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijk postvak niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bron map %s niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
@@ -3624,7 +3645,7 @@ msgid "Server rejected username/password"
 msgstr "Volgens de server is de gebruikernaam en/of het wachtwoord ongeldig"
 
 # calendar/gui/calendar-commands.c:434

-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Bericht %s kon niet worden gevonden."
@@ -3677,16 +3698,16 @@ 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"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kon map niet openen: berichtenlijst was niet compleet."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kon bericht niet van POP server %s halen: %s"
@@ -3734,17 +3755,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kon niet aanmelden bij KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, 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:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, 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:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3754,12 +3775,12 @@ msgstr ""
 "Fout bij versturen van gebruikersnaam: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3767,7 +3788,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3776,13 +3797,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:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3834,12 +3856,149 @@ msgstr "sendmail"
 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-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand gebruik makend van SMTP."
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Authenticatie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+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."
+msgstr ""
+"Bij het verbinden met de POP server het wachtwoord versturen in platte tekst "
+"vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
+"servers."
+
+#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:16
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
+"Kerberos 4 authenticatie."
+
+# mail/mail-config.c:1658

+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "%s server %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Post aflevering via het sendmail programma"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+#, fuzzy
+msgid "Cannot send message: no recipients defined."
+msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Kon kanaal naar sendmail niet maken: %s: bericht niet verstuurt"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "Kon sendmail niet starten: %s: bericht niet verstuurt"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "sendmail stopte met signaal %s: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+# shell/e-storage.c:434

+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Onbekende fout: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 # mail/folder-browser-factory.c:89

 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
@@ -3881,99 +4040,99 @@ msgstr "%.1fG"
 
 # composer/e-msg-composer-attachment-bar.c:299

 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "bijvoegsel"
 
 # composer/e-msg-composer.c:951

-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:7
 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:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Verwijderen"
 
 # composer/e-msg-composer-attachment-bar.c:363

-#: composer/e-msg-composer-attachment-bar.c:465
+#: 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:496
+#: 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:497
+#: 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.glade.h:7

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Attachment eigenschappen"
 
 # composer/e-msg-composer-attachment.glade.h:10

-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
 # composer/e-msg-composer-attachment.glade.h:8

-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME type:"
 
 # mail/message-list.c:488

-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Van:"
 
 # composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 # composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 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:216

-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Aan:"
 
 # composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Geef de geaddresseerden"
 
 # composer/e-msg-composer-hdrs.c:221

-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
 # composer/e-msg-composer-hdrs.c:222

-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
 # composer/e-msg-composer-hdrs.c:228

-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:320
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3982,16 +4141,16 @@ msgstr ""
 "op de geadresseerden-lijst van het bericht verschijnen."
 
 # composer/e-msg-composer-hdrs.c:234

-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 # composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4001,41 +4160,41 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Opslaan als..."
 
 # composer/e-msg-composer.c:474

-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
 # composer/e-msg-composer.c:494

-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzigingen aan bericht..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Wijzigingen aan bericht opslaan..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fout bij het opslaan van de compositie naar 'Klad': %s"
 
 # shell/e-shell-view-menu.c:159

-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4046,32 +4205,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Bestand openen"
 
 # composer/e-msg-composer.c:676

-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Het bestand bestaat niet."
 
 # composer/e-msg-composer.c:686

-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Het is geen gewoon bestand."
 
 # composer/e-msg-composer.c:696

-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 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:923
+#: composer/e-msg-composer.c:928
 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:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4080,17 +4239,17 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 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:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
 # mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
@@ -4108,16 +4267,31 @@ msgstr "_Zoeken"
 
 # calendar/gui/getdate.y:420

 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "jaar"
+
+# calendar/gui/getdate.y:420

+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "jaren"
 
 # calendar/gui/getdate.y:421

 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "maand"
+
+# calendar/gui/getdate.y:421

+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "maanden"
 
 # calendar/gui/getdate.y:423

 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "week"
+
+# calendar/gui/getdate.y:423

+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "weken"
 
@@ -4128,14 +4302,29 @@ msgstr "dagen"
 
 # calendar/gui/getdate.y:425

 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "uur"
+
+# calendar/gui/getdate.y:425

+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "uren"
 
 # calendar/gui/getdate.y:426

 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuut"
+
+# calendar/gui/getdate.y:426

+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuten"
 
+# calendar/gui/getdate.y:428

+#: filter/filter-datespec.c:68
+msgid "second"
+msgstr "seconde"
+
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

 #: filter/filter-datespec.c:68
 msgid "seconds"
@@ -4196,6 +4385,11 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
+# 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

 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
@@ -4225,7 +4419,7 @@ msgid "outgoing"
 msgstr "Uitgaand"
 
 # filter/filter-editor.c:198

-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Filters Bewerken"
 
@@ -4265,7 +4459,7 @@ msgstr "Voer een Map URI in"
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4274,263 +4468,273 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Fout bij het uitoefenen van regex zoekactie op bericht kop: %s"
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
 # composer/e-msg-composer-attachment.glade.h:10

-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Regel naam: "
 
 # shell/e-shell-folder-title-bar.c:355

-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Geen Titel"
 
 # addressbook/gui/component/alphabet.glade.h:14

-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 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:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
-# calendar/gui/gncal-todo.c:488

-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Bewerken"
+# mail/folder-browser-factory.c:35

+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr "Beantwoord aan"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1294

+#: filter/filter-system-flag.c:67
+msgid "Read"
+msgstr "Gelezen"
 
 # filter/filter-editor.c:198

-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
 # mail/mail-config.c:1490

-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filter Regels"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "Inkomend"
 
 # calendar/gui/calendar-commands.c:56

-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "Uitgaand"
 
 # mail/folder-browser-factory.c:89

-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
 # mail/mail-config.c:1199

-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "VMap Bronnen"
 
+# filter/filter-editor.c:198

 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "na"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Geef Score"
 
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "voor"
+
+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "bevat"
+
 # shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopieër naar Map"
 
 # mail/message-list.c:509

-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ontvangst datum"
 
 # mail/message-list.c:502

-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Verzend datum"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expressie"
-
-# mail/folder-browser-factory.c:37

-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Bericht"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Bericht Kop"
+msgid "does not contain"
+msgstr "bevat niet"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Bericht ontvangen"
+msgid "does not end with"
+msgstr "eindigt niet op"
 
+# composer/e-msg-composer.c:676

 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Bericht verzonden"
+msgid "does not exist"
+msgstr "bestaat niet"
 
-# shell/e-shell-view-menu.c:402

 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Verplaats naar Map"
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "begint niet met"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Geaddresseerden"
+msgid "ends with"
+msgstr "eindigt op"
 
+# calendar/gui/getdate.y:441

 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr "Overeenkomende Regex"
+msgid "exists"
+msgstr "bestaat"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# addressbook/contact-editor/e-contact-editor-strings.h:33

 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Afzender"
+msgid "Expression"
+msgstr "Expressie"
 
-# mail/message-list.c:460

+# mail/folder-browser-factory.c:37

 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Stel Status in"
+msgid "Forward to Address"
+msgstr "Doorsturen naar Adres"
 
-# mail/mail-config.c:1490

+# addressbook/gui/component/alphabet.glade.h:17

 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Bron"
+msgid "is"
+msgstr "is"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Specifieke kop"
+msgid "is greater than"
+msgstr "is grote dan"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: filter/libfilter-i18n.h:22
-msgid "Status"
-msgstr "Status"
+msgid "is less than"
+msgstr "is kleiner dan"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stop met Verwerken"
+msgid "is not"
+msgstr "is niet"
 
-# mail/message-list.c:495

 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Onderwerp"
+msgid "Message Body"
+msgstr "Bericht"
 
-# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "na"
+msgid "Message Header"
+msgstr "Bericht Kop"
 
+# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "voor"
+msgid "Message was received"
+msgstr "Bericht ontvangen"
 
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "bevat"
+msgid "Message was sent"
+msgstr "Bericht verzonden"
 
+# shell/e-shell-view-menu.c:402

 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "bevat niet"
+msgid "Move to Folder"
+msgstr "Verplaats naar Map"
 
+# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "eindigt niet op"
+msgid "on or after"
+msgstr "op of na"
 
-# composer/e-msg-composer.c:676

 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "klinkt niet als"
+msgid "on or before"
+msgstr "op of voor"
 
+# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "begint niet met"
+msgid "Recipients"
+msgstr "Geaddresseerden"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "eindigt op"
+msgid "Regex Match"
+msgstr "Overeenkomende Regex"
 
-# calendar/gui/getdate.y:441

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "bestaat"
+msgid "Sender"
+msgstr "Afzender"
 
+# mail/message-list.c:460

 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "is grote dan"
+msgid "Set Status"
+msgstr "Stel Status in"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "is kleiner dan"
+msgid "sounds like"
+msgstr "klinkt als"
 
+# mail/mail-config.c:1490

 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "is niet"
+msgid "Source"
+msgstr "Bron"
 
-# addressbook/gui/component/alphabet.glade.h:17

 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "is"
+msgid "Specific header"
+msgstr "Specifieke kop"
 
-# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "op of na"
+msgid "starts with"
+msgstr "begint met"
 
+# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "op of voor"
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "klinkt als"
+msgid "Stop Processing"
+msgstr "Stop met Verwerken"
 
+# mail/message-list.c:495

 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "begint met"
+msgid "Subject"
+msgstr "Onderwerp"
 
 # filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:43
@@ -4567,134 +4771,171 @@ msgid "Edit VFolder Rule"
 msgstr "Bewerk VMap Regel"
 
 # mail/component-factory.c:196

-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het post gedeelte van Evolution niet initialiseren."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
 # calendar/gui/print.c:326

-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Opslaan"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Bericht of onderwerp bevat"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Bericht bevat"
 
 # mail/message-list.c:495

-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Bericht bevat niet"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+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

+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "Verwijderd"
+
+# addressbook/printing/e-contact-print.glade.h:52

+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Verbergen"
+
+# 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:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Verwijderd"
+
+# mail/message-list.c:495

+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Onderwerp"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Filter op Afzender"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Openen"
 
 # composer/e-msg-composer.c:463

-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 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:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Afdrukken"
 
 # mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Afzender beantwoorden"
 
 # mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
 # mail/folder-browser-factory.c:37

-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Doorsturen"
 
 # calendar/gui/calendar-commands.c:554

-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ga vooruit in tijd"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 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:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
 # shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Verplaats naar Map..."
 
 # shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 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:480
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Terughalen"
 
@@ -4702,19 +4943,81 @@ msgstr "Terughalen"
 # 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:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-#: mail/folder-browser.c:546
+# composer/e-msg-composer.c:894

+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Bericht Bewerken"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailing Lijst (%s)"
 
+# mail/message-list.c:495

+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Onderwerp is %s"
+
+#: mail/folder-browser.c:793
+#, c-format
+msgid "Hide from Sender <%s>"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: mail/local-config.glade.h:6
+#, fuzzy
+msgid "Current store format:"
+msgstr "Bezig met vergaren opslag voor \"%s\""
+
+# calendar/gui/event-editor.c:294

+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Samenvatting postvak"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:10

+# addressbook/contact-editor/e-contact-editor-strings.h:12

+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Nieuws bron type:"
+
+#: mail/local-config.glade.h:9
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+
+#: mail/local-config.glade.h:10
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:11
+#, fuzzy
+msgid "mbox"
+msgstr "Postvak In"
+
+# addressbook/gui/component/alphabet.glade.h:16

+# calendar/cal-util/timeutil.c:98

+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 # mail/mail-config.c:1199

 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4779,7 +5082,7 @@ msgid "You have no Outbox configured"
 msgstr "Er is geen \"Postvak uit\" geconfigureerd"
 
 # mail/mail-ops.c:386

-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4787,22 +5090,27 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
+# mail/folder-browser-factory.c:37

+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "Doorgestuurd bericht:\n"
+
 # mail/folder-browser-factory.c:41

-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
 # composer/e-msg-composer.c:1127

-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopiëer bericht(en) naar"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4810,12 +5118,12 @@ msgstr ""
 "Je mag alleen berichten bewerken die opgeslagen zijn\n"
 "in de Klad map."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
 # shell/e-storage.c:416

-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4823,16 +5131,16 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
 # composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4841,49 +5149,307 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-# mail/mail-config.c:1180

+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:6
+#, fuzzy
+msgid "Account"
+msgstr "Accounts"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Account Informatie"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Account Beheer"
+
+# composer/e-msg-composer-attachment.glade.h:7

+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Attachment eigenschappen"
+
+# calendar/gui/gncal-todo.c:479

+# composer/e-msg-composer-address-dialog.glade.h:13

+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Geavanceerd..."
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr "Authenticatie"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Authenticatie:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+# calendar/gui/prop.c:836

+#: mail/mail-config-druid.glade.h:24
+msgid "Default"
+msgstr "Standaardwaarde"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Verwijder de berichten niet van de server"
+
+# shell/e-shell-view.c:596

+#: mail/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr "Klaar"
+
+# mail/mail-config.c:305

+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-mail Adres:"
+
+# mail/mail-config.c:305

+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "E-mail Adres:"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "Evolution Post Configuratie"
+
+# mail/mail-config.c:277

+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "Volledige Naam:"
+
+# mail/mail-config.c:725

+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+# mail/mail-config.c:1180

+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identiteit"
 
+#: mail/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Mail"
+msgstr "Post"
+
+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Accounts"
+
 # mail/mail-config.c:1163 mail/mail-config.c:1242

-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Post Configuratie"
 
-# mail/mail-config.c:1199

-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Post Bron"
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "Post Configuratie Druide"
 
-# mail/mail-config.c:1220

-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Post Transport"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr "Stel dit in als standaard account"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Welkom bij de Evolution Post Configuratie Wizard!\n"
+# shell/e-shell-view-menu.c:398

+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Nieuws"
 
-#: po/tmp/mail-config-druid.glade.h:14
+# addressbook/printing/e-contact-print.glade.h:10

+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Optioneel"
+
+# mail/mail-config.c:328

+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisatie:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+# mail/folder-browser-factory.c:101

+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr "Bezig met ontvangen E-mail"
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Onthoud dit wachtwoord"
+
+# mail/folder-browser-factory.c:34

+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Antwoord-Naar:"
+
+# mail/folder-browser-factory.c:34

+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Antwoord-naar:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565

+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr "Benodigd"
+
+# addressbook/gui/component/addressbook.c:943

+# addressbook/gui/minicard/e-minicard.c:330

+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Opslaan als VCard"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signatuur bestand:"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+#: mail/mail-config-druid.glade.h:62
+msgid "Sending Email"
+msgstr "Bezig met versturen E-mail"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "Server Configuratie"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Server Type: "
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Server Type: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "SMTP server heeft authenticatie nodig"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Server:"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:1490

+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Bronnen"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "SMTP server heeft authenticatie nodig"
+
+# addressbook/printing/e-contact-print.glade.h:30

+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Type:"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 msgstr ""
-"Je e-mail configuratie is nu klaar.\n"
-"Klik op \"Einde\" om je nieuwe instellingen op te slaan"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Geen informatie"
+
+# mail/mail-config.c:725

+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Welkom bij de Evolution Post Configuratie Wizard!\n"
+
+# calendar/gui/getdate.y:426

+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuten"
 
 # mail/mail-config.c:262

 #: mail/mail-config-gui.c:433
@@ -4906,18 +5472,8 @@ msgstr "Volledige naam:"
 msgid "Email address:"
 msgstr "E-mail adres:"
 
-# mail/mail-config.c:328

-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisatie:"
-
-# mail/mail-config.c:340

-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signatuur bestand:"
-
 # mail/mail-config.c:345

-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signatuur Bestand"
 
@@ -4926,30 +5482,11 @@ msgstr "Signatuur Bestand"
 msgid "Server:"
 msgstr "Server:"
 
-# mail/mail-config.c:725

-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-# mail/mail-config.c:732

-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Pad:"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Authenticatie:"
-
 # mail/mail-config.c:751 mail/mail-config.c:831

 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detecteer ondersteunde types..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "Onthoud dit wachtwoord"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Verwijder de berichten niet van de server"
@@ -4964,7 +5501,7 @@ msgid "Mail source type:"
 msgstr "Post bron type:"
 
 # mail/mail-config.c:960

-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -5002,6 +5539,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Mail transport type:"
 
+# mail/mail-config.c:960

+#: mail/mail-config-gui.c:1183
+#, fuzzy
+msgid ""
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
+msgstr ""
+"Selecteer het soort postserver, en de overige benodigde infomatie.\n"
+"\n"
+"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-gui.c:1233
 msgid "Add Identity"
@@ -5057,67 +5608,75 @@ msgid "Query authorization at \"%s\""
 msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
 # composer/e-msg-composer-address-dialog.glade.h:11

-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adres"
 
 # mail/mail-config.c:1180

-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identiteiten"
 
 # mail/mail-config.c:1199

-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Post Bronnen"
 
-#: po/tmp/mail-config.glade.h:13
+# mail/mail-config.c:1220

+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Post Transport"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Markeer bericht als gelezen [ms]: "
 
 # mail/mail-config.c:1658

-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Nieuws Servers"
 
 # mail/mail-config.c:1490

-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Nieuws Bronnen"
 
 # mail/mail-config.c:328

-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisatie"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Stuur berichten in HTML formaat"
 
-# mail/mail-config.c:1490

-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Bronnen"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Voer je PGP/GPG passphrase in."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
 
 # calendar/gui/event-editor.c:294

-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kon de pipe niet maken: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5127,137 +5686,137 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:814

-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
 # addressbook/contact-editor/e-contact-editor.c:671

 # calendar/gui/event-editor.c:1146

-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
 # composer/e-msg-composer.c:463

-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
 # addressbook/printing/e-contact-print.glade.h:52

-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Verbergen"
 
 # composer/e-msg-composer-attachment-bar.c:299

-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijvoegsel"
 
-# mail/folder-browser-factory.c:34

-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Antwoord-Naar:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
 
 # calendar/gui/prop.c:519

-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
 # composer/e-msg-composer.c:894

-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, 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:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configureer Map"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 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:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
 # composer/e-msg-composer.c:1127

-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Bezig met het kopiëren van berichten"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5266,7 +5825,7 @@ msgstr ""
 "Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5275,325 +5834,229 @@ msgstr ""
 "allicht noodzakelijk om deze handmatig te repareren."
 
 # shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Bezig met registreren lokale map"
 
 # shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Registreren lokale map"
 
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Fout tijdens `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Fout tijden het preparen van %s:\n"
+"%s"
+
+# calendar/gui/gnome-month-item.c:737

+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Bezig met verplaatsen"
+
 # mail/mail-ops.c:374

-#: mail/mail-ops.c:79
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Bezig met ophalen post van %s"
 
 # mail/mail-ops.c:374

-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe post op %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Bezig met op verzoek filteren van post"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filter post op verzoek"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Bezig met versturen van een bericht zonder onderwerp"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Verstuur \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Stuur een bericht zonder onderwerp"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Verzonden email-berichten"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Bezig met verzenden wachtrij"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Verzendings wachtrij"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Bezig met toevoegen \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Bezig met Legen \"%s\""
-
-# mail/folder-browser-factory.c:77

-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Legen \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiëren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiëer berichten van \"%s\" naar \"%s\""
 
 # calendar/gui/gnome-month-item.c:737

-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Bezig met kopiëren"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s bericht %d van %d (uid \"%s\")"
 
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Bezig met Markeren berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Markeer berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Bezig met markeren bericht %d van %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Scan mappen in \"%s\""
-
 # addressbook/gui/component/ldap-server-dialog.glade.h:7

 # composer/e-msg-composer-attachment.glade.h:9

-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Bezig met bijvoegen berichten uit map \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Voeg berichten van \"%s\" bij"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Bezig met Doorsturen berichten \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Bezig met doorsturen berichten zonder onderwerp"
-
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Bericht \"%s\" doorsturen"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Stuur een bericht door zonder onderwerp"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Fout bij genereren mime deel van bericht tijden het genereren van het door "
-"te sturen bericht."
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Doorgestuurd bericht:\n"
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "Doorgestuurd bericht:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Bezig met laden \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Laden \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Bezig met Maken \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Maken \"%s\""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-"Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
-"component listener'."
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Synchronizeren \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Bezig met weergeven UID van bericht \"%s\""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "Bezig met leegmaken berichtweergave"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Geef UID van bericht \"%s\" weer"
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Bezig met Legen \"%s\""
 
-# calendar/gui/prop.c:519

-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "Maak berichtweergave leeg"
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Bezig met openen berichten uit map \"%s\""
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Open berichten van \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Laad \"%s\" Map"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Bezig met bekijken berichten uit map \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Bekijk berichten uit \"%s\""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Bezig opslaan berichten uit map \"%s\""
+# composer/e-msg-composer.c:1127

+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Bezig met het kopiëren van berichten"
 
-#: mail/mail-ops.c:2431
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Bezig met opslaan berichten uit map \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, 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:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Fout bij opslaan bestand: %s"
+
 # filter/filter-editor.c:212

 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Annuleren"
 
 # mail/mail-threads.c:621

-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5602,7 +6065,7 @@ msgstr ""
 "Fout tijden het preparen van %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5612,23 +6075,23 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:623

-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 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:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Verminkt bericht van het verzend parallel proces?"
 
 # mail/mail-threads.c:814

-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Kon dialoog venster niet aanmaken."
 
 # mail/mail-threads.c:849

-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Gebruiker heeft vraag afgebroken."
 
@@ -5638,12 +6101,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Bezig met Bestuderen %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5651,46 +6114,45 @@ msgstr ""
 "Kon UID cache bestand \"%s\" niet lezen. Je zou dubbele berichten kunnen "
 "ontvangen."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
 # mail/folder-browser-factory.c:41

 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Bezig met wegschrijven bericht %d van %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Bezig met opslaan wijzingen aan %s"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (doorgestuurd bericht)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (geen onderwerp)"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5700,86 +6162,106 @@ msgstr ""
 "%s"
 
 # shell/e-shell-view.c:208

-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
 # 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:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Beantwoorden"
 
 # mail/folder-browser-factory.c:34

-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: 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:156 po/tmp/evolution-mail.xml.h:37
+#: 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:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Dit bericht doorsturen"
 
 # mail/folder-browser-factory.c:43

-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Druk dit bericht af"
 
 # mail/folder-browser-factory.c:45

-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Verwijdert dit bericht"
 
 # calendar/gui/getdate.y:448

-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Ongelezen"
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Beantwoord"
 
 # calendar/gui/calendar-commands.c:746

-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr "%s, en dergelijke."
 
 # shell/e-storage.c:434

-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-# mail/folder-browser-factory.c:37

-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "Bezig met herstructureren van bericht weergave"
+# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
 
-# composer/e-msg-composer.c:894

-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Herstructureer bericht weergave"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+# calendar/gui/event-editor.c:1745

+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5795,28 +6277,28 @@ msgstr "Bezig met vergaren opslag voor \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Bezig met vergaren opslag voor \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Bezig met afmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Afmelden bij map \"%s\""
 
 # shell/e-setup.c:47

-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installatie"
 
@@ -5836,27 +6318,27 @@ msgstr ""
 "breken."
 
 # mail/mail-threads.c:814

-#: shell/e-setup.c:155
+#: 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:158 shell/e-setup.c:224
+#: 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:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Het lijkt erop dat dit de eerste keer is dat je Evolution start."
 
 # shell/e-setup.c:52

-#: shell/e-setup.c:188
+#: 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:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5868,7 +6350,7 @@ msgstr ""
 "Fout: %s"
 
 # shell/e-setup.c:84

-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5878,7 +6360,7 @@ msgstr ""
 "`%s'."
 
 # shell/e-setup.c:108

-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5890,7 +6372,7 @@ msgstr ""
 "bestanden af te maken."
 
 # shell/e-setup.c:108

-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5931,7 +6413,7 @@ msgstr ""
 "voor de opdracht."
 
 # shell/e-shell-folder-selection-dialog.c:236

-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nieuw..."
 
@@ -5941,26 +6423,22 @@ msgid "(Untitled)"
 msgstr "(Geen)"
 
 # shell/e-shell-view-menu.c:110

-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 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

-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 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:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 # shell/e-shell-view-menu.c:163

-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5971,7 +6449,7 @@ msgstr ""
 "in de GNOME werkomgeving."
 
 # shell/e-shell-view-menu.c:301

-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
@@ -6088,9 +6566,8 @@ msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 # shell/e-shell-view-menu.c:398

-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
+#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
 msgid "_View"
 msgstr "Weerga_ve"
 
@@ -6161,12 +6638,13 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
 # shell/main.c:99

 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\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"
 "\n"
@@ -6223,329 +6701,313 @@ msgstr "Uitzetten."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-# addressbook/gui/component/addressbook.c:514

-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Ni_euwe Directory Server"
-
-# shell/e-shell-view-menu.c:474

-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Acties"
-
 # shell/e-shell-view-menu.c:404

-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
 # addressbook/gui/component/addressbook.c:426

-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Selecteer een contact"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Vinden"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Zoek een contact"
 
 # shell/e-shell-view-menu.c:398

-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nieuw"
 
 # addressbook/gui/component/addressbook.c:425

-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stoppen"
 
 # addressbook/printing/e-contact-print.glade.h:26

-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Allen Weergeven"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Geef alle kontaken weer"
 
+# mail/folder-browser-factory.c:95

+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "_Mail Configuratie..."
+
 # addressbook/gui/component/addressbook.c:425

-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Druk Kontakten af..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 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

-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Gereedschap"
 
 # calendar/gui/calendar-commands.c:525

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Dagen"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Instellingen Wijzigen"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalender Instellingen..."
 
 # calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
 # calendar/gui/calendar-commands.c:660

-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 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

-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
 # calendar/gui/calendar-commands.c:552

-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Ga terug in tijd"
 
 # calendar/gui/calendar-commands.c:554

-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Ga vooruit in tijd"
 
 # calendar/gui/calendar-commands.c:558

-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ga naar"
 
 # calendar/gui/calendar-commands.c:558

-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ga naar specifieke datum"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Ga naar huidig moment"
 
 # calendar/gui/calendar-commands.c:531

-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Maand"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Volgende"
 
 # calendar/gui/calendar-commands.c:664

-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Open een kalender"
 
 # calendar/gui/calendar-commands.c:552

-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Vorige"
 
 # calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Druk deze kalender af"
 
 # calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Kalender bewaren als iets anders"
 
 # calendar/gui/calendar-commands.c:522

-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Laat 1 dag zien"
 
 # calendar/gui/calendar-commands.c:531

-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Toon 1 maand"
 
 # calendar/gui/calendar-commands.c:528

-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Laat 1 week zien"
 
 # calendar/gui/calendar-commands.c:525

-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Laat de werkweek zien"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Vandaag"
 
 # calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Week"
 
 # shell/e-shell-view-menu.c:398

-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nieuw"
 
 # calendar/gui/calendar-commands.c:663

-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Open Ka_lender"
 
 # calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Druk deze kalender af"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Bewaar Kalender Als"
+# composer/e-msg-composer.c:463

+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+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

-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 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

-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Verwijderen..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Help"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
 # addressbook/contact-editor/e-contact-editor.c:845

 # calendar/gui/event-editor.c:1326

-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Item afdrukken"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Afdrukken..."
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
 # addressbook/contact-editor/e-contact-editor.c:839

-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Opslaan en Sluiten"
 
 # addressbook/contact-editor/e-contact-editor.c:840

 # calendar/gui/event-editor.c:1321

-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 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

-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Zie help"
 
 # addressbook/contact-editor/e-contact-editor.c:782

-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Nieuw _bericht naar contact..."
 
 # widgets/e-table/e-table-config.glade.h:10

-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Bestand"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
 # calendar/gui/print.c:326

-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Opslaan"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Over deze applicatie"
 
@@ -6553,1042 +7015,1084 @@ msgstr "Over deze applicatie"
 # addressbook/printing/e-contact-print.glade.h:21

 # addressbook/printing/e-contact-print.glade.h:51

 # addressbook/printing/e-contact-print.glade.h:54

-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Over..."
 
 # shell/e-shell-view-menu.c:474

-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "W_issen"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "K_nippen"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Wissen"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Selectie wissen"
 
 # calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Deze afspraak sluiten"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopiëer de selectie"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Knippen"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "XML Dumpen"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Dump de UI Xml omschrijving"
 
 # calendar/gui/event-editor.c:1251

-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adres _Boek..."
 
 # 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

-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Seleecteer F_ormulier"
 
 # calendar/gui/event-editor.c:1250

-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Controleer Namen"
 
 # addressbook/contact-editor/e-contact-editor.c:675

 # calendar/gui/event-editor.c:1150

-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopieer naar Folder..."
 
 # addressbook/contact-editor/e-contact-editor.c:761

 # calendar/gui/event-editor.c:1238

-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ontw_erp een Formulier..."
 
 # addressbook/contact-editor/e-contact-editor.c:660

 # calendar/gui/event-editor.c:1135

-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Definiëer Print _Stijlen..."
 
 # addressbook/contact-editor/e-contact-editor.c:760

 # calendar/gui/event-editor.c:1237

-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Ontwerp dit Formulier"
 
 # addressbook/contact-editor/e-contact-editor.c:715

 # calendar/gui/event-editor.c:1190

-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Ee_rste Item in Folder"
 
 # addressbook/contact-editor/e-contact-editor.c:793

 # calendar/gui/event-editor.c:1266

-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: Doorsturen"
 
 # calendar/gui/event-editor.c:1265

-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Doorsturen als v_Calendar"
 
 # addressbook/contact-editor/e-contact-editor.c:862

 # calendar/gui/event-editor.c:1343

-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Help"
 
 # addressbook/contact-editor/e-contact-editor.c:648

 # calendar/gui/event-editor.c:1123

-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Niet complete taak"
 
 # addressbook/contact-editor/e-contact-editor.c:848

 # calendar/gui/event-editor.c:1327

-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Bestand Bijvoegen"
 
 # addressbook/contact-editor/e-contact-editor.c:746

 # calendar/gui/event-editor.c:1223

-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: It_em..."
 
 # addressbook/contact-editor/e-contact-editor.c:699

 # calendar/gui/event-editor.c:1174

-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Plakken _Speciaal..."
 
 # addressbook/contact-editor/e-contact-editor.c:678

 # calendar/gui/event-editor.c:1153

-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Afdruk_voorbeeld"
 
 # addressbook/contact-editor/e-contact-editor.c:764

 # calendar/gui/event-editor.c:1241

-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_bliceer een Formulier als..."
 
 # addressbook/contact-editor/e-contact-editor.c:763

 # calendar/gui/event-editor.c:1240

-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publiceer een _Formulier..."
 
 # calendar/gui/event-editor.c:1260

-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Herhaling..."
 
 # addressbook/contact-editor/e-contact-editor.c:667

 # calendar/gui/event-editor.c:1142

-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: V_ersturen"
 
 # calendar/gui/event-editor.c:1333

-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Aanhangels Opslaan..."
 
 # addressbook/contact-editor/e-contact-editor.c:766

 # calendar/gui/event-editor.c:1243

-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Script _Debugger"
 
 # addressbook/contact-editor/e-contact-editor.c:649

 # calendar/gui/event-editor.c:1124

-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Taak Verzoek"
 
 # addressbook/contact-editor/e-contact-editor.c:647

 # calendar/gui/event-editor.c:1122

-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contact"
 
 # addressbook/contact-editor/e-contact-editor.c:732

 # calendar/gui/event-editor.c:1207

-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Aanpassen..."
 
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: Bestand..."
 
 # addressbook/contact-editor/e-contact-editor.c:752

 # calendar/gui/event-editor.c:1229

-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Font..."
 
 # addressbook/contact-editor/e-contact-editor.c:729

 # calendar/gui/event-editor.c:1204

-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Opmaak"
 
 # 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

-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Item"
 
 # addressbook/contact-editor/e-contact-editor.c:650

 # calendar/gui/event-editor.c:1125

-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Dagboek Item"
 
 # addressbook/contact-editor/e-contact-editor.c:722

 # calendar/gui/event-editor.c:1197

-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Laatste Item in Folder"
 
 # addressbook/contact-editor/e-contact-editor.c:646

 # calendar/gui/event-editor.c:1121

-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Mail bericht"
 
 # addressbook/contact-editor/e-contact-editor.c:658

 # calendar/gui/event-editor.c:1133

-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Memo Stijl"
 
 # addressbook/contact-editor/e-contact-editor.c:674

 # calendar/gui/event-editor.c:1149

-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Verplaats naar Folder..."
 
 # calendar/gui/event-editor.c:1258

-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nieuwe Afspraak"
 
 # addressbook/contact-editor/e-contact-editor.c:651

 # calendar/gui/event-editor.c:1126

-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: Aanteke_ning"
 
 # addressbook/contact-editor/e-contact-editor.c:747

 # calendar/gui/event-editor.c:1224

-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Object..."
 
 # addressbook/contact-editor/e-contact-editor.c:753

 # calendar/gui/event-editor.c:1230

-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Paragraaf..."
 
 # addressbook/contact-editor/e-contact-editor.c:771

 # calendar/gui/event-editor.c:1248

-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Spelling..."
 
 # addressbook/contact-editor/e-contact-editor.c:727

 # calendar/gui/event-editor.c:1202

-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standaard"
 
 # addressbook/contact-editor/e-contact-editor.c:648

 # calendar/gui/event-editor.c:1123

-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Taak"
 
 # 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

-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Ongelezen Item"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: what moet hier staan?"
 
 # addressbook/contact-editor/e-contact-editor.c:806

 # calendar/gui/event-editor.c:1280

-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "_Opmaak"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Opnieuw Zoeken"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Opnieuw _Vinden"
 
 # addressbook/contact-editor/e-contact-editor.c:860

 # calendar/gui/event-editor.c:1342

-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 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

-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ga naar het vorige item"
 
 # calendar/gui/prop.c:678

-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "De bestandseigenschappen wijzigen"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 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

-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Plakken"
 
 # composer/e-msg-composer-address-dialog.c:192

 # composer/e-msg-composer-address-dialog.c:200

-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
 # addressbook/contact-editor/e-contact-editor.c:737

 # calendar/gui/event-editor.c:1212

-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Vorige"
 
 # addressbook/contact-editor/e-contact-editor.c:737

 # calendar/gui/event-editor.c:1212

-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Vorige"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Afdruk In_stellingen..."
 
 # addressbook/printing/e-contact-print.glade.h:7

-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Printer Instellingen"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Eigenschappen"
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Herhalen"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
 # mail/folder-browser-factory.c:34

-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Vervangen"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Tekenreeks vervangen"
 
 # addressbook/contact-editor/e-contact-editor.c:840

 # calendar/gui/event-editor.c:1321

-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Bewaar de afspraak en sluit dit venster"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Afspraak Plannen"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "_Afspraak Plannen"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Een soort afspraak maken"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Zoek naar een tekenreeks"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Selecteer alles"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Stel de pagina instellingen in voor de huidige printer"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Ongedaan maken"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Maak de laatste bewerking ongedaan"
 
 # shell/e-shell-view-menu.c:159

-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Over..."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Sluiten"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Debug"
 
 # calendar/gui/gncal-todo.c:488

-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 msgid "_Edit"
 msgstr "B_ewerken..."
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Vind..."
 
 # addressbook/contact-editor/e-contact-editor.c:773

 # calendar/gui/event-editor.c:1253

-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulier"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
+#: ui/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Help"
 
 # addressbook/contact-editor/e-contact-editor.c:805

 # calendar/gui/event-editor.c:1279

-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Invoegen"
 
 # addressbook/contact-editor/e-contact-editor.c:708

 # calendar/gui/event-editor.c:1183

-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Object"
 
 # composer/e-msg-composer-address-dialog.c:191

 # composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 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

-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Afdrukken"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Herhalen"
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "Ve_rvangen..."
 
 # addressbook/contact-editor/e-contact-editor.c:740

 # calendar/gui/event-editor.c:1217

-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Werkbalk"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
 # mail/folder-browser-factory.c:30

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Opstellen"
 
 # mail/folder-browser-factory.c:30

-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Stel een nieuw bericht op"
 
 # mail/folder-browser-factory.c:41

-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiëer het bericht naar een nieuwe map"
 
 # shell/e-shell-view-menu.c:365

-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Map"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filteren op Afzender"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filteren op Geadresseerden"
 
 # mail/folder-browser-factory.c:101

-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
 # mail/folder-browser-factory.c:29

-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Post Ophalen"
 
+# mail/folder-browser-factory.c:45

+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Bericht Verwijderen"
+
+# mail/folder-browser-factory.c:37

+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Doorgestuurd bericht:\n"
+
+# mail/folder-browser-factory.c:43

+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Druk dit bericht af"
+
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "Post _Filters"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Manage Subscriptions..."
 msgstr "Aanmeldingen Beheren"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "_Markeer Als Gelezen"
 
 # addressbook/contact-editor/e-contact-editor.c:704

 # calendar/gui/event-editor.c:1179

-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Markeer Als _Ongelezen"
 
 # calendar/gui/print.c:326

-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Verplaatsen"
 
 # mail/folder-browser-factory.c:41

-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:894

-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Geeft een voorbeeld van het af te drukken bericht"
 
 # calendar/gui/print.c:1249

-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Afdrukvoorbeeld van bericht..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Bericht afdrukken naar de printer"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Bericht afdrukken..."
 
 # mail/folder-browser-factory.c:35

-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
 # mail/folder-browser-factory.c:35

-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Af_zender beantwoorden"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Verzonden email-berichten"
+
 # mail/folder-browser-factory.c:37

-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
 # mail/mail-config.c:1490

-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Bekijk Pure Bericht Bron"
 
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configureer Map"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Kopiëren naar Map..."
 
 # composer/e-msg-composer.c:894

-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "Bericht _Bewerken"
 
 # mail/folder-browser-factory.c:77

-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Legen"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filteren op Onderwerp"
 
 # mail/folder-browser-factory.c:37

-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration"
-msgstr "_Post Configuratie"
+# mail/folder-browser-factory.c:95

+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "_Mail Configuratie..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Bericht"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Openen in Nieuw Venster"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Bericht A_fdrukken"
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "Bericht Op_slaan als..."
 
 # mail/mail-config.c:1490

-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Bron"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "Rela_ties weergeven"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:8

 # addressbook/contact-editor/e-contact-editor.c:673

-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_VMap op Onderwerp"
 
 # mail/folder-browser-factory.c:89

-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "_Virtuele Map Bewerker"
 
 # composer/e-msg-composer.c:951

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Bijvoegen"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+# composer/e-msg-composer.c:894

+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Versleuteld bericht"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Tekst bestand invoegen..."
 
 # composer/e-msg-composer.c:561

-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Bestand openen"
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Opslaan Als"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Opslaan in _map... (FIXME)"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 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

-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 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

-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "_Later Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "_Later versturen"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Stuur de mail in HTML formaat"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Dit bericht later versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:907

-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Toon / Verberg bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Bekijk bijvoegsels"
 
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Bezig met versturen van een bericht zonder onderwerp"
+
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Openen..."
 
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Security"
+msgstr ""
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "map toevoegen aan de lijst van aangemelde mappen"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Lijst Verfrissen"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Lijst of Mappen Verfrissen"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Map verwijderen van je lijst van aangemelde mappen"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Aanmelden"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
 # shell/e-shell-view-menu.c:402

 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
 # calendar/gui/gncal-todo.c:488

-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Stop_pen"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution balk _snelkoppeling"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
 # shell/e-shell-view-menu.c:443

-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Geef informatie over Evolution weer"
 
 # shell/e-shell-view-menu.c:422

-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "_Mapbalk Tonen"
 
 # shell/e-shell-view-menu.c:419

-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Snelkoppelingenbalk Tonen"
 
 # shell/e-shell-view-menu.c:457

-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
 # shell/e-shell-view-menu.c:458

-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Report insturen met Bug Buddy."
 
 # shell/e-shell-view-menu.c:423

-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mapbalk"
 
 # shell/e-shell-view-menu.c:420

-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
 # shell/e-shell-view-menu.c:452

-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Kont_akt Beheerder"
 
 # shell/e-shell-view-menu.c:449

-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
 # shell/e-shell-view-menu.c:446

-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "De _Mailer Gebruiken"
 
 # shell/e-shell-view-menu.c:159

-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
 # shell/e-shell-view-menu.c:378

-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
 # shell/e-shell-view-menu.c:381

-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
 # shell/e-shell-view-menu.c:365

-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Map"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
 # shell/e-shell-view-menu.c:440

-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
 # shell/e-shell-view-menu.c:375

-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Bericht mailen (FIXME)"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "In_stellingen:"
 
 # shell/e-shell-view-menu.c:384

-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
@@ -7596,7 +8100,7 @@ msgstr "_Taak (FIXME)"
 #. 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
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7695,31 +8199,37 @@ msgstr "_Eindtijd vergadering:"
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
+#. 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
+msgid "MTWTFSS"
+msgstr "MDWDVZZ"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
 # widgets/misc/e-clipped-label.c:106

-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
 # addressbook/gui/component/addressbook.c:420

 # calendar/gui/calendar-commands.c:544

-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Nu"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: 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.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: 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"
 
@@ -7729,13 +8239,360 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Group %i"
 
+# addressbook/contact-editor/categories-strings.h:7

+#~ msgid "categories"
+#~ msgstr "Categorieën"
+
+# addressbook/contact-editor/categories-strings.h:8

+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Item(s) die tot deze categorie behoren:"
+
+# 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

+#~ msgid "Port Number:"
+#~ msgstr "Poort:"
+
+# calendar/gui/calendar-commands.c:56

+#~ msgid "Outline:"
+#~ msgstr "Buitenlijn:"
+
+# 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:59

+#~ msgid "Appointments:"
+#~ msgstr "Afspraaken:"
+
+# calendar/gui/calendar-commands.c:60

+#~ msgid "Highlighted day:"
+#~ msgstr "Gemarkeerde dag:"
+
+# calendar/gui/calendar-commands.c:61

+#~ msgid "Day numbers:"
+#~ msgstr "Dag nummers:"
+
+# calendar/gui/calendar-commands.c:62

+#~ msgid "Current day's number:"
+#~ msgstr "Nummer van vandaag:"
+
+# 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

+#~ msgid "To-Do item that is due today:"
+#~ msgstr "To-Do item dat vandaag af moet:"
+
+# 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

+#~ msgid "may"
+#~ msgstr "may"
+
+# calendar/gui/getdate.y:400

+#~ msgid "sept"
+#~ msgstr "sept"
+
+# calendar/gui/getdate.y:404

+#~ msgid "sunday"
+#~ msgstr "zondag"
+
+# calendar/gui/getdate.y:405

+#~ msgid "monday"
+#~ msgstr "maandag"
+
+# calendar/gui/getdate.y:406

+#~ msgid "tuesday"
+#~ msgstr "dinsdag"
+
+# calendar/gui/getdate.y:407

+#~ msgid "tues"
+#~ msgstr "di"
+
+# calendar/gui/getdate.y:408

+#~ msgid "wednesday"
+#~ msgstr "woensdag"
+
+# calendar/gui/getdate.y:409

+#~ msgid "wednes"
+#~ msgstr "woe"
+
+# calendar/gui/getdate.y:410

+#~ msgid "thursday"
+#~ msgstr "donderdag"
+
+# calendar/gui/getdate.y:411

+#~ msgid "thur"
+#~ msgstr "do"
+
+# calendar/gui/getdate.y:412

+#~ msgid "thurs"
+#~ msgstr "don"
+
+# calendar/gui/getdate.y:413

+#~ msgid "friday"
+#~ msgstr "vrijdag"
+
+# calendar/gui/getdate.y:414

+#~ msgid "saturday"
+#~ msgstr "zaterdag"
+
+# calendar/gui/getdate.y:422

+#~ msgid "fortnight"
+#~ msgstr "twee weken"
+
+# calendar/gui/getdate.y:427

+#~ msgid "min"
+#~ msgstr "min"
+
+# calendar/gui/getdate.y:429

+#~ msgid "sec"
+#~ msgstr "sec"
+
+# calendar/gui/getdate.y:435

+#~ msgid "tomorrow"
+#~ msgstr "morgen"
+
+# calendar/gui/getdate.y:436

+#~ msgid "yesterday"
+#~ msgstr "gisteren"
+
+# calendar/gui/getdate.y:437

+#~ msgid "today"
+#~ msgstr "vandaag"
+
+# calendar/gui/getdate.y:439

+#~ msgid "last"
+#~ msgstr "afgelopen"
+
+# calendar/gui/getdate.y:440

+#~ msgid "this"
+#~ msgstr "deze"
+
+# calendar/gui/getdate.y:441

+#~ msgid "next"
+#~ msgstr "volgende"
+
+# calendar/gui/getdate.y:442

+#~ msgid "first"
+#~ msgstr "eerste"
+
+# calendar/gui/getdate.y:444

+#~ msgid "third"
+#~ msgstr "derde"
+
+# calendar/gui/getdate.y:445

+#~ msgid "fourth"
+#~ msgstr "vierde"
+
+# calendar/gui/getdate.y:446

+#~ msgid "fifth"
+#~ msgstr "vijfde"
+
+# calendar/gui/getdate.y:447

+#~ msgid "sixth"
+#~ msgstr "zesde"
+
+# calendar/gui/getdate.y:448

+#~ msgid "seventh"
+#~ msgstr "sevende"
+
+# calendar/gui/getdate.y:449

+#~ msgid "eighth"
+#~ msgstr "achtste"
+
+# calendar/gui/getdate.y:450

+#~ msgid "ninth"
+#~ msgstr "negende"
+
+# calendar/gui/getdate.y:451

+#~ msgid "tenth"
+#~ msgstr "tiende"
+
+# calendar/gui/getdate.y:452

+#~ msgid "eleventh"
+#~ msgstr "elfde"
+
+# calendar/gui/getdate.y:453

+#~ msgid "twelfth"
+#~ msgstr "twaalfde"
+
+# calendar/gui/getdate.y:454

+#~ msgid "ago"
+#~ msgstr "geleden"
+
+# calendar/gui/goto.c:82

+#~ msgid "Year:"
+#~ msgstr "Jaar:"
+
+# 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"
+#~ "to that date."
+#~ msgstr ""
+#~ "Selecteer de datum waar je naar toe wil.\n"
+#~ "Wanneer op je die dag klikt, ga je naar die\n"
+#~ "dag toe."
+
+# mail/mail-config.c:1199

+#~ msgid "Mail Source"
+#~ msgstr "Post Bron"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Je e-mail configuratie is nu klaar.\n"
+#~ "Klik op \"Einde\" om je nieuwe instellingen op te slaan"
+
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+#~ msgid "Send \"%s\""
+#~ msgstr "Verstuur \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Stuur een bericht zonder onderwerp"
+
+# mail/folder-browser-factory.c:77

+#~ msgid "Expunge \"%s\""
+#~ msgstr "Legen \"%s\""
+
+# 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

+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Markeer berichten in map \"%s\""
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Marking message %d of %d"
+#~ msgstr "Bezig met markeren bericht %d van %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Scan mappen in \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Bezig met bijvoegen berichten uit map \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Voeg berichten van \"%s\" bij"
+
+# 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

+#~ msgid "Forward message \"%s\""
+#~ msgstr "Bericht \"%s\" doorsturen"
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Stuur een bericht door zonder onderwerp"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Fout bij genereren mime deel van bericht tijden het genereren van het door "
+#~ "te sturen bericht."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Bezig met laden \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Laden \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Bezig met Maken \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Maken \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr ""
+#~ "Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
+#~ "component listener'."
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synchronizeren \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Bezig met weergeven UID van bericht \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "Bezig met leegmaken berichtweergave"
+
+#~ 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\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Open berichten van \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Bezig met bekijken berichten uit map \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Bekijk berichten uit \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Bezig opslaan berichten uit map \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Bezig met opslaan berichten uit map \"%s\""
+
+# mail/folder-browser-factory.c:37

+#~ msgid "Rebuilding message view"
+#~ msgstr "Bezig met herstructureren van bericht weergave"
+
+# composer/e-msg-composer.c:894

+#~ msgid "Rebuild message view"
+#~ msgstr "Herstructureer bericht weergave"
+
+# 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

+#~ msgid "_Save Calendar As"
+#~ msgstr "_Bewaar Kalender Als"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#~ msgid "_Mail Configuration"
+#~ msgstr "_Post Configuratie"
+
 # mail/mail-threads.c:814

 #~ msgid "Could not create summary"
 #~ msgstr "Kon samenvatting niet maken"
 
-#~ msgid "Cannot append message to mbox file: %s"
-#~ msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
-
 # shell/e-shell.c:299

 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan bericht niet vergaren: %s"
@@ -7794,19 +8651,6 @@ msgstr "Group %i"
 #~ msgid "Flagged"
 #~ msgstr "Gevlagd"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

-#~ msgid "Read"
-#~ msgstr "Gelezen"
-
-# mail/folder-browser-factory.c:35

-#~ msgid "Replied to"
-#~ msgstr "Beantwoord aan"
-
-# mail/component-factory.c:196

-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr ""
-#~ "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
-
 # mail/component-factory.c:196

 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
@@ -7836,12 +8680,6 @@ msgstr "Group %i"
 #~ msgid "window2"
 #~ msgstr "venster2"
 
-# 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"
-
 # filter/filter-editor.c:198

 #~ msgid "Draft"
 #~ msgstr "Klad"
@@ -7855,18 +8693,6 @@ msgstr "Group %i"
 #~ msgid "matches regex"
 #~ msgstr "is gelijk aan reguliere expressie"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#~ msgid "Account Information"
-#~ msgstr "Account Informatie"
-
-#~ msgid "Account Management"
-#~ msgstr "Account Beheer"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#~ msgid "Accounts"
-#~ msgstr "Accounts"
-
 # calendar/gui/gncal-todo.c:325

 #~ msgid "Add Optional Fields..."
 #~ msgstr "Optionele Velden Toevoegen..."
@@ -7875,70 +8701,18 @@ msgstr "Group %i"
 #~ msgid "Additional Identity Fields"
 #~ msgstr "Optionele Identiteits Velden"
 
-# mail/mail-config.c:739 mail/mail-config.c:819

-#~ msgid "Authentication"
-#~ msgstr "Authenticatie"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:7

 #~ msgid "Browse..."
 #~ msgstr "Bladeren..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
-
-# calendar/gui/prop.c:836

-#~ msgid "Default"
-#~ msgstr "Standaardwaarde"
-
-# shell/e-shell-view.c:596

-#~ msgid "Done"
-#~ msgstr "Klaar"
-
 # mail/mail-config.c:1163 mail/mail-config.c:1242

 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Bewerk Post Configuratie Instellingen"
 
-# mail/mail-config.c:305

-#~ msgid "Email Address:"
-#~ msgstr "E-mail Adres:"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution Post Configuratie"
-
-# mail/mail-config.c:277

-#~ msgid "Full Name:"
-#~ msgstr "Volledige Naam:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "Post"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Post Configuratie Druide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "Stel dit in als standaard account"
-
-# shell/e-shell-view-menu.c:398

-#~ msgid "News"
-#~ msgstr "Nieuws"
-
-# addressbook/printing/e-contact-print.glade.h:10

-#~ msgid "Optional"
-#~ msgstr "Optioneel"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:389

 #~ msgid "Optional Information"
 #~ msgstr "Optionele Informatie"
 
-# mail/folder-browser-factory.c:101

-#~ msgid "Password:"
-#~ msgstr "Wachtwoord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7962,42 +8736,13 @@ msgstr "Group %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Voorkeurstype:"
 
-#~ msgid "Receiving Email"
-#~ msgstr "Bezig met ontvangen E-mail"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Bezig met ontvangen Post"
 
-# mail/folder-browser-factory.c:34

-#~ msgid "Reply-to:"
-#~ msgstr "Antwoord-naar:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#~ msgid "Required"
-#~ msgstr "Benodigd"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP server heeft authenticatie nodig"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#~ msgid "Sending Email"
-#~ msgstr "Bezig met versturen E-mail"
-
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #~ msgid "Sending Mail"
 #~ msgstr "Bezig met versturen Post"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Server Configuration"
-#~ msgstr "Server Configuratie"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#~ msgid "Server Type: "
-#~ msgstr "Server Type: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -8028,10 +8773,6 @@ msgstr "Group %i"
 #~ msgid "_Open"
 #~ msgstr "_Openen"
 
-# mail/folder-browser-factory.c:95

-#~ msgid "_Mail Configuration..."
-#~ msgstr "_Mail Configuratie..."
-
 # shell/e-shell-view-menu.c:404

 #~ msgid "Create a new folder"
 #~ msgstr "Nieuwe map aanmaken"
@@ -8173,10 +8914,6 @@ msgstr "Group %i"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Bekijk bericht bronnen uit \"%s\""
 
-# calendar/gui/event-editor.c:294

-#~ msgid "Mailbox summary"
-#~ msgstr "Samenvatting postvak"
-
 # mail/folder-browser-factory.c:37

 #~ msgid "Threading message list"
 #~ msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
@@ -8188,13 +8925,6 @@ msgstr "Group %i"
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Weet u zeker dat u dit contact\n"
-#~ "wilt verwijderen?"
-
 # composer/e-msg-composer-address-dialog.glade.h:9

 #~ msgid "Quick Search"
 #~ msgstr "Snel Zoeken"
@@ -8248,28 +8978,16 @@ msgstr "Group %i"
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX ongelezen)"
 
-# mail/folder-browser-factory.c:37

-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Bezig met ophalen berichten : %s"
-
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Geen protocol om URI `%s' te openen"
 
 #~ msgid "Open in New Window"
 #~ msgstr "Open in Nieuw Venster"
 
-# composer/e-msg-composer.c:894

-#~ msgid "Edit Message"
-#~ msgstr "Bericht Bewerken"
-
 # mail/folder-browser-factory.c:37

 #~ msgid "Forward Message"
 #~ msgstr "Bericht Doorsturen"
 
-# mail/folder-browser-factory.c:45

-#~ msgid "Delete Message"
-#~ msgstr "Bericht Verwijderen"
-
 #~ msgid "Move Message"
 #~ msgstr "Bericht Verplaatsen"
 
@@ -8501,10 +9219,6 @@ msgstr "Group %i"
 #~ msgid "Search..."
 #~ msgstr "Zoeken..."
 
-# composer/e-msg-composer-address-dialog.glade.h:10

-#~ msgid "Name"
-#~ msgstr "Naam"
-
 # composer/e-msg-composer-address-dialog.glade.h:14

 #~ msgid "To: >>"
 #~ msgstr "Aan: >>"
@@ -8666,9 +9380,6 @@ msgstr "Group %i"
 #~ msgid "S_ubject:"
 #~ msgstr "Onderwerp:"
 
-#~ msgid "Owner:"
-#~ msgstr "Eigenaar:"
-
 #~ msgid ""
 #~ "Not Started\n"
 #~ "In Progress\n"
@@ -8713,9 +9424,6 @@ msgstr "Group %i"
 #~ msgid "Transparency"
 #~ msgstr "Transparantheid"
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
 # addressbook/contact-editor/e-contact-editor.c:671

 # calendar/gui/event-editor.c:1146

 #~ msgid "FIXME: Invite _Attendees..."
@@ -8801,10 +9509,6 @@ msgstr "Group %i"
 #~ "Je moet het mail programma configuren\n"
 #~ "voordat je mail kunt versturen."
 
-# calendar/gui/gncal-todo.c:190

-#~ msgid "Port:"
-#~ msgstr "Poort:"
-
 #~ msgid "Bad folder passed to fetch_mail"
 #~ msgstr "Slechte map gepasseerd naar fetch_mail"
 
@@ -8943,10 +9647,6 @@ msgstr "Group %i"
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Maak een nieuwe afspraak voor vandaag"
 
-# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

-#~ msgid "?"
-#~ msgstr "?"
-
 # composer/e-msg-composer.c:945

 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Knip het geselecteerde gebied naar het klembord"
@@ -9085,18 +9785,9 @@ msgstr "Group %i"
 #~ msgid "Executive Summary"
 #~ msgstr "Samenvatting"
 
-#~ msgid "Inbox"
-#~ msgstr "Postvak In"
-
-#~ msgid "Sent mail messages"
-#~ msgstr "Verzonden email-berichten"
-
 #~ msgid "Tasks list"
 #~ msgstr "Taaklisjt"
 
-#~ msgid "Other Shortcuts"
-#~ msgstr "Andere Snelkoppelingen"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "Zet wat debugging functies aan"