Sync for the release.

svn path=/trunk/; revision=11530

1 files changed, 5953 insertions, 3099 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index bb5c3d412b..a31ce1a565 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,25 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +253,10 @@ msgstr ""
 #: 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
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
@@ -260,14 +269,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -276,716 +285,828 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: 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"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
 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..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
+#: 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/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
+#: 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/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-msgid "General"
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: 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:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
 msgstr ""
 
-#: 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"
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-msgid "This contact belongs to these categories:"
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-msgid "Assistant"
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
-msgid "Business"
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "Business 2"
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Business Fax"
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-msgid "Callback"
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Car"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-msgid "Company"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
-msgid "Home"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Home 2"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
-msgid "Home Fax"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
-msgid "ISDN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-msgid "Mobile"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
 msgstr ""
 
-#: 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"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
-msgid "Other Fax"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
-msgid "Pager"
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-msgid "Primary"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
-msgid "Radio"
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
-msgid "Telex"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
-msgid "TTY/TDD"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
-msgid "Contact Quick-Add"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
-msgid "Edit Full"
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
-msgid "Full Name"
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
-msgid "E-mail"
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Post Code:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+msgid "Unnamed Contact"
+msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: 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"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: 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-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+msgid "Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+msgid "Car"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+msgid "Company"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
+msgid "Other"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
+msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+msgid "Edit Full"
 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:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
 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"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
 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"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
 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/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
 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/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
 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"
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1097,157 +1218,238 @@ msgstr ""
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+msgid "Done."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1285,7 +1487,7 @@ msgid "Dimensions:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+msgid "F_ont..."
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1345,7 +1547,6 @@ 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 ""
 
@@ -1426,140 +1627,317 @@ msgstr ""
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: 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_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Colours"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
+msgstr ""
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 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
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 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
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 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
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: 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
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. 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
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. 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
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1567,160 +1945,294 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 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
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 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
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: 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 "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 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/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: 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-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:306
+msgid "1 second"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+msgid "before start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:364
+msgid "after start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:374
+msgid "before end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:377
+msgid "after end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "_Options..."
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
@@ -1752,36 +2264,38 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
+msgid "Calendar Preferences"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr ""
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colours"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1789,1013 +2303,1099 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
+msgid "End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+msgid "First day of week:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
+msgid "Fri"
 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"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
-msgid "Friday"
+msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 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:"
+msgid "Remind me of all appointments"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
+msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
-msgid "Monday"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+msgid "Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Pick a colour"
+msgid "Start of day:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
+msgid "Sun"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
+msgid "Tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
-msgid "Saturday"
+msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+msgid "Time"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
+msgid "Time zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
-msgid "Sunday"
+msgid "Tue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
+msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
-msgid "Thursday"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
-msgid "Tuesday"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
-msgid "Wednesday"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
 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"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Appointment - %s"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Task - %s"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "Journal entry - %s"
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+msgid "Delegated"
 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:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
 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:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/dialogs/meeting-page.c:1442
+msgid "_Delegate To..."
 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"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 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"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 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/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
-msgid "Date:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
-msgid "Server Message:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation:"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "40%"
 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:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-calendar-table.c:861
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.c:863
+msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-calendar-table.c:868
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-msgid "Send an email"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#. 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3306
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
-msgid "on the"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+msgid "The message is not understandable."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d seconds"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-msgid " before start of appointment"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1605
-msgid " after start of appointment"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1613
-msgid " before end of appointment"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1615
-msgid " after end of appointment"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 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"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 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/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
 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/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: 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/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
 
-#: 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/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr ""
 
-#: 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/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+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-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:700
+#. 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:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2821,236 +3421,251 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
+msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
+msgid "_Go To Today"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: 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
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+msgid "Print Item"
+msgstr ""
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3086,82 +3701,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, 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
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3193,14 +3828,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, c-format
+msgid "Could not lock '%s'"
+msgstr ""
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3215,113 +3869,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 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
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 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
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3340,37 +3989,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: 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
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3467,78 +4116,147 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 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
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. 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"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+msgid "Failed to decode message."
+msgstr ""
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
 
 #: camel/camel-url.c:289
@@ -3546,65 +4264,87 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
-#, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Synchronising \"%s\""
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+msgid "Scanning for changed messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+msgid "Scanning for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3612,7 +4352,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr ""
 
@@ -3644,28 +4384,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3673,116 +4413,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, 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"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: 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
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3790,14 +4539,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: 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:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3805,28 +4554,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: 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:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3836,20 +4598,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3888,83 +4655,100 @@ msgstr ""
 
 #. 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
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -3974,39 +4758,97 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4019,24 +4861,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4045,21 +4887,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4077,7 +4929,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4105,53 +4957,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr ""
 
