Updated Dutch translation.

2000-10-14  Almer S. Tigelaar  <almer1@dds.nl>

	* nl.po: Updated Dutch translation.

svn path=/trunk/; revision=5923

2 files changed, 2502 insertions, 2211 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 09c3ed4435..3258de48c4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-14  Almer S. Tigelaar  <almer1@dds.nl>
+
+	* nl.po: Updated Dutch translation.
+
 2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Added ui/*.h
diff --git a/po/nl.po b/po/nl.po
index 31f3b8d572..cb87b7be76 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,9 +6,9 @@
 # Almer S. Tigelaar <almer1@dds.nl>, 2000
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution VERSION\n"
-"POT-Creation-Date: 2000-08-27 22:26+0200\n"
-"PO-Revision-Date: 2000-08-27 22:50+0200\n"
+"Project-Id-Version: Evolution CVS\n"
+"POT-Creation-Date: 2000-10-14 17:29+0200\n"
+"PO-Revision-Date: 2000-10-14 23:11+0200\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,14 @@ msgstr ""
 
 # addressbook/backend/ebook/load-pine-addressbook.c:41
 # addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/backend/ebook/test-client-list.c:29
-#: addressbook/backend/ebook/test-client.c:54
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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:1215
-#: addressbook/gui/component/addressbook-factory.c:37
-#: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1669
-#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:55
+#: addressbook/gui/component/addressbook-factory.c:38
+#: calendar/conduits/calendar/calendar-conduit.c:1156
+#: calendar/conduits/todo/todo-conduit.c:1077 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -34,44 +33,44 @@ msgstr "Kon Bonobo niet initialiseren"
 #. Custom type implies Disabled state.
 #.
 #: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:70
+#: calendar/conduits/todo/todo-conduit-control-applet.c:70
 msgid "Disabled"
 msgstr "Uitgezet"
 
 #: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:71
+#: calendar/conduits/todo/todo-conduit-control-applet.c:71
 msgid "Synchronize"
 msgstr "Synchronizeren"
 
 #: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:57
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:72
+#: calendar/conduits/todo/todo-conduit-control-applet.c:72
 msgid "Copy From Pilot"
 msgstr "Kopiëren Uit Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:58
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:73
+#: calendar/conduits/todo/todo-conduit-control-applet.c:73
 msgid "Copy To Pilot"
 msgstr "Kopiëren Naar Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:59
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:74
+#: calendar/conduits/todo/todo-conduit-control-applet.c:74
 msgid "Merge From Pilot"
 msgstr "Mengen Uit Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:60
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:75
+#: calendar/conduits/todo/todo-conduit-control-applet.c:75
 msgid "Merge To Pilot"
 msgstr "Mengen Naar Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:144
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:116
+#: calendar/conduits/todo/todo-conduit-control-applet.c:116
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -80,8 +79,6 @@ msgid "Gpilotd address conduit"
 msgstr "Gpilotd adres kanaal"
 
 #: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:147
 msgid "(C) 1998 the Free Software Foundation"
 msgstr "(C) 1998 the Free Software Foundation"
 
@@ -90,43 +87,44 @@ msgid "Configuration utility for the address conduit.\n"
 msgstr "Configuratie voor het adres kanaal.\n"
 
 #: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:150
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:124
+#: calendar/conduits/todo/todo-conduit-control-applet.c:124
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
 #: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:191
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:155
+#: calendar/conduits/todo/todo-conduit-control-applet.c:155
 msgid "Synchronize Action"
 msgstr "Actie Synchronizeren"
 
 #: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
-#: calendar/conduits/todo/todo-conduit-control-applet.c:262
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:214
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Kanaal status"
 
 #: addressbook/conduit/address-conduit-control-applet.c:315
 #: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
-#: calendar/conduits/todo/todo-conduit-control-applet.c:316
-#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:266
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:279
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
 "No pilot configured, please choose the\n"
 "'Pilot Link Properties' capplet first."
-msgstr "Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
+msgstr ""
+"Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
 
 #: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:335
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:285
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Niet verbonden met de gnome-pilot daemon"
 
 #: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
-#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:290
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
 "pilot list from the gnome-pilot daemon"
@@ -176,637 +174,122 @@ msgstr "Item(s) die tot deze categorie behoren:"
 msgid "Available Categories:"
 msgstr "Beschikbare Categorieën:"
 
-# addressbook/contact-editor/e-contact-editor.c:643

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

-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1173
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Afspraak"
-
-# addressbook/contact-editor/e-contact-editor.c:644

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

-#: addressbook/contact-editor/e-contact-editor.c:666
-#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1174
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Verzoek tot Vergadering"
-
-# addressbook/contact-editor/e-contact-editor.c:646

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

-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1176
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mail bericht"
-
-# addressbook/contact-editor/e-contact-editor.c:647

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

-#: addressbook/contact-editor/e-contact-editor.c:669
-#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1177
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:648

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

-#: addressbook/contact-editor/e-contact-editor.c:670
-#: calendar/gui/dialogs/task-editor.c:213
-#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1178
-msgid "FIXME: _Task"
-msgstr "FIXME: _Taak"
-
-# addressbook/contact-editor/e-contact-editor.c:649

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

-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/dialogs/task-editor.c:214
-#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1179
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Taak Verzoek"
-
-# addressbook/contact-editor/e-contact-editor.c:650

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

-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1180
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Dagboek Item"
-
-# addressbook/contact-editor/e-contact-editor.c:651

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

-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1181
-msgid "FIXME: _Note"
-msgstr "FIXME: Aanteke_ning"
-
-# addressbook/contact-editor/e-contact-editor.c:653

-# addressbook/contact-editor/e-contact-editor.c:758

-# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

-#: addressbook/contact-editor/e-contact-editor.c:675
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1183
-#: calendar/gui/event-editor.c:1290
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Seleecteer F_ormulier"
-
-# addressbook/contact-editor/e-contact-editor.c:658

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

-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1188
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo Stijl"
-
-# addressbook/contact-editor/e-contact-editor.c:660

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

-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1190
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Definieer Print _Stijlen..."
-
-# addressbook/contact-editor/e-contact-editor.c:667

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

-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1197
-msgid "FIXME: S_end"
-msgstr "FIXME: V_ersturen"
-
-# addressbook/contact-editor/e-contact-editor.c:671

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

-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1201
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Attac_hments opslaan..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:8

-# addressbook/contact-editor/e-contact-editor.c:673

-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:695
-msgid "_Delete"
-msgstr "Verwijderen"
-
-# addressbook/contact-editor/e-contact-editor.c:674

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

-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1204
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Verplaats naar Folder..."
-
-# addressbook/contact-editor/e-contact-editor.c:675

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

-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1205
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopieer naar Folder..."
-
-# addressbook/contact-editor/e-contact-editor.c:677

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

-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1207
-msgid "Page Set_up"
-msgstr "Pagina instellingen"
-
-# addressbook/contact-editor/e-contact-editor.c:678

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

-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1208
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Afdruk_voorbeeld"
-
-# addressbook/contact-editor/e-contact-editor.c:699

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

-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1229
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: _Speciaal Plakken..."
-
-# addressbook/contact-editor/e-contact-editor.c:704

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

-#: addressbook/contact-editor/e-contact-editor.c:726
-#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1234
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Markeren als Ongelezen"
-
-# addressbook/contact-editor/e-contact-editor.c:708

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

-#: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1238
-msgid "_Object"
-msgstr "_Object"
-
-# addressbook/contact-editor/e-contact-editor.c:713

-# addressbook/contact-editor/e-contact-editor.c:720

-# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

-#: addressbook/contact-editor/e-contact-editor.c:735
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/dialogs/task-editor.c:285
-#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1243
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
-
-# addressbook/contact-editor/e-contact-editor.c:714

-# addressbook/contact-editor/e-contact-editor.c:721

-# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

-#: addressbook/contact-editor/e-contact-editor.c:736
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/dialogs/task-editor.c:286
-#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1244
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Ongelezen Item"
-
-# addressbook/contact-editor/e-contact-editor.c:715

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

-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1245
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Ee_rste Item in Folder"
-
-# addressbook/contact-editor/e-contact-editor.c:722

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

-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1252
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Laatste Item in Folder"
-
-# addressbook/contact-editor/e-contact-editor.c:727

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

-#: addressbook/contact-editor/e-contact-editor.c:749
-#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1257
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standaard"
-
-# addressbook/contact-editor/e-contact-editor.c:729

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

-#: addressbook/contact-editor/e-contact-editor.c:751
-#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1259
-msgid "FIXME: __Formatting"
-msgstr "FIXME: Opmaak"
-
-# addressbook/contact-editor/e-contact-editor.c:732

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

-#: addressbook/contact-editor/e-contact-editor.c:754
-#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1262
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Aanpassen..."
-
-# addressbook/contact-editor/e-contact-editor.c:737

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

-#: addressbook/contact-editor/e-contact-editor.c:759
-#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1267
-msgid "Pre_vious"
-msgstr "_Vorige"
-
-# addressbook/contact-editor/e-contact-editor.c:738

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

-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1268
-msgid "Ne_xt"
-msgstr "Volgende"
-
-# addressbook/contact-editor/e-contact-editor.c:740

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

-#: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1272
-msgid "_Toolbars"
-msgstr "_Werkbalk"
-
-# addressbook/contact-editor/e-contact-editor.c:745

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

-#: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1277
-msgid "FIXME: _File..."
-msgstr "FIXME: Bestand..."
-
-# addressbook/contact-editor/e-contact-editor.c:746

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

-#: addressbook/contact-editor/e-contact-editor.c:768
-#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1278
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
-
-# addressbook/contact-editor/e-contact-editor.c:747

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

-#: addressbook/contact-editor/e-contact-editor.c:769
-#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1279
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Object..."
-
-# addressbook/contact-editor/e-contact-editor.c:752

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

-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1284
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Font..."
-
-# addressbook/contact-editor/e-contact-editor.c:753

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

-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1285
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Paragraaf..."
-
-# addressbook/contact-editor/e-contact-editor.c:760

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

-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1292
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Ontwerp dit Formulier"
-
-# addressbook/contact-editor/e-contact-editor.c:761

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

-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1293
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Ontw_erp een Formulier..."
-
-# addressbook/contact-editor/e-contact-editor.c:763

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

-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1295
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publiceer een _Formulier..."
-
-# addressbook/contact-editor/e-contact-editor.c:764

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

-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1296
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_bliceer een Formulier als..."
-
-# addressbook/contact-editor/e-contact-editor.c:766

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

-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1298
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Script _Debugger"
-
-# addressbook/contact-editor/e-contact-editor.c:771

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

-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1303
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Spelling..."
-
-# addressbook/contact-editor/e-contact-editor.c:773

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

-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1308
-msgid "_Forms"
-msgstr "_Formulier"
-
-# addressbook/contact-editor/e-contact-editor.c:778

-#: addressbook/contact-editor/e-contact-editor.c:800
-msgid "FIXME: _New Contact"
-msgstr "FIXME: _Nieuw Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:779

-#: addressbook/contact-editor/e-contact-editor.c:801
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor.c:781

-#: addressbook/contact-editor/e-contact-editor.c:803
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Nieuwe Brief naar Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:782

-#: addressbook/contact-editor/e-contact-editor.c:804
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Nieuw Bericht naar Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:783

-#: addressbook/contact-editor/e-contact-editor.c:805
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Nieuwe Afspraak met Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:784

-#: addressbook/contact-editor/e-contact-editor.c:806
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: Een Afspraak _Plannen..."
-
-# addressbook/contact-editor/e-contact-editor.c:785

-#: addressbook/contact-editor/e-contact-editor.c:807
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: Nieuwe _Taak for contact"
-
-# addressbook/contact-editor/e-contact-editor.c:786

-#: addressbook/contact-editor/e-contact-editor.c:808
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Nieuwe Dagboek "
-
-# addressbook/contact-editor/e-contact-editor.c:788

-#: addressbook/contact-editor/e-contact-editor.c:810
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _Vlag voor Vervolg..."
-
-# addressbook/contact-editor/e-contact-editor.c:789

-#: addressbook/contact-editor/e-contact-editor.c:811
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: Toon Folder met Adressen"
-
-# addressbook/contact-editor/e-contact-editor.c:790

-#: addressbook/contact-editor/e-contact-editor.c:812
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Pagina Bekijken"
-
-# addressbook/contact-editor/e-contact-editor.c:792

-#: addressbook/contact-editor/e-contact-editor.c:814
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Doorsturen als _vCard"
-
-# addressbook/contact-editor/e-contact-editor.c:793

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

-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1321
-msgid "FIXME: For_ward"
-msgstr "FIXME: Doorsturen"
-
-# addressbook/contact-editor/e-contact-editor.c:805

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

-#: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1334
-msgid "_Insert"
-msgstr "_Invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:806

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

-#: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1335
-msgid "F_ormat"
-msgstr "_Opmaak"
-
-# addressbook/contact-editor/e-contact-editor.c:807

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

-#: addressbook/contact-editor/e-contact-editor.c:829
-#: addressbook/gui/component/addressbook.c:544
-#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1336
-msgid "_Tools"
-msgstr "Gereedschap"
-
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: addressbook/contact-editor/e-contact-editor.c:830
-#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1337
-msgid "Actio_ns"
-msgstr "Acties"
-
-# addressbook/contact-editor/e-contact-editor.c:839

-#: addressbook/contact-editor/e-contact-editor.c:861
-msgid "Save and Close"
-msgstr "Opslaan en Sluiten"
-
-# addressbook/contact-editor/e-contact-editor.c:840

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

-#: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1376
-msgid "Save the appointment and close the dialog box"
-msgstr "Bewaar de afspraak en sluit dit venster"
-
-# addressbook/contact-editor/e-contact-editor.c:844

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

-#: addressbook/contact-editor/e-contact-editor.c:866
-#: calendar/gui/calendar-commands.c:656
-msgid "Print..."
-msgstr "Afdrukken..."
-
-# addressbook/contact-editor/e-contact-editor.c:845

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

-#: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1381
-msgid "Print this item"
-msgstr "Item afdrukken"
-
-# addressbook/contact-editor/e-contact-editor.c:848

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

-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1382
-msgid "FIXME: Insert File..."
-msgstr "FIXME: Bestand Invoegen..."
-
-# addressbook/contact-editor/e-contact-editor.c:849

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

-#: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1383
-msgid "Insert a file as an attachment"
-msgstr "Bestand als attachmente invoegen"
-
-# 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

-#. Delete
-#: addressbook/contact-editor/e-contact-editor.c:874
-#: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/e-calendar-table.c:323
-#: calendar/gui/event-editor-dialog.glade.h:92 calendar/gui/gncal-todo.c:550
-#: mail/folder-browser-factory.c:50 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:147
-msgid "Delete"
-msgstr "Verwijderen"
-
-# addressbook/contact-editor/e-contact-editor.c:853

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

-#: addressbook/contact-editor/e-contact-editor.c:875
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1392
-#: calendar/gui/gncal-todo.c:378
-msgid "Delete this item"
-msgstr "Verwijdert dit item"
-
-# addressbook/contact-editor/e-contact-editor.c:856

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

-#: addressbook/contact-editor/e-contact-editor.c:879
-#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1394
-msgid "FIXME: Previous"
-msgstr "FIXME: Vorige"
-
-# addressbook/contact-editor/e-contact-editor.c:857

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

-#: addressbook/contact-editor/e-contact-editor.c:880
-#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1395
-msgid "Go to the previous item"
-msgstr "Ga naar het vorige item"
-
-# addressbook/contact-editor/e-contact-editor.c:859

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

-#: addressbook/contact-editor/e-contact-editor.c:882
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1396
-msgid "FIXME: Next"
-msgstr "FIXME: Volgende"
-
-# addressbook/contact-editor/e-contact-editor.c:860

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

-#: addressbook/contact-editor/e-contact-editor.c:883
-#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1397
-msgid "Go to the next item"
-msgstr "Ga naar het volgende item"
-
-# addressbook/contact-editor/e-contact-editor.c:862

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

-#: addressbook/contact-editor/e-contact-editor.c:886
-#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1398
-msgid "FIXME: Help"
-msgstr "FIXME: Help"
-
-# addressbook/contact-editor/e-contact-editor.c:863

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

-#: addressbook/contact-editor/e-contact-editor.c:887
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1399
-msgid "See online help"
-msgstr "Zie help"
-
 # addressbook/contact-editor/e-contact-editor.c:1278

-#: addressbook/contact-editor/e-contact-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:1216
 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:1344
-#: addressbook/contact-editor/e-contact-editor.c:1448
+#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1321
 msgid "Business"
 msgstr "Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor.c:1280

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

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1349
+#: addressbook/contact-editor/e-contact-editor.c:1222
 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:1350
-#: addressbook/contact-editor/e-contact-editor.c:1449
+#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1322
 msgid "Home"
 msgstr "Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1286

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1354
+#: addressbook/contact-editor/e-contact-editor.c:1227
 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:1355
-#: addressbook/contact-editor/e-contact-editor.c:1450
+#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1323
 #: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Overige"
 
 # addressbook/contact-editor/e-contact-editor.c:1291

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

-#: addressbook/contact-editor/e-contact-editor.c:1357
+#: addressbook/contact-editor/e-contact-editor.c:1230
 msgid "Pager"
 msgstr "Pieper"
 
 # addressbook/contact-editor/e-contact-editor.c:1293

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1361
+#: addressbook/contact-editor/e-contact-editor.c:1234
 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:23
-#: addressbook/contact-editor/e-contact-editor.c:1405
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Primary Email"
 msgstr "Primaire Email"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/contact-editor/e-contact-editor.c:1406
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Email 2"
 msgstr "Email 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1342

-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Email 3"
 msgstr "Email 3"
 
@@ -838,6 +321,13 @@ msgstr "Contact verwijderen?"
 msgid "_Add"
 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
+#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1203
+msgid "_Delete"
+msgstr "Verwijderen"
+
 # addressbook/contact-editor/e-contact-editor-strings.h:9

 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
@@ -882,62 +372,62 @@ msgstr "Homepage:"
 msgid "Wants to receive _HTML mail"
 msgstr "Wil _HTML mail ontvangen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "Adres:"
-
 # addressbook/contact-editor/e-contact-editor-strings.h:19

-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
 msgid "_Business"
 msgstr "_Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "T_huis"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:21

-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr "Bedrijfs_fax"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:22

-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:24

-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "_Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:25

-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr "Dit is een mail-adres"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:26

-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "C_ontacten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:27

-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "Ca_tegories..."
 msgstr "Ca_tegori`e'n..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:28

-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "Titel:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:29

-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "Bedrijf:"
 
+# composer/e-msg-composer-address-dialog.glade.h:11

+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr "_Adres..."
+
 # addressbook/contact-editor/e-contact-editor-strings.h:30

 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
@@ -996,47 +486,76 @@ 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:33
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
 msgid "Details"
 msgstr "Details"
 
-# addressbook/contact-editor/fullname-strings.h:7

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

 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Controleer Volledige Naam"
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Check Address"
+msgstr "Controleer Adres"
 
-# addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr "_Titel:"
+# addressbook/contact-editor/e-contact-editor-strings.h:18

+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_Address:"
+msgstr "_Adres:"
 
-# addressbook/contact-editor/fullname-strings.h:9

-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr "Voornaam:"
+# addressbook/contact-editor/e-contact-editor-strings.h:36

+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_City:"
+msgstr "_Gemeente:"
 
-# addressbook/contact-editor/fullname-strings.h:10

-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
-msgstr "Tweede Naam:"
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_PO Box:"
+msgstr "_Postbus:"
 
-# addressbook/contact-editor/fullname-strings.h:11

-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr "Achternaam:"
+# 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/fullname-strings.h:12

-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
-msgstr "Achtervoeg_sel:"
+#: addressbook/contact-editor/fulladdr.glade.h:12
+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.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/contact-editor/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr "Controleer Volledige Naam"
 
 # addressbook/contact-editor/fullname-strings.h:13

-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:8
 msgid ""
 "\n"
 "Mr.\n"
@@ -1049,7 +568,7 @@ msgstr ""
 "Dr.\n"
 
 # addressbook/contact-editor/fullname-strings.h:18

-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -1067,80 +586,38 @@ msgstr ""
 "de derde\n"
 "Esq.\n"
 
-# addressbook/gui/component/addressbook.c:420

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

-#: addressbook/gui/component/addressbook.c:436
-#: calendar/gui/calendar-commands.c:513 notes/component-factory.c:27
-msgid "New"
-msgstr "Nieuw"
-
-# addressbook/gui/component/addressbook.c:420

-#: addressbook/gui/component/addressbook.c:436
-msgid "Create a new contact"
-msgstr "Nieuw Contact Aanmaken"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/gui/component/addressbook.c:440
-msgid "Find"
-msgstr "Zoeken"
-
-# addressbook/gui/component/addressbook.c:424

-#: addressbook/gui/component/addressbook.c:440
-msgid "Find a contact"
-msgstr "Zoek een contact"
-
-# addressbook/gui/component/addressbook.c:425

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

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

-#: addressbook/gui/component/addressbook.c:441
-#: calendar/gui/calendar-commands.c:518 mail/folder-browser-factory.c:48
-#: mail/mail-view.c:145
-msgid "Print"
-msgstr "Afdrukken"
-
-# addressbook/gui/component/addressbook.c:425

-#: addressbook/gui/component/addressbook.c:441
-msgid "Print contacts"
-msgstr "Druk contacten af"
-
-# addressbook/gui/component/addressbook.c:426

-#: addressbook/gui/component/addressbook.c:442
-msgid "Delete a contact"
-msgstr "Selecteer een contact"
-
-# addressbook/gui/component/addressbook.c:425

-#: addressbook/gui/component/addressbook.c:511
-msgid "_Print Contacts..."
-msgstr "Druk contacten af..."
+# addressbook/contact-editor/fullname-strings.h:9

+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr "Voornaam:"
 
-# addressbook/gui/component/addressbook.c:499

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

-#: addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:1051
-msgid "As _Table"
-msgstr "Als _Tabel"
+# addressbook/contact-editor/fullname-strings.h:8

+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr "_Titel:"
 
-# addressbook/gui/component/addressbook.c:506

-#: addressbook/gui/component/addressbook.c:528
-msgid "_New Contact"
-msgstr "_Nieuw Contact"
+# addressbook/contact-editor/fullname-strings.h:10

+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr "Tweede Naam:"
 
-# addressbook/gui/component/addressbook.c:514

-#: addressbook/gui/component/addressbook.c:536
-msgid "N_ew Directory Server"
-msgstr "Ni_euwe Directory Server"
+# addressbook/contact-editor/fullname-strings.h:11

+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr "Achternaam:"
 
-#: addressbook/gui/component/addressbook.c:550
-msgid "_Search for contacts"
-msgstr "_Zoek naar contacten"
+# addressbook/contact-editor/fullname-strings.h:12

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

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

-#: addressbook/gui/component/addressbook.c:637
+#: addressbook/gui/component/addressbook.c:413
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -1160,243 +637,244 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-# addressbook/gui/component/addressbook.c:943

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

-#: addressbook/gui/component/addressbook.c:920
-#: addressbook/gui/minicard/e-minicard.c:332
-msgid "Save as VCard"
-msgstr "Opslaan als vCard"
-
-# addressbook/gui/component/addressbook.c:1010

-#: addressbook/gui/component/addressbook.c:1022
-msgid "* Click here to add a contact *"
-msgstr "* Klik hier om een contact toe te voegen *"
-
 # addressbook/gui/component/addressbook.c:1046

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

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

+#: addressbook/gui/component/addressbook.c:535
+msgid "As _Table"
+msgstr "Als _Tabel"
+
 # addressbook/gui/component/addressbook.c:1097

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

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

+#.
+#. * Translatable strings file generated by Glade.
+#. * 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
+msgid "Description:"
+msgstr "Beschrijving:"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:8

+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+msgid "LDAP Server:"
+msgstr "LDAP Server:"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:9

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

+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+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
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Naam:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/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 "Zoek..."
+
+#: 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
+msgid "Message Recipients"
+msgstr "Bericht Ontvangers: "
+
 # addressbook/gui/component/alphabet.glade.h:7

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

-#: 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/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/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/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/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/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/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/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/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:131
+#: 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/component/alphabet.glade.h:34
+#: addressbook/gui/widgets/alphabet.glade.h:34
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Externe Directories"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

-#.
-#. * Translatable strings file generated by Glade.
-#. * 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
-msgid "Description:"
-msgstr "Beschrijving:"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:8

-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP Server:"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

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

-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-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
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Naam:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/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 "Zoek..."
-
-#: 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
-msgid "Message Recipients"
-msgstr "Bericht Ontvangers: "
+# 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
+msgid "Save as VCard"
+msgstr "Opslaan als vCard"
 
 # addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/minicard/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "Opslaan in adressenboek"
 
 # addressbook/gui/minicard/e-minicard-view.c:110

-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -1410,23 +888,9 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr "Reflow Test"
-
-# shell/e-shell-view-menu.c:161

-#: addressbook/gui/minicard/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr "Dit zou het 'reflow' canvas item moeten testen"
-
 # composer/e-msg-composer-address-dialog.glade.h:9

-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-#: mail/folder-browser.c:377
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/folder-browser.c:490
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1663,333 +1127,204 @@ msgid "Header/Footer"
 msgstr "Koptekst/Voettekst"
 
 # calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:596
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
 # calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543

-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:595
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
-msgid "Gpilotd calendar conduit"
-msgstr "Gpilotd kalender kanaal"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:114
+#: calendar/conduits/todo/todo-conduit-control-applet.c:114
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Configuratie voor het kalender kanaal.\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:115
+#: calendar/conduits/todo/todo-conduit-control-applet.c:115
+msgid "Original Author:"
+msgstr "Originele Auteur:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:399
-#: calendar/conduits/calendar/calendar-conduit.c:1109
-#: calendar/conduits/todo/todo-conduit.c:443
-#: calendar/conduits/todo/todo-conduit.c:1025
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:120
+msgid "Evolution Calendar Conduit"
+msgstr "Evolution Kalender Kanaal"
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
+
+#: calendar/conduits/calendar/calendar-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:577
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:707
-#: calendar/conduits/todo/todo-conduit.c:709
-msgid "Could not start gnomecal server"
-msgstr "Kon gnomecal server niet starten"
+#: calendar/conduits/calendar/calendar-conduit.c:701
+#: calendar/conduits/todo/todo-conduit.c:622
+msgid "Could not start wombat server"
+msgstr "Kon \"wombat\" server niet starten"
 
-#: calendar/conduits/calendar/calendar-conduit.c:806
-#: calendar/conduits/calendar/calendar-conduit.c:809
-msgid "Could not read pilot's DateBook application block"
-msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
+#: calendar/conduits/calendar/calendar-conduit.c:702
+#: calendar/conduits/todo/todo-conduit.c:623
+msgid "Could not start wombat"
+msgstr "Kon \"wombat\" niet starten"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:146
-msgid "Gpilotd todo conduit"
-msgstr "Gpilotd to-do kanaal"
+#: calendar/conduits/calendar/calendar-conduit.c:765
+#: calendar/conduits/calendar/calendar-conduit.c:768
+msgid "Could not read pilot's Calendar application block"
+msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:149
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "Configuratie voor het to-do kanaal.\n"
+# shell/e-shell-view-menu.c:369

+#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+msgid "Evolution ToDo Conduit"
+msgstr "Evolution ToDo Kanaal"
 
-#: calendar/conduits/todo/todo-conduit.c:737
-#: calendar/conduits/todo/todo-conduit.c:740
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+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:686
+#: calendar/conduits/todo/todo-conduit.c:689
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
 # calendar/gui/calendar-commands.c:56

-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "Uitlijn:"
 
 # calendar/gui/calendar-commands.c:57

-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "Koppen:"
 
 # calendar/gui/calendar-commands.c:58

-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "Lege dagen:"
 
 # calendar/gui/calendar-commands.c:59

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

-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "Gemarkeerde dag:"
 
 # calendar/gui/calendar-commands.c:61

-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr "Dag nummers:"
 
 # calendar/gui/calendar-commands.c:62

-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "Nummer van vandaag:"
 
 # calendar/gui/calendar-commands.c:63

-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr "To-Do item dat nog niet verlopen is:"
 
 # calendar/gui/calendar-commands.c:64

-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr "To-Do item dat vandaag af moet:"
 
 # calendar/gui/calendar-commands.c:65

-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr "To-Do item dat af moest zijn:"
 
-# calendar/gui/calendar-commands.c:175

-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr "Gnome Kalender"
-
-# calendar/gui/calendar-commands.c:178

-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr "Het GNOME persoonlijke kalender en rooster beheer."
-
 # calendar/gui/calendar-commands.c:434

-#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:396
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
 # calendar/gui/calendar-commands.c:456

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

-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:459
 msgid "Save calendar"
 msgstr "Kalender opslaan"
 
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

-# calendar/gui/gncal-todo.c:717

-#: calendar/gui/calendar-commands.c:491 calendar/gui/gncal-todo.c:765
-#: calendar/gui/gncal-todo.c:769
-msgid "Day"
-msgstr "Dag"
-
-# calendar/gui/calendar-commands.c:522

-#: calendar/gui/calendar-commands.c:491
-msgid "Show 1 day"
-msgstr "Laat 1 dag zien"
-
-# calendar/gui/calendar-commands.c:525

-#: calendar/gui/calendar-commands.c:494
-msgid "5 Days"
-msgstr "5 Dagen"
-
-# calendar/gui/calendar-commands.c:525

-#: calendar/gui/calendar-commands.c:494
-msgid "Show the working week"
-msgstr "Laat de werkweek zien"
-
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#: calendar/gui/calendar-commands.c:497 calendar/gui/gncal-todo.c:764
-msgid "Week"
-msgstr "Week"
-
-# calendar/gui/calendar-commands.c:528

-#: calendar/gui/calendar-commands.c:497
-msgid "Show 1 week"
-msgstr "Laat 1 week zien"
-
-# calendar/gui/calendar-commands.c:531

-#: calendar/gui/calendar-commands.c:500
-msgid "Month"
-msgstr "Maand"
-
-# calendar/gui/calendar-commands.c:531

-#: calendar/gui/calendar-commands.c:500
-msgid "Show 1 month"
-msgstr "Toon 1 maand"
-
-# calendar/gui/calendar-commands.c:535

-#: calendar/gui/calendar-commands.c:504
-msgid "Year"
-msgstr "Jaar"
-
-# calendar/gui/calendar-commands.c:535

-#: calendar/gui/calendar-commands.c:504
-msgid "Show 1 year"
-msgstr "Toon 1 jaar"
-
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/calendar-commands.c:513 calendar/gui/calendar-commands.c:665
-msgid "Create a new appointment"
-msgstr "Maak een nieuwe afspraak"
-
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: calendar/gui/calendar-commands.c:518 calendar/gui/calendar-commands.c:657
-msgid "Print this calendar"
-msgstr "Druk deze kalender af"
-
-# calendar/gui/calendar-commands.c:552

-#: calendar/gui/calendar-commands.c:522
-msgid "Prev"
-msgstr "Vorige"
-
-# calendar/gui/calendar-commands.c:552

-#: calendar/gui/calendar-commands.c:522
-msgid "Go back in time"
-msgstr "Ga terug in tijd"
-
-# calendar/gui/calendar-commands.c:553

-#: calendar/gui/calendar-commands.c:523
-msgid "Today"
-msgstr "Vandaag"
-
-# calendar/gui/calendar-commands.c:553

-#: calendar/gui/calendar-commands.c:523
-msgid "Go to present time"
-msgstr "Ga naar huidig moment"
-
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: calendar/gui/calendar-commands.c:524
-msgid "Next"
-msgstr "Volgende"
-
-# calendar/gui/calendar-commands.c:554

-#: calendar/gui/calendar-commands.c:524
-msgid "Go forward in time"
-msgstr "Ga vooruit in tijd"
-
-# calendar/gui/calendar-commands.c:558

-#: calendar/gui/calendar-commands.c:528
-msgid "Go to"
-msgstr "Ga naar"
-
-# calendar/gui/calendar-commands.c:558

-#: calendar/gui/calendar-commands.c:528
-msgid "Go to a specific date"
-msgstr "Ga naar specifieke datum"
-
-# calendar/gui/calendar-commands.c:659

-#. file menu
-#: calendar/gui/calendar-commands.c:642
-msgid "New Ca_lendar"
-msgstr "Nieuwe Ka_lender"
-
-# calendar/gui/calendar-commands.c:660

-#: calendar/gui/calendar-commands.c:643
-msgid "Create a new calendar"
-msgstr "Maak een nieuwe kalender"
-
-# calendar/gui/calendar-commands.c:663

-#: calendar/gui/calendar-commands.c:646
-msgid "Open Ca_lendar"
-msgstr "Open Ka_lender"
-
-# calendar/gui/calendar-commands.c:664

-#: calendar/gui/calendar-commands.c:647
-msgid "Open a calendar"
-msgstr "Open een kalender"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: calendar/gui/calendar-commands.c:651 calendar/gui/calendar-commands.c:652
-msgid "Save Calendar As"
-msgstr "Bewaar Kalender Als"
-
-# calendar/gui/calendar-commands.c:682

-#: calendar/gui/calendar-commands.c:665
-msgid "_New appointment..."
-msgstr "_Nieuwe Afspraak..."
-
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: calendar/gui/calendar-commands.c:673 calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Instellingen"
-
-# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704

-#: calendar/gui/calendar-commands.c:680 calendar/gui/calendar-commands.c:681
-msgid "About Calendar"
-msgstr "Over de  kalender"
-
-# calendar/gui/calendar-commands.c:746

-#. i18n: This "%s%s" indicates possession. Languages where the order is
-#. * the inverse should translate it to "%2$s%1$s".
-#.
-#: calendar/gui/calendar-commands.c:723
-#, c-format
-msgid "%s%s"
-msgstr "%s%s"
-
-# calendar/gui/calendar-commands.c:746

-#: calendar/gui/calendar-commands.c:723
-msgid "'s calendar"
-msgstr "'s zijn kalender"
-
-#: calendar/gui/calendar-model.c:327
+# calendar/gui/event-editor.c:1745

+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+msgid "%a %m/%d/%Y"
+msgstr "%a %d-%m-%Y"
+
+#. strftime format of a weekday, a date and a time,
+#. in 24-hour format.
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:740
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d-%m-%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time,
+#. in 12-hour format.
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:743
+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:330
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/calendar-model.c:347
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Prive"
 
-#: calendar/gui/calendar-model.c:333
+#: calendar/gui/calendar-model.c:350
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
 # shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:441
 msgid "N"
 msgstr "N"
 
 # calendar/gui/print.c:326

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

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

-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:515
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:518
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:748
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2000,7 +1335,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:916
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
+#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
+#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+msgid "%m/%d/%Y"
+msgstr "%d-%m-%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: calendar/gui/calendar-model.c:867
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:870
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: calendar/gui/calendar-model.c:874
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:877
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#: calendar/gui/calendar-model.c:997
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2010,16 +1374,16 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:1037
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter als 100"
 
-#: calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:1077
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
 
 # calendar/gui/control-factory.c:136

-#: calendar/gui/control-factory.c:124
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "De URI die de Kalender zal weergeven"
 
@@ -2045,11 +1409,12 @@ msgstr "Geen samenvatting beschikbaar."
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/event-editor.c:1372
 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:1086
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1424
 msgid "Snooze"
 msgstr "Sluimeren"
 
@@ -2063,127 +1428,499 @@ msgstr "Afspraak bewerken"
 msgid "Snooze time (minutes)"
 msgstr "Sluimer tijd (minuten)"
 
-# calendar/gui/event-editor.c:1148

-#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1203
-msgid "FIXME: _Delete"
-msgstr "FIXME: Verwij_deren"
+# addressbook/contact-editor/e-contact-editor.c:648

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

+#: calendar/gui/dialogs/task-editor.c:427
+#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1178
+msgid "FIXME: _Task"
+msgstr "FIXME: _Taak"
+
+# addressbook/contact-editor/e-contact-editor.c:649

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

+#: calendar/gui/dialogs/task-editor.c:428
+#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1179
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Taak Verzoek"
+
+# addressbook/contact-editor/e-contact-editor.c:646

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

+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1176
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Mail bericht"
+
+# addressbook/contact-editor/e-contact-editor.c:643

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

+#: calendar/gui/dialogs/task-editor.c:431
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Afspraak"
+
+# addressbook/contact-editor/e-contact-editor.c:644

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

+#: calendar/gui/dialogs/task-editor.c:432
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Verzoek tot Vergadering"
+
+# addressbook/contact-editor/e-contact-editor.c:647

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

+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1177
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:650

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

+#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1180
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Dagboek Item"
+
+# addressbook/contact-editor/e-contact-editor.c:651

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

+#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1181
+msgid "FIXME: _Note"
+msgstr "FIXME: Aanteke_ning"
+
+# addressbook/contact-editor/e-contact-editor.c:653

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

+# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

+#: calendar/gui/dialogs/task-editor.c:439
+#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1183
+#: calendar/gui/event-editor.c:1291
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Seleecteer F_ormulier"
+
+# addressbook/contact-editor/e-contact-editor.c:658

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

+#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1188
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: _Memo Stijl"
+
+# addressbook/contact-editor/e-contact-editor.c:660

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

+#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1190
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Definieer Print _Stijlen..."
+
+# addressbook/contact-editor/e-contact-editor.c:667

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

+#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1197
+msgid "FIXME: S_end"
+msgstr "FIXME: V_ersturen"
+
+# addressbook/contact-editor/e-contact-editor.c:671

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

+#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1201
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Attac_hments opslaan..."
+
+# addressbook/contact-editor/e-contact-editor.c:674

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

+#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1205
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: Verplaats naar Folder..."
+
+# addressbook/contact-editor/e-contact-editor.c:675

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

+#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1206
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopieer naar Folder..."
+
+# addressbook/contact-editor/e-contact-editor.c:677

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

+#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1208
+msgid "Page Set_up"
+msgstr "Pagina instellingen"
+
+# addressbook/contact-editor/e-contact-editor.c:678

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

+#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1209
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Afdruk_voorbeeld"
+
+# addressbook/contact-editor/e-contact-editor.c:699

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

+#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1230
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: _Speciaal Plakken..."
+
+# addressbook/contact-editor/e-contact-editor.c:704

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

+#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
+msgid "FIXME: Mark as U_nread"
+msgstr "FIXME: Markeren als Ongelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:708

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

+#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1239
+msgid "_Object"
+msgstr "_Object"
+
+# addressbook/contact-editor/e-contact-editor.c:713

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

+# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

+#: calendar/gui/dialogs/task-editor.c:500
+#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1244
+#: calendar/gui/event-editor.c:1251
+msgid "FIXME: _Item"
+msgstr "FIXME: _Item"
+
+# addressbook/contact-editor/e-contact-editor.c:714

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

+# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

+#: calendar/gui/dialogs/task-editor.c:501
+#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1245
+#: calendar/gui/event-editor.c:1252
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Ongelezen Item"
 
 # addressbook/contact-editor/e-contact-editor.c:648

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

-#: calendar/gui/dialogs/task-editor.c:287
-#: calendar/gui/dialogs/task-editor.c:295
+#: calendar/gui/dialogs/task-editor.c:502
+#: calendar/gui/dialogs/task-editor.c:510
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Niet complete taak"
 
+# addressbook/contact-editor/e-contact-editor.c:715

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

+#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1246
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Ee_rste Item in Folder"
+
+# addressbook/contact-editor/e-contact-editor.c:722

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

+#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1253
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Laatste Item in Folder"
+
+# addressbook/contact-editor/e-contact-editor.c:727

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

+#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1258
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standaard"
+
+# addressbook/contact-editor/e-contact-editor.c:729

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

+#: calendar/gui/dialogs/task-editor.c:518
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Opmaak"
+
+# addressbook/contact-editor/e-contact-editor.c:732

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

+#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1263
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Aanpassen..."
+
+# addressbook/contact-editor/e-contact-editor.c:737

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

+#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1268
+msgid "Pre_vious"
+msgstr "_Vorige"
+
+# addressbook/contact-editor/e-contact-editor.c:738

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

+#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1269
+msgid "Ne_xt"
+msgstr "Volgende"
+
+# addressbook/contact-editor/e-contact-editor.c:740

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

+#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1273
+msgid "_Toolbars"
+msgstr "_Werkbalk"
+
+# addressbook/contact-editor/e-contact-editor.c:745

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

+#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1278
+msgid "FIXME: _File..."
+msgstr "FIXME: Bestand..."
+
+# addressbook/contact-editor/e-contact-editor.c:746

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

+#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1279
+msgid "FIXME: It_em..."
+msgstr "FIXME: It_em..."
+
+# addressbook/contact-editor/e-contact-editor.c:747

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

+#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1280
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Object..."
+
+# addressbook/contact-editor/e-contact-editor.c:752

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

+#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1285
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Font..."
+
+# addressbook/contact-editor/e-contact-editor.c:753

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

+#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1286
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Paragraaf..."
+
+# addressbook/contact-editor/e-contact-editor.c:760

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

+#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1293
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Ontwerp dit Formulier"
+
+# addressbook/contact-editor/e-contact-editor.c:761

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

+#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1294
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ontw_erp een Formulier..."
+
+# addressbook/contact-editor/e-contact-editor.c:763

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

+#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1296
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publiceer een _Formulier..."
+
+# addressbook/contact-editor/e-contact-editor.c:764

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

+#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1297
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_bliceer een Formulier als..."
+
+# addressbook/contact-editor/e-contact-editor.c:766

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

+#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1299
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Script _Debugger"
+
+# addressbook/contact-editor/e-contact-editor.c:771

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

+#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1304
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Spelling..."
+
 # calendar/gui/event-editor.c:1250

-#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1305
+#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1306
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Controleer Namen"
 
 # calendar/gui/event-editor.c:1251

-#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1306
+#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1307
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adres _Boek..."
 
+# addressbook/contact-editor/e-contact-editor.c:773

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

+#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1309
+msgid "_Forms"
+msgstr "_Formulier"
+
 # addressbook/contact-editor/e-contact-editor.c:648

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

-#: calendar/gui/dialogs/task-editor.c:355
+#: calendar/gui/dialogs/task-editor.c:570
 msgid "FIXME: _New Task"
 msgstr "FIXME: _Nieuwe Taak"
 
 # addressbook/contact-editor/e-contact-editor.c:667

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

-#: calendar/gui/dialogs/task-editor.c:357
+#: calendar/gui/dialogs/task-editor.c:572
 msgid "FIXME: S_end Status Report"
 msgstr "FIXME: Z_end een status report"
 
 # calendar/gui/event-editor.c:1148

-#: calendar/gui/dialogs/task-editor.c:358
+#: calendar/gui/dialogs/task-editor.c:573
 msgid "FIXME: _Mark Complete"
 msgstr "FIXME: _Markeer Volledig"
 
 # calendar/gui/event-editor.c:1260

-#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1315
+#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1316
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Herhaling..."
 
 # addressbook/contact-editor/e-contact-editor.c:667

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

-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:576
 msgid "FIXME: S_kip Occurrence"
 msgstr "FIXME: S_top Herhaling"
 
 # addressbook/contact-editor/e-contact-editor.c:648

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

-#: calendar/gui/dialogs/task-editor.c:363
+#: calendar/gui/dialogs/task-editor.c:578
 msgid "FIXME: Assig_n Task"
 msgstr "FIXME: Ken Taak Toe"
 
 # addressbook/contact-editor/e-contact-editor.c:862

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

-#: calendar/gui/dialogs/task-editor.c:365
+#: calendar/gui/dialogs/task-editor.c:580
 msgid "FIXME: _Reply"
 msgstr "FIXME: Beantwoorden"
 
 # mail/folder-browser-factory.c:35

-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:581
 msgid "FIXME: Reply to A_ll"
 msgstr "FIXME: Iedereen beantwoorden"
 
-# calendar/gui/event-editor.c:1320

-#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1375
-msgid "FIXME: Save and Close"
-msgstr "FIXME: Opslaan en sluiten"
+# addressbook/contact-editor/e-contact-editor.c:793

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

+#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1321
+msgid "FIXME: For_ward"
+msgstr "FIXME: Doorsturen"
+
+# addressbook/contact-editor/e-contact-editor.c:805

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

+#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1334
+msgid "_Insert"
+msgstr "_Invoegen"
+
+# addressbook/contact-editor/e-contact-editor.c:806

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

+#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1335
+#: composer/e-msg-composer.c:962
+msgid "F_ormat"
+msgstr "_Opmaak"
+
+# addressbook/contact-editor/e-contact-editor.c:807

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

+#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1336
+msgid "_Tools"
+msgstr "Gereedschap"
+
+# addressbook/contact-editor/e-contact-editor.c:808

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

+#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1337
+msgid "Actio_ns"
+msgstr "Acties"
+
+# addressbook/contact-editor/e-contact-editor.c:839

+#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1362
+msgid "Save and Close"
+msgstr "Opslaan en Sluiten"
 
 # addressbook/contact-editor/e-contact-editor.c:840

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

-#: calendar/gui/dialogs/task-editor.c:410
+#: calendar/gui/dialogs/task-editor.c:625
 msgid "Save the task and close the dialog box"
 msgstr "Bewaar de afspraak en sluit het dialoog boxje"
 
 # calendar/gui/event-editor.c:1325

-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1380
+#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1379
 msgid "FIXME: Print..."
 msgstr "FIXME: Afdrukken"
 
-# calendar/gui/event-editor.c:1330

-#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1385
-msgid "FIXME: Recurrence..."
-msgstr "FIXME: Herhaling..."
+# addressbook/contact-editor/e-contact-editor.c:845

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

+#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
+msgid "Print this item"
+msgstr "Item afdrukken"
 
-# calendar/gui/event-editor.c:1331

-#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1386
-msgid "Configure recurrence rules"
-msgstr "Configureer herhalings regels"
+# addressbook/contact-editor/e-contact-editor.c:848

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

+#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1385
+msgid "FIXME: Insert File..."
+msgstr "FIXME: Bestand Invoegen..."
+
+# addressbook/contact-editor/e-contact-editor.c:849

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

+#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1386
+msgid "Insert a file as an attachment"
+msgstr "Bestand als attachmente invoegen"
 
 # addressbook/contact-editor/e-contact-editor.c:761

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

-#: calendar/gui/dialogs/task-editor.c:422
+#: calendar/gui/dialogs/task-editor.c:639
 msgid "FIXME: Assign Task..."
 msgstr "FIXME: Ken Taak Toe..."
 
-#: calendar/gui/dialogs/task-editor.c:423
+#: calendar/gui/dialogs/task-editor.c:640
 msgid "Assign the task to someone"
 msgstr "Ken de taak aan iemand toe"
 
-# calendar/gui/event-editor.c:1336

-#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1391
-msgid "FIXME: Delete"
-msgstr "FIXME: Verwijderen"
+# addressbook/contact-editor/e-contact-editor.c:852

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

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

+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:303
+#: calendar/gui/event-editor-dialog.glade.h:92
+#: calendar/gui/event-editor.c:1367 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:163
+msgid "Delete"
+msgstr "Verwijderen"
+
+# addressbook/contact-editor/e-contact-editor.c:853

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

+#: calendar/gui/dialogs/task-editor.c:645
+msgid "Delete this task"
+msgstr "Verwijder deze taak"
+
+# addressbook/contact-editor/e-contact-editor.c:856

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

+#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1396
+msgid "FIXME: Previous"
+msgstr "FIXME: Vorige"
+
+# addressbook/contact-editor/e-contact-editor.c:857

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

+#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1397
+msgid "Go to the previous item"
+msgstr "Ga naar het vorige item"
+
+# addressbook/contact-editor/e-contact-editor.c:859

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

+#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1399
+msgid "FIXME: Next"
+msgstr "FIXME: Volgende"
+
+# addressbook/contact-editor/e-contact-editor.c:860

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

+#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1400
+msgid "Go to the next item"
+msgstr "Ga naar het volgende item"
+
+# addressbook/contact-editor/e-contact-editor.c:862

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

+#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1402
+msgid "FIXME: Help"
+msgstr "FIXME: Help"
+
+# addressbook/contact-editor/e-contact-editor.c:863

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

+#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1403
+msgid "See online help"
+msgstr "Zie help"
+
+#: calendar/gui/dialogs/task-editor.c:913
+msgid "Edit Task"
+msgstr "_Taak Bewerken"
+
+# calendar/gui/event-editor.c:294

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

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

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

+#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:297
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Dagboek Item - %s"
 
-# composer/e-msg-composer-hdrs.c:234

 #.
 #. * Translatable strings file generated by Glade.
 #. * 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 "S_ubject:"
-msgstr "Onderwerp:"
+msgid "task-editor-dialog"
+msgstr "taak-bewerkings-dialoogvenster"
 
+# calendar/gui/gncal-todo.c:425

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Owner:"
-msgstr "Eigenaar:"
+msgid "S_ummary"
+msgstr "S_amenvatting"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Sta_rt Date:"
@@ -2191,58 +1928,70 @@ msgstr "Sta_rt Datum:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:31

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#, fuzzy
 msgid "_Due Date:"
-msgstr "_Datum:"
+msgstr "_Verloop Datum:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "_Status:"
-msgstr "_Status:"
+msgid "% Comp_lete:"
+msgstr "% Gedaan:"
 
+# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Cancelled\n"
-msgstr ""
-"Niet Gestart\n"
-"Onderweg\n"
-"Klaar\n"
-"Afgebroken\n"
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Not Started"
 msgstr "Niet Gestart"
 
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+msgid "In Progress"
+msgstr "In Uitvoer"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+msgid "Completed"
+msgstr "Gedaan"
+
+# filter/filter-editor.c:212

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

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "_Priority:"
 msgstr "Prioriteit:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-msgstr ""
-"Hoog\n"
-"Normaal\n"
-"Laag\n"
-
 # addressbook/printing/e-contact-print.glade.h:34

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

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "High"
 msgstr "Hoogte:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "% Comp_lete:"
-msgstr "% Af"
+# addressbook/printing/e-contact-print.glade.h:28

+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+msgid "Normal"
+msgstr "Normaal"
+
+# 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
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:992
+#: 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:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "C_ontacten..."
 
@@ -2255,214 +2004,148 @@ msgstr "_Taak"
 msgid "Date Completed:"
 msgstr "Datum Afgemaakt:"
 
-# addressbook/printing/e-contact-print.glade.h:12

 #: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "Location:"
-msgstr "Locatie:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
 msgid "URL:"
 msgstr "URL:"
 
-# addressbook/printing/e-contact-print.glade.h:35

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "Resources:"
-msgstr "Bronnen:"
-
-# addressbook/contact-editor/categories-strings.h:7

-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "Categorieën"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Classificatie"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr "Afmaak datum"
-
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr "Eind Datum"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
-msgstr "Start datum"
-
-# mail/message-list.c:502

-#: calendar/gui/e-calendar-table.c:201
-#, fuzzy
-msgid "Due date"
-msgstr "Datum"
-
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
-msgstr "Geografische positie"
-
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
-msgstr "Percentage af"
-
-# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

-# mail/message-list.c:474

-#: calendar/gui/e-calendar-table.c:204 calendar/gui/gncal-todo.c:478
-#: calendar/gui/prop.c:611 mail/message-list.c:508
-msgid "Priority"
-msgstr "Prioriteit:"
-
-# calendar/gui/gncal-todo.c:425

-#: calendar/gui/e-calendar-table.c:212 calendar/gui/gncal-todo.c:476
-msgid "Summary"
-msgstr "Opsomming"
-
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
-msgstr "Transparantheid"
-
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
-
-# calendar/gui/prop.c:780

-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmen"
-
-#: calendar/gui/e-calendar-table.c:317
+#: calendar/gui/e-calendar-table.c:297
 msgid "Open..."
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:298
 msgid "Open the task"
 msgstr "Open de taak"
 
-#: calendar/gui/e-calendar-table.c:320
+#: calendar/gui/e-calendar-table.c:300
 msgid "Mark Complete"
 msgstr "Markeer Af"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:301
 msgid "Mark the task complete"
 msgstr "Markeer de taak af"
 
 # addressbook/contact-editor/e-contact-editor.c:853

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

-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/e-calendar-table.c:304
 msgid "Delete the task"
 msgstr "Verwijder de taak"
 
 # calendar/gui/e-day-view-time-item.c:391

-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:406
 #, c-format
 msgid "%02i minute divisions"
 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.c:1172
+msgid "%A %d %B"
+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.c:1186
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1199
+msgid "%d %b"
+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:2334 calendar/gui/e-day-view.c:2341
-#: calendar/gui/e-day-view.c:2350 calendar/gui/e-week-view.c:2681
-#: calendar/gui/e-week-view.c:2688 calendar/gui/e-week-view.c:2697
+#: calendar/gui/e-day-view.c:2632 calendar/gui/e-day-view.c:2639
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2935
+#: calendar/gui/e-week-view.c:2942 calendar/gui/e-week-view.c:2951
 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:2338 calendar/gui/e-day-view.c:2345
-#: calendar/gui/e-week-view.c:2685 calendar/gui/e-week-view.c:2692
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-day-view.c:2643
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2946
 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:2339 calendar/gui/e-week-view.c:2686
+#: calendar/gui/e-day-view.c:2637 calendar/gui/e-week-view.c:2940
+#: calendar/gui/event-editor.c:1368
 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:2346 calendar/gui/e-week-view.c:2693
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2947
 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:2347 calendar/gui/e-week-view.c:2694
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2948
 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:2348 calendar/gui/e-week-view.c:2695
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2949
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
 # calendar/gui/event-editor.c:289

-#: calendar/gui/event-editor.c:293
+#: calendar/gui/event-editor.c:279
 msgid "Edit Appointment"
 msgstr "Bewerk Afspraak"
 
-# calendar/gui/event-editor.c:294

-#: calendar/gui/event-editor.c:299
-msgid "No summary"
-msgstr "Geen opsomming"
-
-# calendar/gui/event-editor.c:298

-#: calendar/gui/event-editor.c:305
-#, c-format
-msgid "Appointment - %s"
-msgstr "Afspraak - %s"
-
-# calendar/gui/event-editor.c:301

-#: calendar/gui/event-editor.c:308
-#, c-format
-msgid "Task - %s"
-msgstr "Taak - %s"
-
-# calendar/gui/event-editor.c:304

-#: calendar/gui/event-editor.c:311
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Dagboek Item - %s"
+# addressbook/contact-editor/e-contact-editor.c:729

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

+#: calendar/gui/event-editor.c:1260
+msgid "FIXME: _Formatting"
+msgstr "FIXME: _Opmaak"
 
 # calendar/gui/event-editor.c:1215

-#: calendar/gui/event-editor.c:1270
+#: calendar/gui/event-editor.c:1271
 msgid "FIXME: Ca_lendar..."
 msgstr "FIXME: Ka_lender..."
 
 # calendar/gui/event-editor.c:1258

-#: calendar/gui/event-editor.c:1313
+#: calendar/gui/event-editor.c:1314
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nieuwe Afspraak"
 
-# addressbook/contact-editor/e-contact-editor.c:671

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

-#: calendar/gui/event-editor.c:1317
-msgid "FIXME: Invite _Attendees..."
-msgstr "FIXME: Nodig _Gasten Uit..."
-
-# calendar/gui/event-editor.c:1263

 #: calendar/gui/event-editor.c:1318
-msgid "FIXME: C_ancel Invitation..."
-msgstr "FIXME: _Annuleer Uitnodiging..."
+msgid "Schedule _Meeting..."
+msgstr "_Afspraak Plannen.."
 
 # calendar/gui/event-editor.c:1265

 #: calendar/gui/event-editor.c:1320
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Doorsturen als v_Calendar"
 
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

+#: calendar/gui/event-editor.c:1363
+msgid "Save and close this appointment"
+msgstr "Deze afspraak opslaan en sluiten"
+
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

+#: calendar/gui/event-editor.c:1373
+msgid "Close this appointment"
+msgstr "Deze afspraak sluiten"
+
 # calendar/gui/event-editor.c:1333

-#: calendar/gui/event-editor.c:1388
+#: calendar/gui/event-editor.c:1389
 msgid "FIXME: Invite Attendees..."
 msgstr "FIXME: Nodig Gasten Uit..."
 
 # calendar/gui/event-editor.c:1334

-#: calendar/gui/event-editor.c:1389
+#: calendar/gui/event-editor.c:1390
 msgid "Invite attendees to a meeting"
 msgstr "Nodig gasten uit op een afspraak"
 
 # calendar/gui/event-editor.c:1745

-#: calendar/gui/event-editor.c:1832
+#: calendar/gui/event-editor.c:1947 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"
 
@@ -2513,6 +2196,10 @@ msgstr "Eind tijd:"
 msgid "A_ll day event"
 msgstr "_Gebeurtenis die de gehele dag plaatsvind"
 
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "Classification"
+msgstr "Classificatie"
+
 #: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Pu_blic"
 msgstr "Pu_bliekelijk"
@@ -2572,11 +2259,6 @@ msgstr "Herinnering"
 msgid "Recurrence rule"
 msgstr "Herhalings regel"
 
-# shell/e-shell-view.c:596

-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:879
-msgid "None"
-msgstr "Geen"
-
 # calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

 # calendar/gui/gncal-todo.c:717

 #: calendar/gui/event-editor-dialog.glade.h:43
@@ -3036,127 +2718,60 @@ msgid "ago"
 msgstr "geleden"
 
 # calendar/gui/gncal-todo.c:137

-#: calendar/gui/gncal-todo.c:167
+#: calendar/gui/gncal-todo.c:139
 msgid "Create to-do item"
 msgstr "Maak een To-Do item aan"
 
 # calendar/gui/gncal-todo.c:137

-#: calendar/gui/gncal-todo.c:167
+#: calendar/gui/gncal-todo.c:139
 msgid "Edit to-do item"
 msgstr "Verander een To-Do item"
 
 # calendar/gui/gncal-todo.c:171

-#: calendar/gui/gncal-todo.c:203
+#: calendar/gui/gncal-todo.c:175
 msgid "Summary:"
 msgstr "Opsomming:"
 
 # calendar/gui/gncal-todo.c:181

-#: calendar/gui/gncal-todo.c:214
-#, fuzzy
+#: calendar/gui/gncal-todo.c:186
 msgid "Due Date:"
-msgstr "Datum:"
+msgstr "Verloop Datum:"
 
 # calendar/gui/gncal-todo.c:190

-#: calendar/gui/gncal-todo.c:225
+#: calendar/gui/gncal-todo.c:201
 msgid "Priority:"
 msgstr "Prioriteit:"
 
 # calendar/gui/gncal-todo.c:207

-#: calendar/gui/gncal-todo.c:243
+#: calendar/gui/gncal-todo.c:219
 msgid "Item Comments:"
 msgstr "Item Commentaar:"
 
-# calendar/gui/gncal-todo.c:325

-#: calendar/gui/gncal-todo.c:376
-msgid "Add to-do item..."
-msgstr "To-Do item toevoegen..."
-
-# calendar/gui/gncal-todo.c:326

-#: calendar/gui/gncal-todo.c:377
-msgid "Edit this item..."
-msgstr "Bewerk dit item..."
-
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: calendar/gui/gncal-todo.c:477 calendar/gui/prop.c:610
-#, fuzzy
-msgid "Due Date"
-msgstr "Datum"
-
-# calendar/gui/gncal-todo.c:428

-#: calendar/gui/gncal-todo.c:479
-msgid "Time Left"
-msgstr "Resterende tijd"
-
-# calendar/gui/gncal-todo.c:440

-#. Label
-#: calendar/gui/gncal-todo.c:491
-msgid "To-do list"
-msgstr "To-Do lijst"
-
-# calendar/gui/gncal-todo.c:479

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

-#. Add
-#: calendar/gui/gncal-todo.c:530
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Toevoegen..."
-
-# calendar/gui/gncal-todo.c:488

-#. Edit
-#: calendar/gui/gncal-todo.c:539
-msgid "Edit..."
-msgstr "Bewerken..."
-
-# calendar/gui/gncal-todo.c:712

-#: calendar/gui/gncal-todo.c:764
-msgid "Weeks"
-msgstr "Weken"
-
-# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

-#: calendar/gui/gncal-todo.c:765 calendar/gui/gncal-todo.c:769
-msgid "Days"
-msgstr "Dagen"
-
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
-msgid "Hours"
-msgstr "Uren"
-
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
-msgid "Hour"
-msgstr "Uur"
-
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
-msgid "Minutes"
-msgstr "Minuten"
-
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
-msgid "Minute"
-msgstr "Minuut"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
-msgid "Seconds"
-msgstr "Seconden"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
-msgid "Second"
-msgstr "Seconde"
-
 # calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

-#: calendar/gui/gnome-cal.c:458 calendar/gui/gnome-cal.c:1094
-#: calendar/gui/gnome-cal.c:1150
+#: calendar/gui/gnome-cal.c:694 calendar/gui/gnome-cal.c:1432
+#: calendar/gui/gnome-cal.c:1488
 msgid "Reminder of your appointment at "
 msgstr "Herinnering van je afspraak op "
 
+#: calendar/gui/gnome-cal.c:1128
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Kon de kalender in `%s' niet laden"
+
+#: calendar/gui/gnome-cal.c:1139
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Kon kalender niet in aanmaken in `%s'"
+
+#: calendar/gui/gnome-cal.c:1150
+#, 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:1099 calendar/gui/gnome-cal.c:1154
+#: calendar/gui/gnome-cal.c:1437 calendar/gui/gnome-cal.c:1492
 msgid "Ok"
 msgstr "Ok"
 
@@ -3166,13 +2781,13 @@ msgid "Year:"
 msgstr "Jaar:"
 
 # calendar/gui/goto.c:264

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

 #. Instructions
-#: calendar/gui/goto.c:275
+#: calendar/gui/goto.c:281
 msgid ""
 "Please select the date you want to go to.\n"
 "When you click on a day, you will be taken\n"
@@ -3183,7 +2798,7 @@ msgstr ""
 "dag toe."
 
 # calendar/gui/goto.c:312

-#: calendar/gui/goto.c:312
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr "Ga naar vandaag"
 
@@ -3343,102 +2958,85 @@ msgid "31st"
 msgstr "31ste"
 
 # calendar/gui/print.c:326

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

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

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

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

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

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

-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr "Za"
 
-# calendar/gui/print.c:868

-#: calendar/gui/print.c:937
-msgid "TODO Items"
-msgstr "TODO Items"
+#: calendar/gui/print.c:936
+msgid "Tasks"
+msgstr "_Taken"
 
 # calendar/gui/print.c:980

 #. Day
-#: calendar/gui/print.c:1038
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dag van vandaag (%a %b %d %Y)"
 
-# calendar/gui/print.c:1000 calendar/gui/print.c:1014

-# calendar/gui/print.c:1015

-#: calendar/gui/print.c:1058 calendar/gui/print.c:1072
-#: calendar/gui/print.c:1073
-msgid "%a"
-msgstr "%a"
+# calendar/gui/event-editor.c:1745

+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
+msgstr "%a %b %d"
 
-# calendar/gui/print.c:1001 calendar/gui/print.c:1002

-# calendar/gui/print.c:1016 calendar/gui/print.c:1017

-#: calendar/gui/print.c:1059 calendar/gui/print.c:1060
-#: calendar/gui/print.c:1074 calendar/gui/print.c:1075
-msgid "%b"
-msgstr "%b"
+# calendar/gui/event-editor.c:1745

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

-#: calendar/gui/print.c:1062
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
-msgstr "Current week (%s %s %d - %s %d %d)"
-
-# calendar/gui/print.c:1021

-#: calendar/gui/print.c:1079
+#: calendar/gui/print.c:1092
 #, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr "Current week (%s %s %d - %s %s %d %d)"
-
-# calendar/gui/print.c:1027

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

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

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

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

-#: calendar/gui/print.c:1307
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:794
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -3522,11 +3120,21 @@ msgstr "Kleuren"
 msgid "Show on TODO List:"
 msgstr "Weergeven op TO-DO Lijst:"
 
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+#: calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Verloop Datum"
+
+# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

+# mail/message-list.c:474

+#: calendar/gui/prop.c:611
+msgid "Priority"
+msgstr "Prioriteit:"
+
 # calendar/gui/prop.c:606

 #: calendar/gui/prop.c:612
-#, fuzzy
 msgid "Time Until Due"
-msgstr "Tijd Tot Gedaan"
+msgstr "Tijd Tot Verlopen"
 
 # calendar/gui/prop.c:637

 #: calendar/gui/prop.c:643
@@ -3558,6 +3166,16 @@ msgstr "To-Do lijst instellingen"
 msgid "To Do List"
 msgstr "To-Do lijst"
 
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+#: calendar/gui/prop.c:718
+msgid "Preferences"
+msgstr "Instellingen"
+
+# calendar/gui/prop.c:780

+#: calendar/gui/prop.c:786
+msgid "Alarms"
+msgstr "Alarmen"
+
 # calendar/gui/prop.c:783

 #. build miscellaneous box
 #: calendar/gui/prop.c:789
@@ -3591,42 +3209,41 @@ msgid "Defaults"
 msgstr "Standaard instellingen"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: composer/e-msg-composer-address-dialog.c:182
+#: composer/e-msg-composer-address-dialog.c:186
 msgid "Cut"
 msgstr "Knippen"
 
 # composer/e-msg-composer-address-dialog.c:184

-#: composer/e-msg-composer-address-dialog.c:183
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Cut selected item into clipboard"
 msgstr "Knip het geselecteerde item naar het klembord"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: composer/e-msg-composer-address-dialog.c:186
-#: mail/folder-browser-factory.c:46
+#: composer/e-msg-composer-address-dialog.c:190
 msgid "Copy"
 msgstr "Kopieren"
 
 # composer/e-msg-composer-address-dialog.c:188

-#: composer/e-msg-composer-address-dialog.c:187
+#: composer/e-msg-composer-address-dialog.c:191
 msgid "Copy selected item into clipboard"
 msgstr "Kopieer het geselecteerde item naar het klembord"
 
 # composer/e-msg-composer-address-dialog.c:191

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

-#: composer/e-msg-composer-address-dialog.c:190
-#: composer/e-msg-composer-address-dialog.c:198
+#: composer/e-msg-composer-address-dialog.c:194
+#: composer/e-msg-composer-address-dialog.c:202
 msgid "Paste"
 msgstr "Plakken"
 
 # composer/e-msg-composer-address-dialog.c:192

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

-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
+#: composer/e-msg-composer-address-dialog.c:195
+#: composer/e-msg-composer-address-dialog.c:203
 msgid "Paste item from clipboard"
 msgstr "Plak een item vanaf het klembord"
 
 # composer/e-msg-composer-address-dialog.c:528

-#: composer/e-msg-composer-address-dialog.c:525
+#: composer/e-msg-composer-address-dialog.c:529
 msgid "Select recipients' addresses"
 msgstr "Selecteer de geadresseerden"
 
@@ -3661,6 +3278,12 @@ msgstr "Adres"
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
+# calendar/gui/gncal-todo.c:479

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

+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Toevoegen..."
+
 # composer/e-msg-composer-address-dialog.glade.h:14

 #: composer/e-msg-composer-address-dialog.glade.h:14
 msgid "To: >>"
@@ -3692,56 +3315,57 @@ msgid "label8"
 msgstr "label8"
 
 # composer/e-msg-composer-attachment-bar.c:76

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

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

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

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

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

-#: composer/e-msg-composer-attachment-bar.c:299
+#: composer/e-msg-composer-attachment-bar.c:411
 msgid "Add attachment"
 msgstr "Bestand bijvoegen"
 
 # composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333

-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:474 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:363
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van attachments"
 
 # composer/e-msg-composer-attachment-bar.c:394

-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -3766,47 +3390,47 @@ msgid "File name:"
 msgstr "Bestandsnaam:"
 
 # mail/message-list.c:488

-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:140 composer/e-msg-composer-hdrs.c:298
 msgid "From:"
 msgstr "Van:"
 
 # composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:246
 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:297
-msgid "Enter the identitiy you wish to send this message from"
+#: composer/e-msg-composer-hdrs.c:299
+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:301
+#: composer/e-msg-composer-hdrs.c:303
 msgid "To:"
 msgstr "Aan:"
 
 # composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the recipients of the message"
 msgstr "Geef de geaddreseerden"
 
 # composer/e-msg-composer-hdrs.c:221

-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:308
 msgid "Cc:"
 msgstr "Cc:"
 
 # composer/e-msg-composer-hdrs.c:222

-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een 'carbon copy' van het bericht moeten krijgen"
 
 # composer/e-msg-composer-hdrs.c:227

-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Bcc:"
 msgstr "Bcc:"
 
 # composer/e-msg-composer-hdrs.c:228

-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:315
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3816,47 +3440,47 @@ msgstr ""
 "dat ze op de geadresseerden-lijst van het bericht verschijnen."
 
 # composer/e-msg-composer-hdrs.c:234

-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 # composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:322
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
 # composer/e-msg-composer.c:463

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

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

-#: composer/e-msg-composer.c:482
+#: composer/e-msg-composer.c:439
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:504
+#: composer/e-msg-composer.c:461
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzingen aan bericht..."
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:463
 msgid "About to save changes to message..."
 msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
 
 # shell/e-shell-view-menu.c:159

-#: composer/e-msg-composer.c:590 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:596
+#: composer/e-msg-composer.c:554
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3867,32 +3491,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

-#: composer/e-msg-composer.c:618
+#: composer/e-msg-composer.c:576
 msgid "Open file"
 msgstr "Bestand Openen"
 
 # composer/e-msg-composer.c:676

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

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

-#: composer/e-msg-composer.c:750
+#: composer/e-msg-composer.c:715
 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:760
+#: composer/e-msg-composer.c:725
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Het bestand is toegangelijk maar open(2) faalde."
 
 # composer/e-msg-composer.c:729

-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:747
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3901,140 +3525,151 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:803
+#: composer/e-msg-composer.c:768
 msgid "An error occurred while reading the file."
 msgstr "Een fout trad op tijdens het openen van het bestand."
 
 # widgets/e-table/e-table-config.glade.h:10

-#: composer/e-msg-composer.c:899 shell/e-shell-view-menu.c:434
+#: composer/e-msg-composer.c:864
 msgid "_File"
 msgstr "_Bestand"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:870
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:871
 msgid "Load a previously saved message"
 msgstr "Laad een eerder opgeslagen bericht"
 
 # composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:879
 msgid "_Save..."
 msgstr "Ops_laan als..."
 
-#: composer/e-msg-composer.c:915
+#: composer/e-msg-composer.c:880
 msgid "Save message"
 msgstr "Bericht Opslaan"
 
 # composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:923
-msgid "_Save as..."
-msgstr "Ops_laan als..."
+#: composer/e-msg-composer.c:888
+msgid "Save _as..."
+msgstr "Opslaan _als..."
 
 # composer/e-msg-composer.c:888

-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:889
 msgid "Save message with a different name"
 msgstr "Sla het bericht op onder een andere naam"
 
 # composer/e-msg-composer.c:888

-#: composer/e-msg-composer.c:932
+#: composer/e-msg-composer.c:897
 msgid "Save in _folder..."
 msgstr "Opslaan in _folder..."
 
 # composer/e-msg-composer.c:888

-#: composer/e-msg-composer.c:933
+#: composer/e-msg-composer.c:898
 msgid "Save the message in a specified folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:891

-#: composer/e-msg-composer.c:942
+#: composer/e-msg-composer.c:907
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
 # composer/e-msg-composer.c:891

-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:908
 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

-#: composer/e-msg-composer.c:952
-msgid "_Send"
-msgstr "Ver_sturen"
+#: composer/e-msg-composer.c:917
+msgid "Send _Now"
+msgstr "_Nu Versturen"
 
 # composer/e-msg-composer.c:894

-#: composer/e-msg-composer.c:953
-msgid "Send the message"
-msgstr "Verstuur het bericht"
+#: composer/e-msg-composer.c:918
+msgid "Send the message now"
+msgstr "Verstuur het bericht nu"
+
+# filter/filter-editor.c:198

+#: composer/e-msg-composer.c:926
+msgid "Send _Later"
+msgstr "_Later Versturen"
+
+# composer/e-msg-composer.c:894

+#: composer/e-msg-composer.c:927
+msgid "Send the message later"
+msgstr "Verstuur het bericht later"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

-#: composer/e-msg-composer.c:963
+#: composer/e-msg-composer.c:937
 msgid "_Close..."
 msgstr "Sl_uiten..."
 
-#: composer/e-msg-composer.c:964
+#: composer/e-msg-composer.c:938
 msgid "Quit the message composer"
 msgstr "Sluit het bericht venster"
 
 # calendar/gui/gncal-todo.c:488

-#: composer/e-msg-composer.c:977 shell/e-shell-view-menu.c:478
+#: composer/e-msg-composer.c:951
 msgid "_Edit"
 msgstr "B_ewerken..."
 
-# addressbook/printing/e-contact-print.glade.h:28

-#: composer/e-msg-composer.c:988
-msgid "_Format"
-msgstr "_Formaat"
-
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:968
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:969
 msgid "Send the mail in HTML format"
 msgstr "Stuur de mail in HTML formaat"
 
 # shell/e-shell-view-menu.c:398

-#: composer/e-msg-composer.c:1008 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:221
+#: composer/e-msg-composer.c:982 shell/e-storage-set-view.c:222
 msgid "_View"
 msgstr "Weerga_ve"
 
 # composer/e-msg-composer.c:906

-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:988
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
 # composer/e-msg-composer.c:907

-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:989
 msgid "Show/hide attachments"
 msgstr "Toon/verberg de attachments"
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1022
 msgid "Send"
 msgstr "Versturen"
 
 # composer/e-msg-composer.c:942

-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1023
 msgid "Send this message"
 msgstr "Dit bericht versturen"
 
 # composer/e-msg-composer.c:951

-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1032
 msgid "Attach"
 msgstr "Bijvoegen"
 
 # composer/e-msg-composer.c:951

-#: composer/e-msg-composer.c:1059
+#: composer/e-msg-composer.c:1033
 msgid "Attach a file"
 msgstr "Voeg een bestand bij"
 
 # composer/e-msg-composer.c:1127

-#: composer/e-msg-composer.c:1246
+#: composer/e-msg-composer.c:1257
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
+# mail/mail-threads.c:814

+#: composer/e-msg-composer.c:1334
+msgid "Could not create composer window."
+msgstr ""
+"Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
+"aanmaken."
+
 # calendar/gui/getdate.y:420

 #: filter/filter-datespec.c:61
 msgid "years"
@@ -4123,34 +3758,41 @@ msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
 # mail/mail-config.c:1490

-#: filter/filter-editor.c:156 filter/score-editor.c:126
-#: filter/vfolder-editor.c:152
+#: filter/filter-editor.c:158 filter/score-editor.c:127
+#: filter/vfolder-editor.c:153
 msgid "Add Rule"
 msgstr "Regel Toevoegen"
 
 # filter/filter-editor.c:198

-#: filter/filter-editor.c:188
+#: filter/filter-editor.c:199
 msgid "Edit Rule"
 msgstr "Bewerk Regel"
 
-#: filter/filter-filter.c:397 filter/filter-rule.c:536
-msgid "Less"
-msgstr "Minder"
-
 # calendar/gui/print.c:326

-#: filter/filter-filter.c:400 filter/filter-rule.c:539
-msgid "More"
-msgstr "Meer"
+#. and now for the action area
+#: filter/filter-filter.c:396
+msgid "Then"
+msgstr "Dan"
+
+# addressbook/contact-editor/e-contact-editor.c:808

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

+#: filter/filter-filter.c:409
+msgid "Add action"
+msgstr "Actie Toevoegen"
+
+#: filter/filter-filter.c:415
+msgid "Remove action"
+msgstr "Deze Actie Verwijderen"
 
-#: filter/filter-folder.c:185 filter/vfolder-rule.c:269
+#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-folder.c:207
+#: filter/filter-folder.c:209
 msgid "Enter folder URI"
 msgstr "Voer een Map URI in"
 
-#: filter/filter-folder.c:249
+#: filter/filter-folder.c:253
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
@@ -4158,231 +3800,125 @@ msgstr "<klik hier om een map te selecteren>"
 msgid "Test"
 msgstr "Test"
 
-# mail/mail-config.c:1488

-#: filter/score-editor.c:160
-msgid "Edit Score Rule"
-msgstr "Bewerk Score Regel"
-
-# filter/filter-editor.c:198

-#: filter/vfolder-editor.c:186
-msgid "Edit VFolder Rule"
-msgstr "Bewerk VMap Regel"
-
-# mail/component-factory.c:196

-#: mail/component-factory.c:187
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan het mail gedeelte van Evolution niet initialiseren."
-
-# mail/folder-browser-factory.c:29

-#: mail/folder-browser-factory.c:33
-msgid "Get mail"
-msgstr "Mail ophalen"
-
-# mail/folder-browser-factory.c:29

-#: mail/folder-browser-factory.c:33
-msgid "Check for new mail"
-msgstr "Controleer op nieuwe mail"
+# composer/e-msg-composer-attachment.glade.h:10

+#: filter/filter-rule.c:494
+msgid "Rule name: "
+msgstr "Regel naam::"
 
-# mail/folder-browser-factory.c:30

-#: mail/folder-browser-factory.c:34
-msgid "Compose"
-msgstr "Opstellen"
+# shell/e-shell-folder-title-bar.c:355

+#: filter/filter-rule.c:498
+msgid "untitled"
+msgstr "GeenTitel"
 
-# mail/folder-browser-factory.c:30

-#: mail/folder-browser-factory.c:34
-msgid "Compose a new message"
-msgstr "Stel een nieuw bericht op"
+# addressbook/gui/component/alphabet.glade.h:14

+#: filter/filter-rule.c:509
+msgid "If"
+msgstr "Als"
 
-# mail/folder-browser-factory.c:34

-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
-msgid "Reply"
-msgstr "Beantwoorden"
+#: filter/filter-rule.c:526
+msgid "Execute actions"
+msgstr "Acties uitvoeren"
 
-# mail/folder-browser-factory.c:34

-#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
-msgid "Reply to the sender of this message"
-msgstr "Beantwoord dit bericht"
+#: filter/filter-rule.c:530
+msgid "if all criteria are met"
+msgstr "als aan alle criteria wordt voldaan"
 
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
-msgid "Reply to All"
-msgstr "Iedereen beantwoorden"
+#: filter/filter-rule.c:537
+msgid "if any criteria are met"
+msgstr "als aan een van de criteria wordt voldaan"
 
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
-msgid "Reply to all recipients of this message"
-msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
+# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

+#: filter/filter-rule.c:550
+msgid "More criterion"
+msgstr "Meer criteria:"
 
-# mail/folder-browser-factory.c:37

-#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
-msgid "Forward"
-msgstr "Doorsturen"
+#: filter/filter-rule.c:556
+msgid "Fewer criterion"
+msgstr "Minder criteria"
 
-# mail/folder-browser-factory.c:37

-#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
-msgid "Forward this message"
-msgstr "Dit bericht doorsturen"
+# mail/mail-config.c:1488

+#: filter/score-editor.c:165
+msgid "Edit Score Rule"
+msgstr "Bewerk Score Regel"
 
 # calendar/gui/print.c:326

-#: mail/folder-browser-factory.c:45
-msgid "Move"
-msgstr "Verplaatsen"
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr "Score"
 
-# mail/folder-browser-factory.c:41

-#: mail/folder-browser-factory.c:45
-msgid "Move message to a new folder"
-msgstr "Sla het bericht op in een bepaalde folder"
+# filter/filter-editor.c:198

+#: filter/vfolder-editor.c:192
+msgid "Edit VFolder Rule"
+msgstr "Bewerk VMap Regel"
 
-# mail/folder-browser-factory.c:41

-#: mail/folder-browser-factory.c:46
-msgid "Copy message to a new folder"
-msgstr "Kopiëer het bericht naar een nieuwe map"
+# mail/component-factory.c:196

+#: mail/component-factory.c:236
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Kan het mail gedeelte van Evolution niet initialiseren."
 
-# mail/folder-browser-factory.c:43

-#: mail/folder-browser-factory.c:48 mail/mail-view.c:145
-msgid "Print the selected message"
-msgstr "Druk dit bericht af"
+# mail/component-factory.c:196

+#: mail/component-factory.c:243
+msgid "Cannot initialize Evolution's mail summary component."
+msgstr "Kan het mail samenvattings gedeelte van Evolution niet initialiseren."
 
-# mail/folder-browser-factory.c:45

-#: mail/folder-browser-factory.c:50 mail/mail-view.c:147
-msgid "Delete this message"
-msgstr "Verwijdert dit bericht"
+# mail/component-factory.c:196

+#: mail/component-factory.c:248
+msgid "Cannot initialize Evolution's mail storage hash."
+msgstr ""
+"Kan het mail opslag \"hash\" gedeelte van Evolution niet initialiseren."
 
-#: mail/folder-browser-factory.c:71
+#: mail/folder-browser-factory.c:53
 #, c-format
 msgid "Run filter \"%s\""
 msgstr "Start filter \"%s\""
 
-#: mail/folder-browser-factory.c:129 mail/folder-browser-factory.c:187
-msgid "_Print Message"
-msgstr "Bericht _Afdrukken"
-
-# mail/folder-browser-factory.c:65

-#: mail/folder-browser-factory.c:139
-msgid "_Threaded Message List"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:745

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

-#: mail/folder-browser-factory.c:150
-msgid "Mail _Filters..."
-msgstr "FIXME: Mail _Filters..."
-
-# mail/folder-browser-factory.c:89

-#: mail/folder-browser-factory.c:155
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtuele Map Wizard..."
-
-# mail/folder-browser-factory.c:95

-#: mail/folder-browser-factory.c:160
-msgid "_Mail Configuration..."
-msgstr "_Mail Configuratie..."
-
-# mail/folder-browser-factory.c:101

-#: mail/folder-browser-factory.c:165
-msgid "Forget _Passwords"
-msgstr "Vergeten Wachtwoorden"
-
-#: mail/folder-browser-factory.c:173
-msgid "_Message"
-msgstr "_Bericht"
-
-#: mail/folder-browser-factory.c:177
-msgid "_Open in New Window"
-msgstr "_Openen in Nieuw Venster"
-
-# composer/e-msg-composer.c:894

-#: mail/folder-browser-factory.c:182
-msgid "_Edit Message"
-msgstr "B_ewerk het bericht"
-
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser-factory.c:194
-msgid "Reply to _Sender"
-msgstr "Af_zender beantwoorden"
-
-# mail/folder-browser-factory.c:35

-#: mail/folder-browser-factory.c:199
-msgid "Reply to _All"
-msgstr "Iedereen Be_antwoorden"
-
-# mail/folder-browser-factory.c:37

-#: mail/folder-browser-factory.c:204
-msgid "_Forward"
-msgstr "_Doorsturen"
-
-# mail/folder-browser-factory.c:45

-#: mail/folder-browser-factory.c:211
-msgid "_Delete Message"
-msgstr "Verwij_der dit bericht"
-
-#: mail/folder-browser-factory.c:216
-msgid "_Move Message"
-msgstr "Verplaats Ber_icht"
-
-# composer/e-msg-composer.c:1127

-#: mail/folder-browser-factory.c:221
-msgid "_Copy Message"
-msgstr "_Kopiëer Bericht"
-
-#: mail/folder-browser-factory.c:228
-msgid "_VFolder on Subject"
-msgstr "_VMap op Onderwerp"
-
-#: mail/folder-browser-factory.c:233
-msgid "VFolder on Se_nder"
-msgstr "VMap op Afze_nder"
-
-#: mail/folder-browser-factory.c:238
-msgid "VFolder on _Recipients"
-msgstr "VMap op Gead_resseerden"
-
-#: mail/folder-browser-factory.c:245
-msgid "_Filter on Subject"
-msgstr "_Filter op Onderwerp"
-
-#: mail/folder-browser-factory.c:250
-msgid "Fi_lter on Sender"
-msgstr "Fi_lter op Afzender"
-
-#: mail/folder-browser-factory.c:255
-msgid "Filter on Rec_ipients"
-msgstr "Filter op Ge_adresseerden"
+# composer/e-msg-composer-address-dialog.glade.h:9

+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: mail/folder-browser.c:488
+msgid "Full Search"
+msgstr "Volledige Zoekactie"
 
-# shell/e-shell-view-menu.c:365

-#: mail/folder-browser-factory.c:262
-msgid "F_older"
-msgstr "_Folder"
+# calendar/gui/print.c:326

+#: mail/folder-browser.c:493
+msgid "Save"
+msgstr "Opslaan"
 
-#: mail/folder-browser-factory.c:266
-msgid "_Mark all as Read"
-msgstr "_Markeer allen als Gelezen"
+# mail/mail-config.c:1199

+#: mail/mail-autofilter.c:75
+#, c-format
+msgid "Mail to %s"
+msgstr "Mail naar %s"
 
-# mail/folder-browser-factory.c:77

-#: mail/folder-browser-factory.c:271
-msgid "_Expunge"
-msgstr "V_erwijderen"
+# mail/mail-ops.c:374

+#: mail/mail-autofilter.c:229
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail ophalen van %s"
 
-#: mail/folder-browser-factory.c:276
-msgid "_Configure Folder"
-msgstr "_Configureer Map"
+# mail/mail-config.c:1490

+#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
+msgid "Add Filter Rule"
+msgstr "Filter Regel Toevoegen"
 
-# calendar/gui/print.c:326

-#: mail/folder-browser.c:380
-msgid "Save"
-msgstr "Opslaan"
+#: mail/mail-autofilter.c:328
+#, c-format
+msgid "%s mailing list"
+msgstr "%s mailing lijst"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-callbacks.c:72
 msgid ""
-"You need to configure the mail client\n"
-"before you can compose mail."
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
 msgstr ""
-"Je moet het mail programma configuren\n"
-"voordat je mail kunt versturen."
+"Je hebt het mail programma nog niet geconfigureerd.\n"
+"Dit moet gebeuren voordat je e-mail kan zenden, versturen,\n"
+"of ontvangen.\n"
+"Wil je nu het programma configureren?"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:112
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4390,7 +3926,7 @@ msgstr ""
 "Je moet een identiteit configuren\n"
 "voordat je mail kunt versturen."
 
-#: mail/mail-callbacks.c:110
+#: mail/mail-callbacks.c:126
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4399,7 +3935,7 @@ msgstr ""
 "voordat je een mail kunt versturen."
 
 # mail/mail-ops.c:386

-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:242
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4408,16 +3944,16 @@ msgstr ""
 "Weet u zeker dat u het wilt versturen?"
 
 # mail/folder-browser-factory.c:41

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

-#: mail/mail-callbacks.c:419
+#: mail/mail-callbacks.c:506
 msgid "Copy message(s) to"
 msgstr "Kopiëer bericht(en) naar"
 
-#: mail/mail-callbacks.c:474
+#: mail/mail-callbacks.c:608
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4426,7 +3962,7 @@ msgstr ""
 "in de Klad map."
 
 # composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:564
+#: mail/mail-callbacks.c:707
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4435,8 +3971,16 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
+#: mail/mail-callbacks.c:754 mail/message-list.c:1567
+msgid "Print Message"
+msgstr "Bericht Afdrukken"
+
+#: mail/mail-callbacks.c:801
+msgid "Printing of message failed"
+msgstr "Afdrukken van bericht mislukt"
+
 # mail/mail-config.c:262

-#: mail/mail-config-gui.c:435
+#: mail/mail-config-gui.c:432
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4447,70 +3991,65 @@ msgstr ""
 "staat."
 
 # mail/mail-config.c:277

-#: mail/mail-config-gui.c:448
+#: mail/mail-config-gui.c:445
 msgid "Full name:"
 msgstr "Volledige naam:"
 
 # mail/mail-config.c:305

-#: mail/mail-config-gui.c:472
+#: mail/mail-config-gui.c:469
 msgid "Email address:"
 msgstr "Email adres:"
 
 # mail/mail-config.c:328

-#: mail/mail-config-gui.c:487
+#: mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organisatie:"
 
 # mail/mail-config.c:340

-#: mail/mail-config-gui.c:498
+#: mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Signature bestand:"
 
 # mail/mail-config.c:345

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

-#: mail/mail-config-gui.c:930
+#: mail/mail-config-gui.c:897
 msgid "Server:"
 msgstr "Server:"
 
-# calendar/gui/gncal-todo.c:190

-#: mail/mail-config-gui.c:933
-msgid "Port:"
-msgstr "Poort:"
-
 # mail/mail-config.c:725

-#: mail/mail-config-gui.c:938
+#: mail/mail-config-gui.c:903
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
 # mail/mail-config.c:732

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

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

-#: mail/mail-config-gui.c:964
+#: mail/mail-config-gui.c:930
 msgid "Detect supported types..."
 msgstr "Detecteer ondersteunde types..."
 
-#: mail/mail-config-gui.c:989
+#: mail/mail-config-gui.c:957
 msgid "Don't delete messages from server"
 msgstr "Verwijder de berichten niet van de server"
 
-#: mail/mail-config-gui.c:1001
+#: mail/mail-config-gui.c:969
 msgid "Test Settings"
 msgstr "Test Instellingen"
 
 # mail/mail-config.c:960

-#: mail/mail-config-gui.c:1133 mail/mail-config-gui.c:1181
+#: mail/mail-config-gui.c:1101 mail/mail-config-gui.c:1149
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4524,7 +4063,7 @@ msgstr ""
 "types...\" klikken nadat je de overigen informatie hebt ingevuld."
 
 # mail/mail-config.c:960

-#: mail/mail-config-gui.c:1157
+#: mail/mail-config-gui.c:1125
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4534,47 +4073,104 @@ msgid ""
 msgstr ""
 "Selecteer het soort mailserver, en de overige benodigde informatie.\n"
 "\n"
-"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde types...\" klikken nadat je de overige informatie hebt ingevuld."
+"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
+"types...\" klikken nadat je de overige informatie hebt ingevuld."
 
 # mail/mail-config.c:1220

-#: mail/mail-config-gui.c:1176
+#: mail/mail-config-gui.c:1144
 msgid "Mail transport type:"
 msgstr "Mail transport type:"
 
 # mail/mail-config.c:1345

-#: mail/mail-config-gui.c:1231
+#: mail/mail-config-gui.c:1199
 msgid "Add Identity"
 msgstr "Voeg identiteit toe"
 
 # mail/mail-config.c:1343

-#: mail/mail-config-gui.c:1233
+#: mail/mail-config-gui.c:1201
 msgid "Edit Identity"
 msgstr "Bewerk identiteit"
 
 # mail/mail-config.c:1490

-#: mail/mail-config-gui.c:1325
+#: mail/mail-config-gui.c:1293
 msgid "Add Source"
 msgstr "Bron Toevoegen"
 
 # mail/mail-config.c:1488

-#: mail/mail-config-gui.c:1327
+#: mail/mail-config-gui.c:1295
 msgid "Edit Source"
 msgstr "Bron bewerken"
 
 # mail/mail-config.c:1658

-#: mail/mail-config-gui.c:1422
+#: mail/mail-config-gui.c:1390
 msgid "Add News Server"
 msgstr "Nieuwe News Server Toevoegen"
 
 # mail/mail-config.c:1656

-#: mail/mail-config-gui.c:1424
+#: mail/mail-config-gui.c:1392
 msgid "Edit News Server"
 msgstr "Bewerk News Server"
 
-#: mail/mail-config-gui.c:2285
+#: mail/mail-config-gui.c:2263
 msgid "The connection was successful!"
 msgstr "De verbinding was successvol!"
 
+#: mail/mail-config-gui.c:2313
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
+msgstr "Bezig met uizoeken van authorisatie mogelijkheden van \"%s\""
+
+#: mail/mail-config-gui.c:2315
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr "Authorisatie van \"%s\" uitzoeken"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#.
+#. * 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-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "Mail configuratie"
+
+#: mail/mail-config-druid.glade.h:9
+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 Mail 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:1180

+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Identiteit"
+
+# mail/mail-config.c:1199

+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "Mail Bron"
+
+# mail/mail-config.c:1220

+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "Mail Transport"
+
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Je email configuratie is nu klaar.\n"
+"Klik op \"Afmaken\" om je nieuwe instellingen op te slaan"
+
 # mail/mail-config.c:1180

 #.
 #. * Translatable strings file generated by Glade.
@@ -4606,11 +4202,6 @@ msgstr "Bronnen"
 msgid "Mail Sources"
 msgstr "Mail Bron"
 
-# mail/mail-config.c:1220

-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Mail Transport"
-
 # mail/mail-config.c:1658

 #: mail/mail-config.glade.h:21
 msgid "News Servers"
@@ -4629,59 +4220,64 @@ msgstr "Stuur berichten in HTML formaat"
 msgid "Mark message as seen [ms]: "
 msgstr "Markeer bericht als gelezen [ms]: "
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#.
-#. * 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-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Mail configuratie"
+#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+msgid "Please enter your PGP/GPG passphrase."
+msgstr "Voer je PGP/GPG passphrase in."
 
-#: mail/mail-config-druid.glade.h:9
-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 Mail 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-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+msgid "No password provided."
+msgstr "Geen paswoord ingevoerd."
 
-# mail/mail-config.c:1180

-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identiteit"
+#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
 
-# mail/mail-config.c:1199

-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Mail Bron"
+# calendar/gui/event-editor.c:294

+#: mail/mail-crypto.c:600
+msgid "No GPG/PGP program available."
+msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/mail-config-druid.glade.h:17
+#: mail/mail-display.c:68
+msgid "Overwrite file?"
+msgstr "Bestand overschrijven?"
+
+# shell/e-storage.c:416

+#: mail/mail-display.c:72
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
-"Je email configuratie is nu klaar.\n"
-"Klik op \"Afmaken\" om je nieuwe instellingen op te slaan"
+"Er bestaat al een bestand met die naam.\n"
+"Overschrijven?"
 
-#: mail/mail-crypto.c:338 mail/mail-crypto.c:434
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Voer je PGP/GPG passphrase in."
+# composer/e-msg-composer.c:463

+#: mail/mail-display.c:274
+msgid "Save to Disk..."
+msgstr "Opslaan op Schijf..."
 
-#: mail/mail-crypto.c:342 mail/mail-crypto.c:438
-msgid "No password provided."
-msgstr "Geen paswoord ingevoerd."
+#: mail/mail-display.c:276
+#, c-format
+msgid "Open in %s..."
+msgstr "Openen in %s..."
+
+#: mail/mail-display.c:278
+msgid "View Inline"
+msgstr "Geef Ingebonden Weer"
+
+#: mail/mail-display.c:299
+msgid "External Viewer"
+msgstr "Extern Weergave Programma"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444
+#: mail/mail-display.c:322
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
+msgid "View Inline (via %s)"
+msgstr "Geef Ingebonde Weer (via %s)"
+
+# addressbook/printing/e-contact-print.glade.h:52

+#: mail/mail-display.c:326
+msgid "Hide"
+msgstr "Verbergen"
 
 #: mail/mail-local.c:257
 #, c-format
@@ -4693,226 +4289,297 @@ msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
+#. 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)"
+
 # mail/mail-ops.c:374

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

-#: mail/mail-ops.c:76
+#: mail/mail-ops.c:70
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Ophalen mail van %s"
 
-#: mail/mail-ops.c:87
-msgid "You have no remote mail source configured to fetch mail from."
-msgstr "Je hebt geen afgelegen mail bron geconfigureerd om mail van op te halen"
+#: mail/mail-ops.c:173
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr "Bezig met ophalen bericht %d van %d"
 
-#: mail/mail-ops.c:97
-msgid "Bad folder passed to fetch_mail"
-msgstr "Slechte map gepasseerd naar fetch_mail"
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:237
+#, c-format
+msgid "Retrieving messages : %s"
+msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:166
+#: mail/mail-ops.c:373
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe mail op %s."
 
-#: mail/mail-ops.c:238
+#: mail/mail-ops.c:430
+msgid "Filtering email on demand"
+msgstr "Bezig met op verzoek filteren van email"
+
+#: mail/mail-ops.c:432
+msgid "Filter email on demand"
+msgstr "Filter email op verzoek"
+
+#: mail/mail-ops.c:637
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:642
 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:246
+#: mail/mail-ops.c:645
 #, c-format
 msgid "Send \"%s\""
 msgstr "Verstuur \"%s\""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:648
 msgid "Send a message without a subject"
 msgstr "Stuur een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:414
+#: mail/mail-ops.c:792
+msgid "Sending queue"
+msgstr "Bezig met verzenden wachtrij"
+
+#: mail/mail-ops.c:794
+msgid "Send queue"
+msgstr "Verzendings wachtrij"
+
+#: mail/mail-ops.c:930 mail/mail-ops.c:937
+#, c-format
+msgid "Appending \"%s\""
+msgstr "Bezig met toevoegen \"%s\""
+
+#: mail/mail-ops.c:934 mail/mail-ops.c:940
+msgid "Appending a message without a subject"
+msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
+
+#: mail/mail-ops.c:1012
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Bezig met Verwijderen \"%s\""
 
 # mail/folder-browser-factory.c:77

-#: mail/mail-ops.c:416
+#: mail/mail-ops.c:1014
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "V_erwijderen \"%s\""
 
-#: mail/mail-ops.c:488
+#: mail/mail-ops.c:1073
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:490
+#: mail/mail-ops.c:1075
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiëren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:493
+#: mail/mail-ops.c:1078
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:495
+#: mail/mail-ops.c:1080
 #, 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:1111
+msgid "Moving"
+msgstr "Bezig met verplaatsen"
+
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

+#: mail/mail-ops.c:1114
+msgid "Copying"
+msgstr "Bezig met kopiëren"
+
+#: mail/mail-ops.c:1134
+#, 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:642
+#: mail/mail-ops.c:1213
 #, 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:645
+#: mail/mail-ops.c:1216
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Markeer berichten in map \"%s\""
 
-#: mail/mail-ops.c:801
+# mail/folder-browser-factory.c:41

+#: mail/mail-ops.c:1247
+#, c-format
+msgid "Marking message %d of %d"
+msgstr "Bezig met markeren bericht %d van %d"
+
+#: mail/mail-ops.c:1367
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:804
+#: mail/mail-ops.c:1370
 #, 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:891
+#: mail/mail-ops.c:1441
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
-#: mail/mail-ops.c:954
+#: mail/mail-ops.c:1501
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Bezig met bijvoegen berichten uit map \"%s\""
 
-#: mail/mail-ops.c:957
+#: mail/mail-ops.c:1504
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Voeg berichten van \"%s\" bij"
 
 # mail/folder-browser-factory.c:37

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

-#: mail/mail-ops.c:1091
+#: mail/mail-ops.c:1615
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Bericht \"%s\" doorsturen"
 
-#: mail/mail-ops.c:1096
+#: mail/mail-ops.c:1620
 msgid "Forward a message without a subject"
 msgstr "Stuur een bericht door zonder onderwerp"
 
-#: mail/mail-ops.c:1161
+#: mail/mail-ops.c:1657
+#, 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:1674
 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."
+msgstr ""
+"Fout bij genereren mime deel van bericht tijden het genereren van het door "
+"te sturen bericht."
 
-#: mail/mail-ops.c:1250
+#: mail/mail-ops.c:1760
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Bezig met laden \"%s\""
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1762
 #, c-format
 msgid "Load \"%s\""
 msgstr "Laden \"%s\""
 
-#: mail/mail-ops.c:1371
+#: mail/mail-ops.c:1864
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Bezig met Maken \"%s\""
 
-#: mail/mail-ops.c:1373
+#: mail/mail-ops.c:1866
 #, c-format
 msgid "Create \"%s\""
 msgstr "Maken \"%s\""
 
-#: mail/mail-ops.c:1444
+#: mail/mail-ops.c:1912
 msgid "Exception while reporting result to shell component listener."
-msgstr "Uitzondering tijdens het rapporteren van het resultaat aan de 'shell component listener'."
+msgstr ""
+"Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
+"component listener'."
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1958
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1960
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Bezig met weergeven UID van bericht \"%s\""
 
-#: mail/mail-ops.c:1578
+#: mail/mail-ops.c:2026
 msgid "Clearing message display"
 msgstr "Bezig met leegmaken berichtweergave"
 
-#: mail/mail-ops.c:1581
+#: mail/mail-ops.c:2029
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Geef UID van bericht \"%s\" weer"
 
 # calendar/gui/prop.c:519

-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:2032
 msgid "Clear message display"
 msgstr "Maak berichtweergave leeg"
 
-#: mail/mail-ops.c:1711
+#: mail/mail-ops.c:2141
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Bezig met openen berichten uit map \"%s\""
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:2144
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Open berichten van \"%s\""
 
-#: mail/mail-ops.c:1826
-msgid "Loading Draftbox"
-msgstr "Bezig met laden Kladvak"
+#: mail/mail-ops.c:2248
+#, c-format
+msgid "Loading %s Folder"
+msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:1828
-msgid "Load Draftbox"
-msgstr "Laden Kladvak"
+#: mail/mail-ops.c:2250
+#, c-format
+msgid "Load %s Folder"
+msgstr "Laad \"%s\" Map"
 
-#: mail/mail-ops.c:1896
+#: mail/mail-ops.c:2315
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Bezig met bekijken berichten uit map \"%s\""
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:2318
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Bekijk berichten uit \"%s\""
 
-#: mail/mail-threads.c:274
+#: mail/mail-ops.c:2344
+#, c-format
+msgid "Retrieving message %d of %d (uid \"%s\")"
+msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
+
+#: mail/mail-threads.c:299
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4921,7 +4588,7 @@ msgstr ""
 "Fout tijden het preparen van %s:\n"
 "%s"
 
-#: mail/mail-threads.c:694
+#: mail/mail-threads.c:648
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4931,74 +4598,77 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:621

-#: mail/mail-threads.c:747
+#: mail/mail-threads.c:701
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
 # mail/mail-threads.c:623

-#: mail/mail-threads.c:751
+#: mail/mail-threads.c:705
 msgid "Error reading commands from dispatching thread."
-msgstr "Fout tijdens het lezen van commando's van het verzendende parallele proces"
+msgstr ""
+"Fout tijdens het lezen van commando's van het verzendende parallele proces"
 
 # mail/mail-threads.c:712

-#: mail/mail-threads.c:816
+#: mail/mail-threads.c:770
 msgid "Corrupted message from dispatching thread?"
 msgstr "Verminkt bericht van het verzend parallel proces?"
 
 # mail/mail-threads.c:814

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

-#: mail/mail-threads.c:936
+#: mail/mail-threads.c:899
 msgid "User cancelled query."
 msgstr "Gebruiker heeft vraag afgebroken."
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:207
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
-#: mail/mail-tools.c:293
+#: mail/mail-tools.c:291
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr "Kon UID cache bestand \"%s\" niet lezen. Je zou dubbele berichten kunnen ontvangen."
+msgstr ""
+"Kon UID cache bestand \"%s\" niet lezen. Je zou dubbele berichten kunnen "
+"ontvangen."
 
 # calendar/gui/calendar-commands.c:746

-#: mail/mail-tools.c:385
+#: mail/mail-tools.c:384
 #, c-format
 msgid "[%s] %s"
 msgstr "[%s] %s"
 
 # mail/folder-browser-factory.c:37

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

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

-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:434
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:636
+#: mail/mail-tools.c:546
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr "Geen protocol om URI `%s' te openen"
 
-#: mail/mail-tools.c:665
+#: mail/mail-tools.c:575
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5007,59 +4677,124 @@ msgstr ""
 "Kan locatie `%s' niet openen:\n"
 "%s"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:291
 msgid "New VFolder"
 msgstr "_Nieuwe VMap"
 
-# mail/message-list.c:460

-#: mail/message-list.c:490
-msgid "Online Status"
-msgstr "Online status"
+# 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
+msgid "Reply"
+msgstr "Beantwoorden"
 
-# mail/message-list.c:488

-#: mail/message-list.c:526
-msgid "From"
-msgstr "Van"
+# mail/folder-browser-factory.c:34

+#: mail/mail-view.c:151
+msgid "Reply to the sender of this message"
+msgstr "Beantwoord dit bericht"
 
-# mail/message-list.c:495

-#: mail/message-list.c:533
-msgid "Subject"
-msgstr "Onderwerp"
+# mail/folder-browser-factory.c:35

+#: mail/mail-view.c:154 mail/message-list.c:1570
+msgid "Reply to All"
+msgstr "Iedereen beantwoorden"
 
-# mail/message-list.c:502

-#: mail/message-list.c:540
-msgid "Date"
-msgstr "Datum"
+# mail/folder-browser-factory.c:35

+#: mail/mail-view.c:154
+msgid "Reply to all recipients of this message"
+msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
-# mail/message-list.c:509

-#: mail/message-list.c:547
-msgid "Received"
-msgstr "Ontvangen"
+# mail/folder-browser-factory.c:37

+#: mail/mail-view.c:157
+msgid "Forward"
+msgstr "Doorsturen"
 
-# mail/message-list.c:516

-#: mail/message-list.c:554
-msgid "To"
-msgstr "Aan"
+# mail/folder-browser-factory.c:37

+#: mail/mail-view.c:157
+msgid "Forward this message"
+msgstr "Dit bericht doorsturen"
 
-# mail/message-list.c:523

-#: mail/message-list.c:561
-msgid "Size"
-msgstr "Grootte"
+# 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
+msgid "Print"
+msgstr "Afdrukken"
 
-# shell/e-shell-view-menu.c:404

-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "Nieuwe Notitie maken"
+# mail/folder-browser-factory.c:43

+#: mail/mail-view.c:161
+msgid "Print the selected message"
+msgstr "Druk dit bericht af"
 
-# mail/component-factory.c:196

-#: notes/component-factory.c:148
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
+# mail/folder-browser-factory.c:45

+#: mail/mail-view.c:163
+msgid "Delete this message"
+msgstr "Verwijdert dit bericht"
 
-# mail/main.c:62

-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
+#: mail/message-list.c:1565
+msgid "Open in New Window"
+msgstr "Open in Nieuw Venster"
+
+# composer/e-msg-composer.c:894

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

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

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

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

+#: mail/message-list.c:1575
+msgid "Copy Message"
+msgstr "Bericht Kopiëren"
+
+#: mail/message-list.c:1577
+msgid "VFolder on Subject"
+msgstr "VMap op Onderwerp"
+
+#: mail/message-list.c:1578
+msgid "VFolder on Sender"
+msgstr "VMap op Afzender"
+
+#: mail/message-list.c:1579
+msgid "VFolder on Recipients"
+msgstr "VMap op Geadresseerden"
+
+#: mail/message-list.c:1581
+msgid "Filter on Subject"
+msgstr "Filter op Onderwerp"
+
+#: mail/message-list.c:1582
+msgid "Filter on Sender"
+msgstr "Filter op Afzender"
+
+#: mail/message-list.c:1583
+msgid "Filter on Recipients"
+msgstr "Filter op Geadresseerden"
+
+#: mail/message-list.c:1584 mail/message-list.c:1607
+msgid "Filter on Mailing List"
+msgstr "Filter op Mailing Lijst"
+
+#: mail/message-list.c:1609
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filter op Mailing Lijst (%s)"
 
 # shell/e-setup.c:47

 #: shell/e-setup.c:47
@@ -5128,7 +4863,7 @@ msgstr ""
 "bestanden af te maken."
 
 # shell/e-shell-folder-creation-dialog.c:81

-#: shell/e-shell-folder-creation-dialog.c:81
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -5138,12 +4873,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-folder-creation-dialog.c:133

-#: shell/e-shell-folder-creation-dialog.c:133
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven folder-naam is niet geldig."
 
 # shell/e-shell-folder-creation-dialog.c:223

-#: shell/e-shell-folder-creation-dialog.c:223
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe folder maken"
 
@@ -5157,12 +4892,12 @@ msgstr ""
 "voor de opdracht."
 
 # shell/e-shell-folder-selection-dialog.c:236

-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:274
 msgid "New..."
 msgstr "Nieuw..."
 
 # shell/e-shell-folder-title-bar.c:355

-#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
+#: shell/e-shell-folder-title-bar.c:448 shell/e-shell-folder-title-bar.c:449
 msgid "(Untitled)"
 msgstr "(GeenTitel)"
 
@@ -5170,23 +4905,23 @@ msgstr "(GeenTitel)"
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:113
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug Buddy was niet gevonden in het $PATH."
 
 # shell/e-shell-view-menu.c:116

 #. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kon niet worden gestart."
 
 # shell/e-shell-view-menu.c:161

-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:168
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 # shell/e-shell-view-menu.c:163

-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:170
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5197,198 +4932,114 @@ msgstr ""
 "in de GNOME werkomgeving."
 
 # shell/e-shell-view-menu.c:301

-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:331
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
-# shell/e-shell-view-menu.c:398

-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "_Nieuw"
-
-# shell/e-shell-view-menu.c:365

-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "_Folder"
-
-# shell/e-shell-view-menu.c:369

-#: shell/e-shell-view-menu.c:395
-msgid "Evolution bar _shortcut"
-msgstr "Evolution balk _snelkoppeling"
-
-# shell/e-shell-view-menu.c:375

-#: shell/e-shell-view-menu.c:404
-msgid "_Mail message (FIXME)"
-msgstr "_Mail bericht (FIXME)"
-
-# shell/e-shell-view-menu.c:378

-#: shell/e-shell-view-menu.c:410
-msgid "_Appointment (FIXME)"
-msgstr "_Afspraak (FIXME)"
-
-# shell/e-shell-view-menu.c:381

-#: shell/e-shell-view-menu.c:416
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-# shell/e-shell-view-menu.c:384

-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr "_Taak (FIXME)"
-
-# shell/e-shell-view-menu.c:402

-#: shell/e-shell-view-menu.c:444
-msgid "_Go to Folder..."
-msgstr "_Ga naar map..."
-
-# shell/e-shell-view-menu.c:402

-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr "Toon een andere map"
-
-# shell/e-shell-view-menu.c:404

-#: shell/e-shell-view-menu.c:452
-msgid "_Create New Folder..."
-msgstr "Nieu_we map aanmaken..."
-
-# shell/e-shell-view-menu.c:404

-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-msgid "Create a new folder"
-msgstr "Nieuwe map aanmaken"
-
-# calendar/gui/gncal-todo.c:488

-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "Stop_pen..."
-
-# shell/e-shell-view-menu.c:419

-#: shell/e-shell-view-menu.c:495
-msgid "Show _Shortcut Bar"
-msgstr "Snelkoppelingenbalk Tonen"
-
-# shell/e-shell-view-menu.c:420

-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr "Toont de snelkoppelingenbalk"
-
-# shell/e-shell-view-menu.c:422

-#: shell/e-shell-view-menu.c:501
-msgid "Show _Folder Bar"
-msgstr "_Mapbalk Tonen"
-
-# shell/e-shell-view-menu.c:423

-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "Toont de mapbalk"
-
-# addressbook/printing/e-contact-print.glade.h:12

-#: shell/e-shell-view-menu.c:513
-msgid "_Settings"
-msgstr "In_stellingen:"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: shell/e-shell-view-menu.c:524
-msgid "_Help"
-msgstr "_Help"
-
-# shell/e-shell-view-menu.c:440

-#: shell/e-shell-view-menu.c:530
-msgid "Help _Index"
-msgstr "Help _Index"
-
-# shell/e-shell-view-menu.c:443

-#: shell/e-shell-view-menu.c:537
-msgid "Getting _Started"
-msgstr "_Beginnen"
-
-# shell/e-shell-view-menu.c:446

-#: shell/e-shell-view-menu.c:544
-msgid "Using the _Mailer"
-msgstr "De _Mailer gebruiken"
-
-# shell/e-shell-view-menu.c:449

-#: shell/e-shell-view-menu.c:551
-msgid "Using the _Calendar"
-msgstr "De Kalender gebruiken"
-
-# shell/e-shell-view-menu.c:452

-#: shell/e-shell-view-menu.c:558
-msgid "Using the C_ontact Manager"
-msgstr "De Cont_act Manager gebruiken"
-
-# shell/e-shell-view-menu.c:457

-#: shell/e-shell-view-menu.c:568
-msgid "_Submit Bug Report"
-msgstr "Bug Report In_sturen"
-
-# shell/e-shell-view-menu.c:458

-#: shell/e-shell-view-menu.c:569
-msgid "Submit bug report using Bug Buddy"
-msgstr "Bug Report insturen met Bug Buddy"
-
-# shell/e-shell-view-menu.c:159

-#: shell/e-shell-view-menu.c:578
-msgid "_About Evolution..."
-msgstr "_Over Evolution..."
-
-#: shell/e-shell-view-menu.c:579
-msgid "Show information about Evolution"
-msgstr "Geef informatie over Evolution weer"
-
 # shell/e-shell-view.c:113

-#: shell/e-shell-view.c:122
+#: shell/e-shell-view.c:134
 msgid "(No folder displayed)"
 msgstr "(Geen folder weergegeven)"
 
 # shell/e-shell-view.c:208

-#: shell/e-shell-view.c:350
+#: shell/e-shell-view.c:413
 msgid "Folders"
 msgstr "Folders"
 
 # shell/e-shell-view.c:600

-#: shell/e-shell-view.c:883
+#: shell/e-shell-view.c:996
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
+#: shell/e-shell-view.c:1136
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' has 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:293
+#: shell/e-shell.c:331
 #, 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"
+msgstr "Nieuwe snelkoppelings groep aanmaken"
+
+# mail/mail-config.c:277

+#: shell/e-shortcuts-view.c:125
+msgid "Group name:"
+msgstr "Groep:"
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+"Wil je echt de groep `%s' verwijderen\n"
+"van de snelkoppelingsbalk?"
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr "Niet verwijderen"
+
 # shell/e-shortcuts-view.c:235

-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
-msgstr "Kleine Iconen"
+#: shell/e-shortcuts-view.c:250
+msgid "_Small Icons"
+msgstr "_Kleine Iconen"
 
 # shell/e-shortcuts-view.c:236

-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine iconen"
 
 # shell/e-shortcuts-view.c:238

-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
-msgstr "Grote Iconen"
+#: shell/e-shortcuts-view.c:253
+msgid "_Large Icons"
+msgstr "_Grote Iconen"
 
 # shell/e-shortcuts-view.c:239

-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote iconen"
 
+#: shell/e-shortcuts-view.c:265
+msgid "_New Group..."
+msgstr "_Nieuwe Groep..."
+
+# addressbook/gui/component/addressbook.c:420

+#: shell/e-shortcuts-view.c:266
+msgid "Create a new shortcut group"
+msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Remove This Group..."
+msgstr "Deze Groep _Verwijderen..."
+
+# shell/e-shortcuts-view.c:333

+#: shell/e-shortcuts-view.c:269
+msgid "Remove this shortcut group"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
 # shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr "Activeren"
 
 # shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr "Activeer deze snelkoppeling"
 
 # shell/e-shortcuts-view.c:333

-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
@@ -5398,77 +5049,77 @@ msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 # shell/e-storage.c:217

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

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

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

-#: shell/e-storage.c:416
+#: shell/e-storage.c:322
 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:418
+#: shell/e-storage.c:324
 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:420
+#: shell/e-storage.c:326
 msgid "I/O error"
 msgstr "I/O fout"
 
 # shell/e-storage.c:422

-#: shell/e-storage.c:422
+#: shell/e-storage.c:328
 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:424
+#: shell/e-storage.c:330
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder was niet gevonden"
 
 # shell/e-storage.c:426

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

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

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

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

-#: shell/e-storage.c:434
+#: shell/e-storage.c:340
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
 # mail/folder-browser-factory.c:43

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

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

-#: shell/main.c:94
+#: shell/main.c:95
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5518,166 +5169,15 @@ msgstr ""
 "Het Evolution Team\n"
 
 # shell/main.c:172

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

-#: shell/main.c:159
+#: shell/main.c:160
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
-msgstr "Het component claimt nu dat het geen PersistStream ondersteund!"
-
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
-msgstr ""
-"Een uitzondering trad op tijdens het proberen van het laden van het component\n"
-"in PersistStream"
-
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
-msgstr "Het %s component ondersteund geen PersistStream!\n"
-
-# composer/e-msg-composer.c:894

-#: tests/ui-tests/message-browser.c:710
-msgid "Open Mime Message"
-msgstr "Open Mime Bericht"
-
-# widgets/e-table/e-table-config.glade.h:7

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "Velden"
-
-# widgets/e-table/e-table-config.glade.h:8

-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "Groeperen"
-
-# widgets/e-table/e-table-config.glade.h:9

-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "Sorteren"
-
-# widgets/e-table/e-table-config.glade.h:10

-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
-msgstr "Filter"
-
-# widgets/e-table/e-table-field-chooser.glade.h:7

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-#: widgets/e-table/e-table-header-item.c:1164
-msgid "Field Chooser"
-msgstr "Veld Kiezer"
-
-# widgets/e-table/e-table-field-chooser.glade.h:8

-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"Om een kolom toe te voegen in de tabel, moet je\n"
-"het slepen naar de plaats waar je de kolum wilt."
-
-# widgets/e-table/e-table-group.glade.h:7

-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
-msgstr "window1"
-
-# widgets/e-table/e-table-group.glade.h:8

-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "Beschikbare velden"
-
-# widgets/e-table/e-table-group.glade.h:9

-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
-msgstr "label1"
-
-# widgets/e-table/e-table-group.glade.h:10

-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "Toon in deze volgorde"
-
-# widgets/e-table/e-table-group.glade.h:11

-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
-msgstr "label2"
-
-# widgets/e-table/e-table-group.glade.h:12

-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "Toevoegen >>"
-
-# widgets/e-table/e-table-group.glade.h:13

-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< Verwijderen"
-
-#: widgets/e-table/e-table-header-item.c:1156
-msgid "Sort Ascending"
-msgstr "Sorteer Oplopend"
-
-#: widgets/e-table/e-table-header-item.c:1157
-msgid "Sort Descending"
-msgstr "Sorteer Aflopend"
-
-# addressbook/contact-editor/e-contact-editor.c:805

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

-#: widgets/e-table/e-table-header-item.c:1158
-msgid "Unsort"
-msgstr "Sortering Opheffen"
-
-#: widgets/e-table/e-table-header-item.c:1160
-msgid "Group By This Field"
-msgstr "Groeperen Op Dit Veld"
-
-# widgets/shortcut-bar/e-group-bar.c:632

-#: widgets/e-table/e-table-header-item.c:1161
-msgid "Group By Box"
-msgstr "Grouperen Per Vak"
-
-#: widgets/e-table/e-table-header-item.c:1163
-msgid "Remove This Column"
-msgstr "Deze Kolom Verwijderen"
-
-# calendar/gui/calendar-commands.c:59

-#: widgets/e-table/e-table-header-item.c:1166
-msgid "Alignment"
-msgstr "Uitlijning:"
-
-#: widgets/e-table/e-table-header-item.c:1167
-msgid "Best Fit"
-msgstr "Meest Passend"
-
-#: widgets/e-table/e-table-header-item.c:1168
-msgid "Format Columns..."
-msgstr "Kolom Opmaak..."
-
-#: widgets/e-table/e-table-header-item.c:1170
-msgid "Customize Current View..."
-msgstr "Huidige Weergave Aanpassen..."
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:386

 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -5773,23 +5273,817 @@ msgstr "_Eindtijd v_ergadering:"
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
+# calendar/gui/event-editor.c:1745

+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:281
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+msgid "%B %Y"
+msgstr "%B %Y"
+
 # widgets/misc/e-clipped-label.c:106

 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
 msgstr "..."
 
+# addressbook/gui/component/addressbook.c:420

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

+#: widgets/misc/e-dateedit.c:325
+msgid "Now"
+msgstr "Nu"
+
+# calendar/gui/calendar-commands.c:553

+#: widgets/misc/e-dateedit.c:331
+msgid "Today"
+msgstr "Vandaag"
+
+#. 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
+#: 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
+#: widgets/misc/e-dateedit.c:1130
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
 # widgets/shortcut-bar/e-group-bar.c:632

 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Group %i"
 
+# addressbook/contact-editor/e-contact-editor.c:778

+#~ msgid "FIXME: _New Contact"
+#~ msgstr "FIXME: _Nieuw Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:779

+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
+
+# addressbook/contact-editor/e-contact-editor.c:781

+#~ 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"
+
+# addressbook/contact-editor/e-contact-editor.c:784

+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "FIXME: Een Afspraak _Plannen..."
+
+# addressbook/contact-editor/e-contact-editor.c:785

+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "FIXME: Nieuwe _Taak for contact"
+
+# addressbook/contact-editor/e-contact-editor.c:786

+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "FIXME: Nieuwe Dagboek "
+
+# addressbook/contact-editor/e-contact-editor.c:788

+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "FIXME: _Vlag voor Vervolg..."
+
+# addressbook/contact-editor/e-contact-editor.c:789

+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "FIXME: Toon Folder met Adressen"
+
+# addressbook/contact-editor/e-contact-editor.c:790

+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: Pagina Bekijken"
+
+# addressbook/contact-editor/e-contact-editor.c:792

+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "FIXME: Doorsturen als _vCard"
+
+# addressbook/contact-editor/e-contact-editor.c:840

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

+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Bewaar de afspraak en sluit dit venster"
+
+# addressbook/contact-editor/e-contact-editor.c:844

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

+#~ msgid "Print..."
+#~ msgstr "Afdrukken..."
+
+# addressbook/contact-editor/e-contact-editor.c:853

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

+#~ msgid "Delete this item"
+#~ msgstr "Verwijdert dit item"
+
+# addressbook/gui/component/addressbook.c:424

+#~ msgid "Find a contact"
+#~ msgstr "Zoek een contact"
+
+# addressbook/gui/component/addressbook.c:425

+#~ msgid "Print contacts"
+#~ msgstr "Druk contacten af"
+
+# addressbook/gui/component/addressbook.c:426

+#~ msgid "Delete a contact"
+#~ msgstr "Selecteer een contact"
+
+# addressbook/gui/component/addressbook.c:425

+#~ msgid "_Print Contacts..."
+#~ msgstr "Druk contacten af..."
+
+# addressbook/gui/component/addressbook.c:506

+#~ msgid "_New Contact"
+#~ msgstr "_Nieuw Contact"
+
+# addressbook/gui/component/addressbook.c:514

+#~ msgid "N_ew Directory Server"
+#~ msgstr "Ni_euwe Directory Server"
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Zoek naar contacten"
+
+# addressbook/gui/component/addressbook.c:1010

+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klik hier om een contact toe te voegen *"
+
+#~ msgid "Reflow Test"
+#~ msgstr "Reflow Test"
+
+# shell/e-shell-view-menu.c:161

+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#~ msgid "This should test the reflow canvas item"
+#~ msgstr "Dit zou het 'reflow' canvas item moeten testen"
+
+#~ msgid "Could not read pilot's DateBook application block"
+#~ msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
+
+#~ msgid "Gpilotd todo conduit"
+#~ msgstr "Gpilotd to-do kanaal"
+
+# calendar/gui/calendar-commands.c:175

+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome Kalender"
+
+# calendar/gui/calendar-commands.c:178

+#~ msgid "The GNOME personal calendar and schedule manager."
+#~ msgstr "Het GNOME persoonlijke kalender en rooster beheer."
+
+# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

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

+#~ msgid "Day"
+#~ msgstr "Dag"
+
+# calendar/gui/calendar-commands.c:522

+#~ msgid "Show 1 day"
+#~ msgstr "Laat 1 dag zien"
+
+# calendar/gui/calendar-commands.c:525

+#~ msgid "5 Days"
+#~ msgstr "5 Dagen"
+
+# calendar/gui/calendar-commands.c:525

+#~ msgid "Show the working week"
+#~ msgstr "Laat de werkweek zien"
+
+# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

+#~ msgid "Week"
+#~ msgstr "Week"
+
+# calendar/gui/calendar-commands.c:528

+#~ msgid "Show 1 week"
+#~ msgstr "Laat 1 week zien"
+
+# calendar/gui/calendar-commands.c:531

+#~ msgid "Month"
+#~ msgstr "Maand"
+
+# calendar/gui/calendar-commands.c:531

+#~ msgid "Show 1 month"
+#~ msgstr "Toon 1 maand"
+
+# calendar/gui/calendar-commands.c:535

+#~ msgid "Year"
+#~ msgstr "Jaar"
+
+# calendar/gui/calendar-commands.c:535

+#~ msgid "Show 1 year"
+#~ msgstr "Toon 1 jaar"
+
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

+#~ msgid "Create a new appointment"
+#~ msgstr "Maak een nieuwe afspraak"
+
+# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

+#~ msgid "Print this calendar"
+#~ msgstr "Druk deze kalender af"
+
+# calendar/gui/calendar-commands.c:552

+#~ msgid "Prev"
+#~ msgstr "Vorige"
+
+# calendar/gui/calendar-commands.c:552

+#~ msgid "Go back in time"
+#~ msgstr "Ga terug in tijd"
+
+# calendar/gui/calendar-commands.c:553

+#~ msgid "Go to present time"
+#~ msgstr "Ga naar huidig moment"
+
+# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+# calendar/gui/calendar-commands.c:554

+#~ msgid "Go forward in time"
+#~ msgstr "Ga vooruit in tijd"
+
+# calendar/gui/calendar-commands.c:558

+#~ msgid "Go to"
+#~ msgstr "Ga naar"
+
+# calendar/gui/calendar-commands.c:558

+#~ msgid "Go to a specific date"
+#~ msgstr "Ga naar specifieke datum"
+
+# calendar/gui/calendar-commands.c:659

+#~ msgid "New Ca_lendar"
+#~ msgstr "Nieuwe Ka_lender"
+
+# calendar/gui/calendar-commands.c:660

+#~ msgid "Create a new calendar"
+#~ msgstr "Maak een nieuwe kalender"
+
+# calendar/gui/calendar-commands.c:663

+#~ msgid "Open Ca_lendar"
+#~ msgstr "Open Ka_lender"
+
+# calendar/gui/calendar-commands.c:664

+#~ msgid "Open a calendar"
+#~ msgstr "Open een kalender"
+
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

+#~ msgid "Save Calendar As"
+#~ msgstr "Bewaar Kalender Als"
+
+# calendar/gui/calendar-commands.c:682

+#~ msgid "_New appointment..."
+#~ msgstr "_Nieuwe Afspraak..."
+
+# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704

+#~ msgid "About Calendar"
+#~ msgstr "Over de  kalender"
+
+# calendar/gui/calendar-commands.c:746

+#~ msgid "%s%s"
+#~ msgstr "%s%s"
+
+# calendar/gui/calendar-commands.c:746

+#~ msgid "'s calendar"
+#~ msgstr "'s zijn kalender"
+
+# calendar/gui/event-editor.c:1148

+#~ msgid "FIXME: _Delete"
+#~ msgstr "FIXME: Verwij_deren"
+
+# calendar/gui/event-editor.c:1320

+#~ msgid "FIXME: Save and Close"
+#~ msgstr "FIXME: Opslaan en sluiten"
+
+# calendar/gui/event-editor.c:1330

+#~ msgid "FIXME: Recurrence..."
+#~ msgstr "FIXME: Herhaling..."
+
+# calendar/gui/event-editor.c:1331

+#~ msgid "Configure recurrence rules"
+#~ msgstr "Configureer herhalings regels"
+
+# calendar/gui/event-editor.c:1336

+#~ msgid "FIXME: Delete"
+#~ msgstr "FIXME: Verwijderen"
+
+# composer/e-msg-composer-hdrs.c:234

+#~ msgid "S_ubject:"
+#~ msgstr "Onderwerp:"
+
+#~ msgid "Owner:"
+#~ msgstr "Eigenaar:"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Cancelled\n"
+#~ msgstr ""
+#~ "Niet Gestart\n"
+#~ "Onderweg\n"
+#~ "Klaar\n"
+#~ "Afgebroken\n"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ msgstr ""
+#~ "Hoog\n"
+#~ "Normaal\n"
+#~ "Laag\n"
+
+# addressbook/printing/e-contact-print.glade.h:12

+#~ msgid "Location:"
+#~ msgstr "Locatie:"
+
+# addressbook/printing/e-contact-print.glade.h:35

+#~ msgid "Resources:"
+#~ msgstr "Bronnen:"
+
+# addressbook/contact-editor/categories-strings.h:7

+#~ msgid "Categories"
+#~ msgstr "Categorieën"
+
+# calendar/gui/goto.c:264

+#~ msgid "Completion date"
+#~ msgstr "Afmaak datum"
+
+#~ msgid "End date"
+#~ msgstr "Eind Datum"
+
+# calendar/gui/goto.c:264

+#~ msgid "Start date"
+#~ msgstr "Start datum"
+
+# mail/message-list.c:502

+#~ msgid "Due date"
+#~ msgstr "Verloop Datum"
+
+#~ msgid "Geographical position"
+#~ msgstr "Geografische positie"
+
+#~ msgid "Percent complete"
+#~ msgstr "Percentage af"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparantheid"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+# addressbook/contact-editor/e-contact-editor.c:671

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

+#~ msgid "FIXME: Invite _Attendees..."
+#~ msgstr "FIXME: Nodig _Gasten Uit..."
+
+# calendar/gui/event-editor.c:1263

+#~ 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..."
+
+# calendar/gui/gncal-todo.c:428

+#~ msgid "Time Left"
+#~ msgstr "Resterende tijd"
+
+# calendar/gui/gncal-todo.c:440

+#~ msgid "To-do list"
+#~ msgstr "To-Do lijst"
+
+# calendar/gui/gncal-todo.c:488

+#~ msgid "Edit..."
+#~ msgstr "Bewerken..."
+
+# calendar/gui/gncal-todo.c:712

+#~ msgid "Weeks"
+#~ msgstr "Weken"
+
+# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

+#~ msgid "Days"
+#~ msgstr "Dagen"
+
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+#~ msgid "Hours"
+#~ msgstr "Uren"
+
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+#~ msgid "Hour"
+#~ msgstr "Uur"
+
+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

+#~ msgid "Minutes"
+#~ msgstr "Minuten"
+
+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

+#~ msgid "Minute"
+#~ msgstr "Minuut"
+
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+#~ msgid "Seconds"
+#~ msgstr "Seconden"
+
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+#~ msgid "Second"
+#~ msgstr "Seconde"
+
+# calendar/gui/print.c:868

+#~ msgid "TODO Items"
+#~ msgstr "TODO Items"
+
+# calendar/gui/print.c:1000 calendar/gui/print.c:1014

+# calendar/gui/print.c:1015

+#~ msgid "%a"
+#~ msgstr "%a"
+
+# calendar/gui/print.c:1001 calendar/gui/print.c:1002

+# calendar/gui/print.c:1016 calendar/gui/print.c:1017

+#~ msgid "%b"
+#~ msgstr "%b"
+
+# calendar/gui/print.c:1021

+#~ msgid "Current week (%s %s %d - %s %s %d %d)"
+#~ msgstr "Current week (%s %s %d - %s %s %d %d)"
+
+# calendar/gui/print.c:1027

+#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
+#~ msgstr "Current week (%s %s %d %d - %s %s %d %d)"
+
+# composer/e-msg-composer.c:463

+#~ 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"
+
+#~ msgid "Less"
+#~ msgstr "Minder"
+
+# mail/folder-browser-factory.c:29

+#~ msgid "Get mail"
+#~ msgstr "Mail ophalen"
+
+# mail/folder-browser-factory.c:29

+#~ msgid "Check for new mail"
+#~ msgstr "Controleer op nieuwe mail"
+
+# mail/folder-browser-factory.c:30

+#~ msgid "Compose"
+#~ msgstr "Opstellen"
+
+# mail/folder-browser-factory.c:30

+#~ msgid "Compose a new message"
+#~ msgstr "Stel een nieuw bericht op"
+
+# calendar/gui/print.c:326

+#~ msgid "Move"
+#~ msgstr "Verplaatsen"
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Move message to a new folder"
+#~ msgstr "Sla het bericht op in een bepaalde folder"
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopiëer het bericht naar een nieuwe map"
+
+# addressbook/contact-editor/e-contact-editor.c:745

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

+#~ msgid "Mail _Filters..."
+#~ msgstr "FIXME: Mail _Filters..."
+
+# mail/folder-browser-factory.c:89

+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "_Virtuele Map Wizard..."
+
+# mail/folder-browser-factory.c:95

+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mail Configuratie..."
+
+# mail/folder-browser-factory.c:101

+#~ msgid "Forget _Passwords"
+#~ msgstr "Vergeten Wachtwoorden"
+
+#~ msgid "_Message"
+#~ msgstr "_Bericht"
+
+# mail/folder-browser-factory.c:35

+#~ msgid "Reply to _All"
+#~ msgstr "Iedereen Be_antwoorden"
+
+# mail/folder-browser-factory.c:37

+#~ msgid "_Forward"
+#~ msgstr "_Doorsturen"
+
+# shell/e-shell-view-menu.c:365

+#~ msgid "F_older"
+#~ msgstr "_Folder"
+
+#~ msgid "_Mark all as Read"
+#~ msgstr "_Markeer allen als Gelezen"
+
+# mail/folder-browser-factory.c:77

+#~ msgid "_Expunge"
+#~ msgstr "V_erwijderen"
+
+#~ msgid "_Configure Folder"
+#~ msgstr "_Configureer Map"
+
+#~ msgid ""
+#~ "You need to configure the mail client\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Je moet het mail programma configuren\n"
+#~ "voordat je mail kunt versturen."
+
+# calendar/gui/gncal-todo.c:190

+#~ msgid "Port:"
+#~ msgstr "Poort:"
+
+#~ msgid "You have no remote mail source configured to fetch mail from."
+#~ msgstr ""
+#~ "Je hebt geen afgelegen mail bron geconfigureerd om mail van op te halen"
+
+#~ msgid "Bad folder passed to fetch_mail"
+#~ msgstr "Slechte map gepasseerd naar fetch_mail"
+
+#~ msgid "Loading Draftbox"
+#~ msgstr "Bezig met laden Kladvak"
+
+#~ msgid "Load Draftbox"
+#~ msgstr "Laden Kladvak"
+
+# mail/message-list.c:460

+#~ msgid "Online Status"
+#~ msgstr "Online status"
+
+# mail/message-list.c:488

+#~ msgid "From"
+#~ msgstr "Van"
+
+# mail/message-list.c:495

+#~ msgid "Subject"
+#~ msgstr "Onderwerp"
+
+# mail/message-list.c:502

+#~ msgid "Date"
+#~ msgstr "Datum"
+
+# mail/message-list.c:509

+#~ msgid "Received"
+#~ msgstr "Ontvangen"
+
+# mail/message-list.c:516

+#~ msgid "To"
+#~ msgstr "Aan"
+
+# mail/message-list.c:523

+#~ msgid "Size"
+#~ msgstr "Grootte"
+
+# shell/e-shell-view-menu.c:404

+#~ msgid "Create a new note"
+#~ msgstr "Nieuwe Notitie maken"
+
+# mail/component-factory.c:196

+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
+
+# mail/main.c:62

+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
+
+# shell/e-shell-view-menu.c:398

+#~ msgid "_New"
+#~ msgstr "_Nieuw"
+
+# shell/e-shell-view-menu.c:365

+#~ msgid "_Folder"
+#~ msgstr "_Folder"
+
+# shell/e-shell-view-menu.c:375

+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_Mail bericht (FIXME)"
+
+# shell/e-shell-view-menu.c:378

+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Afspraak (FIXME)"
+
+# shell/e-shell-view-menu.c:381

+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+# shell/e-shell-view-menu.c:384

+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Taak (FIXME)"
+
+# shell/e-shell-view-menu.c:402

+#~ msgid "_Go to Folder..."
+#~ msgstr "_Ga naar map..."
+
+# shell/e-shell-view-menu.c:402

+#~ msgid "Display a different folder"
+#~ msgstr "Toon een andere map"
+
+# shell/e-shell-view-menu.c:404

+#~ msgid "_Create New Folder..."
+#~ msgstr "Nieu_we map aanmaken..."
+
+# shell/e-shell-view-menu.c:404

+#~ msgid "Create a new folder"
+#~ msgstr "Nieuwe map aanmaken"
+
+# calendar/gui/gncal-todo.c:488

+#~ msgid "E_xit..."
+#~ msgstr "Stop_pen..."
+
+# shell/e-shell-view-menu.c:419

+#~ msgid "Show _Shortcut Bar"
+#~ msgstr "Snelkoppelingenbalk Tonen"
+
+# shell/e-shell-view-menu.c:420

+#~ msgid "Show the shortcut bar"
+#~ msgstr "Toont de snelkoppelingenbalk"
+
+# shell/e-shell-view-menu.c:422

+#~ msgid "Show _Folder Bar"
+#~ msgstr "_Mapbalk Tonen"
+
+# shell/e-shell-view-menu.c:423

+#~ msgid "Show the folder bar"
+#~ msgstr "Toont de mapbalk"
+
+# addressbook/printing/e-contact-print.glade.h:12

+#~ msgid "_Settings"
+#~ msgstr "In_stellingen:"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:20

+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+# shell/e-shell-view-menu.c:440

+#~ msgid "Help _Index"
+#~ msgstr "Help _Index"
+
+# shell/e-shell-view-menu.c:443

+#~ msgid "Getting _Started"
+#~ msgstr "_Beginnen"
+
+# shell/e-shell-view-menu.c:446

+#~ msgid "Using the _Mailer"
+#~ msgstr "De _Mailer gebruiken"
+
+# shell/e-shell-view-menu.c:449

+#~ msgid "Using the _Calendar"
+#~ msgstr "De Kalender gebruiken"
+
+# shell/e-shell-view-menu.c:452

+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "De Cont_act Manager gebruiken"
+
+# shell/e-shell-view-menu.c:457

+#~ msgid "_Submit Bug Report"
+#~ msgstr "Bug Report In_sturen"
+
+# shell/e-shell-view-menu.c:458

+#~ msgid "Submit bug report using Bug Buddy"
+#~ msgstr "Bug Report insturen met Bug Buddy"
+
+# shell/e-shell-view-menu.c:159

+#~ msgid "_About Evolution..."
+#~ msgstr "_Over Evolution..."
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Geef informatie over Evolution weer"
+
+#~ msgid "The component now claims that it doesn't support PersistStream!"
+#~ msgstr "Het component claimt nu dat het geen PersistStream ondersteund!"
+
+#~ msgid ""
+#~ "An exception occured while trying to load data into the component with "
+#~ "PersistStream"
+#~ msgstr ""
+#~ "Een uitzondering trad op tijdens het proberen van het laden van het "
+#~ "component\n"
+#~ "in PersistStream"
+
+#~ msgid "The %s component doesn't support PersistStream!\n"
+#~ msgstr "Het %s component ondersteund geen PersistStream!\n"
+
+# composer/e-msg-composer.c:894

+#~ msgid "Open Mime Message"
+#~ msgstr "Open Mime Bericht"
+
+# widgets/e-table/e-table-config.glade.h:7

+#~ msgid "Fields"
+#~ msgstr "Velden"
+
+# widgets/e-table/e-table-config.glade.h:8

+#~ msgid "Grouping"
+#~ msgstr "Groeperen"
+
+# widgets/e-table/e-table-config.glade.h:9

+#~ msgid "Sort"
+#~ msgstr "Sorteren"
+
+# widgets/e-table/e-table-config.glade.h:10

+#~ msgid "Filter"
+#~ msgstr "Filter"
+
+# widgets/e-table/e-table-field-chooser.glade.h:7

+#~ msgid "Field Chooser"
+#~ msgstr "Veld Kiezer"
+
+# widgets/e-table/e-table-field-chooser.glade.h:8

+#~ msgid ""
+#~ "To add a column to your table, drag it into\n"
+#~ "the location in which you want it to appear."
+#~ msgstr ""
+#~ "Om een kolom toe te voegen in de tabel, moet je\n"
+#~ "het slepen naar de plaats waar je de kolum wilt."
+
+# widgets/e-table/e-table-group.glade.h:7

+#~ msgid "window1"
+#~ msgstr "window1"
+
+# widgets/e-table/e-table-group.glade.h:8

+#~ msgid "Available fields"
+#~ msgstr "Beschikbare velden"
+
+# widgets/e-table/e-table-group.glade.h:9

+#~ msgid "label1"
+#~ msgstr "label1"
+
+# widgets/e-table/e-table-group.glade.h:10

+#~ msgid "Show in this order"
+#~ msgstr "Toon in deze volgorde"
+
+# widgets/e-table/e-table-group.glade.h:11

+#~ msgid "label2"
+#~ msgstr "label2"
+
+# widgets/e-table/e-table-group.glade.h:12

+#~ msgid "Add >>"
+#~ msgstr "Toevoegen >>"
+
+# widgets/e-table/e-table-group.glade.h:13

+#~ msgid "<< Remove"
+#~ msgstr "<< Verwijderen"
+
+#~ msgid "Sort Ascending"
+#~ msgstr "Sorteer Oplopend"
+
+#~ msgid "Sort Descending"
+#~ msgstr "Sorteer Aflopend"
+
+# addressbook/contact-editor/e-contact-editor.c:805

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

+#~ msgid "Unsort"
+#~ msgstr "Sortering Opheffen"
+
+#~ msgid "Group By This Field"
+#~ msgstr "Groeperen Op Dit Veld"
+
+# widgets/shortcut-bar/e-group-bar.c:632

+#~ msgid "Group By Box"
+#~ msgstr "Grouperen Per Vak"
+
+# calendar/gui/calendar-commands.c:59

+#~ msgid "Alignment"
+#~ msgstr "Uitlijning:"
+
+#~ msgid "Best Fit"
+#~ msgstr "Meest Passend"
+
+#~ msgid "Format Columns..."
+#~ msgstr "Kolom Opmaak..."
+
+#~ msgid "Customize Current View..."
+#~ msgstr "Huidige Weergave Aanpassen..."
+
 # calendar/gui/calendar-commands.c:687

 #~ msgid "New appointment for _today..."
 #~ msgstr "Nieuwe afspraak voor vandaag..."
@@ -5834,10 +6128,6 @@ msgstr "Group %i"
 #~ msgid "Finish"
 #~ msgstr "Afmaken"
 
-# filter/filter-editor.c:212

-#~ msgid "Cancel"
-#~ msgstr "Annuleren"
-
 # filter/filter-editor.c:216

 #~ msgid "Apply"
 #~ msgstr "Toepassen"
@@ -5889,9 +6179,6 @@ msgstr "Group %i"
 #~ msgid "Evolution can not create its local folders"
 #~ msgstr "Evolution kan zijn lokale mappen niet maken"
 
-#~ msgid "New group"
-#~ msgstr "Nieuwe groep"
-
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr "Het spijt ons, Evolution's Map Bladeraar kon niet worden geladen."