Removed addressbook/gui/widgets/test-minicard-view.c,

001-01-17 Dave Camp <dave@ximian.com> * POTFILES.in: Removed addressbook/gui/widgets/test-minicard-view.c, camel/providers/local/camel-mbox-provider.c, notes/component-factory.c, notes/main.c, and calendar/gui/gnome-month-item.c, and calendar/gui/alarm-notify.c. svn path=/trunk/; revision=7611
author: Dave Camp <dave@ximian.com> 2001-01-18 13:11:02 +0800
committer: Dave Camp <campd@src.gnome.org> 2001-01-18 13:11:02 +0800
commit: c90d8e6799b27b7964db9f3d4874557db8d313ac (patch)
tree: 3381f029d4507fa8ba260aa55c7388cef5992271 /po/en_GB.po
parent: 809a9d80148789de20f4d00ec49dce7ead5a3399 (diff)
download: gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.gz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.bz2
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.lz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.xz
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.zst
gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.zip
1 files changed, 1065 insertions, 2957 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 88da06ada7..7be1b22d4d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -14,197 +14,363 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
+#: addressbook/backend/ebook/test-client-list.c:18
+#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/conduit/address-conduit.c:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, c-format
+msgid "No such message: %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Colours"
+
+#: executive-summary/component/e-summary-url.c:68
+#, c-format
+msgid "Move %s to the left"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:933
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr ""
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr ""
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -220,29 +386,18 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -358,40 +513,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr ""
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -401,7 +548,7 @@ msgid "_Add"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr ""
 
@@ -414,14 +561,7 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -479,7 +619,6 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -496,8 +635,6 @@ msgid "_Address..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr ""
 
@@ -542,24 +679,27 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -568,6 +708,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr ""
 
@@ -577,28 +718,33 @@ msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr ""
 
@@ -607,10 +753,12 @@ msgid "Other Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr ""
 
@@ -627,62 +775,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Post Code:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -745,12 +847,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -775,27 +872,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -820,9 +917,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr ""
 
@@ -855,12 +952,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr ""
 
@@ -877,12 +972,10 @@ msgid "Search Scope:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr ""
 
@@ -905,190 +998,80 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from:"
-msgstr ""
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisation"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1097,179 +1080,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1278,13 +1088,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1296,71 +1106,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-msgid "Calendar Server"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr ""
 
@@ -1370,25 +1126,25 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1396,60 +1152,57 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1458,7 +1211,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1466,851 +1219,412 @@ msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:224
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
-msgid "Loading Calendar"
-msgstr ""
-
-#: calendar/gui/control-factory.c:125
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
-msgid "No summary available."
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Colours"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
+#: calendar/gui/calendar-summary.c:484
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
+#: calendar/gui/calendar-summary.c:489
+msgid "Show appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/calendar-summary.c:497
+msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/calendar-summary.c:583
+msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:158
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/e-calendar-table.c:163
+msgid "Summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 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"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
+#: calendar/gui/e-tasks.c:285
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:696
 #, c-format
-msgid "Could not create a calendar in `%s'"
+msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "April"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:15
-msgid "March"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:16
-msgid "May"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:18
-msgid "October"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
 msgstr ""
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
@@ -2503,10 +1817,14 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr ""
 
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2597,78 +1915,84 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2684,40 +2008,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2729,25 +2054,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2755,13 +2080,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2769,7 +2094,7 @@ msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2777,7 +2102,7 @@ msgid "For storing local mail in standard mbox format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3098,8 +2423,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3128,71 +2453,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr ""
 
@@ -3240,130 +2564,123 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3406,12 +2723,11 @@ msgid "attachment"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr ""
 
@@ -3427,66 +2743,50 @@ msgstr ""
 msgid "Attach a file to the message"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr ""
 
@@ -3497,91 +2797,87 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
@@ -3706,7 +3002,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3803,185 +3099,166 @@ msgstr ""
 msgid "Read"
 msgstr ""
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr ""
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Assign Score"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "before"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Forward to Address"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
@@ -4000,10 +3277,6 @@ msgstr ""
 msgid "Edit Score Rule"
 msgstr ""
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr ""
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr ""
@@ -4012,204 +3285,160 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
+#: mail/folder-browser.c:658
+msgid "Open"
 msgstr ""
 
-#: mail/folder-browser.c:657
-msgid "Hide selected"
+#: mail/folder-browser.c:659
+msgid "Edit"
 msgstr ""
 
