Updated Dutch translation.

2000-11-19  Almer S. Tigelaar  <almer1@dds.nl>

	* nl.po: Updated Dutch translation.

svn path=/trunk/; revision=6613

2 files changed, 2622 insertions, 2216 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 84f621de15..36f1ed9df0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-19  Almer S. Tigelaar  <almer1@dds.nl>
+
+	* nl.po: Updated Dutch translation.
+
 2000-11-18  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/nl.po b/po/nl.po
index eb99fe60b7..454c9ca720 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2000-10-31 15:37+0200\n"
-"PO-Revision-Date: 2000-10-31 15:38+0200\n"
+"POT-Creation-Date: 2000-11-19 20:15+0100\n"
+"PO-Revision-Date: 2000-10-31 20:20+0200\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 # addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Kaart: "
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Naam: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Prefix:      "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Gegeven:      "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Extra: "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
@@ -63,7 +63,7 @@ msgstr ""
 "  Familie:      "
 
 # addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "  Achtervoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +80,7 @@ msgstr ""
 "Geboorte Datum: "
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +88,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +96,7 @@ msgstr ""
 "\n"
 "  Postbus:  "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +104,7 @@ msgstr ""
 "\n"
 "Ext:           "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +112,7 @@ msgstr ""
 "\n"
 "  Straat:      "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +120,7 @@ msgstr ""
 "\n"
 "  Stad:        "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +128,7 @@ msgstr ""
 "\n"
 "  Regio:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +136,7 @@ msgstr ""
 "\n"
 "  Postcode: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -144,7 +144,7 @@ msgstr ""
 "\n"
 "  Land:      "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
@@ -152,7 +152,7 @@ msgstr ""
 "\n"
 "Afleverings Label: "
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -160,7 +160,7 @@ msgstr ""
 "\n"
 "Telefoons:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +169,7 @@ msgstr ""
 "Telefoon:"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +178,7 @@ msgstr ""
 "E-mail:\n"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -203,7 +203,7 @@ msgstr ""
 "Tijdzone: "
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -212,7 +212,7 @@ msgstr ""
 "Geografische Locatie: "
 
 # addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -220,7 +220,7 @@ msgstr ""
 "\n"
 "Bedrijfsrol: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -230,7 +230,7 @@ msgstr ""
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "Naam:   "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Eenheid:  "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Eenheid2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Eenheid3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -271,7 +271,7 @@ msgstr ""
 "  Eenheid4: "
 
 # addressbook/contact-editor/categories-strings.h:7

-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -280,7 +280,7 @@ msgstr ""
 "Categorieën: "
 
 # calendar/gui/gncal-todo.c:207

-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -298,7 +298,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -306,7 +306,7 @@ msgstr ""
 "\n"
 "Unieke Tekenreeks: "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -320,10 +320,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:1064
+#: addressbook/conduit/address-conduit.c:1012
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1058
-#: calendar/conduits/todo/todo-conduit.c:932 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1092
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -444,25 +444,28 @@ 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:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
-msgstr "BLARG\n"
+#: addressbook/conduit/address-conduit.c:207
+msgid "Cursor could not be loaded\n"
+msgstr "Cursor kon niet worden geladen\n"
+
+#: addressbook/conduit/address-conduit.c:220
+msgid "EBook not loaded\n"
+msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:622
-#: calendar/conduits/todo/todo-conduit.c:495
+#: addressbook/conduit/address-conduit.c:579
+#: calendar/conduits/calendar/calendar-conduit.c:651
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:623
-#: calendar/conduits/todo/todo-conduit.c:496
+#: addressbook/conduit/address-conduit.c:580
+#: calendar/conduits/calendar/calendar-conduit.c:652
+#: calendar/conduits/todo/todo-conduit.c:525
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:613
+#: addressbook/conduit/address-conduit.c:616
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
@@ -487,139 +490,131 @@ msgid "Available Categories:"
 msgstr "Beschikbare Categorieën:"
 
 # addressbook/contact-editor/e-contact-editor.c:1278

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

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

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

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

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

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

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1277
 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:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: mail/mail-config.glade.h:18
 msgid "Other"
 msgstr "Overige"
 
 # addressbook/contact-editor/e-contact-editor.c:1291

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

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

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # 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:1280
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Primary Email"
 msgstr "Primaire E-mail"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

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

-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "E-mail 3"
 
+# addressbook/gui/component/addressbook.c:426

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Weet u zeker dat u dit contact\n"
-"wilt verwijderen?"
-
-# addressbook/gui/component/addressbook.c:426

-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
 msgid "Delete Contact?"
 msgstr "Contact verwijderen?"
 
@@ -636,7 +631,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
-#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:49
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -653,11 +648,14 @@ msgid "New phone type"
 msgstr "Nieuw telefoon type"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:11

+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -723,7 +721,7 @@ msgstr "K_ontakten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:27

 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieën..."
 
@@ -800,64 +798,51 @@ msgstr "Aa_ntekeningen:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:41

 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Details"
 msgstr "Details"
 
-# composer/e-msg-composer-address-dialog.glade.h:11

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

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Address _2:"
+msgstr "Adres _2:"
+
+# composer/e-msg-composer-address-dialog.glade.h:11

+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Controleer Adres"
 
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "_Land:"
+
 # addressbook/contact-editor/e-contact-editor-strings.h:18

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

-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_City:"
 msgstr "_Gemeente:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Adres _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Canada"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "_Land:"
-
 # addressbook/contact-editor/fullname-strings.h:7

 #.
 #. * Translatable strings file generated by Glade.
@@ -925,36 +910,30 @@ msgstr "Achternaam:"
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: addressbook/gui/component/addressbook.c:275
-msgid "Quick Search"
-msgstr "Snel Zoeken"
-
 # addressbook/gui/component/addressbook.c:1046

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

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

 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:272
+#: ui/evolution-addressbook.xml.h:7
 msgid "As _Table"
 msgstr "Als _Tabel"
 
 # addressbook/gui/component/addressbook.c:593

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

-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:397
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -974,8 +953,34 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+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:509 mail/folder-browser.c:154
+msgid "Advanced..."
+msgstr "Geavanceerd..."
+
+#: addressbook/gui/component/addressbook.c:539
+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:540
+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:541
+msgid "Email contains"
+msgstr "E-mail bevat"
+
 # addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:627
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
@@ -986,12 +991,12 @@ 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 Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "Description:"
 msgstr "Beschrijving:"
 
@@ -1000,196 +1005,65 @@ msgstr "Beschrijving:"
 msgid "LDAP Server:"
 msgstr "LDAP Server:"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

+# addressbook/gui/component/ldap-server-dialog.glade.h:11

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

 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: mail/mail-config-druid.glade.h:37
+msgid "Name:"
+msgstr "Naam:"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:9

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

-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
 msgid "Root DN:"
 msgstr "Wortel DN:"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Naam:"
-
+# addressbook/gui/component/addressbook.c:424

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Selecteer namen"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Find..."
 msgstr "Vind..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Selecteer naam uit lijst:"
-
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Message Recipients"
 msgstr "Geaddresseerden"
 
-# addressbook/gui/component/alphabet.glade.h:7

+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select Names"
+msgstr "Selecteer namen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Select name from List:"
+msgstr "Selecteer naam uit lijst:"
+
+# addressbook/gui/component/alphabet.glade.h:8

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "venster2"
-
-# addressbook/gui/component/alphabet.glade.h:8

-#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "123"
 msgstr "123"
 
-# addressbook/gui/component/alphabet.glade.h:9

-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "a"
-msgstr "a"
-
-# addressbook/gui/component/alphabet.glade.h:10

-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "b"
-msgstr "b"
-
-# addressbook/gui/component/alphabet.glade.h:11

-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "c"
-msgstr "c"
-
-# addressbook/gui/component/alphabet.glade.h:12

-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "d"
-msgstr "d"
-
-# addressbook/gui/component/alphabet.glade.h:13

-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "e"
-msgstr "e"
-
-# addressbook/gui/component/alphabet.glade.h:14

-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "f"
-msgstr "f"
-
-# addressbook/gui/component/alphabet.glade.h:15

-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "g"
-msgstr "g"
-
-# addressbook/gui/component/alphabet.glade.h:16

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

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

-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "i"
-msgstr "i"
-
-# addressbook/gui/component/alphabet.glade.h:18

-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "j"
-msgstr "j"
-
-# addressbook/gui/component/alphabet.glade.h:19

-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "k"
-msgstr "k"
-
-# addressbook/gui/component/alphabet.glade.h:20

-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "l"
-msgstr "l"
-
-# addressbook/gui/component/alphabet.glade.h:21

-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "m"
-msgstr "m"
-
-# addressbook/gui/component/alphabet.glade.h:22

-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "n"
-msgstr "n"
-
-# addressbook/gui/component/alphabet.glade.h:23

-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "o"
-msgstr "o"
-
-# addressbook/gui/component/alphabet.glade.h:24

-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "p"
-msgstr "p"
-
-# addressbook/gui/component/alphabet.glade.h:25

-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "q"
-msgstr "q"
-
-# addressbook/gui/component/alphabet.glade.h:26

-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "r"
-msgstr "r"
-
-# addressbook/gui/component/alphabet.glade.h:27

-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "s"
-msgstr "s"
-
-# addressbook/gui/component/alphabet.glade.h:28

-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "t"
-msgstr "t"
-
-# addressbook/gui/component/alphabet.glade.h:29

-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "u"
-msgstr "u"
-
-# addressbook/gui/component/alphabet.glade.h:30

-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "v"
-msgstr "v"
-
-# addressbook/gui/component/alphabet.glade.h:31

-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "w"
-msgstr "w"
-
-# addressbook/gui/component/alphabet.glade.h:32

-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "x"
-msgstr "x"
-
-# addressbook/gui/component/alphabet.glade.h:33

-#: addressbook/gui/widgets/alphabet.glade.h:33
-msgid "y"
-msgstr "y"
-
-# addressbook/gui/component/alphabet.glade.h:34

-#: addressbook/gui/widgets/alphabet.glade.h:34
-msgid "z"
-msgstr "z"
+# addressbook/gui/component/alphabet.glade.h:7

+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "window2"
+msgstr "venster2"
 
 # addressbook/gui/component/addressbook.c:943

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

-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
@@ -1214,241 +1088,234 @@ msgstr ""
 "Dubbelklik hier om een nieuw Contact te maken."
 
 # composer/e-msg-composer-address-dialog.glade.h:9

-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494 mail/mail-search-dialogue.c:101
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Zoeken"
 
-# addressbook/printing/e-contact-print.glade.h:7

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

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Pagina Instellingen:"
+msgid "10 pt. Tahoma"
+msgstr "10 punts Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:8

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

 #: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Stijl Naam:"
+msgid "8 pt. Tahoma"
+msgstr "8 punts Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:9

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

 #: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Voorbeeld:"
+msgid "Blank forms at end:"
+msgstr "Lege formulieren op het einde:"
 
-# addressbook/printing/e-contact-print.glade.h:10

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

 #: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Opties"
+msgid "Body"
+msgstr "Inhoud"
 
-# addressbook/printing/e-contact-print.glade.h:11

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

 #: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Insluiten:"
+msgid "Bottom:"
+msgstr "Onderkant:"
 
-# addressbook/printing/e-contact-print.glade.h:12

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

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

 #: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Secties:"
+msgid "Dimensions:"
+msgstr "Dimensies:"
 
-# addressbook/printing/e-contact-print.glade.h:13

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

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

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

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

 #: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Elkaar direct opvolgend"
+msgid "Font..."
+msgstr "Lettertype..."
 
-# addressbook/printing/e-contact-print.glade.h:14

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

 #: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Letter tabs aan de kant"
+msgid "Fonts"
+msgstr "Lettertypen"
 
-# addressbook/printing/e-contact-print.glade.h:15

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

 #: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Koppen voor elke letter"
+msgid "Footer:"
+msgstr "Voet:"
 
-# addressbook/printing/e-contact-print.glade.h:16

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

 #: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Begin op een nieuwe pagina"
+msgid "Format"
+msgstr "Formaat"
 
-# addressbook/printing/e-contact-print.glade.h:17

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

 #: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Aantal kolommen:"
+msgid "Header"
+msgstr "Kop"
 
-# addressbook/printing/e-contact-print.glade.h:18

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

 #: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Lege formulieren op het einde:"
+msgid "Header/Footer"
+msgstr "Koptekst/Voettekst"
 
-# addressbook/printing/e-contact-print.glade.h:19

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

 #: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Lettertypen"
+msgid "Headings"
+msgstr "Koppen"
 
-# addressbook/printing/e-contact-print.glade.h:20

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

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

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

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

 #: addressbook/printing/e-contact-print.glade.h:20
+msgid "Headings for each letter"
+msgstr "Koppen voor elke letter"
+
+# addressbook/printing/e-contact-print.glade.h:34

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

 #: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Lettertype..."
+msgid "Height:"
+msgstr "Hoogte:"
 
-# addressbook/printing/e-contact-print.glade.h:22

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

 #: addressbook/printing/e-contact-print.glade.h:22
-msgid "Headings"
-msgstr "Koppen"
+msgid "Immediately follow each other"
+msgstr "Elkaar direct opvolgend"
 
-# addressbook/printing/e-contact-print.glade.h:23

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

 #: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 punts Tahoma"
+msgid "Include:"
+msgstr "Insluiten:"
 
-# addressbook/printing/e-contact-print.glade.h:24

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

 #: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Inhoud"
+msgid "Landscape"
+msgstr "Liggend"
 
-# addressbook/printing/e-contact-print.glade.h:25

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

 #: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 punts Tahoma"
+msgid "Left:"
+msgstr "Links:"
 
-# addressbook/printing/e-contact-print.glade.h:26

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

 #: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Shaduw"
+msgid "Letter tabs on side"
+msgstr "Letter tabs aan de kant"
 
-# addressbook/printing/e-contact-print.glade.h:27

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

 #: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Maak gebruik van grijze schaduw op de afdruk"
+msgid "Margins"
+msgstr "Marges"
 
-# addressbook/printing/e-contact-print.glade.h:28

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

 #: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Formaat"
+msgid "Number of columns:"
+msgstr "Aantal kolommen:"
 
-# addressbook/printing/e-contact-print.glade.h:29

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

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

 #: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Paper"
+msgid "Options"
+msgstr "Opties"
 
-# addressbook/printing/e-contact-print.glade.h:30

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

 #: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Type:"
+msgid "Orientation"
+msgstr "Orientatie"
 
-# addressbook/printing/e-contact-print.glade.h:31

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

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

 #: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "label26"
+msgid "Page"
+msgstr "Pagina"
 
-# addressbook/printing/e-contact-print.glade.h:32

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

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

 #: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Dimensies:"
+msgid "Page Setup:"
+msgstr "Pagina Instellingen:"
 
-# addressbook/printing/e-contact-print.glade.h:33

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

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

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

 #: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Breedte:"
-
-# addressbook/printing/e-contact-print.glade.h:34

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

-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Hoogte:"
+msgid "Paper"
+msgstr "Paper"
 
 # addressbook/printing/e-contact-print.glade.h:35

-#: addressbook/printing/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Paper source:"
 msgstr "Papier bron:"
 
-# addressbook/printing/e-contact-print.glade.h:36

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

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

 #: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Marges"
+msgid "Preview:"
+msgstr "Voorbeeld:"
 
-# addressbook/printing/e-contact-print.glade.h:37

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

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

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

 #: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Onderkant:"
-
-# addressbook/printing/e-contact-print.glade.h:39

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

-#: addressbook/printing/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Right:"
 msgstr "Rechts:"
 
-# addressbook/printing/e-contact-print.glade.h:41

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

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

 #: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Pagina"
+msgid "Shading"
+msgstr "Shaduw"
 
 # addressbook/printing/e-contact-print.glade.h:42

 #: addressbook/printing/e-contact-print.glade.h:42
 msgid "Size:"
 msgstr "Grootte:"
 
-# addressbook/printing/e-contact-print.glade.h:47

-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Orientatie"
-
-# addressbook/printing/e-contact-print.glade.h:48

-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Staand"
+# addressbook/printing/e-contact-print.glade.h:16

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

-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Liggend"
+# addressbook/printing/e-contact-print.glade.h:8

+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Style name:"
+msgstr "Stijl Naam:"
 
-# addressbook/printing/e-contact-print.glade.h:52

-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Kop"
+# addressbook/printing/e-contact-print.glade.h:37

+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Top:"
+msgstr "Top:"
 
-# addressbook/printing/e-contact-print.glade.h:53

-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Voet:"
+# addressbook/printing/e-contact-print.glade.h:30

+#: addressbook/printing/e-contact-print.glade.h:46
+#: mail/mail-config-druid.glade.h:66
+msgid "Type:"
+msgstr "Type:"
 
-# addressbook/printing/e-contact-print.glade.h:55

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

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

+#: addressbook/printing/e-contact-print.glade.h:47
+msgid "Width:"
+msgstr "Breedte:"
 
-# addressbook/printing/e-contact-print.glade.h:56

-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "Koptekst/Voettekst"
+# addressbook/printing/e-contact-print.glade.h:31

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

+#: addressbook/printing/e-contact-print.glade.h:48
+msgid "label26"
+msgstr "label26"
 
 # calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

 #: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
