Do this everywhere, also fixup CLEANFILES

Do this everywhere, also fixup CLEANFILES 2001-04-14 Michael Meeks <michael@ximian.com> * Makefile.am (dist-hook): remove built sources from dist. svn path=/trunk/; revision=9309
author: Michael Meeks <michael@ximian.com> 2001-04-14 16:02:59 +0800
committer: Michael Meeks <michael@src.gnome.org> 2001-04-14 16:02:59 +0800
commit: 04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree: b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/en_GB.po
parent: a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download: gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.bz2
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.lz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.xz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip
1 files changed, 5372 insertions, 1857 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 7be1b22d4d..bb5c3d412b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -14,363 +13,197 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Colours"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:933
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr ""
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -386,132 +219,37 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronise"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronise Action"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:43
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -521,346 +259,425 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * 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/e-contact-editor-strings.h:7
-msgid "_Add"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:7
+msgid "Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:74
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: addressbook/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:603
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr ""
 
-#.
-#. * 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
+#: addressbook/contact-editor/e-contact-quick-add.c:223
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:225
+msgid "Edit Full"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
+msgid "Full Name"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:268
+msgid "E-mail"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
-"\n"
-"Mr\n"
-"Ms\n"
-"Miss\n"
-"Mrs\n"
-"Dr\n"
-"Prof\n"
-"Rev\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:26
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:247
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:399
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -872,206 +689,565 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:555
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:587
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:170
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:183
 msgid "Subtree"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:354
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:406
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:415
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:435
 msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:508
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:513
 msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:647
 msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:649
 msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:672
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:674
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:675
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+msgid "Add to Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
+msgid "Remove"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+msgid "Remove All"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select Names"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select name from:"
+msgstr ""
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+msgid "n"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+msgid "o"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+msgid "r"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+msgid "Send message to contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
+msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1080,439 +1256,1250 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+msgid "Card View"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#, fuzzy
+msgid "Orientation"
+msgstr "Organisation"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:266
+msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-commands.c:290
+msgid "Open calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:332
+msgid "Save calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:468
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+msgid "High"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+msgid "Normal"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+msgid "Low"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:426
+msgid "Not Started"
 msgstr ""
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:427
+msgid "In Progress"
 msgstr ""
 
-#. 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:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:428
+msgid "Completed"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
+msgid "Cancelled"
 msgstr ""
 
-#. 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:900
-msgid "%I:%M %p%n"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:799
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:879
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+msgid "None"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/calendar-model.c:1048
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1061
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:355
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1102
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1571
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-model.c:1573
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1579
+msgid "No"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:77
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:162
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:481
+msgid "Friday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:477
+msgid "Monday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:165
+msgid "Priority"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Remind me of all appointments"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:482
+msgid "Saturday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Show appointment end times"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:483
+msgid "Sunday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "TaskPad"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:480
+msgid "Thursday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:478
+msgid "Tuesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:479
+msgid "Wednesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:78
+msgid "seconds."
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:70
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:73
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:79
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:82
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:88
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "Date & Time"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+msgid "URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:159
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:160
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:161
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:168
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
+#: calendar/gui/e-calendar-table.c:170
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:384
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
+#: calendar/gui/e-calendar-table.c:557
+msgid "Edit this task..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:558
+msgid "Edit the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:560
+#: ui/evolution-task-editor-dialog.xml.h:19
+msgid "Delete this task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+msgid "New All Day Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+msgid "Go to Today"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+msgid "Go to Date..."
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+msgid "Delete this Appointment"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+msgid "Make this Occurrence Movable"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+msgid "Delete this Occurrence"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3179
+msgid "Delete all Occurrences"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:161
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+msgid "Component successfully updated."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:173
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:197
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:470
+msgid "I couldn't read your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:483
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:499
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:540
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+msgid "Component successfully deleted."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:694
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/e-itip-control.c:780
+msgid "Add to Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-itip-control.c:860
+msgid "Update Calendar"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:883
+msgid "Cancel Meeting"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+msgid "Date:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation:"
+
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+msgid "Attendee address"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+msgid "Chair"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+msgid "Meeting Invitations"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Organisation:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+msgid "Role"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:155
 msgid "Category:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:298
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1520,559 +2507,1165 @@ msgstr ""
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:3
+msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
+#: calendar/gui/event-editor-dialog.glade.h:4
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
 msgstr ""
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1579
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Preview"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+msgid "Reminder"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1588
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1585
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
+msgid "Settings..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1582
+msgid "Show a dialog"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
+msgid "after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr ""
+
+#: calendar/gui/event-editor.c:373
+msgid "Edit Appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:451
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:603
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:610
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:756
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1534
+#, c-format
+msgid " %d days"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1536
+msgid " 1 day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1539
+#, c-format
+msgid " %d weeks"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1541
+msgid " 1 week"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1544
+#, c-format
+msgid " %d hours"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1546
+msgid " 1 hour"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1549
+#, c-format
+msgid " %d minutes"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1551
+msgid " 1 minute"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1554
+#, c-format
+msgid " %d seconds"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1556
+msgid " 1 second"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1603
+msgid " before start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1605
+msgid " after start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1613
+msgid " before end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1615
+msgid " after end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/gnome-cal.c:700
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:711
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
 msgstr ""
 