@@ -4203,7 +5060,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4211,122 +5068,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4334,318 +5191,356 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr ""
 
-#: 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:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
+#: composer/e-msg-composer.c:1047
+#, c-format
+msgid "Error accessing file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, c-format
 msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:908
-msgid "Open file"
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1076
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 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
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
@@ -4663,310 +5558,133 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 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"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 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"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 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"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 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"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 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
+#: e-util/e-time-utils.c:303
 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
+#: e-util/e-time-utils.c:312
 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
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 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:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4974,28 +5692,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5004,11 +5730,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr ""
 
@@ -5018,27 +5744,27 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5050,26 +5776,45 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5110,370 +5855,488 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
+msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
-msgid "Date received"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "Date sent"
+#: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Deleted"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Exist"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Important"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Is Not"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Is"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message was received"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Message was sent"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Move to Folder"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Read"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "Recipients"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Regex Match"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Replied to"
+msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
-msgid "Score"
+#: filter/libfilter-i18n.h:28
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Sender"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Set Status"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Source Account"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Specific header"
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Stop Processing"
+msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
-msgid "Subject"
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "contains"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "does not contain"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "does not end with"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not start with"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "ends with"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "exists"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "is greater than"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "is less than"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "is"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "on or after"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "sounds like"
+msgid "was after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "starts with"
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: filter/rule-editor.c:147
+msgid "Rules"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr ""
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
 msgstr ""
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr ""
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+msgid "Settings"
+msgstr ""
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: 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/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr ""
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Properties..."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 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:609 ui/evolution-mail.xml.h:1
-msgid "Apply Filters"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:735
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:736
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1313
+msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+#: mail/folder-browser.c:1318
+msgid "Apply Filters"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1322
+msgid "Create Ru_le From Message"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1482
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1483
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Factory for the Evolution mail component."
+msgid "Factory to import mbox into Evolution"
 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/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5506,38 +6369,62 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr ""
+
+#: mail/mail-account-gui.c:971
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 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?"
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -5560,11 +6447,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5572,99 +6459,155 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 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?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1463
+msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr ""
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"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-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-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:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5678,34 +6621,63 @@ msgid " color"
 msgstr "Colours"
 
 #: mail/mail-config.glade.h:3
-msgid "Account"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Management"
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5715,418 +6687,551 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr ""
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+msgid "Mark messages as Read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+msgid "NNTP Server:"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "Source Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"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."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: 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."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
 msgstr ""
 
-#: 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."
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 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."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:299
-msgid "View Inline"
+#: mail/mail-display.c:399
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:403
+msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1406
+msgid "Copy Link Location"
+msgstr ""
+
+#: mail/mail-display.c:1408
+msgid "Save Link as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:1410
+msgid "Save Image as..."
+msgstr ""
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "View Inline (via %s)"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-display.c:361
-msgid "Hide"
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
 msgstr ""
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-display.c:1104
-msgid "Save as (FIXME)"
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-display.c:1106
-msgid "Copy location (FIXME)"
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
-msgid "Loading message content"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr ""
+
+#: mail/mail-format.c:842
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr ""
+
+#: mail/mail-format.c:867
+msgid "Reply-To"
+msgstr ""
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr ""
+
+#: mail/mail-format.c:873
+msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
 #, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1802
-msgid "Malformed external-body part."
+#: mail/mail-format.c:2102
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
+#: mail/mail-format.c:2107
+msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr ""
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, 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:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, c-format
+msgid "Reconfigure %s"
+msgstr ""
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr ""
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
@@ -6140,275 +7245,269 @@ msgstr ""
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr ""
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
-msgstr ""
-
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1722
 #, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, c-format
+msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-send-recv.c:233
-msgid "Send & Receive mail"
+#: mail/mail-search.c:235
+msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
-msgid "Receiving"
+#: mail/mail-search.c:239
+msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-search.c:284
+msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-send-recv.c:306
-msgid "Sending"
+#: mail/mail-search.c:315
+msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-send-recv.c:471
-msgid "Cancelled."
+#: mail/mail-search.c:332
+msgid "Find:"
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-search.c:335
+msgid "Matches:"
 msgstr ""
 
-#: mail/mail-tools.c:141
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
+#: mail/mail-send-recv.c:250
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
+#: mail/mail-send-recv.c:253
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+#: mail/mail-send-recv.c:323
+msgid "Sending"
 msgstr ""
 
-#: mail/mail-vfolder.c:249
-msgid "VFolders"
+#: mail/mail-send-recv.c:488
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-vfolder.c:427
-msgid "New VFolder"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
+#: mail/mail-tools.c:173
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
+#: mail/mail-tools.c:241
+#, c-format
+msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
+#: mail/mail-tools.c:245
+msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
+#: mail/mail-tools.c:469
+msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
+#: mail/mail-vfolder.c:270
+msgid "VFolders"
 msgstr ""
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
+#: mail/mail-vfolder.c:463
+msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
-msgid "From"
+#: mail/message-list.c:2290
+msgid "Updating message list"
 msgstr ""
 
-#: mail/message-list.c:1053
-msgid "Date"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr ""
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr ""
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr ""
 
@@ -6436,153 +7535,1404 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
+#: my-evolution/e-summary-calendar.c:177
+msgid "No appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#: 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."
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-mail.c:104
+msgid "Mail summary"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-preferences.c:1408
+msgid "My Evolution Settings"
 msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/e-summary-tasks.c:206
+msgid "No tasks"
 msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
+#: my-evolution/e-summary-weather.c:643
+msgid "Regions"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Could not initialise Bonobo"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
 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."
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+msgid "Snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Partial mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+msgid "Sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+msgid "Haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "All folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Display folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "Five days"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "One day"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One month"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Show all tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "Tasks "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+msgid "Local Folders"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6590,14 +8940,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6605,7 +8955,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6613,482 +8972,819 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+msgid "Move folder"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:354
+#, c-format
+msgid "Delete folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+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/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr ""
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr ""
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr ""
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 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:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+msgid "Create a new shortcut"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, 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:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+msgid "Rename Shortcut Group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+msgid "Re_name this Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:336
+msgid "Rename this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
+#: shell/e-shortcuts-view.c:461
+msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: 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"
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
 
-#: shell/main.c:83
+#: 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/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, 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"
 "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"
+"places where features are either missing or only half working. \n"
 "\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"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:10
+msgid "New contact"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+msgid "New list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
-msgid "Stop"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "Stop Loading"
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14
-msgid "View All"
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:17
+msgid "Print selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:21
+msgid "Stop Loading"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: 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"
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
+msgid "Create a new appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to a specific date"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to present time"
+msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-msgid "Month"
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
+#: ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
+msgid "Print calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-msgid "Prev"
+msgid "Print this Calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:22
-msgid "Previews the calendar to be printed"
+msgid "Publish Free/Busy Information"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
-msgid "Print calendar"
+msgid "Show 1 month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:29
+msgid "_Appointment..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "Show 1 week"
+msgid "_Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
+msgid "_Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "W_ork Week"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Colours"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Day"
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
-msgid "_Month"
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
 msgstr ""
 
-#: 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"
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:2
@@ -7096,6 +9792,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr ""
 
@@ -7107,27 +9804,12 @@ msgstr ""
 msgid "Print En_velope..."
 msgstr ""
 
-#: 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
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 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 ""
@@ -7144,1221 +9826,1373 @@ msgstr ""
 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"
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+msgid "_Save"
 msgstr ""
 
-#: 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"
+#: ui/evolution-contact-list-editor.xml.h:2
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Send _message to list..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Compose"
+msgstr "Colours"
+
+#: ui/evolution-mail-global.xml.h:4
+msgid "Compose _New Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
 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"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
 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"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
 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"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
 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"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 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..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 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-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
 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"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
 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"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
+#: ui/evolution-mail-message.xml.h:2
+msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-#, fuzzy
-msgid "Compose"
-msgstr "Colours"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:22
+msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
-msgid "Forward As"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:30
-msgid "Full _Headers"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
-msgid "Hide Deleted Messages"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:32
-msgid "Hide S_elected Messages"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide _Deleted Messages"
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Read messages"
+#: ui/evolution-mail-message.xml.h:33
+msgid "Forward _Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 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"
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
-msgid "Move"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:50
+msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Next Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
+#: ui/evolution-mail-message.xml.h:53
+msgid "Next Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
+#: ui/evolution-mail-message.xml.h:55
+msgid "Next Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to all"
+#: ui/evolution-mail-message.xml.h:56
+msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:64
-msgid "Reply to sender"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:67
-msgid "Save the message into a new file"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Previous Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:70
-msgid "Select _Thread"
+#: ui/evolution-mail-message.xml.h:61
+msgid "Previous Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:71
-msgid "Send / Receive"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Print Message..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:65
+msgid "Print Preview..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:66
+msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Show _All"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid "Un-delete the selected messages"
+#: ui/evolution-mail-message.xml.h:72
+msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on _Subject"
+#: ui/evolution-mail-message.xml.h:75
+msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:86
-msgid "Virtual Folder _Editor..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:87
-msgid "_Apply Filters"
+#: ui/evolution-mail-message.xml.h:78
+msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
-msgid "_Attachment"
+#: ui/evolution-mail-message.xml.h:79
+msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:89
-msgid "_Copy to Folder..."
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Create Filter From Message"
+#: ui/evolution-mail-message.xml.h:81
+msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
+#: ui/evolution-mail-message.xml.h:82
+msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:93
-msgid "_Filters..."
+#: ui/evolution-mail-message.xml.h:83
+msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
+#: ui/evolution-mail-message.xml.h:85
+msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
+#: ui/evolution-mail-message.xml.h:88
+msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:98
-msgid "_Mail Message"
+#: ui/evolution-mail-message.xml.h:89
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Mail Settings..."
+#: ui/evolution-mail-message.xml.h:90
+msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Move to Folder..."
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Open Selected Items"
+#: ui/evolution-mail-message.xml.h:92
+msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Quoted"
+#: ui/evolution-mail-message.xml.h:93
+msgid "_Re-send Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Reply"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Resend Messages"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Save Message As..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Send / Receive"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
 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
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
+msgid "Delete all but signature"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
+msgid "Encrypt this message with PGP"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
+msgid "F_ormat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
+msgid "Insert a file as text into the message"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:12
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Open a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
+msgid "S/MIME Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
+msgid "Save _Draft"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:23
-msgid "Send"
+msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
+msgid "Save the current file with a different name"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
+msgid "Save the message in a specified folder"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
+msgid "Send"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
+msgid "Send _Later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
+msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
+msgid "Send the mail in HTML format"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
+msgid "Send the message later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
+msgid "Send this message now"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
+msgid "Show / hide attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the BCC field is displayed"
+msgid "Show _attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the CC field is displayed"
+msgid "Show attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the From chooser is displayed"
+msgid "Sign this message with your PGP key"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
-msgid "_Bcc Field"
+msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:40
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:42
+msgid "_Attachment..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr ""
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 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)"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 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)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:8
+msgid "New Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
+#: ui/evolution-tasks.xml.h:9
+msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
+#: ui/evolution-tasks.xml.h:13
+msgid "Tasks Settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:19
+msgid "_Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-msgid "New Task"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Synchronising \"%s\""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
+#: ui/evolution.xml.h:7
+msgid "Create _New Folder..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
-msgid "_Task"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#: ui/evolution.xml.h:9
+msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
+#: ui/evolution.xml.h:13
+msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:15
+msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
+#: ui/evolution.xml.h:17
+msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:8
-msgid "E_xit"
+#: ui/evolution.xml.h:18
+msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+#: ui/evolution.xml.h:19
+msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-msgid "Exit the program"
+#: ui/evolution.xml.h:20
+msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "Getting _Started"
+#: ui/evolution.xml.h:22
+msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:12
-msgid "Import an external file format"
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:44
+msgid "_Copy..."
+msgstr ""
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+msgid "_Move..."
+msgstr ""
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr ""
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+msgid "_Rename..."
+msgstr ""
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr ""
+
+#: views/addressbook/galview.xml.h:1
+msgid "Address 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 ""
+
+#: 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 ""
+
 #. 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:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
-msgid "Now"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
-msgid "Message"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:148
-msgid "Sear_ch"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Organisation"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
 msgstr ""
 
-#: views/mail/galview.xml.h:2
-msgid "By Status"
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
 msgstr ""
 
-#: views/mail/galview.xml.h:4
-msgid "Messages"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
 msgstr ""
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:157
+msgid "Search Editor"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:173
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:241
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: 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:155
+msgid "Sear_ch"
 msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
@@ -8384,13 +11218,36 @@ msgstr "Could not initialise Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
+#~ msgid "Colors"
+#~ msgstr "Colours"
+
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Could not initialise Bonobo"
+#~ msgid "Organizer: "
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Cannot initialise Evolution's mail component."
 
 #~ msgid "Synchronize"
 #~ msgstr "Synchronise"
@@ -8434,8 +11291,5 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synchronise \"%s\""
 
-#~ msgid "Colors for display"
-#~ msgstr "Colours for display"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Cannot initialise Evolution's mail storage hash."