@@ -1460,6 +1327,12 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
+# addressbook/gui/component/alphabet.glade.h:16

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

+#: calendar/cal-util/timeutil.c:100
+msgid "h"
+msgstr "h"
+
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution Kalender Kanaal"
@@ -1468,13 +1341,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:578
-#: calendar/conduits/todo/todo-conduit.c:451
+#: calendar/conduits/calendar/calendar-conduit.c:607
+#: calendar/conduits/todo/todo-conduit.c:480
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:676
-#: calendar/conduits/calendar/calendar-conduit.c:679
+#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:709
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
@@ -1487,8 +1360,8 @@ 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:549
-#: calendar/conduits/todo/todo-conduit.c:552
+#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:582
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
@@ -1578,17 +1451,14 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
 #: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Public"
 msgstr "Publiekelijk"
 
 #: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Prive"
 
 #: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
@@ -1638,8 +1508,8 @@ msgstr ""
 #. strptime format for a date.
 #: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
+#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
@@ -1705,458 +1575,348 @@ msgstr "Geen samenvatting beschikbaar."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
-#: ui/evolution-subscribe.h:10
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Sluiten"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Sluimeren"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:9

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

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

 #: calendar/gui/dialogs/alarm-notify.glade.h:10
 msgid "Snooze time (minutes)"
 msgstr "Sluimer tijd (minuten)"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+# calendar/gui/prop.c:335

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Kalender Instellingen"
+msgid "12 hour (am/pm)"
+msgstr "12 uurs (am/pm)"
 
-# calendar/gui/getdate.y:423

+# calendar/gui/prop.c:336

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Werk week"
+msgid "24 hour"
+msgstr "24 uurs"
 
-# calendar/gui/gnome-month-item.c:737

+# calendar/gui/prop.c:803

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Maa"
+msgid "Alarms timeout after"
+msgstr "Alarm stopt na"
 
-# calendar/gui/gnome-month-item.c:738

+# calendar/gui/prop.c:780

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Din"
+msgid "Audio Alarms"
+msgstr "Audio Alarmen"
 
-# calendar/gui/gnome-month-item.c:739

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Woe"
+msgid "Beep when alarm windows appear."
+msgstr "Piep als het alarm venster verschijnt."
 
-# calendar/gui/gnome-month-item.c:740

+# calendar/gui/calendar-commands.c:659

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Don"
+msgid "Calendar"
+msgstr "Kalender"
 
-# calendar/gui/gnome-month-item.c:741

+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Vrij"
+msgid "Calendar Preferences"
+msgstr "Kalender Instellingen"
 
-# calendar/gui/gnome-month-item.c:742

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Zat"
+# calendar/gui/prop.c:522

+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Kleuren"
 
-# calendar/gui/gnome-month-item.c:736

-#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Zon"
+msgid "Compress weekends"
+msgstr "Weekeinden comprimeren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Eerste dag van de week:"
+msgid "Date navigator options"
+msgstr "Datum navigator instellingen"
 
-# calendar/gui/prop.c:348

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Maandag"
+# calendar/gui/prop.c:836

+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "Standaard instellingen"
 
-# calendar/gui/getdate.y:406

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "Dinsdag"
+msgid "Display options"
+msgstr "Weergave instellingen"
 
-# calendar/gui/getdate.y:408

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "Woensdag"
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Verloop Datum"
 
-# calendar/gui/getdate.y:410

+# calendar/gui/prop.c:820

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Donderdag"
+msgid "Enable snoozing for"
+msgstr "Maak sluimeren mogelijk voor"
 
-# calendar/gui/getdate.y:413

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "Vrijdag"
+msgid "End of day:"
+msgstr "Eind van dag:"
 
-# calendar/gui/getdate.y:414

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "Zaterdag"
+msgid "First day of week:"
+msgstr "Eerste dag van de week:"
 
-# calendar/gui/prop.c:347

+# calendar/gui/gnome-month-item.c:741

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Zondag"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Vrij"
 
-# calendar/gui/goto.c:264

+# calendar/gui/calendar-commands.c:60

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Start van dag:"
+msgid "Highlight"
+msgstr "Markeer"
 
+# calendar/gui/prop.c:648

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Eind van dag:"
+msgid "Items Due Today"
+msgstr "Items die vandaag verlopen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
-msgstr "Weergave instellingen"
+msgid "Items Due Today:"
+msgstr "Items die vandaag verlopen:"
 
-# calendar/gui/e-day-view-time-item.c:391

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Tijd delingen:"
+msgid "Items Not Yet Due"
+msgstr "Items die nog niet zijn verlopen"
 
-# calendar/gui/prop.c:334

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Tijdsformaat:"
+msgid "Items Not Yet Due:"
+msgstr "Items die nog niet zijn verlopen:"
 
-# calendar/gui/event-editor.c:298

+# calendar/gui/gnome-month-item.c:737

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Geef eindtijden afspraken weer"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Maa"
 
+# calendar/gui/prop.c:642

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Weekeinden comprimeren"
+msgid "Overdue Items"
+msgstr "Verlopen items"
 
-# calendar/gui/prop.c:335

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 uurs (am/pm)"
+msgid "Overdue Items:"
+msgstr "Verlopen items:"
 
-# calendar/gui/prop.c:336

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 uurs"
+msgid "Pick a color"
+msgstr "Kies een kleur"
 
-# calendar/gui/getdate.y:426

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minuten"
+# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

+# mail/message-list.c:474

+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
+msgid "Priority"
+msgstr "Prioriteit"
 
-# calendar/gui/getdate.y:426

+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minuten"
+msgid "Remind me of all appointments"
+msgstr "Herinner me van alle afspraken"
 
-# calendar/gui/getdate.y:426

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minuten"
+msgid "Reminders"
+msgstr "Herinneringen"
 
-# calendar/gui/getdate.y:426

+# calendar/gui/gnome-month-item.c:742

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minuten"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Zat"
 
-# calendar/gui/getdate.y:426

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minuten"
+msgid "Show"
+msgstr "Weergeven"
 
+# calendar/gui/event-editor.c:298

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Datum navigator instellingen"
+msgid "Show appointment end times"
+msgstr "Geef eindtijden afspraken weer"
 
 # calendar/gui/calendar-commands.c:528

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Show week numbers"
 msgstr "Geef weeknummers weer"
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/goto.c:264

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Kalender"
+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/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Weergeven"
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Zon"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Verloop Datum"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "TaskPad"
+msgstr "TaakBlad"
+
+# calendar/gui/gnome-month-item.c:740

+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Don"
 
 # calendar/gui/prop.c:606

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Tijd Tot Verlooptijd"
 
-# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

-# mail/message-list.c:474

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
-msgid "Priority"
-msgstr "Prioriteit"
-
-# calendar/gui/calendar-commands.c:60

+# calendar/gui/e-day-view-time-item.c:391

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Markeer"
+msgid "Time divisions:"
+msgstr "Tijd delingen:"
 
-# calendar/gui/prop.c:642

+# calendar/gui/prop.c:334

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Verlopen items"
+msgid "Time format:"
+msgstr "Tijdsformaat:"
 
-# calendar/gui/prop.c:648

+# calendar/gui/gnome-month-item.c:738

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Items die vandaag verlopen"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Din"
 
+# calendar/gui/prop.c:780

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Items die nog niet zijn verlopen"
+msgid "Visual Alarms"
+msgstr "Visuele Alarmen"
 
-# calendar/gui/prop.c:522

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Kleuren"
+# calendar/gui/gnome-month-item.c:739

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

 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Kies een kleur"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Items die nog niet zijn verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Items die vandaag verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Verlopen items:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
-msgstr "TaakBlad"
-
-# calendar/gui/prop.c:836

-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Standaard instellingen"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Herinner me van alle afspraken"
+msgid "Work week"
+msgstr "Werk week"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "minutes before they occur."
 msgstr "minuten voor ze plaatsvinden."
 
-# calendar/gui/prop.c:780

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Visuele Alarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Piep als het alarm venster verschijnt."
-
-# calendar/gui/prop.c:780

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Audio Alarmen"
-
-# calendar/gui/prop.c:803

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Alarm stopt na"
-
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "seconds."
 msgstr "seconden."
 
-# calendar/gui/prop.c:820

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Maak sluimeren mogelijk voor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Herinneringen"
-
-#: calendar/gui/dialogs/task-editor.c:657
+#: calendar/gui/dialogs/task-editor.c:655
 msgid "Edit Task"
 msgstr "Taak Bewerken"
 
 # calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:303
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
 msgid "No summary"
 msgstr "Geen opsomming"
 
 # calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:309
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
 # calendar/gui/event-editor.c:301

-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:312
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
 # calendar/gui/event-editor.c:304

-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:315
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboek Item - %s"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "taak-bewerkings-dialoogvenster"
+msgid "% Comp_lete:"
+msgstr "% Af:"
 
-# calendar/gui/gncal-todo.c:425

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "S_amenvatting"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Sta_rt Datum:"
+msgid "C_lassification:"
+msgstr "C_lassificatie:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31

+# calendar/gui/gncal-todo.c:207

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Verloop Datum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
-msgstr "% Af:"
+msgid "Date Completed:"
+msgstr "Datum Afgemaakt:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

+# calendar/gui/gncal-todo.c:425

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_Status:"
+msgid "S_ummary"
+msgstr "S_amenvatting"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Niet Gestart"
+msgid "Sta_rt Date:"
+msgstr "Sta_rt Datum:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "In Uitvoer"
+msgid "Task"
+msgstr "_Taak"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Gedaan"
+msgid "URL:"
+msgstr "URL:"
 
-# filter/filter-editor.c:212

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

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Geannuleerd"
+msgid "_Contacts..."
+msgstr "C_ontacten..."
 
-# calendar/gui/gncal-todo.c:190

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

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Prioriteit:"
+msgid "_Due Date:"
+msgstr "_Verloop Datum:"
 
-# addressbook/printing/e-contact-print.glade.h:34

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

+# calendar/gui/gncal-todo.c:190

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Hoog"
+msgid "_Priority:"
+msgstr "_Prioriteit:"
 
-# addressbook/printing/e-contact-print.glade.h:28

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

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normaal"
+msgid "_Status:"
+msgstr "_Status:"
 
-# calendar/gui/getdate.y:438

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Laag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "C_lassificatie:"
-
-# shell/e-shell-view.c:596

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Geen"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:26

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "C_ontacten..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
-msgstr "_Taak"
-
-# calendar/gui/gncal-todo.c:207

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Datum Afgemaakt:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "URL:"
-msgstr "URL:"
+msgid "task-editor-dialog"
+msgstr "taak-bewerkings-dialoogvenster"
 
 #: calendar/gui/e-calendar-table.c:294
 msgid "Open..."
@@ -2178,13 +1938,11 @@ msgstr "Markeer de taak als gedaan"
 # addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

 # mail/folder-browser-factory.c:45

 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
-#: ui/evolution-mail.h:13
+#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
+#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
+#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -2203,7 +1961,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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -2211,14 +1969,14 @@ 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
@@ -2226,37 +1984,37 @@ msgstr "%d %b"
 # 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:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
+#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
 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:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
+#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
 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:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:14
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
+#: ui/evolution-event-editor.xml.h:21
 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:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
 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:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
 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:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
@@ -2268,22 +2026,77 @@ msgid "%d %B"
 msgstr "%d %B"
 
 # calendar/gui/event-editor.c:289

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

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

+#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
+
+# calendar/gui/prop.c:348

+#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "Maandag"
+
+# calendar/gui/getdate.y:406

+#: calendar/gui/event-editor.c:391
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+# calendar/gui/getdate.y:408

+#: calendar/gui/event-editor.c:392
+msgid "Wednesday"
+msgstr "Woensdag"
+
+# calendar/gui/getdate.y:410

+#: calendar/gui/event-editor.c:393
+msgid "Thursday"
+msgstr "Donderdag"
+
+# calendar/gui/getdate.y:413

+#: calendar/gui/event-editor.c:394
+msgid "Friday"
+msgstr "Vrijdag"
+
+# calendar/gui/getdate.y:414

+#: calendar/gui/event-editor.c:395
+msgid "Saturday"
+msgstr "Zaterdag"
+
+# calendar/gui/prop.c:347

+#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "Zondag"
+
+# calendar/gui/getdate.y:421

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

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

-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
+#: calendar/gui/event-editor.c:675
+msgid "occurrences"
 msgstr "gebeurtenissen"
 
+#: calendar/gui/event-editor.c:792
+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:2382 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2311,7 +2124,7 @@ msgstr "gebeurtenis-bewerkings-dialoog"
 
 # calendar/gui/gncal-todo.c:171

 #: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "Su_mmary:"
 msgstr "Opso_mming:"
 
@@ -2403,139 +2216,91 @@ msgstr "_Geluid"
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Herhaal op de"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "de dag van de maand"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4e"
-
-# calendar/gui/print.c:265

-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5e"
-
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Elke"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "maand(en)"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Herhaling"
-
 # calendar/gui/calendar-commands.c:59

-#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "Appointment Basics"
 msgstr "Afspraak Basis:"
 
 # calendar/gui/goto.c:264

-#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "_Starting date:"
 msgstr "_Begin datum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "Recurrence Rule"
 msgstr "Herhalings Regel"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "No recurrence"
 msgstr "Geen herhaling"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "Simple recurrence"
 msgstr "Eenvoudige herhaling"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "Custom recurrence"
 msgstr "Aangepaste herhaling"
 
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "Every"
+msgstr "Elke"
+
 # calendar/gui/getdate.y:424

-#: calendar/gui/event-editor-dialog.glade.h:63
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "day(s)"
 msgstr "dag(en)"
 
 # calendar/gui/getdate.y:423

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

-#: calendar/gui/event-editor-dialog.glade.h:66
+#: calendar/gui/event-editor-dialog.glade.h:48
 msgid "year(s)"
 msgstr "jar(en)"
 
 # calendar/gui/getdate.y:445

-#: calendar/gui/event-editor-dialog.glade.h:67
+#: calendar/gui/event-editor-dialog.glade.h:49
 msgid "for"
 msgstr "voor"
 
 # shell/e-shell-folder-title-bar.c:355

-#: calendar/gui/event-editor-dialog.glade.h:68
+#: calendar/gui/event-editor-dialog.glade.h:50
 msgid "until"
 msgstr "totdat"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
+#: calendar/gui/event-editor-dialog.glade.h:51
 msgid "forever"
 msgstr "oneindig"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
+#: calendar/gui/event-editor-dialog.glade.h:52
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
 # calendar/gui/prop.c:348

-#: calendar/gui/event-editor-dialog.glade.h:72
+#: calendar/gui/event-editor-dialog.glade.h:54
 msgid "Modify"
 msgstr "Aanpassen"
 
 # widgets/e-table/e-table-group.glade.h:9

-#: calendar/gui/event-editor-dialog.glade.h:74
+#: calendar/gui/event-editor-dialog.glade.h:56
 msgid "label21"
 msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"Deze afspraak heeft aangepaste herhalings regels die niet kunnen worden "
-"bewerkt door \n"
-"Evolution.\n"
-"\n"
-"Maar, deze afspraak zal zich wel herhalen op de juiste tijd en zal juist "
-"worden \n"
-"weergegeven op de kalender."
+# addressbook/printing/e-contact-print.glade.h:9

+#: calendar/gui/event-editor-dialog.glade.h:57
+msgid "Preview"
+msgstr "Voorbeeld"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+msgid "Recurrence"
+msgstr "Herhaling"
 
 # calendar/gui/getdate.y:391

 #: calendar/gui/getdate.y:391
@@ -2658,12 +2423,12 @@ msgid "saturday"
 msgstr "zaterdag"
 
 # calendar/gui/getdate.y:420

-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: 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:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "maand"
 
@@ -2673,22 +2438,17 @@ msgid "fortnight"
 msgstr "twee weken"
 
 # calendar/gui/getdate.y:423

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

-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "dag"
-
 # calendar/gui/getdate.y:425

-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: 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:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minuut"
 
@@ -2698,7 +2458,7 @@ msgid "min"
 msgstr "min"
 
 # calendar/gui/getdate.y:428

-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "seconde"
 
@@ -2723,8 +2483,8 @@ msgid "today"
 msgstr "vandaag"
 
 # calendar/gui/getdate.y:438

-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "nu"
 
@@ -2836,30 +2596,30 @@ msgstr "Item Commentaar:"
 
 # calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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/gnome-cal.c:1144
+#: 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/gnome-cal.c:1155
+#: 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/gnome-cal.c:1166
+#: 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/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124

 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
 
@@ -2890,6 +2650,31 @@ msgstr ""
 msgid "Go to today"
 msgstr "Ga naar vandaag"
 
+# calendar/gui/print.c:265

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

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

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

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

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

 #: calendar/gui/print.c:289
 msgid "6th"
@@ -3099,7 +2884,7 @@ msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 # calendar/gui/print.c:1249

-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:833
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:873
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -3236,40 +3021,40 @@ msgstr "Maak sluimeren mogelijk voor "
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:97
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kon post bestand %s niet controleren: %s"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#: camel/camel-movemail.c:134 camel/camel-movemail.c:181
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kon vergrendelings bestand voor %s niet maken: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:144
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kon post bestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:154
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kon tijdelijk post bestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:195
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Kon het vergrendelings bestand voor %s niet testen: %s"
 
-#: camel/camel-movemail.c:214
+#: camel/camel-movemail.c:215
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3277,39 +3062,39 @@ msgstr ""
 "tot bestand %s. Probeer het later opnieuw."
 
 # composer/e-msg-composer.c:494

-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:241
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fout bij het lezen van post bestand: %s"
 
 # composer/e-msg-composer.c:474

-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:252
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk post bestand: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:270
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:302
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kon de pipe niet maken: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:314
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kon niet starten: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:352
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma mislukt: %s"
 
 # shell/e-storage.c:434

-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:353
 msgid "(Unknown error)"
 msgstr "(Onbekende fout)"
 
@@ -3324,46 +3109,46 @@ 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:185
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, 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:231
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-#: camel/camel-service.c:119
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaam gedeelte nodig"
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een computernaam gedeelte nodig"
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een pad gedeelte nodig"
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:486
 #, c-format
 msgid "No such host %s."
 msgstr "Computer %s niet gevonden."
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:489
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
@@ -3383,17 +3168,17 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL `%s' bevat geen protocol"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL `%s' bevat een ongeldig protocol"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Poort nummer in URL `%s' is niet numeriek"
@@ -3409,7 +3194,7 @@ 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:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -3441,35 +3226,35 @@ 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:232
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: 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:234
+#: camel/providers/imap/camel-imap-store.c:236
 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:243
+#: camel/providers/imap/camel-imap-store.c:245
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:247
 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:331
+#: camel/providers/imap/camel-imap-store.c:333
 #, 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:357
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3481,25 +3266,25 @@ msgstr ""
 "\n"
 
 # shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:537
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
 # mail/mail-threads.c:814

 #. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
+#: camel/providers/mbox/camel-mbox-folder.c:223
 msgid "Could not create summary"
 msgstr "Kon samenvatting niet maken"
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
+#: camel/providers/mbox/camel-mbox-folder.c:378
+#: camel/providers/mbox/camel-mbox-folder.c:381
 #, c-format
 msgid "Cannot append message to mbox file: %s"
 msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
 
 # shell/e-shell.c:299

-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/mbox/camel-mbox-folder.c:485
 #, c-format
 msgid "Cannot get message: %s"
 msgstr "Kan bericht niet vergaren: %s"
@@ -3516,7 +3301,7 @@ msgstr ""
 "Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
 "het opslaan van post op de lokale schijf."
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/mbox/camel-mbox-store.c:118
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3526,13 +3311,13 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:676

-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/mbox/camel-mbox-store.c:125
+#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3542,14 +3327,14 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:686

-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/mbox/camel-mbox-store.c:143
+#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' is geen gewoon bestand."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/mbox/camel-mbox-store.c:169
+#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3558,90 +3343,90 @@ msgstr ""
 "Kon map `%s' niet verwijderen:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
+#: camel/providers/mbox/camel-mbox-store.c:222
 #, c-format
 msgid "Could not rename folder %s to %s: destination exists"
 msgstr "Kon de naam van de map niet wijzigen van %s naar %s: de map bestaat al"
 
-#: camel/providers/mbox/camel-mbox-store.c:263
+#: camel/providers/mbox/camel-mbox-store.c:260
 msgid "Mbox folders may not be nested."
 msgstr "Mbox mappen mogen niet recursief in elkaar worden opgenomen."
 
 # composer/e-msg-composer.c:474

-#: camel/providers/mbox/camel-mbox-store.c:277
+#: camel/providers/mbox/camel-mbox-store.c:274
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokaal post bestand %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
+#: camel/providers/mbox/camel-mbox-summary.c:667
 #, c-format
 msgid "Could not open summary %s"
 msgstr "Kon samenvatting %s niet openen"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijk postvak niet openen: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
+#: camel/providers/mbox/camel-mbox-summary.c:734
 msgid "Summary mismatch, aborting sync"
 msgstr "Samenvattingen niet gelijk, synchroniseren word afgebroken"
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
+#: camel/providers/mbox/camel-mbox-summary.c:754
 msgid "Summary mismatch, X-Evolution header missing"
 msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
 
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak: %s"
 
 # shell/e-setup.c:84

-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
+#: camel/providers/mbox/camel-mbox-summary.c:789
+#: camel/providers/mbox/camel-mbox-summary.c:807
 #, c-format
 msgid "Cannot copy data to output file: %s"
 msgstr "Kan de gegevens niet naar het uitvoerbestand kopiëren: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bron map %s niet sluiten: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/mbox/camel-mbox-summary.c:849
 #, 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/mbox/camel-mbox-summary.c:842
+#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
 #. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
+#: camel/providers/mh/camel-mh-folder.c:213
 msgid "Could not load or create summary"
 msgstr "Kon samenvatting niet aanmaken of laden"
 
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
+#: camel/providers/mh/camel-mh-folder.c:336
+#: camel/providers/mh/camel-mh-folder.c:339
 #, c-format
 msgid "Cannot append message to mh folder: %s"
 msgstr "Kan bericht niet toevoegen aan mh map: %s"
 
 # mail/folder-browser-factory.c:41

-#: camel/providers/mh/camel-mh-folder.c:399
+#: camel/providers/mh/camel-mh-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3658,7 +3443,7 @@ msgstr "UNIX MH-formaat post directories"
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Voor het opslaan van lokale post in MH-achtige post directories"
 
-#: camel/providers/mh/camel-mh-store.c:115
+#: camel/providers/mh/camel-mh-store.c:112
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3667,7 +3452,7 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/mh/camel-mh-store.c:130
+#: camel/providers/mh/camel-mh-store.c:127
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3676,33 +3461,33 @@ msgstr ""
 "Kon map `%s' niet maken:\n"
 "%s"
 
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' is geen directory."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
+#: camel/providers/mh/camel-mh-store.c:155
+#: camel/providers/mh/camel-mh-store.c:168
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
 
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
+#: camel/providers/mh/camel-mh-store.c:186
+#: camel/providers/mh/camel-mh-store.c:190
 #, c-format
 msgid "Could not rename folder `%s': %s"
 msgstr "Kon de naam van map `%s' niet wijzigen: %s"
 
-#: camel/providers/mh/camel-mh-store.c:197
+#: camel/providers/mh/camel-mh-store.c:194
 #, c-format
 msgid "Could not rename folder `%s': %s exists"
 msgstr "Kon de naam van map `%s' niet wijzigen: %s bestaat al"
 
-#: camel/providers/mh/camel-mh-store.c:205
+#: camel/providers/mh/camel-mh-store.c:202
 msgid "MH folders may not be nested."
 msgstr "MH mappen mogen niet recursief in elkaar worden opgenomen."
 
-#: camel/providers/mh/camel-mh-store.c:217
+#: camel/providers/mh/camel-mh-store.c:214
 #, c-format
 msgid "Local mail directory %s"
 msgstr "Directory voor lokale post %s"
@@ -3760,20 +3545,20 @@ msgstr ""
 msgid "Could not open directory for news server: %s"
 msgstr "Kon directory voor nieuws servers niet openen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Het wachtwoord zal naar de NNTP server worden verstuurd in platte tekst vorm."
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
@@ -3804,7 +3589,7 @@ msgstr ""
 "Voor het verbinden met POP servers. Het POP protocol kan ook gebruikt worden "
 "om post te halen van bepaalde 'web mail' providers en gesloten post systemen."
 
-#: camel/providers/pop3/camel-pop3-store.c:154
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3813,7 +3598,7 @@ msgstr ""
 "vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
 "servers."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3823,29 +3608,29 @@ msgstr ""
 "wachtwoord via het APOP protocol. Deze optie zal niet werken voor alle "
 "gebruikers op servers die te kennen geven het te ondersteunen."
 
-#: camel/providers/pop3/camel-pop3-store.c:176
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dit zal verbinden met de POP server en gebruik maken van Kerberos 4 bij het "
 "aanmelden."
 
-#: camel/providers/pop3/camel-pop3-store.c:221
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kon niet aanmelden bij KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:339
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, 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:393
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, 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:412
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3855,12 +3640,12 @@ msgstr ""
 "Fout bij versturen van gebruikersnaam: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: camel/providers/pop3/camel-pop3-store.c:442
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3868,7 +3653,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3877,7 +3662,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:556
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
@@ -3952,130 +3737,130 @@ msgstr ""
 "Voor het lezen van post als een query of een andere verzameling van mappen"
 
 # composer/e-msg-composer-attachment-bar.c:76

-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
 # composer/e-msg-composer-attachment-bar.c:78

-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
 # composer/e-msg-composer-attachment-bar.c:85

-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
 # composer/e-msg-composer-attachment-bar.c:89

-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
 # composer/e-msg-composer-attachment-bar.c:93

-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 # composer/e-msg-composer-attachment-bar.c:299

 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
 msgid "attachment"
 msgstr "bijvoegsel"
 
 # composer/e-msg-composer.c:951

-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:397
+#: ui/evolution-message-composer.xml.h:8
 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:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: 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:443
+#: composer/e-msg-composer-attachment-bar.c:445
 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:474
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:477
 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 Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Attachment properties"
 msgstr "Attachment eigenschappen"
 
-# composer/e-msg-composer-attachment.glade.h:8

-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME type:"
-
 # composer/e-msg-composer-attachment.glade.h:10

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

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

-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:588
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:599
 msgid "From:"
 msgstr "Van:"
 
 # composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 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:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
 msgid "To:"
 msgstr "Aan:"
 
 # composer/e-msg-composer-hdrs.c:217

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

-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:608
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
 msgid "Cc:"
 msgstr "Cc:"
 
 # composer/e-msg-composer-hdrs.c:222

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

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

-#: composer/e-msg-composer-hdrs.c:318 mail/mail-format.c:613
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 # composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
-#: composer/e-msg-composer.c:299
+#: composer/e-msg-composer.c:428
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4103,41 +3888,41 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:463

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

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

-#: composer/e-msg-composer.c:437
+#: composer/e-msg-composer.c:626
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:648
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzigingen aan bericht..."
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:650
 msgid "Save changes to message..."
 msgstr "Wijzigingen aan bericht opslaan..."
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:691
 #, 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:546 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:552
+#: composer/e-msg-composer.c:741
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4148,32 +3933,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

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

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

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

-#: composer/e-msg-composer.c:720
+#: composer/e-msg-composer.c:909
 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:730
+#: composer/e-msg-composer.c:919
 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:752
+#: composer/e-msg-composer.c:941
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4182,17 +3967,17 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:962
 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:1136
+#: composer/e-msg-composer.c:1339
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
 # mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1416
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
@@ -4204,41 +3989,49 @@ msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de post samensteller van Evolution niet initialiseren."
 
 # calendar/gui/getdate.y:420

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

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

-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "weken"
 
 # calendar/gui/getdate.y:424

-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dagen"
 
 # calendar/gui/getdate.y:425

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

-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuten"
 
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " seconden"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr "Oops. Je bent vergeten een datum te kiezen."
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr "Oops. Je hebt een ongeldige datum gekozen."
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4248,7 +4041,7 @@ msgstr ""
 "de tijd die het is op het moment dat de filter gestart\n"
 "word of een vfolder word geopend."
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4256,7 +4049,7 @@ msgstr ""
 "De datum van het bericht zal vergelijken worden met\n"
 "de tijd die je hier invoert."
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4268,46 +4061,41 @@ msgstr ""
 
 # calendar/gui/calendar-commands.c:553

 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "de huidige tijd"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "Een tijd die je specificeert"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "Een tijd relatief aan de huidige tijd"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
 # addressbook/gui/component/addressbook.c:1010

-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
 # mail/mail-config.c:1490

-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:333
 msgid "Add Filter Rule"
 msgstr "Filter Regel Toevoegen"
 
 # filter/filter-editor.c:198

-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 msgid "Edit Filter Rule"
 msgstr "Bewerk VMap Regel"
 
 # filter/filter-editor.c:198

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:456 filter/filter.glade.h:10
 msgid "Edit Filters"
 msgstr "Filters Bewerken"
 
@@ -4327,15 +4115,23 @@ msgstr "Actie Toevoegen"
 msgid "Remove action"
 msgstr "Deze Actie Verwijderen"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+"Oops, je bent vergeten een map te kiezen.\n"
+"Ga terug en specificeer een geldige map om mail in af te leveren."
+
+#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:235
 msgid "Enter folder URI"
 msgstr "Voer een Map URI in"
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:281
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
@@ -4389,206 +4185,234 @@ msgstr "Criteria toevoegen"
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Inkomend\n"
-"Uitgaand\n"
-
-# mail/mail-config.c:1490

-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filter Regels"
-
 # calendar/gui/gncal-todo.c:488

-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: filter/filter.glade.h:9 mail/folder-browser.c:463
+#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
 msgid "Edit"
 msgstr "Bewerken"
 
 # filter/filter-editor.c:198

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

+#: filter/filter.glade.h:12
+msgid "Filter Rules"
+msgstr "Filter Regels"
+
 # mail/folder-browser-factory.c:89

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

-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: filter/filter.glade.h:15
 msgid "vFolder Sources"
 msgstr "VMap Bronnen"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:2 mail/message-list.c:515
+msgid "Answered"
+msgstr "Beantwoord"
+
+#: 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"
 
 # shell/e-shell-view-menu.c:402

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

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

-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Verzend datum"
 
+# addressbook/contact-editor/e-contact-editor.c:852

+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

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

+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Verwijderd"
+
+# filter/filter-editor.c:198

+#: filter/libfilter-i18n.h:10
+msgid "Draft"
+msgstr "Klad"
+
 # addressbook/contact-editor/e-contact-editor-strings.h:33

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

-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:13
 msgid "Forward to Address"
 msgstr "Doorsturen naar Adres"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:14
 msgid "Message Body"
 msgstr "Bericht"
 
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:15
 msgid "Message was received"
 msgstr "Bericht ontvangen"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:16
 msgid "Message was sent"
 msgstr "Bericht verzonden"
 
 # shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:17
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:19
 msgid "Recipients"
 msgstr "Geaddresseerden"
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:20 mail/message-list.c:512
+msgid "Seen"
+msgstr "Gelezen"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+#: filter/libfilter-i18n.h:21
 msgid "Sender"
 msgstr "Afzender"
 
+#: filter/libfilter-i18n.h:22
+msgid "Set Flag"
+msgstr "Stel Vlag in"
+
 # mail/mail-config.c:1490

-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:23
 msgid "Source"
 msgstr "Bron"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:24
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:25
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
 # mail/message-list.c:495

-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:26
 msgid "Subject"
 msgstr "Onderwerp"
 
 # filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:27
 msgid "after"
 msgstr "na"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:28
 msgid "before"
 msgstr "voor"
 
 # addressbook/contact-editor/e-contact-editor.c:808

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

-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:29
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:30
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:31
 msgid "does not end with"
 msgstr "eindigt niet op"
 
 # composer/e-msg-composer.c:676

-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:32
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:33
 msgid "does not match regex"
 msgstr "niet gelijk aan reguliere expressie"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:34
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:35
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:36
 msgid "ends with"
 msgstr "eindigt op"
 
 # calendar/gui/getdate.y:441

-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:37
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:38
 msgid "is greater than"
 msgstr "is grote dan"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:39
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:40
 msgid "is not"
 msgstr "is niet"
 
 # addressbook/gui/component/alphabet.glade.h:17

-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:41
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:42
 msgid "matches regex"
 msgstr "is gelijk aan reguliere expressie"
 
 # filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:43
 msgid "on or after"
 msgstr "op of na"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:44
 msgid "on or before"
 msgstr "op of voor"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: filter/libfilter-i18n.h:46
 msgid "starts with"
 msgstr "begint met"
 
 # filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "was na"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "was voor"
 
@@ -4633,80 +4457,171 @@ msgid "Cannot initialize Evolution's mail storage hash."
 msgstr ""
 "Kan het post \"hash\" opslag gedeelte van Evolution niet initialiseren."
 
-#: mail/component-factory.c:323
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr "Slechte opslag URL (geen server): %s"
-
-#: mail/component-factory.c:342
+#: mail/component-factory.c:279
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser.c:137
+# calendar/gui/print.c:326

+#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save"
+msgstr "Opslaan"
+
+#: mail/folder-browser.c:169
 msgid "Body or subject contains"
 msgstr "Bericht of onderwerp bevat"
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:170
 msgid "Body contains"
 msgstr "Bericht bevat"
 
 # mail/message-list.c:495

-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:171
 msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:172
 msgid "Body does not contain"
 msgstr "Bericht bevat niet"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:173
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
-msgstr "Aangepast zoeken"
+#: mail/folder-browser.c:451
+msgid "VFolder on Subject"
+msgstr "VMap op Onderwerp"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: mail/folder-browser.c:314
-msgid "Custom"
-msgstr "Aangepast"
+#: mail/folder-browser.c:452
+msgid "VFolder on Sender"
+msgstr "VMap op Afzender"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: mail/folder-browser.c:492
-msgid "Full Search"
-msgstr "Volledige Zoekactie"
+#: mail/folder-browser.c:453
+msgid "VFolder on Recipients"
+msgstr "VMap op Geadresseerden"
 
-# calendar/gui/print.c:326

-#.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: mail/folder-browser.c:497 ui/evolution-event-editor.h:9
-msgid "Save"
-msgstr "Opslaan"
+#: mail/folder-browser.c:455
+msgid "Filter on Subject"
+msgstr "Filter op Onderwerp"
+
+#: mail/folder-browser.c:456
+msgid "Filter on Sender"
+msgstr "Filter op Afzender"
+
+#: mail/folder-browser.c:457
+msgid "Filter on Recipients"
+msgstr "Filter op Geadresseerden"
+
+#: mail/folder-browser.c:458 mail/folder-browser.c:543
+msgid "Filter on Mailing List"
+msgstr "Filter op Mailing Lijst"
+
+#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+msgid "Open"
+msgstr "Openen"
+
+# 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:464 mail/mail-view.c:163
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:29
+msgid "Print"
+msgstr "Afdrukken"
+
+# mail/folder-browser-factory.c:35

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

+#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+msgid "Reply to All"
+msgstr "Iedereen beantwoorden"
+
+# mail/folder-browser-factory.c:37

+#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+msgid "Forward"
+msgstr "Doorsturen"
+
+# composer/e-msg-composer.c:906

+#: mail/folder-browser.c:469 ui/evolution-mail.xml.h:19
+msgid "Forward as Attachment"
+msgstr "Bekijk als Bijvoegsel"
+
+#: mail/folder-browser.c:471
+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:472
+msgid "Mark as Unread"
+msgstr "Markeer Als Ongelezen"
+
+# shell/e-shell-view-menu.c:402

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

+#: mail/folder-browser.c:475
+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:477
+msgid "Undelete"
+msgstr "Terughalen"
+
+# addressbook/contact-editor/e-contact-editor.c:745

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

+#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
+#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
+#: mail/folder-browser.c:481
+msgid "Apply Filters"
+msgstr "Filters Toepassen"
+
+#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+msgid "Create Rule From Message"
+msgstr "Maak Regel Van Bericht"
+
+# mail/mail-config.c:1490

+#: mail/folder-browser.c:485 ui/evolution-mail.xml.h:45
+msgid "View Message Source"
+msgstr "Bekijk Bericht Bron"
+
+#: mail/folder-browser.c:545
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filter op Mailing Lijst (%s)"
 
 # mail/mail-config.c:1199

-#: mail/mail-autofilter.c:76
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
+# mail/message-list.c:495

+#: mail/mail-autofilter.c:214
+#, c-format
+msgid "Subject is %s"
+msgstr "Onderwerp is %s"
+
 # mail/mail-ops.c:374

 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:329
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing lijst"
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4718,7 +4633,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil je nu het programma configureren?"
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4726,7 +4641,7 @@ msgstr ""
 "Je moet een identiteit configuren\n"
 "voordat je post kunt versturen."
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4734,20 +4649,20 @@ msgstr ""
 "Je moet een post transport configuren\n"
 "voordat je een e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "Je hebt geen post bronnen geconfigureerd"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post transport methode ingesteld"
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "Er is geen \"Postvak uit\" geconfigureerd"
 
 # mail/mail-ops.c:386

-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4755,22 +4670,22 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:291
 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:41

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

-#: mail/mail-callbacks.c:534
+#: mail/mail-callbacks.c:544
 msgid "Copy message(s) to"
 msgstr "Kopiëer bericht(en) naar"
 
-#: mail/mail-callbacks.c:649
+#: mail/mail-callbacks.c:659
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4779,7 +4694,7 @@ msgstr ""
 "in de Klad map."
 
 # composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:788
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4788,11 +4703,11 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:793 mail/message-list.c:1574
+#: mail/mail-callbacks.c:833
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:840
+#: mail/mail-callbacks.c:880
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
@@ -4818,37 +4733,37 @@ msgid "Email address:"
 msgstr "E-mail adres:"
 
 # mail/mail-config.c:328

-#: mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organisatie:"
 
 # mail/mail-config.c:340

-#: mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Signatuur bestand:"
 
 # mail/mail-config.c:345

-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
 msgid "Signature File"
 msgstr "Signatuur Bestand"
 
 # mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config-gui.c:906
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Server:"
 
 # mail/mail-config.c:725

-#: mail/mail-config-gui.c:912
+#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
 # mail/mail-config.c:732

-#: mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Pad:"
 
 # mail/mail-config.c:739 mail/mail-config.c:819

-#: mail/mail-config-gui.c:927
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Authenticatie:"
 
@@ -4857,11 +4772,11 @@ msgstr "Authenticatie:"
 msgid "Detect supported types..."
 msgstr "Detecteer ondersteunde types..."
 
-#: mail/mail-config-gui.c:967
+#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Verwijder de berichten niet van de server"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Test Instellingen"
 
@@ -4963,139 +4878,308 @@ msgstr "Bezig met uitzoeken van aanmeldings mogelijkheden van \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: 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"
+
+# addressbook/contact-editor/e-contact-editor.c:808

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

+#: mail/mail-config-druid.glade.h:9
+msgid "Accounts"
+msgstr "Accounts"
+
+# calendar/gui/gncal-todo.c:325

+#: mail/mail-config-druid.glade.h:11
+msgid "Add Optional Fields..."
+msgstr "Optionele Velden Toevoegen..."
+
+# mail/mail-config.c:1345

+#: mail/mail-config-druid.glade.h:12
+msgid "Additional Identity Fields"
+msgstr "Optionele Identiteits Velden"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: mail/mail-config-druid.glade.h:13
+msgid "Authentication"
+msgstr "Authenticatie"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:7

+#: mail/mail-config-druid.glade.h:15
+msgid "Browse..."
+msgstr "Bladeren..."
+
 #: mail/mail-config-druid.glade.h:16
+msgid "Congratulations, your mail configuration is complete."
+msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
+
+# calendar/gui/prop.c:836

+#: mail/mail-config-druid.glade.h:22
+msgid "Default"
+msgstr "Standaardwaarde"
+
+# shell/e-shell-view.c:596

+#: mail/mail-config-druid.glade.h:25
+msgid "Done"
+msgstr "Klaar"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:27
+msgid "Edit Mail Configuration Settings"
+msgstr "Bewerk Post Configuratie Instellingen"
+
+# mail/mail-config.c:305

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

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

+#: mail/mail-config-druid.glade.h:30
+msgid "Full Name:"
+msgstr "Volledige Naam:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "IMAP"
+msgstr "IMAP"
+
+# mail/mail-config.c:1180

+#: mail/mail-config-druid.glade.h:32
+msgid "Identity"
+msgstr "Identiteit"
+
+#: mail/mail-config-druid.glade.h:33
+msgid "Mail"
+msgstr "Post"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:34
 msgid "Mail Configuration"
 msgstr "Post Configuratie"
 
-#: mail/mail-config-druid.glade.h:9
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:35
+msgid "Mail Configuration Druid"
+msgstr "Post Configuratie Druide"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "Make this my default account"
+msgstr "Stel dit in als standaard account"
+
+# shell/e-shell-view-menu.c:398

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

+#: mail/mail-config-druid.glade.h:39
+msgid "Optional"
+msgstr "Optioneel"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: mail/mail-config-druid.glade.h:40
+msgid "Optional Information"
+msgstr "Optionele Informatie"
+
+# mail/folder-browser-factory.c:101

+#: mail/mail-config-druid.glade.h:42
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: mail/mail-config-druid.glade.h:44
 msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
+"Please enter information about your incoming mail server below. If you don't "
+"know what"
 msgstr ""
-"Welkom bij de Evolutie Post configuratie wizard!\n"
-"Door het invullen van wat informatie over je email\n"
-"instellingen kun je direct e-mail versturen en ontvangen.\n"
-"Klik op Volgende om verder te gaan."
+"Voer informatie over je inkomende e-mail server in. Als je niet weet wat"
 
-# mail/mail-config.c:1180

-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identiteit"
+#: mail/mail-config-druid.glade.h:46
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know "
+msgstr ""
+"Voer informatie omtrent je uitgaand e-mail protocol beneden in. Als je niet "
+"weet "
 
-# mail/mail-config.c:1199

-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Post Bron"
+#: mail/mail-config-druid.glade.h:48
+msgid ""
+"Please enter your name and email address below. The &quot;optional&quot; "
+"fields below do not "
+msgstr ""
+"Voer je naam en e-mail adres beneden in. De &quot;optional&quot; velden "
+"beneden doen niet "
 
-# mail/mail-config.c:1220

-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Post Transport"
+#: mail/mail-config-druid.glade.h:50
+msgid "Preferred type: "
+msgstr "Voorkeurstype:"
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Receiving Email"
+msgstr "Bezig met ontvangen E-mail"
+
+#: mail/mail-config-druid.glade.h:52
+msgid "Receiving Mail"
+msgstr "Bezig met ontvangen Post"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Remember my password"
+msgstr "Onthoud mijn wachtwoord"
+
+# mail/folder-browser-factory.c:34

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

+#: mail/mail-config-druid.glade.h:55
+msgid "Required"
+msgstr "Benodigd"
+
+#: mail/mail-config-druid.glade.h:56
+msgid "SMTP"
+msgstr "SMTP"
 
-#: mail/mail-config-druid.glade.h:17
+#: mail/mail-config-druid.glade.h:57
+msgid "SMTP server requires authentication"
+msgstr "SMTP server heeft authenticatie nodig"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+#: mail/mail-config-druid.glade.h:58
+msgid "Sending Email"
+msgstr "Bezig met versturen E-mail"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+#: mail/mail-config-druid.glade.h:59
+msgid "Sending Mail"
+msgstr "Bezig met versturen Post"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:60
+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:61
+msgid "Server Type: "
+msgstr "Server Type: "
+
+# mail/mail-config.c:1490

+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
+msgid "Sources"
+msgstr "Bronnen"
+
+#: mail/mail-config-druid.glade.h:68
+msgid "Welcome to the Evolution Mail Configuration Druid! "
+msgstr "Welkom bij de Evolution Post Configuratie Druide!"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"You are almost done with the mail configuration process. The identity, "
+"incoming"
 msgstr ""
-"Je e-mail configuratie is nu klaar.\n"
-"Klik op \"Einde\" om je nieuwe instellingen op te slaan"
+"Je bent bijna klaar met het post configuratie proces. De indentiteit, "
+"inkomend"
 
-# mail/mail-config.c:1180

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identiteiten"
+#: mail/mail-config-druid.glade.h:78
+msgid "Your mail server supports the following types of authentication. Please"
+msgstr ""
+"Je mail server ondersteund de volgende authenticatie typen. Alsjeblieft"
 
 # composer/e-msg-composer-address-dialog.glade.h:11

 #: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Adres"
 
-# mail/mail-config.c:328

-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organisatie"
-
-# mail/mail-config.c:1490

-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Bronnen"
+# mail/mail-config.c:1180

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

-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:12
 msgid "Mail Sources"
 msgstr "Post Bronnen"
 
+# mail/mail-config.c:1220

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

-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:15
 msgid "News Servers"
 msgstr "Nieuws Servers"
 
 # mail/mail-config.c:1490

-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:16
 msgid "News Sources"
 msgstr "Nieuws Bronnen"
 
-#: mail/mail-config.glade.h:26
+# mail/mail-config.c:328

+#: mail/mail-config.glade.h:17
+msgid "Organization"
+msgstr "Organisatie"
+
+#: mail/mail-config.glade.h:19
 msgid "Send messages in HTML format"
 msgstr "Stuur berichten in HTML formaat"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Markeer bericht als gelezen [ms]: "
-
-#: mail/mail-crypto.c:137
+#: mail/mail-crypto.c:136
 #, c-format
 msgid "Couldn't create pipe to %s: %s"
 msgstr "Kon de kanaal naar %s niet maken: %s"
 
-#: mail/mail-crypto.c:164
+#: mail/mail-crypto.c:163
 #, c-format
 msgid "Could not execute %s: %s\n"
 msgstr "Kon %s niet uitvoeren: %s\n"
 
-#: mail/mail-crypto.c:168
+#: mail/mail-crypto.c:167
 #, c-format
 msgid "Cannot fork %s: %s"
 msgstr "Kan %s niet starten: %s"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Voer je PGP/GPG passphrase in."
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
 #, 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:600
+#: mail/mail-crypto.c:599
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/mail-display.c:68
+#: mail/mail-display.c:67
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
 # shell/e-storage.c:416

-#: mail/mail-display.c:72
+#: mail/mail-display.c:71
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5103,7 +5187,7 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-display.c:86
+#: mail/mail-display.c:85
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5113,132 +5197,137 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:814

-#: mail/mail-display.c:98
+#: mail/mail-display.c:97
 #, 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:194
+#: mail/mail-display.c:193
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:233
 #, 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:276
+#: mail/mail-display.c:275
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:277
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:279
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:303
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:326
 #, 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:331
+#: mail/mail-display.c:330
 msgid "Hide"
 msgstr "Verbergen"
 
 # composer/e-msg-composer-attachment-bar.c:299

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

-#: mail/mail-format.c:594
+#: mail/mail-format.c:601
 msgid "Reply-To:"
 msgstr "Antwoord-Naar:"
 
-#: mail/mail-format.c:834
+#: mail/mail-format.c:823
 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:846
+#: mail/mail-format.c:835
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
 # composer/e-msg-composer.c:894

-#: mail/mail-format.c:852
+#: mail/mail-format.c:841
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:842
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1455
+#: mail/mail-format.c:1444
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1456
 #, 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:1471
+#: mail/mail-format.c:1460
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1494
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1510
+#: mail/mail-format.c:1499
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1669
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "Op %s, %s schreef:\n"
+
+#: mail/mail-local.c:194
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:198
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:254
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:286
 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:380
+#: mail/mail-local.c:307
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
 # composer/e-msg-composer.c:1127

-#: mail/mail-local.c:395
+#: mail/mail-local.c:322
 msgid "Copying messages"
 msgstr "Bezig met het kopiëren van berichten"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:334
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5247,7 +5336,7 @@ msgstr ""
 "Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:370
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5255,307 +5344,330 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "allicht noodzakelijk om deze handmatig te repareren."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX ongelezen)"
+# shell/e-shell-view-menu.c:404

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

+#: mail/mail-local.c:661
+msgid "Register local folder"
+msgstr "Registreren lokale map"
 
 # mail/mail-ops.c:374

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

-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:72
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Post ophalen van %s"
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:110
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr "Bezig met ophalen berichten : %s"
-
-#: mail/mail-ops.c:255
+#: mail/mail-ops.c:312
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe post op %s."
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:367
 msgid "Filtering email on demand"
 msgstr "Bezig met op verzoek filteren van post"
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:369
 msgid "Filter email on demand"
 msgstr "Filter post op verzoek"
 
-#: mail/mail-ops.c:443
+#: mail/mail-ops.c:504
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:448
+#: mail/mail-ops.c:509
 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:451
+#: mail/mail-ops.c:512
 #, c-format
 msgid "Send \"%s\""
 msgstr "Verstuur \"%s\""
 
-#: mail/mail-ops.c:454
+#: mail/mail-ops.c:515
 msgid "Send a message without a subject"
 msgstr "Stuur een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:686
 msgid "Sending queue"
 msgstr "Bezig met verzenden wachtrij"
 
-#: mail/mail-ops.c:627
+#: mail/mail-ops.c:688
 msgid "Send queue"
 msgstr "Verzendings wachtrij"
 
-#: mail/mail-ops.c:763 mail/mail-ops.c:770
+#: mail/mail-ops.c:824 mail/mail-ops.c:831
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Bezig met toevoegen \"%s\""
 
-#: mail/mail-ops.c:767 mail/mail-ops.c:773
+#: mail/mail-ops.c:828 mail/mail-ops.c:834
 msgid "Appending a message without a subject"
 msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Bezig met Legen \"%s\""
 
 # mail/folder-browser-factory.c:77

-#: mail/mail-ops.c:847
+#: mail/mail-ops.c:908
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Legen \"%s\""
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:967
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:969
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiëren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:972
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:974
 #, 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:944
+#: mail/mail-ops.c:1005
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:1008
 msgid "Copying"
 msgstr "Bezig met kopiëren"
 
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:1028
 #, 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:1046
+#: mail/mail-ops.c:1107
 #, 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:1049
+#: mail/mail-ops.c:1110
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Markeer berichten in map \"%s\""
 
 # mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1080
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Bezig met markeren bericht %d van %d"
 
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1264
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1266
 #, 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:1274 mail/subscribe-dialog.c:194
+#: mail/mail-ops.c:1335 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
-#: mail/mail-ops.c:1334
+#: mail/mail-ops.c:1396
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Bezig met bijvoegen berichten uit map \"%s\""
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1399
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Voeg berichten van \"%s\" bij"
 
 # mail/folder-browser-factory.c:37

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

-#: mail/mail-ops.c:1448
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Bericht \"%s\" doorsturen"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1510
 msgid "Forward a message without a subject"
 msgstr "Stuur een bericht door zonder onderwerp"
 
-#: mail/mail-ops.c:1490
+#: mail/mail-ops.c:1557
 #, 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:1507
+#: mail/mail-ops.c:1573
 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/mail-ops.c:1593
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:1617
+msgid "Forwarded message:\n"
+msgstr "Doorgestuurd bericht:\n"
+
+#: mail/mail-ops.c:1686
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Bezig met laden \"%s\""
 
-#: mail/mail-ops.c:1595
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Load \"%s\""
 msgstr "Laden \"%s\""
 
-#: mail/mail-ops.c:1697
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Bezig met Maken \"%s\""
 
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1792
 #, c-format
 msgid "Create \"%s\""
 msgstr "Maken \"%s\""
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1840
 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:1793
+#: mail/mail-ops.c:1886
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1795
+#: mail/mail-ops.c:1888
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1952
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Bezig met weergeven UID van bericht \"%s\""
 
-#: mail/mail-ops.c:1861
+#: mail/mail-ops.c:1955
 msgid "Clearing message display"
 msgstr "Bezig met leegmaken berichtweergave"
 
-#: mail/mail-ops.c:1864
+#: mail/mail-ops.c:1958
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Geef UID van bericht \"%s\" weer"
 
 # calendar/gui/prop.c:519

-#: mail/mail-ops.c:1867
+#: mail/mail-ops.c:1961
 msgid "Clear message display"
 msgstr "Maak berichtweergave leeg"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:2074
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Bezig met openen berichten uit map \"%s\""
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2077
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Open berichten van \"%s\""
 
-#: mail/mail-ops.c:2083
+#: mail/mail-ops.c:2181
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:2085
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Load %s Folder"
 msgstr "Laad \"%s\" Map"
 
-#: mail/mail-ops.c:2152
+#: mail/mail-ops.c:2250
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Bezig met bekijken berichten uit map \"%s\""
 
-#: mail/mail-ops.c:2155
+#: mail/mail-ops.c:2253
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Bekijk berichten uit \"%s\""
 
-#: mail/mail-ops.c:2181
+#: mail/mail-ops.c:2279 mail/mail-ops.c:2397 mail/mail-ops.c:2527
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
 
+#: mail/mail-ops.c:2369
+#, c-format
+msgid "Viewing message sources from folder \"%s\""
+msgstr "Bezig met bekijken bericht bronnen uit map \"%s\""
+
+#: mail/mail-ops.c:2372
+#, c-format
+msgid "View message sources from \"%s\""
+msgstr "Bekijk bericht bronnen uit \"%s\""
+
+#: mail/mail-ops.c:2500
+#, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Bezig opslaan berichten uit map \"%s\""
+
+#: mail/mail-ops.c:2503
+#, c-format
+msgid "Saving messages from \"%s\""
+msgstr "Bezig met opslaan berichten van \"%s\""
+
 # filter/filter-editor.c:212

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

-#: mail/mail-summary.c:96 mail/mail-threads.c:701
+#: mail/mail-summary.c:95 mail/mail-threads.c:703
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
 # calendar/gui/event-editor.c:294

-#: mail/mail-summary.c:365
+#: mail/mail-summary.c:368
 msgid "Mailbox summary"
 msgstr "Samenvatting postvak"
 
-#: mail/mail-threads.c:299
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5564,7 +5676,7 @@ msgstr ""
 "Fout tijden het preparen van %s:\n"
 "%s"
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:650
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5574,38 +5686,38 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:623

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

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

-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:902
 msgid "User cancelled query."
 msgstr "Gebruiker heeft vraag afgebroken."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 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:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Bezig met Bestuderen %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5614,50 +5726,45 @@ msgstr ""
 "ontvangen."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, 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:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Bezig met wegschrijven bericht %d van %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Bezig met opslaan wijzingen aan %s"
 
 # mail/folder-browser-factory.c:37

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

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

-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Geen protocol om URI `%s' te openen"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5678,163 +5785,100 @@ 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:151 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:34
 msgid "Reply"
 msgstr "Beantwoorden"
 
 # mail/folder-browser-factory.c:34

-#: mail/mail-view.c:151 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:39
 msgid "Reply to the sender of this message"
 msgstr "Beantwoord dit bericht"
 
 # mail/folder-browser-factory.c:35

-#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
-msgid "Reply to All"
-msgstr "Iedereen beantwoorden"
-
-# mail/folder-browser-factory.c:35

-#: mail/mail-view.c:154 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:38
 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:157 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Doorsturen"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-view.c:157 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:20
 msgid "Forward this message"
 msgstr "Dit bericht doorsturen"
 
-# 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/mail-view.c:161 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Afdrukken"
-
 # mail/folder-browser-factory.c:43

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

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

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

-#: mail/message-list.c:521
-msgid "Seen"
-msgstr "Gelezen"
-
-#: mail/message-list.c:524
-msgid "Answered"
-msgstr "Beantwoord"
-
-#: mail/message-list.c:1572
-msgid "Open in New Window"
-msgstr "Open in Nieuw Venster"
-
-# composer/e-msg-composer.c:894

-#: mail/message-list.c:1573
-msgid "Edit Message"
-msgstr "Bericht Bewerken"
-
-# mail/folder-browser-factory.c:35

-#: mail/message-list.c:1576
-msgid "Reply to Sender"
-msgstr "Afzender beantwoorden"
-
-# mail/folder-browser-factory.c:37

-#: mail/message-list.c:1578
-msgid "Forward Message"
-msgstr "Bericht Doorsturen"
-
-# mail/folder-browser-factory.c:45

-#: mail/message-list.c:1580
-msgid "Delete Message"
-msgstr "Bericht Verwijderen"
-
-#: mail/message-list.c:1581
-msgid "Move Message"
-msgstr "Bericht Verplaatsen"
-
-# composer/e-msg-composer.c:1127

-#: mail/message-list.c:1582
-msgid "Copy Message"
-msgstr "Bericht Kopiëren"
-
-#: mail/message-list.c:1584
-msgid "VFolder on Subject"
-msgstr "VMap op Onderwerp"
-
-#: mail/message-list.c:1585
-msgid "VFolder on Sender"
-msgstr "VMap op Afzender"
-
-#: mail/message-list.c:1586
-msgid "VFolder on Recipients"
-msgstr "VMap op Geadresseerden"
-
-#: mail/message-list.c:1588
-msgid "Filter on Subject"
-msgstr "Filter op Onderwerp"
-
-#: mail/message-list.c:1589
-msgid "Filter on Sender"
-msgstr "Filter op Afzender"
-
-#: mail/message-list.c:1590
-msgid "Filter on Recipients"
-msgstr "Filter op Geadresseerden"
-
-#: mail/message-list.c:1591 mail/message-list.c:1614
-msgid "Filter on Mailing List"
-msgstr "Filter op Mailing Lijst"
-
-#: mail/message-list.c:1616
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter op Mailing Lijst (%s)"
-
 # mail/folder-browser-factory.c:37

-#: mail/message-list.c:1734
+#: mail/message-list.c:2054
 msgid "Rebuilding message view"
 msgstr "Bezig met herstructureren van bericht weergave"
 
 # composer/e-msg-composer.c:894

-#: mail/message-list.c:1736
+#: mail/message-list.c:2056
 msgid "Rebuild message view"
 msgstr "Herstructureer bericht weergave"
 
 # mail/folder-browser-factory.c:37

-#: mail/message-thread.c:525
+#: mail/message-thread.c:583
 msgid "Threading message list"
 msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
 
 # mail/folder-browser-factory.c:37

-#: mail/message-thread.c:527
+#: mail/message-thread.c:585
 msgid "Thread message list"
 msgstr "Berichtenlijst weergeven met onderlinge relaties"
 
-#: mail/subscribe-dialog.c:132
-msgid "Display folders containing:"
-msgstr "Geef mappen weer die bevatten:"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr "Geef mappen weer die beginnen met:"
+
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr "Bezig met vergaren opslag voor \"%s\""
+
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr "Bezig met vergaren opslag voor \"%s\""
+
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Bezig met aanmelden bij map \"%s\""
+
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Bezig met afmelden bij map \"%s\""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Aanmelden bij map \"%s\""
+
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Afmelden bij map \"%s\""
 
 # shell/e-setup.c:47

-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:110 shell/e-setup.c:179
 msgid "Evolution installation"
 msgstr "Evolution installatie"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:114
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5843,34 +5887,34 @@ msgstr ""
 "in je persoonlijke Evolutie directory"
 
 # shell/e-setup.c:52

-#: shell/e-setup.c:111
+#: shell/e-setup.c:115
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
 # mail/mail-threads.c:814

-#: shell/e-setup.c:152
+#: shell/e-setup.c:156
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct updaten"
 
 # shell/e-setup.c:88

-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:160 shell/e-setup.c:220
 msgid "Evolution files successfully installed."
 msgstr "Evolution bestanden succesvol geinstalleerd."
 
 # shell/e-setup.c:51

-#: shell/e-setup.c:179
+#: shell/e-setup.c:183
 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:180
+#: shell/e-setup.c:184
 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:197
+#: shell/e-setup.c:201
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5882,7 +5926,7 @@ msgstr ""
 "Fout: %s"
 
 # shell/e-setup.c:84

-#: shell/e-setup.c:212
+#: shell/e-setup.c:216
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5892,7 +5936,7 @@ msgstr ""
 "`%s'."
 
 # shell/e-setup.c:108

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

-#: shell/e-setup.c:249
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5999,27 +6043,33 @@ msgstr "(Geen map weergegeven)"
 msgid "Folders"
 msgstr "Mappen"
 
+# shell/e-shell-view.c:596

+#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:212
+#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+msgid "None"
+msgstr "Geen"
+
 # shell/e-shell-view.c:600

-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1022
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+# shell/e-shell.c:299

+#: shell/e-shell.c:339
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan de lokale opslag niet opzetten -- %s"
+
+#: shell/e-shell.c:1157
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
 "Dit betekent waarschijnlijk dat het %s component is gecrashed"
 
-# shell/e-shell.c:299

-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan de lokale opslag niet opzetten -- %s"
-
 # addressbook/gui/component/addressbook.c:420

 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
@@ -6102,78 +6152,78 @@ msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 # shell/e-storage.c:217

-#: shell/e-storage.c:127
+#: shell/e-storage.c:128
 msgid "(No name)"
 msgstr "(Geen naam)"
 
 # shell/e-storage.c:412

-#: shell/e-storage.c:318
+#: shell/e-storage.c:327
 msgid "No error"
 msgstr "Geen fout"
 
 # shell/e-storage.c:414

-#: shell/e-storage.c:320
+#: shell/e-storage.c:329
 msgid "Generic error"
 msgstr "Generieke fout"
 
 # shell/e-storage.c:416

-#: shell/e-storage.c:322
+#: shell/e-storage.c:331
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat al"
 
 # shell/e-storage.c:418

-#: shell/e-storage.c:324
+#: shell/e-storage.c:333
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde folder type is niet geldig"
 
 # shell/e-storage.c:420

-#: shell/e-storage.c:326
+#: shell/e-storage.c:335
 msgid "I/O error"
 msgstr "I/O fout"
 
 # shell/e-storage.c:422

-#: shell/e-storage.c:328
+#: shell/e-storage.c:337
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
 # shell/e-storage.c:424

-#: shell/e-storage.c:330
+#: shell/e-storage.c:339
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder was niet gevonden"
 
 # shell/e-storage.c:426

-#: shell/e-storage.c:332
+#: shell/e-storage.c:341
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geimplementeerd voor deze opslag"
 
 # shell/e-storage.c:428

-#: shell/e-storage.c:334
+#: shell/e-storage.c:343
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
 # shell/e-storage.c:430

-#: shell/e-storage.c:336
+#: shell/e-storage.c:345
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
 # shell/e-storage.c:432

-#: shell/e-storage.c:338
+#: shell/e-storage.c:347
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
 # shell/e-shell-view-menu.c:398

-#: shell/e-storage-set-view.c:223 ui/evolution-event-editor.h:91
-#: ui/evolution.h:39
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
+#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Weerga_ve"
 
 # mail/folder-browser-factory.c:43

-#: shell/e-storage-set-view.c:223
+#: shell/e-storage-set-view.c:235
 msgid "View the selected folder"
 msgstr "Geef de geselecteerde map weer"
 
 # shell/main.c:99

-#: shell/main.c:68
+#: shell/main.c:70
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -6214,7 +6264,7 @@ msgstr ""
 "wachten met smart je bijdrage af!\n"
 
 # shell/main.c:126

-#: shell/main.c:95
+#: shell/main.c:97
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6223,1238 +6273,1394 @@ msgstr ""
 "Het Evolution Team\n"
 
 # shell/main.c:172

-#: shell/main.c:123
+#: shell/main.c:122
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan de Evolution shell niet initialiseren."
 
+#: shell/main.c:144
+msgid "Disable."
+msgstr "Uitzetten."
+
 # shell/main.c:220

-#: shell/main.c:160
+#: shell/main.c:166
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
 # addressbook/gui/component/addressbook.c:514

 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: ui/evolution-addressbook-ldap.xml.h:7
 msgid "N_ew Directory Server"
 msgstr "Ni_euwe Directory Server"
 
 # shell/e-shell-view-menu.c:474

-#: ui/evolution-addressbook-ldap.h:10
+#: ui/evolution-addressbook-ldap.xml.h:8
 msgid "_Actions"
 msgstr "_Acties"
 
 # shell/e-shell-view-menu.c:404

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

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

-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
 msgid "Find"
 msgstr "Vinden"
 
 # addressbook/gui/component/addressbook.c:424

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

-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nieuw"
 
 # addressbook/gui/component/addressbook.c:425

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

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

-#: ui/evolution-addressbook.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "View all contacts"
 msgstr "Geef alle kontaken weer"
 
 # addressbook/gui/component/addressbook.c:506

-#: ui/evolution-addressbook.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "_New Contact"
 msgstr "_Nieuw Kontakt"
 
 # addressbook/gui/component/addressbook.c:425

-#: ui/evolution-addressbook.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Print Contacts..."
 msgstr "_Druk Kontakten af..."
 
-#: ui/evolution-addressbook.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Search for contacts"
 msgstr "_Zoek naar kontakten"
 
 # addressbook/contact-editor/e-contact-editor.c:807

 # calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473

-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
 msgid "_Tools"
 msgstr "_Gereedschap"
 
 # calendar/gui/calendar-commands.c:525

 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: ui/evolution-calendar.xml.h:7
 msgid "5 Days"
 msgstr "5 Dagen"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: ui/evolution-calendar.h:10
+#: ui/evolution-calendar.xml.h:8
 msgid "Alter preferences"
 msgstr "Instellingen Wijzigen"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

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

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

-#: ui/evolution-calendar.h:13
+#: 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

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

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

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

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

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

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

-#: ui/evolution-calendar.h:20
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Maand"
 
 # calendar/gui/calendar-commands.c:659

-#: ui/evolution-calendar.h:22
+#: ui/evolution-calendar.xml.h:20
 msgid "New Ca_lendar"
 msgstr "Nieuwe Ka_lender"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
+#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
 msgid "Next"
 msgstr "Volgende"
 
 # calendar/gui/calendar-commands.c:664

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

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

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

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

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

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

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

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

-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
 msgid "Today"
 msgstr "Vandaag"
 
 # calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

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

-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
 msgid "_New"
 msgstr "_Nieuw"
 
 # calendar/gui/calendar-commands.c:682

-#: ui/evolution-calendar.h:36
+#: ui/evolution-calendar.xml.h:34
 msgid "_New appointment..."
 msgstr "_Nieuwe Afspraak..."
 
-#: ui/evolution-calendar.h:37
+#: ui/evolution-calendar.xml.h:35
 msgid "_Open"
 msgstr "_Openen"
 
 # calendar/gui/calendar-commands.c:663

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

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

-#: ui/evolution-calendar.h:40
+#: ui/evolution-calendar.xml.h:38
 msgid "_Save Calendar As"
 msgstr "_Bewaar Kalender Als"
 
-# widgets/e-table/e-table-config.glade.h:10

-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
-msgid "_File"
-msgstr "_Bestand"
+# addressbook/contact-editor/e-contact-editor.c:853

+# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

+#: ui/evolution-contact-editor.xml.h:8
+msgid "Delete this item"
+msgstr "Verwijderd dit item"
 
-# calendar/gui/print.c:326

-#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
-msgid "_Save"
-msgstr "_Opslaan"
+# addressbook/contact-editor/e-contact-editor.c:852

+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

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

+#: ui/evolution-contact-editor.xml.h:9
+msgid "Delete..."
+msgstr "Verwijderen..."
 
-# composer/e-msg-composer.c:463

-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Opslaan _Als"
+# addressbook/contact-editor/e-contact-editor-strings.h:20

+#: ui/evolution-contact-editor.xml.h:10
+msgid "Help"
+msgstr "Help"
 
-# addressbook/gui/component/addressbook.c:425

-# addressbook/gui/component/addressbook.c:492

-# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
-msgid "_Print"
-msgstr "_Afdrukken"
+# addressbook/contact-editor/e-contact-editor.c:844

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

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

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

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

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

+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+msgid "Print..."
+msgstr "Afdrukken..."
+
+# composer/e-msg-composer.c:463

+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save _As..."
+msgstr "Opslaan _Als..."
 
 # addressbook/contact-editor/e-contact-editor.c:839

-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
+#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
 msgid "Save and Close"
 msgstr "Opslaan en Sluiten"
 
 # addressbook/contact-editor/e-contact-editor.c:840

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

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

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

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

+#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
+#: ui/evolution.xml.h:28
+msgid "_File"
+msgstr "_Bestand"
+
 # addressbook/contact-editor/e-contact-editor.c:844

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

-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
-msgid "Print..."
-msgstr "Afdrukken..."
+#: ui/evolution-contact-editor.xml.h:21
+msgid "_Print..."
+msgstr "_Afdrukken..."
 
-# addressbook/contact-editor/e-contact-editor.c:845

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

-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
-msgid "Print this item"
-msgstr "Item afdrukken"
+# calendar/gui/print.c:326

+#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Save"
+msgstr "_Opslaan"
 
-# addressbook/contact-editor/e-contact-editor.c:853

-# calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Verwijderd dit item"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-event-editor.xml.h:7
+msgid "About this application"
+msgstr "Over deze applicatie"
 
-# calendar/gui/calendar-commands.c:553

-#: ui/evolution-event-editor.h:10
-msgid "Save the current file"
-msgstr "Huidig bestand opslaan"
+# addressbook/printing/e-contact-print.glade.h:20

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

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

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

+#: ui/evolution-event-editor.xml.h:8
+msgid "About..."
+msgstr "Over..."
 
-# addressbook/contact-editor/e-contact-editor.c:840

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

-#: ui/evolution-event-editor.h:12
-msgid "Save the appointment and close the dialog box"
-msgstr "Bewaar de afspraak en sluit dit venster"
+# shell/e-shell-view-menu.c:474

+#: ui/evolution-event-editor.xml.h:9
+msgid "Actio_ns"
+msgstr "Ac_ties"
 
-# addressbook/printing/e-contact-print.glade.h:7

-#: ui/evolution-event-editor.h:17
-msgid "Print Setup"
-msgstr "Printer Instellingen"
+# calendar/gui/calendar-commands.c:659

+#: ui/evolution-event-editor.xml.h:10
+msgid "C_lear"
+msgstr "W_issen"
 
-#: ui/evolution-event-editor.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Stel de pagina instellingen in voor de huidige printer"
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

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

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

-#: ui/evolution-event-editor.h:20
+#: ui/evolution-event-editor.xml.h:15
 msgid "Close this appointment"
 msgstr "Deze afspraak sluiten"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution-event-editor.h:21
-msgid "Cut"
-msgstr "Knippen"
-
-#: ui/evolution-event-editor.h:22
-msgid "Cut the selection"
-msgstr "Knip de selectie"
-
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ui/evolution-event-editor.h:24
+#: ui/evolution-event-editor.xml.h:17
 msgid "Copy the selection"
 msgstr "Kopiëer de selectie"
 
-# composer/e-msg-composer-address-dialog.c:191

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

-#: ui/evolution-event-editor.h:25
-msgid "Paste"
-msgstr "Plakken"
-
-# composer/e-msg-composer-address-dialog.c:192

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

-#: ui/evolution-event-editor.h:26
-msgid "Paste the clipboard"
-msgstr "Plak het klembord"
-
-# calendar/gui/calendar-commands.c:659

-#: ui/evolution-event-editor.h:27
-msgid "Clear"
-msgstr "Wissen"
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

+#: ui/evolution-event-editor.xml.h:18
+msgid "Cut"
+msgstr "Knippen"
 
-#: ui/evolution-event-editor.h:28
-msgid "Clear the selection"
-msgstr "Selectie wissen"
+#: ui/evolution-event-editor.xml.h:19
+msgid "Cut the selection"
+msgstr "Knip de selectie"
 
-# composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.h:29
-msgid "Undo"
-msgstr "Ongedaan maken"
+#: ui/evolution-event-editor.xml.h:22
+msgid "Dump XML"
+msgstr "XML Dumpen"
 
-# composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.h:30
-msgid "Undo the last action"
-msgstr "Maak de laatste bewerking ongedaan"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Dump the UI Xml description"
+msgstr "Dump de UI Xml omschrijving"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: ui/evolution-event-editor.h:31
-msgid "Redo"
-msgstr "Herhalen"
+# calendar/gui/event-editor.c:1251

+#: ui/evolution-event-editor.xml.h:24
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: Adres _Boek..."
 
-#: ui/evolution-event-editor.h:32
-msgid "Redo the undone action"
-msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
+# 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

+#: ui/evolution-event-editor.xml.h:25
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Seleecteer F_ormulier"
 
-#: ui/evolution-event-editor.h:34
-msgid "Search for a string"
-msgstr "Zoek naar een tekenreeks"
+# calendar/gui/event-editor.c:1250

+#: ui/evolution-event-editor.xml.h:26
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Controleer Namen"
 
-#: ui/evolution-event-editor.h:35
-msgid "Find Again"
-msgstr "Opnieuw Zoeken"
+# addressbook/contact-editor/e-contact-editor.c:675

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

+#: ui/evolution-event-editor.xml.h:27
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopieer naar Folder..."
 
-#: ui/evolution-event-editor.h:36
-msgid "Search again for the same string"
-msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
+# addressbook/contact-editor/e-contact-editor.c:761

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

+#: ui/evolution-event-editor.xml.h:28
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ontw_erp een Formulier..."
 
-# mail/folder-browser-factory.c:34

-#: ui/evolution-event-editor.h:37
-msgid "Replace"
-msgstr "Vervangen"
+# addressbook/contact-editor/e-contact-editor.c:660

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

+#: ui/evolution-event-editor.xml.h:29
+msgid "FIXME: Define Print _Styles"
+msgstr "FIXME: Definiëer Print _Stijlen..."
 
-#: ui/evolution-event-editor.h:38
-msgid "Replace a string"
-msgstr "Tekenreeks vervangen"
+# addressbook/contact-editor/e-contact-editor.c:760

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

+#: ui/evolution-event-editor.xml.h:30
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Ontwerp dit Formulier"
 
-#: ui/evolution-event-editor.h:39
-msgid "Select All"
-msgstr "Alles Selecteren"
+# addressbook/contact-editor/e-contact-editor.c:715

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

+#: ui/evolution-event-editor.xml.h:31
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Ee_rste Item in Folder"
 
-#: ui/evolution-event-editor.h:40
-msgid "Select everything"
-msgstr "Selecteer alles"
+# addressbook/contact-editor/e-contact-editor.c:793

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

+#: ui/evolution-event-editor.xml.h:32
+msgid "FIXME: For_ward"
+msgstr "FIXME: Doorsturen"
 
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.h:41
-msgid "Properties"
-msgstr "Eigenschappen"
+# calendar/gui/event-editor.c:1265

+#: ui/evolution-event-editor.xml.h:33
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Doorsturen als v_Calendar"
 
-# calendar/gui/prop.c:678

-#: ui/evolution-event-editor.h:42
-msgid "Modify the file's properties"
-msgstr "De bestandseigenschappen wijzigen"
+# addressbook/contact-editor/e-contact-editor.c:862

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

+#: ui/evolution-event-editor.xml.h:34
+msgid "FIXME: Help"
+msgstr "FIXME: Help"
 
-# addressbook/contact-editor/e-contact-editor.c:737

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

-#: ui/evolution-event-editor.h:43
-msgid "Previous"
-msgstr "Vorige"
+# addressbook/contact-editor/e-contact-editor.c:648

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

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

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

-#: ui/evolution-event-editor.h:44
-msgid "Go to the previous item"
-msgstr "Ga naar het vorige item"
+# addressbook/contact-editor/e-contact-editor.c:848

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

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

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

-#: ui/evolution-event-editor.h:46
-msgid "Go to the next item"
-msgstr "Ga naar het volgende item"
+# addressbook/contact-editor/e-contact-editor.c:746

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

+#: ui/evolution-event-editor.xml.h:37
+msgid "FIXME: It_em..."
+msgstr "FIXME: It_em..."
 
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: Afspraak Plannen.."
+# addressbook/contact-editor/e-contact-editor.c:699

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

+#: ui/evolution-event-editor.xml.h:38
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Plakken _Speciaal..."
 
-#: ui/evolution-event-editor.h:48
-msgid "Schedule some sort of a meeting"
-msgstr "Een soort afspraak maken"
+# addressbook/contact-editor/e-contact-editor.c:678

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

+#: ui/evolution-event-editor.xml.h:39
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Afdruk_voorbeeld"
 
-# addressbook/printing/e-contact-print.glade.h:20

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

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

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

-#: ui/evolution-event-editor.h:49
-msgid "About..."
-msgstr "Over..."
+# addressbook/contact-editor/e-contact-editor.c:764

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

+#: ui/evolution-event-editor.xml.h:40
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_bliceer een Formulier als..."
 
-#: ui/evolution-event-editor.h:50
-msgid "About this application"
-msgstr "Over deze applicatie"
+# addressbook/contact-editor/e-contact-editor.c:763

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

+#: ui/evolution-event-editor.xml.h:41
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publiceer een _Formulier..."
 
-# addressbook/contact-editor/e-contact-editor.c:862

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

-#: ui/evolution-event-editor.h:51
-msgid "FIXME: Help"
-msgstr "FIXME: Help"
+# calendar/gui/event-editor.c:1260

+#: ui/evolution-event-editor.xml.h:42
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: _Herhaling..."
 
-# addressbook/contact-editor/e-contact-editor.c:863

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

-#: ui/evolution-event-editor.h:52
-msgid "See online help"
-msgstr "Zie help"
+# addressbook/contact-editor/e-contact-editor.c:667

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

+#: ui/evolution-event-editor.xml.h:43
+msgid "FIXME: S_end"
+msgstr "FIXME: V_ersturen"
 
-#: ui/evolution-event-editor.h:53
-msgid "Dump XML"
-msgstr "XML Dumpen"
+# calendar/gui/event-editor.c:1333

+#: ui/evolution-event-editor.xml.h:44
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Aanhangels Opslaan..."
 
-#: ui/evolution-event-editor.h:54
-msgid "Dump the UI Xml description"
-msgstr "Dump de UI Xml omschrijving"
+# addressbook/contact-editor/e-contact-editor.c:766

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

+#: ui/evolution-event-editor.xml.h:45
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Script _Debugger"
 
-# addressbook/contact-editor/e-contact-editor.c:646

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

-#: ui/evolution-event-editor.h:56
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mail bericht"
+# addressbook/contact-editor/e-contact-editor.c:649

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

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

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

-#: ui/evolution-event-editor.h:57
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

-#: ui/evolution-event-editor.h:58
-msgid "FIXME: _Task"
-msgstr "FIXME: _Taak"
+# addressbook/contact-editor/e-contact-editor.c:732

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

+#: ui/evolution-event-editor.xml.h:48
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Aanpassen..."
 
-# addressbook/contact-editor/e-contact-editor.c:649

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

-#: ui/evolution-event-editor.h:59
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Taak Verzoek"
+# addressbook/contact-editor/e-contact-editor.c:745

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

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

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

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

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

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

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

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

-#: ui/evolution-event-editor.h:60
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Dagboek Item"
 
-# addressbook/contact-editor/e-contact-editor.c:651

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

-#: ui/evolution-event-editor.h:61
-msgid "FIXME: _Note"
-msgstr "FIXME: Aanteke_ning"
+# addressbook/contact-editor/e-contact-editor.c:722

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

+#: ui/evolution-event-editor.xml.h:54
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Laatste Item in Folder"
 
-# 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

-#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Seleecteer F_ormulier"
+# addressbook/contact-editor/e-contact-editor.c:646

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

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

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

-#: ui/evolution-event-editor.h:63
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Memo Stijl"
 
-# addressbook/contact-editor/e-contact-editor.c:660

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

-#: ui/evolution-event-editor.h:64
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Definiëer Print _Stijlen..."
-
-# addressbook/contact-editor/e-contact-editor.c:678

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

-#: ui/evolution-event-editor.h:65
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Afdruk_voorbeeld"
-
-# addressbook/contact-editor/e-contact-editor.c:844

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

-#: ui/evolution-event-editor.h:67
-msgid "Print S_etup..."
-msgstr "Afdruk In_stellingen..."
-
-# addressbook/contact-editor/e-contact-editor.c:667

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

-#: ui/evolution-event-editor.h:68
-msgid "FIXME: S_end"
-msgstr "FIXME: V_ersturen"
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-event-editor.h:70
-msgid "Save _As..."
-msgstr "Opslaan _Als..."
-
-# calendar/gui/event-editor.c:1333

-#: ui/evolution-event-editor.h:71
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Aanhangels Opslaan..."
-
 # addressbook/contact-editor/e-contact-editor.c:674

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

-#: ui/evolution-event-editor.h:73
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Verplaats naar Folder..."
 
-# addressbook/contact-editor/e-contact-editor.c:675

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

-#: ui/evolution-event-editor.h:74
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopieer naar Folder..."
-
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.h:75
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
+# calendar/gui/event-editor.c:1258

+#: ui/evolution-event-editor.xml.h:58
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nieuwe Afspraak"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#: ui/evolution-event-editor.h:76
-msgid "_Close"
-msgstr "_Sluiten"
+# addressbook/contact-editor/e-contact-editor.c:651

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

+#: ui/evolution-event-editor.xml.h:59
+msgid "FIXME: _Note"
+msgstr "FIXME: Aanteke_ning"
 
-# calendar/gui/gncal-todo.c:488

-#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
-msgid "_Edit"
-msgstr "B_ewerken..."
+# addressbook/contact-editor/e-contact-editor.c:747

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

+#: ui/evolution-event-editor.xml.h:60
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Object..."
 
-# composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.h:78
-msgid "_Undo"
-msgstr "_Ongedaan maken"
+# addressbook/contact-editor/e-contact-editor.c:753

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

+#: ui/evolution-event-editor.xml.h:61
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Paragraaf..."
 
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: ui/evolution-event-editor.h:79
-msgid "_Redo"
-msgstr "_Herhalen"
+# addressbook/contact-editor/e-contact-editor.c:771

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

+#: ui/evolution-event-editor.xml.h:62
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Spelling..."
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution-event-editor.h:80
-msgid "C_ut"
-msgstr "K_nippen"
+# addressbook/contact-editor/e-contact-editor.c:727

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

+#: ui/evolution-event-editor.xml.h:63
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standaard"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.h:81
-msgid "_Copy"
-msgstr "_Kopiëren"
+# addressbook/contact-editor/e-contact-editor.c:648

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

+#: ui/evolution-event-editor.xml.h:64
+msgid "FIXME: _Task"
+msgstr "FIXME: _Taak"
 
-# composer/e-msg-composer-address-dialog.c:191

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

-#: ui/evolution-event-editor.h:82
-msgid "_Paste"
-msgstr "_Plakken"
+# 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

+#: ui/evolution-event-editor.xml.h:65
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Ongelezen Item"
 
-# addressbook/contact-editor/e-contact-editor.c:699

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

-#: ui/evolution-event-editor.h:83
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Plakken _Speciaal..."
+#: ui/evolution-event-editor.xml.h:66
+msgid "FIXME: what goes here?"
+msgstr "FIXME: what moet hier staan?"
 
-# calendar/gui/calendar-commands.c:659

-#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
-msgid "C_lear"
-msgstr "W_issen"
+# addressbook/contact-editor/e-contact-editor.c:806

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

+#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+msgid "F_ormat"
+msgstr "_Opmaak"
 
-# addressbook/gui/component/addressbook.c:424

-#: ui/evolution-event-editor.h:86
-msgid "_Find..."
-msgstr "_Vind..."
+#: ui/evolution-event-editor.xml.h:69
+msgid "Find Again"
+msgstr "Opnieuw Zoeken"
 
-#: ui/evolution-event-editor.h:87
+#: ui/evolution-event-editor.xml.h:70
 msgid "Find _Again"
 msgstr "Opnieuw _Vinden"
 
-# composer/e-msg-composer.c:463

-#: ui/evolution-event-editor.h:88
-msgid "_Replace..."
-msgstr "Ve_rvangen..."
+# addressbook/contact-editor/e-contact-editor.c:860

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

+#: ui/evolution-event-editor.xml.h:71
+msgid "Go to the next item"
+msgstr "Ga naar het volgende item"
 
-# addressbook/contact-editor/e-contact-editor.c:708

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

-#: ui/evolution-event-editor.h:89
-msgid "_Object"
-msgstr "_Object"
+# addressbook/contact-editor/e-contact-editor.c:857

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

+#: ui/evolution-event-editor.xml.h:72
+msgid "Go to the previous item"
+msgstr "Ga naar het vorige item"
 
-#: ui/evolution-event-editor.h:90
-msgid "FIXME: what goes here?"
-msgstr "FIXME: what moet hier staan?"
+# calendar/gui/prop.c:678

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

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

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

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

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

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

-#: ui/evolution-event-editor.h:92
+#: ui/evolution-event-editor.xml.h:78
 msgid "Pre_vious"
 msgstr "_Vorige"
 
-# 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

-#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
+# addressbook/contact-editor/e-contact-editor.c:737

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

+#: ui/evolution-event-editor.xml.h:79
+msgid "Previous"
+msgstr "Vorige"
 
-# 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

-#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Ongelezen Item"
+# addressbook/contact-editor/e-contact-editor.c:844

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

+#: ui/evolution-event-editor.xml.h:80
+msgid "Print S_etup..."
+msgstr "Afdruk In_stellingen..."
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