-#: calendar/gui/main.c:50
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr ""
+
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr ""
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr ""
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr ""
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr ""
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr ""
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr ""
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr ""
+
+#: camel/camel-filter-driver.c:866
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:871
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:328
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:338
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:559
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+msgid "No password provided."
+msgstr ""
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
+#: camel/camel-pgp-context.c:1242
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:464
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+msgid "Authentication failed."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:131
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:143
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:37
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:45
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:847
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:875
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:42
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr ""
+
+#: camel/camel-search-private.c:110
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:554
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:606
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:57
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:59
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
+#. Fill in the new fields
+#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
+#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+msgid "Trash"
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:289
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
+msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-vee-folder.c:451
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
+msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:545
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
+msgid "No such message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:351
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:440
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2080,302 +3673,321 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:865
+#, c-format
+msgid "%s is not a selectable folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:136
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
+#: camel/providers/local/camel-local-store.c:175
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:241
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:283
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:293
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:122
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:248
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:253
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:295
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:370
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:556
+#: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:616
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr ""
 
@@ -2399,11 +4011,11 @@ msgstr ""
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
@@ -2429,529 +4041,932 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:149
+msgid "Retrieving POP summary"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:289
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
+msgid "Delete after %s day(s)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not find 'From' address in message"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+msgid "SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:40
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "Help message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Service ready"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Requested mail action okay, completed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
-msgid "No authentication required"
+#: camel/providers/smtp/camel-smtp-transport.c:187
+msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+#: camel/providers/smtp/camel-smtp-transport.c:189
+msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:199
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:201
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:203
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:207
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:209
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:211
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:213
+msgid "Temporary authentication failure"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:215
+msgid "Authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:305
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
 msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:798
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:887
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
+msgid "Attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Inline attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Send as:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+msgid "From:"
+msgstr ""
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+msgid "Reply-To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+msgid "Subject:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr ""
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:961
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:355
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:370
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: filter/filter-datespec.c:62
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""
+
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr ""
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr ""
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+msgid "%m/%d/%Y"
+msgstr ""
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
+msgid "%H:%M:%S%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
+msgid "%H:%M%n"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:274
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:283
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+msgid "%H:%M"
+msgstr ""
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:315
+msgid "%H:%M:%S"
+msgstr ""
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+msgid "%I:%M %p"
+msgstr ""
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:323
+msgid "%I:%M:%S %p"
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Colours"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:924
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:938
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:956
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:62
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+msgid "RDF Summary"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:768
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:778
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:788
+msgid "Update every "
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
+msgid "minutes"
+msgstr ""
+
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr ""
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -2959,144 +4974,140 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-filter.c:420
-msgid "Remove action"
-msgstr ""
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
+#: filter/filter.glade.h:7
+msgid "Incoming"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
-msgid "Read"
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr ""
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
 msgstr ""
 
 #. Automatically generated. Do not edit.