-#. could use another mask, but not enough api do to it
 #: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr ""
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
-msgid "Open"
-msgstr ""
-
-#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr ""
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr ""
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr ""
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr ""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-msgid "Current store format:"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
 msgstr ""
 
-#: mail/local-config.glade.h:7
-msgid "Mailbox Format"
+#: mail/mail-accounts.c:115
+msgid " (default)"
 msgstr ""
 
-#: mail/local-config.glade.h:8
-msgid "New store format:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:12
-msgid "mh"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+msgid "Evolution Account Editor"
 msgstr ""
 
 #: mail/mail-autofilter.c:71
@@ -4232,7 +3461,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4240,504 +3469,108 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Account Properties"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Default"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:26
-msgid "Delete mail from server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Done"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:28
-msgid "E-Mail Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Email Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Full Name:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Hostname:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:41
-msgid "Mail Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-msgid "News"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Optional"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:57
-msgid "Reply-to:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Save password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Select signature file"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:62
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Server Type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-msgid "Servers"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Signature:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-msgid "User Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-msgid "minute(s)"
-msgstr ""
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organisation, and the name of a file to "
-"read your signature from."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr ""
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr ""
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr ""
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr ""
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr ""
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr ""
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr ""
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr ""
-
-#: mail/mail-config-gui.c:1135
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr ""
-
-#: mail/mail-config-gui.c:1159
-msgid ""
-"Select the kind of news server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr ""
-
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr ""
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr ""
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr ""
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr ""
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr ""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr ""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr ""
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Querying authorisation capabilities of \"%s\""
-
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Query authorisation at \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr ""
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr ""
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr ""
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
 #: mail/mail-display.c:98
@@ -4774,65 +3607,65 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4888,7 +3721,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -4913,156 +3746,156 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr ""
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5073,7 +3906,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5175,111 +4008,182 @@ msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+msgid "Attachment"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "From"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "Date"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "Received"
+msgstr ""
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr ""
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr ""
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr ""
+
+#: mail/subscribe-dialog.c:63
+msgid "Store"
+msgstr ""
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5370,30 +4274,30 @@ msgstr ""
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 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:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr ""
 
@@ -5401,13 +4305,18 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
 #, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s"
+msgstr ""
+
+#: shell/e-shell-view.c:1100
+#, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr ""
 
 #: shell/e-shell.c:372
@@ -5415,73 +4324,81 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5489,12 +4406,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr ""
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr ""
 
@@ -5586,1107 +4502,256 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
+#: ui/evolution-contact-editor.xml:31
 msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-contact-editor.xml:35
 msgid "FIXME: Save Attac_hments..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:56
+#: ui/evolution-contact-editor.xml:38
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-contact-editor.xml:63
+msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
+#: ui/evolution-contact-editor.xml:93
+msgid "FIXME: __Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:77
+#: ui/evolution-contact-editor.xml:101
 msgid "Pre_vious"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
-
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:122
+#: ui/evolution-contact-editor.xml:104
 msgid "_Toolbars"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
 msgstr ""
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
+#: ui/evolution-contact-editor.xml:146
+msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
 msgstr ""
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
 msgstr ""
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
 msgstr ""
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
@@ -6783,7 +4848,7 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:111
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
@@ -6791,6 +4856,10 @@ msgstr ""
 msgid "Now"
 msgstr ""
 
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr ""
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
 #: widgets/misc/e-dateedit.c:1486
@@ -6803,11 +4872,50 @@ msgstr ""
 msgid "%I:%M %p"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr ""
 
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Post Code:"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Cannot initialise Evolution's mail summary component."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#~ msgid "Colors"
+#~ msgstr "Colours"
+
+#~ msgid "Pick a color"
+#~ msgstr "Pick a colour"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisation:"
+
+#~ msgid ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
+#~ msgstr ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organisation, and the name of a file to "
+#~ "read your signature from."
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Querying authorisation capabilities of \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Query authorisation at \"%s\""
+
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synchronise \"%s\""
author	Dave Camp <dave@ximian.com>	2001-01-18 13:11:02 +0800
committer	Dave Camp <campd@src.gnome.org>	2001-01-18 13:11:02 +0800
commit	c90d8e6799b27b7964db9f3d4874557db8d313ac (patch)
tree	3381f029d4507fa8ba260aa55c7388cef5992271 /po/en_GB.po
parent	809a9d80148789de20f4d00ec49dce7ead5a3399 (diff)
download	gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.gz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.bz2 gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.lz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.xz gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.tar.zst gsoc2013-evolution-c90d8e6799b27b7964db9f3d4874557db8d313ac.zip