-#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Niet complete taak"
+# addressbook/printing/e-contact-print.glade.h:7

+#: ui/evolution-event-editor.xml.h:81
+msgid "Print Setup"
+msgstr "Printer Instellingen"
 
-# addressbook/contact-editor/e-contact-editor.c:715

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

-#: ui/evolution-event-editor.h:96
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Ee_rste Item in Folder"
+# composer/e-msg-composer-address-dialog.glade.h:12

+#: ui/evolution-event-editor.xml.h:84
+msgid "Properties"
+msgstr "Eigenschappen"
 
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-event-editor.h:97
-msgid "N_ext"
-msgstr "V_olgende"
+# addressbook/contact-editor/e-contact-editor.c:1294

+#: ui/evolution-event-editor.xml.h:85
+msgid "Redo"
+msgstr "Herhalen"
 
-# addressbook/contact-editor/e-contact-editor.c:722

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

-#: ui/evolution-event-editor.h:101
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Laatste Item in Folder"
+#: ui/evolution-event-editor.xml.h:86
+msgid "Redo the undone action"
+msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
-# addressbook/contact-editor/e-contact-editor.c:740

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

-#: ui/evolution-event-editor.h:102
-msgid "_Toolbars"
-msgstr "_Werkbalk"
+# mail/folder-browser-factory.c:34

+#: ui/evolution-event-editor.xml.h:87
+msgid "Replace"
+msgstr "Vervangen"
 
-# addressbook/contact-editor/e-contact-editor.c:727

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

-#: ui/evolution-event-editor.h:103
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standaard"
+#: ui/evolution-event-editor.xml.h:88
+msgid "Replace a string"
+msgstr "Tekenreeks vervangen"
 
-# addressbook/contact-editor/e-contact-editor.c:729

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

-#: ui/evolution-event-editor.h:104
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Opmaak"
+# addressbook/contact-editor/e-contact-editor.c:840

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

+#: ui/evolution-event-editor.xml.h:92
+msgid "Save the appointment and close the dialog box"
+msgstr "Bewaar de afspraak en sluit dit venster"
 
-# addressbook/contact-editor/e-contact-editor.c:732

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

-#: ui/evolution-event-editor.h:105
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Aanpassen..."
+# calendar/gui/calendar-commands.c:553

+#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+msgid "Save the current file"
+msgstr "Huidig bestand opslaan"
 
-# addressbook/contact-editor/e-contact-editor.c:805

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

-#: ui/evolution-event-editor.h:106
-msgid "_Insert"
-msgstr "_Invoegen"
+#: ui/evolution-event-editor.xml.h:94
+msgid "Schedule Meeting"
+msgstr "Afspraak Plannen"
 
-# addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-event-editor.h:107
-msgid "FIXME: _File..."
-msgstr "FIXME: Bestand..."
+#: ui/evolution-event-editor.xml.h:95
+msgid "Schedule _Meeting"
+msgstr "_Afspraak Plannen"
 
-# addressbook/contact-editor/e-contact-editor.c:746

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

-#: ui/evolution-event-editor.h:108
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
+#: ui/evolution-event-editor.xml.h:96
+msgid "Schedule some sort of a meeting"
+msgstr "Een soort afspraak maken"
 
-# addressbook/contact-editor/e-contact-editor.c:747

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

-#: ui/evolution-event-editor.h:109
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Object..."
+#: ui/evolution-event-editor.xml.h:97
+msgid "Search again for the same string"
+msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 
-# addressbook/contact-editor/e-contact-editor.c:806

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

-#: ui/evolution-event-editor.h:110
-msgid "F_ormat"
-msgstr "_Opmaak"
+#: ui/evolution-event-editor.xml.h:98
+msgid "Search for a string"
+msgstr "Zoek naar een tekenreeks"
 
-# addressbook/contact-editor/e-contact-editor.c:752

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

-#: ui/evolution-event-editor.h:111
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Font..."
+#: ui/evolution-event-editor.xml.h:100
+msgid "Select All"
+msgstr "Alles Selecteren"
 
-# addressbook/contact-editor/e-contact-editor.c:753

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

-#: ui/evolution-event-editor.h:112
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Paragraaf..."
+#: ui/evolution-event-editor.xml.h:101
+msgid "Select everything"
+msgstr "Selecteer alles"
 
-# addressbook/contact-editor/e-contact-editor.c:771

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

-#: ui/evolution-event-editor.h:114
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Spelling..."
+#: ui/evolution-event-editor.xml.h:102
+msgid "Setup the page settings for your current printer"
+msgstr "Stel de pagina instellingen in voor de huidige printer"
 
-# calendar/gui/event-editor.c:1250

-#: ui/evolution-event-editor.h:115
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Controleer Namen"
+# composer/e-msg-composer.c:948

+#: ui/evolution-event-editor.xml.h:103
+msgid "Undo"
+msgstr "Ongedaan maken"
 
-# calendar/gui/event-editor.c:1251

-#: ui/evolution-event-editor.h:116
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Adres _Boek..."
+# composer/e-msg-composer.c:948

+#: ui/evolution-event-editor.xml.h:104
+msgid "Undo the last action"
+msgstr "Maak de laatste bewerking ongedaan"
 
-# addressbook/contact-editor/e-contact-editor.c:773

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

-#: ui/evolution-event-editor.h:117
-msgid "_Forms"
-msgstr "_Formulier"
+# shell/e-shell-view-menu.c:159

+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+msgid "_About..."
+msgstr "_Over..."
 
-# addressbook/contact-editor/e-contact-editor.c:760

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

-#: ui/evolution-event-editor.h:119
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Ontwerp dit Formulier"
+# calendar/gui/dialogs/alarm-notify.glade.h:7

+#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+msgid "_Close"
+msgstr "_Sluiten"
 
-# addressbook/contact-editor/e-contact-editor.c:761

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

-#: ui/evolution-event-editor.h:120
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Ontw_erp een Formulier..."
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

+#: ui/evolution-event-editor.xml.h:107
+msgid "_Copy"
+msgstr "_Kopiëren"
 
-# addressbook/contact-editor/e-contact-editor.c:763

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

-#: ui/evolution-event-editor.h:121
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publiceer een _Formulier..."
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+msgid "_Debug"
+msgstr "_Debug"
 
-# addressbook/contact-editor/e-contact-editor.c:764

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

-#: ui/evolution-event-editor.h:122
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_bliceer een Formulier als..."
+# calendar/gui/gncal-todo.c:488

+#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+msgid "_Edit"
+msgstr "B_ewerken..."
 
-# addressbook/contact-editor/e-contact-editor.c:766

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

-#: ui/evolution-event-editor.h:123
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Script _Debugger"
+# addressbook/gui/component/addressbook.c:424

+#: ui/evolution-event-editor.xml.h:112
+msgid "_Find..."
+msgstr "_Vind..."
 
-# shell/e-shell-view-menu.c:474

-#: ui/evolution-event-editor.h:124
-msgid "Actio_ns"
-msgstr "Ac_ties"
+# addressbook/contact-editor/e-contact-editor.c:773

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

+#: ui/evolution-event-editor.xml.h:113
+msgid "_Forms"
+msgstr "_Formulier"
 
-# calendar/gui/event-editor.c:1258

-#: ui/evolution-event-editor.h:125
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nieuwe Afspraak"
+# addressbook/contact-editor/e-contact-editor-strings.h:20

+#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
+#: ui/evolution.xml.h:31
+msgid "_Help"
+msgstr "_Help"
 
-# calendar/gui/event-editor.c:1260

-#: ui/evolution-event-editor.h:126
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Herhaling..."
+# addressbook/contact-editor/e-contact-editor.c:805

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

+#: ui/evolution-event-editor.xml.h:115
+msgid "_Insert"
+msgstr "_Invoegen"
 
-#: ui/evolution-event-editor.h:127
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: _Afspraak Plannen"
+# addressbook/contact-editor/e-contact-editor.c:708

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

+#: ui/evolution-event-editor.xml.h:116
+msgid "_Object"
+msgstr "_Object"
 
-# calendar/gui/event-editor.c:1265

-#: ui/evolution-event-editor.h:128
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Doorsturen als v_Calendar"
+# composer/e-msg-composer-address-dialog.c:191

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

+#: ui/evolution-event-editor.xml.h:117
+msgid "_Paste"
+msgstr "_Plakken"
 
-# addressbook/contact-editor/e-contact-editor.c:793

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

-#: ui/evolution-event-editor.h:129
-msgid "FIXME: For_ward"
-msgstr "FIXME: Doorsturen"
+# addressbook/gui/component/addressbook.c:425

+# addressbook/gui/component/addressbook.c:492

+# calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

+#: ui/evolution-event-editor.xml.h:118
+msgid "_Print"
+msgstr "_Afdrukken"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: ui/evolution-event-editor.h:130 ui/evolution.h:32
-msgid "_Help"
-msgstr "_Help"
+# composer/e-msg-composer-address-dialog.glade.h:12

+#: ui/evolution-event-editor.xml.h:119
+msgid "_Properties..."
+msgstr "_Eigenschappen..."
 
-# shell/e-shell-view-menu.c:159

-#: ui/evolution-event-editor.h:131
-msgid "_About..."
-msgstr "_Over..."
+# addressbook/contact-editor/e-contact-editor.c:1294

+#: ui/evolution-event-editor.xml.h:120
+msgid "_Redo"
+msgstr "_Herhalen"
 
-#: ui/evolution-event-editor.h:132
-msgid "_Debug"
-msgstr "_Debug"
+# composer/e-msg-composer.c:463

+#: ui/evolution-event-editor.xml.h:121
+msgid "_Replace..."
+msgstr "Ve_rvangen..."
 
-# addressbook/contact-editor/e-contact-editor.c:848

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

-#: ui/evolution-event-editor.h:133
-msgid "FIXME: Insert File"
-msgstr "FIXME: Bestand Bijvoegen"
+# addressbook/contact-editor/e-contact-editor.c:740

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

+#: ui/evolution-event-editor.xml.h:123
+msgid "_Toolbars"
+msgstr "_Werkbalk"
+
+# composer/e-msg-composer.c:948

+#: ui/evolution-event-editor.xml.h:125
+msgid "_Undo"
+msgstr "_Ongedaan maken"
 
 # mail/folder-browser-factory.c:30

 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: ui/evolution-mail.xml.h:7
 msgid "Compose"
 msgstr "Opstellen"
 
 # mail/folder-browser-factory.c:30

-#: ui/evolution-mail.h:10
+#: ui/evolution-mail.xml.h:8
 msgid "Compose a new message"
 msgstr "Stel een nieuw bericht op"
 
 # mail/folder-browser-factory.c:41

-#: ui/evolution-mail.h:12
+#: ui/evolution-mail.xml.h:10
 msgid "Copy message to a new folder"
 msgstr "Kopiëer het bericht naar een nieuwe map"
 
 # shell/e-shell-view-menu.c:365

-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
 msgid "F_older"
 msgstr "_Map"
 
-#: ui/evolution-mail.h:16
+#: ui/evolution-mail.xml.h:15
 msgid "Fi_lter on Sender"
 msgstr "Filteren op Afzender"
 
-#: ui/evolution-mail.h:17
+#: ui/evolution-mail.xml.h:16
 msgid "Filter on Rec_ipients"
 msgstr "Filteren op Geadresseerden"
 
 # mail/folder-browser-factory.c:101

-#: ui/evolution-mail.h:18
+#: ui/evolution-mail.xml.h:17
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
 # mail/folder-browser-factory.c:29

-#: ui/evolution-mail.h:21
+#: ui/evolution-mail.xml.h:21
 msgid "Get Mail"
 msgstr "Post Ophalen"
 
 # addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-mail.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Mail _Filters..."
 msgstr "Post _Filters..."
 
-#: ui/evolution-mail.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Manage Subscriptions..."
 msgstr "Aanmeldingen Beheren..."
 
-#: ui/evolution-mail.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Mar_k As Read"
 msgstr "_Markeer Als Gelezen"
 
 # addressbook/contact-editor/e-contact-editor.c:704

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

-#: ui/evolution-mail.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mark As U_nread"
 msgstr "Markeer Als _Ongelezen"
 
 # calendar/gui/print.c:326

-#: ui/evolution-mail.h:26
+#: ui/evolution-mail.xml.h:26
 msgid "Move"
 msgstr "Verplaatsen"
 
 # mail/folder-browser-factory.c:41

-#: ui/evolution-mail.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Move message to a new folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:894

-#: ui/evolution-mail.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Previews the message to be printed"
 msgstr "Geeft een voorbeeld van het af te drukken bericht"
 
 # calendar/gui/print.c:1249

-#: ui/evolution-mail.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Print Preview of message..."
 msgstr "Afdrukvoorbeeld van bericht..."
 
-#: ui/evolution-mail.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Print message to the printer"
 msgstr "Bericht afdrukken naar de printer"
 
-#: ui/evolution-mail.h:32
+#: ui/evolution-mail.xml.h:32
 msgid "Print message..."
 msgstr "Bericht afdrukken..."
 
 # mail/folder-browser-factory.c:35

-#: ui/evolution-mail.h:36
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
 # mail/folder-browser-factory.c:35

-#: ui/evolution-mail.h:37
+#: ui/evolution-mail.xml.h:37
 msgid "Reply to _Sender"
 msgstr "Af_zender beantwoorden"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:13
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: ui/evolution-mail.h:41
+#: ui/evolution-mail.xml.h:41
 msgid "Send queued mail and retrieve new mail"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
 # mail/folder-browser-factory.c:37

-#: ui/evolution-mail.h:42
+#: ui/evolution-mail.xml.h:42
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: ui/evolution-mail.h:43
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
 # addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-mail.h:45
+#: ui/evolution-mail.xml.h:46
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: ui/evolution-mail.h:46
+#: ui/evolution-mail.xml.h:47
 msgid "_Configure Folder"
 msgstr "_Configureer Map"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
-msgstr "_Kopiëren naar Map"
+#: ui/evolution-mail.xml.h:48
+msgid "_Copy to Folder..."
+msgstr "_Kopiëren naar Map..."
 
 # composer/e-msg-composer.c:894

-#: ui/evolution-mail.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "_Edit Message"
 msgstr "Bericht _Bewerken"
 
 # mail/folder-browser-factory.c:77

-#: ui/evolution-mail.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "_Expunge"
 msgstr "_Legen"
 
-#: ui/evolution-mail.h:51
+#: ui/evolution-mail.xml.h:52
 msgid "_Filter on Subject"
 msgstr "_Filteren op Onderwerp"
 
 # mail/folder-browser-factory.c:37

-#: ui/evolution-mail.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:18
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
 # mail/folder-browser-factory.c:95

-#: ui/evolution-mail.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "_Mail Configuration..."
 msgstr "_Mail Configuratie..."
 
-#: ui/evolution-mail.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Message"
 msgstr "_Bericht"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
-msgstr "_Verplaatsen naar map..."
+#: ui/evolution-mail.xml.h:57
+msgid "_Move to Folder..."
+msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-mail.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Open in New Window"
 msgstr "_Openen in Nieuw Venster"
 
-#: ui/evolution-mail.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Print Message"
 msgstr "Bericht A_fdrukken"
 
-#: ui/evolution-mail.h:59
+#: ui/evolution-mail.xml.h:60
 msgid "_Threaded"
 msgstr "Rela_ties weergeven"
 
-#: ui/evolution-mail.h:60
+# addressbook/contact-editor/e-contact-editor-strings.h:8

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

+#: ui/evolution-mail.xml.h:61
+msgid "_Undelete"
+msgstr "_Herstellen"
+
+#: ui/evolution-mail.xml.h:62
 msgid "_VFolder on Subject"
 msgstr "_VMap op Onderwerp"
 
 # mail/folder-browser-factory.c:89

-#: ui/evolution-mail.h:61
+#: ui/evolution-mail.xml.h:63
 msgid "_Virtual Folder Editor..."
 msgstr "_Virtuele Map Bewerken..."
 
+# composer/e-msg-composer.c:951

+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-message-composer.xml.h:7
+msgid "Attach"
+msgstr "Bijvoegen"
+
+# addressbook/printing/e-contact-print.glade.h:24

+#: ui/evolution-message-composer.xml.h:9
+msgid "Bold"
+msgstr "Vet"
+
+# calendar/gui/calendar-commands.c:553

+#: ui/evolution-message-composer.xml.h:11
+msgid "Close the current file"
+msgstr "Huidig bestand sluiten"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "HTML"
+msgstr "HTML"
+
+# composer/e-msg-composer.c:891

+#: ui/evolution-message-composer.xml.h:14
+msgid "Insert a file as text into the message"
+msgstr "Voeg een bestand bij het bericht"
+
+# composer/e-msg-composer.c:891

+#: ui/evolution-message-composer.xml.h:15
+msgid "Insert text file..."
+msgstr "Tekst bestand invoegen..."
+
+# composer/e-msg-composer.c:561

+#: ui/evolution-message-composer.xml.h:17
+msgid "Open a file"
+msgstr "Bestand openen"
+
+# composer/e-msg-composer.c:463

+#: ui/evolution-message-composer.xml.h:19
+msgid "Save As"
+msgstr "Opslaan Als"
+
+# composer/e-msg-composer.c:888

+#: ui/evolution-message-composer.xml.h:21
+msgid "Save in _folder... (FIXME)"
+msgstr "Opslaan in _map... (FIXME)"
+
+# composer/e-msg-composer.c:888

+#: ui/evolution-message-composer.xml.h:22
+msgid "Save in folder..."
+msgstr "Opslaan in _map..."
+
+# composer/e-msg-composer.c:888

+#: ui/evolution-message-composer.xml.h:24
+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

+#: ui/evolution-message-composer.xml.h:25
+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

+#: ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Versturen"
+
+# filter/filter-editor.c:198

+#: ui/evolution-message-composer.xml.h:27
+msgid "Send _Later"
+msgstr "_Later Versturen"
+
+# filter/filter-editor.c:198

+#: ui/evolution-message-composer.xml.h:28
+msgid "Send _later"
+msgstr "_Later versturen"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send the mail in HTML format"
+msgstr "Stuur de mail in HTML formaat"
+
+# composer/e-msg-composer.c:942

+#: ui/evolution-message-composer.xml.h:30
+msgid "Send the message later"
+msgstr "Dit bericht later versturen"
+
+# composer/e-msg-composer.c:942

+#: ui/evolution-message-composer.xml.h:31
+msgid "Send the message now"
+msgstr "Dit bericht nu versturen"
+
+# composer/e-msg-composer.c:942

+#: ui/evolution-message-composer.xml.h:32
+msgid "Send this message now"
+msgstr "Dit bericht nu versturen"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sets something as bold"
+msgstr "Stelt iets in als vet"
+
+# composer/e-msg-composer.c:907

+#: ui/evolution-message-composer.xml.h:34
+msgid "Show / hide attachments"
+msgstr "Toon / Verberg bijvoegsels"
+
+# composer/e-msg-composer.c:906

+#: ui/evolution-message-composer.xml.h:35
+msgid "Show _attachments"
+msgstr "Bekijk _bijvoegsels"
+
+# composer/e-msg-composer.c:906

+#: ui/evolution-message-composer.xml.h:36
+msgid "Show attachments"
+msgstr "Bekijk bijvoegsels"
+
+# composer/e-msg-composer.c:891

+#: ui/evolution-message-composer.xml.h:43
+msgid "_Insert text file... (FIXME)"
+msgstr "Voeg test-bestand _in... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Open..."
+msgstr "_Openen..."
+
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: ui/evolution-subscribe.xml.h:7
 msgid "Add folder to your list of subscribed folders"
 msgstr "map toevoegen aan de lijst van aangemelde mappen"
 
-#: ui/evolution-subscribe.h:12
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List"
 msgstr "Lijst Verfrissen"
 
-#: ui/evolution-subscribe.h:13
+#: ui/evolution-subscribe.xml.h:11
 msgid "Refresh List of Folders"
 msgstr "Lijst of Mappen Verfrissen"
 
-#: ui/evolution-subscribe.h:14
+#: ui/evolution-subscribe.xml.h:12
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Map verwijderen van je lijst van aangemelde mappen"
 
-#: ui/evolution-subscribe.h:16
+#: ui/evolution-subscribe.xml.h:14
 msgid "Subscribe"
 msgstr "Aanmelden"
 
-#: ui/evolution-subscribe.h:17
+#: ui/evolution-subscribe.xml.h:15
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
 # shell/e-shell-view-menu.c:404

 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution.h:9
+#: ui/evolution.xml.h:7
 msgid "Create a new folder"
 msgstr "Nieuwe map aanmaken"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution.h:10
+#: ui/evolution.xml.h:8
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
 # calendar/gui/gncal-todo.c:488

-#: ui/evolution.h:11
+#: ui/evolution.xml.h:9
 msgid "E_xit"
 msgstr "Stop_pen"
 
-#: ui/evolution.h:12
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "Evolution balk _snelkoppeling"
 
-#: ui/evolution.h:13
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
 # shell/e-shell-view-menu.c:443

-#: ui/evolution.h:14
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: ui/evolution.h:15
+#: ui/evolution.xml.h:13
 msgid "Show information about Evolution"
 msgstr "Geef informatie over Evolution weer"
 
 # shell/e-shell-view-menu.c:422

-#: ui/evolution.h:16
+#: ui/evolution.xml.h:14
 msgid "Show the _Folder Bar"
 msgstr "_Mapbalk Tonen"
 
 # shell/e-shell-view-menu.c:419

-#: ui/evolution.h:17
+#: ui/evolution.xml.h:15
 msgid "Show the _Shortcut Bar"
 msgstr "Snelkoppelingenbalk Tonen"
 
+# shell/e-shell-view-menu.c:457

+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "_Bug Report Insturen"
+
 # shell/e-shell-view-menu.c:458

-#: ui/evolution.h:18
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy"
 
 # shell/e-shell-view-menu.c:423

-#: ui/evolution.h:19
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mapbalk"
 
 # shell/e-shell-view-menu.c:420

-#: ui/evolution.h:20
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
 # shell/e-shell-view-menu.c:452

-#: ui/evolution.h:21
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Kont_akt Beheerder"
 
 # shell/e-shell-view-menu.c:449

-#: ui/evolution.h:22
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
 # shell/e-shell-view-menu.c:446

-#: ui/evolution.h:23
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "De _Mailer Gebruiken"
 
 # shell/e-shell-view-menu.c:159

-#: ui/evolution.h:24
+#: ui/evolution.xml.h:23
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
 # shell/e-shell-view-menu.c:378

-#: ui/evolution.h:25
+#: ui/evolution.xml.h:24
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
 # shell/e-shell-view-menu.c:381

-#: ui/evolution.h:26
+#: ui/evolution.xml.h:25
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
 # shell/e-shell-view-menu.c:404

-#: ui/evolution.h:27
+#: ui/evolution.xml.h:26
 msgid "_Create New Folder..."
 msgstr "Nieu_we map aanmaken..."
 
 # shell/e-shell-view-menu.c:365

-#: ui/evolution.h:30
+#: ui/evolution.xml.h:29
 msgid "_Folder"
 msgstr "_Map"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution.h:31
+#: ui/evolution.xml.h:30
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
 # shell/e-shell-view-menu.c:440

-#: ui/evolution.h:33
+#: ui/evolution.xml.h:32
 msgid "_Index"
 msgstr "_Index"
 
 # shell/e-shell-view-menu.c:375

-#: ui/evolution.h:34
+#: ui/evolution.xml.h:33
 msgid "_Mail message (FIXME)"
 msgstr "_Bericht mailen (FIXME)"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: ui/evolution.h:36
+#: ui/evolution.xml.h:35
 msgid "_Settings"
 msgstr "In_stellingen:"
 
-# shell/e-shell-view-menu.c:457

-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "Bug Report In_sturen"
-
 # shell/e-shell-view-menu.c:384

-#: ui/evolution.h:38
+#: ui/evolution.xml.h:36
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
@@ -7571,32 +7777,298 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-# addressbook/gui/component/addressbook.c:420

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

-#: widgets/misc/e-dateedit.c:325
-msgid "Now"
-msgstr "Nu"
-
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
+#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
 #: widgets/misc/e-dateedit.c:1127
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
+#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
 #: widgets/misc/e-dateedit.c:1130
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+# addressbook/gui/component/addressbook.c:420

+# calendar/gui/calendar-commands.c:544

+#: widgets/misc/e-dateedit.c:359
+msgid "Now"
+msgstr "Nu"
+
 # widgets/shortcut-bar/e-group-bar.c:632

 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 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?"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Canada"
+#~ msgstr "Canada"
+
+# addressbook/gui/component/addressbook.c:424

+#~ msgid "Finland"
+#~ msgstr "Finland"
+
+# composer/e-msg-composer-address-dialog.glade.h:9

+#~ msgid "Quick Search"
+#~ msgstr "Snel Zoeken"
+
+# addressbook/gui/component/alphabet.glade.h:9

+#~ msgid "a"
+#~ msgstr "a"
+
+# addressbook/gui/component/alphabet.glade.h:10

+#~ msgid "b"
+#~ msgstr "b"
+
+# addressbook/gui/component/alphabet.glade.h:11

+#~ msgid "c"
+#~ msgstr "c"
+
+# addressbook/gui/component/alphabet.glade.h:12

+#~ msgid "d"
+#~ msgstr "d"
+
+# addressbook/gui/component/alphabet.glade.h:13

+#~ msgid "e"
+#~ msgstr "e"
+
+# addressbook/gui/component/alphabet.glade.h:14

+#~ msgid "f"
+#~ msgstr "f"
+
+# addressbook/gui/component/alphabet.glade.h:15

+#~ msgid "g"
+#~ msgstr "g"
+
+# addressbook/gui/component/alphabet.glade.h:17

+#~ msgid "i"
+#~ msgstr "i"
+
+# addressbook/gui/component/alphabet.glade.h:18

+#~ msgid "j"
+#~ msgstr "j"
+
+# addressbook/gui/component/alphabet.glade.h:19

+#~ msgid "k"
+#~ msgstr "k"
+
+# addressbook/gui/component/alphabet.glade.h:20

+#~ msgid "l"
+#~ msgstr "l"
+
+# addressbook/gui/component/alphabet.glade.h:21

+#~ msgid "m"
+#~ msgstr "m"
+
+# addressbook/gui/component/alphabet.glade.h:22

+#~ msgid "n"
+#~ msgstr "n"
+
+# addressbook/gui/component/alphabet.glade.h:23

+#~ msgid "o"
+#~ msgstr "o"
+
+# addressbook/gui/component/alphabet.glade.h:24

+#~ msgid "p"
+#~ msgstr "p"
+
+# addressbook/gui/component/alphabet.glade.h:25

+#~ msgid "q"
+#~ msgstr "q"
+
+# addressbook/gui/component/alphabet.glade.h:26

+#~ msgid "r"
+#~ msgstr "r"
+
+# addressbook/gui/component/alphabet.glade.h:27

+#~ msgid "s"
+#~ msgstr "s"
+
+# addressbook/gui/component/alphabet.glade.h:28

+#~ msgid "t"
+#~ msgstr "t"
+
+# addressbook/gui/component/alphabet.glade.h:29

+#~ msgid "u"
+#~ msgstr "u"
+
+# addressbook/gui/component/alphabet.glade.h:30

+#~ msgid "v"
+#~ msgstr "v"
+
+# addressbook/gui/component/alphabet.glade.h:31

+#~ msgid "w"
+#~ msgstr "w"
+
+# addressbook/gui/component/alphabet.glade.h:32

+#~ msgid "x"
+#~ msgstr "x"
+
+# addressbook/gui/component/alphabet.glade.h:33

+#~ msgid "y"
+#~ msgstr "y"
+
+# addressbook/gui/component/alphabet.glade.h:34

+#~ msgid "z"
+#~ msgstr "z"
+
+# calendar/gui/getdate.y:426

+#~ msgid "60 minutes"
+#~ msgstr "60 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "30 minutes"
+#~ msgstr "30 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "15 minutes"
+#~ msgstr "15 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "10 minutes"
+#~ msgstr "10 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "05 minutes"
+#~ msgstr "05 minuten"
+
+#~ msgid "Not Started"
+#~ msgstr "Niet Gestart"
+
+#~ msgid "In Progress"
+#~ msgstr "In Uitvoer"
+
+#~ msgid "Completed"
+#~ msgstr "Gedaan"
+
+# filter/filter-editor.c:212

+#~ msgid "Cancelled"
+#~ msgstr "Geannuleerd"
+
+# addressbook/printing/e-contact-print.glade.h:34

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

+#~ msgid "High"
+#~ msgstr "Hoog"
+
+# addressbook/printing/e-contact-print.glade.h:28

+#~ msgid "Normal"
+#~ msgstr "Normaal"
+
+# calendar/gui/getdate.y:438

+#~ msgid "Low"
+#~ msgstr "Laag"
+
+#~ msgid "Recur on the"
+#~ msgstr "Herhaal op de"
+
+#~ msgid "th day of the month"
+#~ msgstr "de dag van de maand"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "Deze afspraak heeft aangepaste herhalings regels die niet kunnen worden "
+#~ "bewerkt door \n"
+#~ "Evolution.\n"
+#~ "\n"
+#~ "Maar, deze afspraak zal zich wel herhalen op de juiste tijd en zal juist "
+#~ "worden \n"
+#~ "weergegeven op de kalender."
+
+#~ msgid ""
+#~ "Incoming\n"
+#~ "Outgoing\n"
+#~ msgstr ""
+#~ "Inkomend\n"
+#~ "Uitgaand\n"
+
+#~ msgid "Bad storage URL (no server): %s"
+#~ msgstr "Slechte opslag URL (geen server): %s"
+
+#~ msgid "Custom search"
+#~ msgstr "Aangepast zoeken"
+
+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

+#~ msgid "Custom"
+#~ msgstr "Aangepast"
+
+# composer/e-msg-composer-address-dialog.glade.h:9

+#~ msgid "Full Search"
+#~ msgstr "Volledige Zoekactie"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Welkom bij de Evolutie Post configuratie wizard!\n"
+#~ "Door het invullen van wat informatie over je email\n"
+#~ "instellingen kun je direct e-mail versturen en ontvangen.\n"
+#~ "Klik op Volgende om verder te gaan."
+
+# 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"
+
+#~ 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"
+
+# composer/e-msg-composer.c:1127

+#~ msgid "Copy Message"
+#~ msgstr "Bericht Kopiëren"
+
 #~ msgid "Gpilotd address conduit"
 #~ msgstr "Gpilotd adres kanaal"
 
@@ -7825,11 +8297,6 @@ msgstr "Group %i"
 #~ msgid "Name"
 #~ msgstr "Naam"
 
-# calendar/gui/gncal-todo.c:479

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

-#~ msgid "Add..."
-#~ msgstr "Toevoegen..."
-
 # composer/e-msg-composer-address-dialog.glade.h:14

 #~ msgid "To: >>"
 #~ msgstr "Aan: >>"
@@ -7864,63 +8331,13 @@ msgstr "Group %i"
 #~ msgid "Save message"
 #~ msgstr "Bericht Opslaan"
 
-# composer/e-msg-composer.c:888

-#~ msgid "Save message with a different name"
-#~ msgstr "Sla het bericht op onder een andere naam"
-
-# composer/e-msg-composer.c:888

-#~ msgid "Save in _folder..."
-#~ msgstr "Opslaan in _folder..."
-
-# composer/e-msg-composer.c:888

-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Sla het bericht op in een bepaalde folder"
-
-# composer/e-msg-composer.c:891

-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "Voeg test-bestand _in... (FIXME)"
-
-# composer/e-msg-composer.c:891

-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Voeg een bestand bij het bericht"
-
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #~ msgid "Send _Now"
 #~ msgstr "_Nu Versturen"
 
-# filter/filter-editor.c:198

-#~ msgid "Send _Later"
-#~ msgstr "_Later Versturen"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#~ msgid "_Close..."
-#~ msgstr "Sl_uiten..."
-
 #~ msgid "Quit the message composer"
 #~ msgstr "Sluit het bericht venster"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Stuur de mail in HTML formaat"
-
-# composer/e-msg-composer.c:906

-#~ msgid "Show _attachments"
-#~ msgstr "Bekijk _bijvoegsels"
-
-# composer/e-msg-composer.c:907

-#~ msgid "Show/hide attachments"
-#~ msgstr "Toon/verberg de attachments"
-
-# composer/e-msg-composer.c:942

-#~ msgid "Send this message"
-#~ msgstr "Dit bericht versturen"
-
-# composer/e-msg-composer.c:951

-#~ msgid "Attach"
-#~ msgstr "Bijvoegen"
-
 # addressbook/gui/component/ldap-server-dialog.glade.h:7

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

 #~ msgid "More criterion"
@@ -7948,10 +8365,6 @@ msgstr "Group %i"
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Nieuwe Brief naar Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:782

-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Nieuw Bericht naar Contact"
-
 # addressbook/contact-editor/e-contact-editor.c:783

 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nieuwe Afspraak met Contact"
@@ -8115,10 +8528,6 @@ msgstr "Group %i"
 #~ msgid "FIXME: C_ancel Invitation..."
 #~ msgstr "FIXME: _Annuleer Uitnodiging..."
 
-# calendar/gui/gncal-todo.c:325

-#~ msgid "Add to-do item..."
-#~ msgstr "To-Do item toevoegen..."
-
 # calendar/gui/gncal-todo.c:326

 #~ msgid "Edit this item..."
 #~ msgstr "Bewerk dit item..."
@@ -8181,10 +8590,6 @@ msgstr "Group %i"
 #~ msgid "_Save as..."
 #~ msgstr "Ops_laan als..."
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#~ msgid "_Send"
-#~ msgstr "Ver_sturen"
-
 # addressbook/printing/e-contact-print.glade.h:28

 #~ msgid "_Format"
 #~ msgstr "_Formaat"
@@ -8497,9 +8902,6 @@ msgstr "Group %i"
 #~ msgid "Sent mail messages"
 #~ msgstr "Verzonden email-berichten"
 
-#~ msgid "Draft mail messages"
-#~ msgstr "Klad mail berichten"
-
 #~ msgid "Tasks list"
 #~ msgstr "Taaklisjt"