@@ -3109,359 +5120,451 @@ msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
+msgid "Attachments"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "Date sent"
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
+msgid "Is Not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
+#: filter/libfilter-i18n.h:17
+msgid "Is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
+#: filter/libfilter-i18n.h:22
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
+#: filter/libfilter-i18n.h:24
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
+msgid "Replied to"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
+msgid "Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "Set Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "Source Account"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+msgid "Subject"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:130
+msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
-
-#: mail/component-factory.c:284
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
+#: mail/folder-browser-factory.c:209
+#, c-format
+msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-msgid "Open"
+#: mail/folder-browser.c:568
+msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:570
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
-msgstr ""
-
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:593
 msgid "Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:595
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr ""
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: mail/folder-browser.c:736
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/mail-accounts.c:115
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
+msgstr ""
+
+#: mail/local-config.glade.h:7
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr ""
+
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr ""
 
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr ""
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor.c:173
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+msgid "Add Filter Rule"
+msgstr ""
+
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3469,756 +5572,1017 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:365
-msgid "You must specify recipients in order to send this message."
+#: mail/mail-callbacks.c:591
+#, c-format
+msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:773
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1056
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1137
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1139
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
-#, c-format
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:3
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "Authentication Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:12
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config-druid.c:629
-#, c-format
+#: mail/mail-config.glade.h:18
+msgid "De_fault"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "Done"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:34
+msgid "Mark messages as \"Read\" after:"
+msgstr ""
+
+#: mail/mail-config.glade.h:36
+msgid "News"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:41
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Send mail in HTML format by default."
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+msgid "Sent"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Sent and Draft Messages"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
+msgid "Sent messages folder:"
+msgstr ""
+
+#: mail/mail-config.glade.h:61
+msgid "Server Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:62
+msgid "Server Type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:63
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:64
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+msgid "Sources"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
+
+#: mail/mail-config.glade.h:68
+msgid "Type"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:70
+msgid "Username:"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:949
-msgid "Evolution Account Wizard"
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
+msgid "_Edit"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
+#: mail/mail-config-druid.c:99
 msgid ""
-"Could not open file %s:\n"
-"%s"
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
 
-#: mail/mail-display.c:229
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:504
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr ""
+
+#: mail/mail-display.c:1104
+msgid "Save as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:1106
+msgid "Copy location (FIXME)"
+msgstr ""
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:742
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
+#: mail/mail-local.c:337
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "No such folder %s"
 msgstr ""
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:509
+#, c-format
+msgid "Opening '%s'"
+msgstr ""
+
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:815
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr ""
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:192
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
+#: mail/mail-mt.c:679 mail/session.c:98
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
+#: mail/mail-mt.c:873
+msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr ""
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
+#: mail/mail-ops.c:704
+#, c-format
+msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-ops.c:723
 #, c-format
-msgid "Appending \"%s\""
+msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
+#: mail/mail-ops.c:811
+msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:884
 #, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
+msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synchronising \"%s\""
+#: mail/mail-ops.c:1247
+#, c-format
+msgid "Opening store %s"
+msgstr ""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
+#: mail/mail-ops.c:1814
+msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1857
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
 msgstr ""
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
+#: mail/mail-send-recv.c:138
+msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
+#: mail/mail-send-recv.c:233
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
+#: mail/mail-send-recv.c:236
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:285
+msgid "Updating ..."
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:306
+msgid "Sending"
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:471
+msgid "Cancelled."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-summary.c:109
+msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:141
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:599
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:605
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
+#: mail/message-list.c:651
+msgid "Multiple Unseen Messages"
 msgstr ""
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
+#: mail/message-list.c:652
+msgid "Multiple Messages"
+msgstr ""
+
+#: mail/message-list.c:656
+msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
+#: mail/message-list.c:657
+msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:973
+#: mail/message-list.c:661
+msgid "Higher"
+msgstr ""
+
+#: mail/message-list.c:662
+msgid "Highest"
+msgstr ""
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:989
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-msgid "Attachment"
-msgstr ""
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "From"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "To"
 msgstr ""
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr ""
 
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+msgid "Folder"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
+#: mail/subscribe-dialog.c:77
+msgid "Store"
 msgstr ""
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
+#: mail/subscribe-dialog.c:168
+#, c-format
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
+#: mail/subscribe-dialog.c:273
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
-#, c-format
-msgid "Couldn't create temp file: %s"
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-msgid "Folder"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:63
-msgid "Store"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
 #, c-format
-msgid "Getting store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
-msgid "Get store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: shell/importer/importer.c:341
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/importer/importer.c:351
+msgid "Importing"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:359
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:372
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid "Error starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:387
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:523
+msgid "Filename:"
+msgstr ""
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+msgid "Select a file"
+msgstr ""
+
+#: shell/importer/importer.c:538
+msgid "File type:"
+msgstr ""
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
+msgid "Import"
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:195
+msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4226,14 +6590,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4241,7 +6605,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4249,18 +6613,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -4270,573 +6634,1636 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:208
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr ""
-
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1248
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr ""
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr ""
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/main.c:83
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:178
-msgid "Disable."
+#: shell/main.c:185
+msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
+#: ui/evolution-addressbook.xml.h:2
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
+#: ui/evolution-addressbook.xml.h:7
+msgid "New contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-calendar.xml.h:7
+msgid "Day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-calendar.xml.h:8
+msgid "Go To"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
-msgid "FIXME: __Formatting"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
+#: ui/evolution-calendar.xml.h:15
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-calendar.xml.h:20
+msgid "Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-calendar.xml.h:21
+msgid "Prev"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-calendar.xml.h:25
+msgid "Print calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-calendar.xml.h:26
+msgid "Print this Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+msgid "Save As"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-calendar.xml.h:28
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show 1 day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-calendar.xml.h:31
+msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
+#: ui/evolution-calendar.xml.h:32
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
+#: ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:146
-msgid "FIXME: New _Message to Contact"
+#: ui/evolution-calendar.xml.h:36
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
+#: ui/evolution-calendar.xml.h:39
+msgid "_Month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+msgid "_New"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
+#: ui/evolution-calendar.xml.h:41
+msgid "_Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
+#: ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
+#: ui/evolution-contact-editor.xml.h:3
+msgid "Delete..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
+#: ui/evolution-contact-editor.xml.h:5
+msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+msgid "Save _As..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:13
+msgid "Send _message to contact..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
+msgid "_File"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:172
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+msgid "About this application"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+msgid "Address _Book... (FIXME)"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+msgid "C_lear"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+msgid "Chec_k Names (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+msgid "Clear"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+msgid "Clear the selection"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:11
+msgid "Close this appointment"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+msgid "Cop_y to Folder... (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:250
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+msgid "For_ward (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 msgid "Go to the next item"
 msgstr ""
 
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+msgid "In_complete Task (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+msgid "Print Pre_view"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+msgid "Save"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:46
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
+msgid "Select All"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+msgid "_About..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
+
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:28
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+msgid "_Help"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+msgid "_Item (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+msgid "_Journal Entry (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+msgid "_Last Item in Folder (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+msgid "_Mail Message (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+msgid "_Move to Folder... (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+msgid "_Note (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
+#: ui/evolution-task-editor-dialog.xml.h:83
+msgid "_Properties..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+msgid "_Select All"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:41
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+msgid "_Unread Item (FIXME)"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Add Service"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:3
+msgid "Create a new email"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:5
+msgid "New Mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
+#, fuzzy
+msgid "Compose"
+msgstr "Colours"
+
+#: ui/evolution-mail.xml.h:5
+msgid "Compose a new message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:6
+msgid "Configure Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:8
+msgid "Copy message to a new folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:10
+msgid "Create _Virtual Folder From Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:12
+msgid "Delete the selected messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:14
+msgid "Display all of the message headers"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:15
+msgid "Edit Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:16
+msgid "Edit the current message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:17
+msgid "Empty _Trash"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:20
+msgid "Filter on _Recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:21
+msgid "Filter on _Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
+msgid "Forget _Passwords"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:25
+msgid "Forward As"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:30
+msgid "Full _Headers"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:31
+msgid "Hide Deleted Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:32
+msgid "Hide S_elected Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:33
+msgid "Hide _Deleted Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:34
+msgid "Hide _Read messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:35
+msgid "Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:36
+msgid "Manage _Subscriptions..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:37
+msgid "Mar_k as Read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:38
+msgid "Mark All as R_ead"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:39
+msgid "Mark As Read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:41
+msgid "Mark as U_nread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:42
+msgid "Mark the selected messages as having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
+msgid "Move"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:45
+msgid "Move message to a new folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:46
+msgid "Move selected messages to another folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+msgid "Open the current message in a new window"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:54
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:58
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:61
+msgid "Reply to _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:62
+msgid "Reply to all"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:64
+msgid "Reply to sender"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:66
+msgid "S_ource"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:67
+msgid "Save the message into a new file"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:70
+msgid "Select _Thread"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:71
+msgid "Send / Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:76
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:77
+msgid "Show _All"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:79
+msgid "Threaded Message list"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:80
+msgid "Un-delete the selected messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:82
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:83
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:84
+msgid "VFolder on _Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:85
+msgid "View Raw Message Source"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:86
+msgid "Virtual Folder _Editor..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:87
+msgid "_Apply Filters"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:88
+msgid "_Attachment"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:89
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:90
+msgid "_Create Filter From Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:92
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:93
+msgid "_Filters..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
+msgid "_Folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:95
+msgid "_Forward"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:96
+msgid "_Inline"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:98
+msgid "_Mail Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:99
+msgid "_Mail Settings..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:100
+msgid "_Move to Folder..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:101
+msgid "_Open Selected Items"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:103
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:104
+msgid "_Reply"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:105
+msgid "_Resend Messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:107
+msgid "_Save Message As..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:108
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:109
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:111
+msgid "_Undelete"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+msgid "Close the current file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:5
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save in folder..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send _Later"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Send _later"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send the message later"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send the message now"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send this message now"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Show / hide attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Show _attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Show attachments"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:49
+msgid "_Open..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:5
+msgid "Assig_n Task (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:29
+msgid "Meeting Re_quest (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:46
+msgid "Replace a string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:47
+msgid "Reply to A_ll (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:48
+msgid "S_end Status Report (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+msgid "_Appointment (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:77
+msgid "_Mark Complete (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:84
+msgid "_Reply (FIXME)"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:2
+msgid "Create a new task"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+msgid "New Task"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:6
+msgid "Tasks Preferences..."
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr ""
+
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:3
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution.xml.h:5
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
+
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
+
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr ""
+
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr ""
+
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr ""
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr ""
+
+#: ui/evolution.xml.h:32
+msgid "_Folder Bar"
+msgstr ""
+
+#: ui/evolution.xml.h:33
+msgid "_Go to Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:35
+msgid "_Import file..."
+msgstr ""
+
+#: ui/evolution.xml.h:36
+msgid "_Index"
+msgstr ""
+
+#: ui/evolution.xml.h:37
+msgid "_Mail message"
+msgstr ""
+
+#: ui/evolution.xml.h:39
+msgid "_New Folder"
+msgstr ""
+
+#: ui/evolution.xml.h:40
+msgid "_Shortcut Bar"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:177
+msgid "_Current View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:196
+msgid "Define Views"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -4844,62 +8271,150 @@ msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
 msgid "%B %Y"
 msgstr ""
 
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+msgid "Now"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:242
+msgid "OK"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
+#: widgets/misc/e-filter-bar.c:166
+msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
+#: widgets/misc/e-filter-bar.c:237
+msgid "Advanced Search"
 msgstr ""
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
+#: widgets/misc/e-filter-bar.c:317
+msgid "Advanced ..."
 msgstr ""
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:180
+msgid "Message"
+msgstr ""
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+msgid "Don't show this message again."
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:148
 msgid "Sear_ch"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr ""
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
 msgstr ""
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Post Code:"
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr ""
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr ""
 
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Could not initialise Bonobo"
 
+#: wombat/wombat.c:185
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#~ msgid "Colors"
-#~ msgstr "Colours"
+#, fuzzy
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Could not initialise Bonobo"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronise"
 
-#~ msgid "Pick a color"
-#~ msgstr "Pick a colour"
+#~ msgid "Synchronize Action"
+#~ msgstr "Synchronise Action"
 
-#~ msgid "Organization:"
-#~ msgstr "Organisation:"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mr\n"
+#~ "Ms\n"
+#~ "Miss\n"
+#~ "Mrs\n"
+#~ "Dr\n"
+#~ "Prof\n"
+#~ "Rev\n"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
author	Michael Meeks <michael@ximian.com>	2001-04-14 16:02:59 +0800
committer	Michael Meeks <michael@src.gnome.org>	2001-04-14 16:02:59 +0800
commit	04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree	b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/en_GB.po
parent	a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download	gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.bz2 gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.lz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.xz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip