Sync for 0.13.

svn path=/trunk/; revision=12408
author: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
commit: df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree: badb87b38dc4b74df00899b45d774054672cc19a /po/en_GB.po
parent: d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download: gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip
1 files changed, 3537 insertions, 1992 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 7ddc719700..2156265d31 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -21,197 +22,197 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -227,13 +228,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -252,8 +253,8 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -268,20 +269,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: calendar/conduits/calendar/calendar-conduit.c:778
 #: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:655
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -331,200 +332,191 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New _Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
-msgid "Password"
+#: addressbook/gui/component/addressbook-component.c:387
+msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
+#: addressbook/gui/component/addressbook-component.c:387
+msgid "New Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
 msgstr ""
 
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
-msgid "Remember this password"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Search s_cope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Server Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
+"This name will be used to identify your account. It is for display purposes "
+"only."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:21
+msgid "_Account name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:36
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_My server requires authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
+#: addressbook/gui/component/addressbook-config.glade.h:26
+msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
+#: addressbook/gui/component/addressbook-storage.c:138
+msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:108
-msgid "_Add"
+#: addressbook/gui/component/addressbook.c:386
+#, c-format
+msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
-msgid "_Edit"
+#: addressbook/gui/component/addressbook.c:394
+msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:118
-msgid "Other Contacts"
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/component/addressbook.c:418
+msgid "Password:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -532,47 +524,70 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
+msgid "Category is"
+msgstr ""
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr ""
+
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1537
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1538
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr ""
 
@@ -594,19 +609,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -627,13 +642,10 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:630
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:481
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr ""
 
@@ -645,33 +657,48 @@ msgstr ""
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
+msgid "C_ontaining:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
+msgid "Co_ntacts:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
+msgid "F_ind"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
+msgid "Select Names"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "_Category:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "_Message Recipients:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -687,8 +714,8 @@ msgid "Business _Fax"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -697,16 +724,15 @@ msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+msgid "File A_s:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
@@ -731,239 +757,1170 @@ msgstr ""
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "_Address..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "_Address..."
+msgid "_Assistant's name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "_Assistant's name:"
+msgid "_Birthday:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "_Birthday:"
+msgid "_Business"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Business"
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+msgid "_Delete"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
-msgid "_Delete"
+msgid "_Department:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Department:"
+msgid "_Full Name..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "_Full Name..."
+msgid "_Home"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Home"
+msgid "_Job title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Job title:"
+msgid "_Manager's Name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Manager's Name:"
+msgid "_Mobile"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Mobile"
+msgid "_Nickname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Nickname:"
+msgid "_Office:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Office:"
+msgid "_Profession:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Profession:"
+msgid "_Spouse:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Spouse:"
+msgid "_This is the mailing address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_This is the mailing address"
+msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+msgid "Afghanistan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+msgid "Albania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+msgid "Algeria"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+msgid "American Samoa"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+msgid "Andorra"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+msgid "Angola"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
+msgid "Anguilla"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+msgid "Antarctica"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+msgid "Antigua And Barbuda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Organisation"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+msgid "Austria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+msgid "Belarus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+msgid "Belize"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+msgid "Canada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+msgid "Chad"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+msgid "China"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Colours"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+msgid "Congo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
+msgid "Finland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+msgid "France"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+msgid "Greece"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+msgid "Greenland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+msgid "Grenada"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+msgid "Guam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+msgid "Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+msgid "Haiti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+msgid "Honduras"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+msgid "Hungary"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+msgid "Laos"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+msgid "Lesotho"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+msgid "Macau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+msgid "Malawi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+msgid "Mali"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+msgid "Malta"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+msgid "Mauritius"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+msgid "Mayotte"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+msgid "Monaco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+msgid "Mozambique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+msgid "Nepal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+msgid "Netherlands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+msgid "New Caledonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+msgid "Niger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+msgid "Nigeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+msgid "Niue"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+msgid "Norway"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+msgid "Pakistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+msgid "Panama"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+msgid "Peru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+msgid "Poland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+msgid "Portugal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+msgid "Qatar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+msgid "Reunion"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+msgid "Rwanda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+msgid "Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+msgid "Senegal"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+msgid "Somalia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+msgid "Spain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+msgid "Sudan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+msgid "Suriname"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+msgid "Swaziland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+msgid "Sweden"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+msgid "Tajikistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+msgid "Thailand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+msgid "Togo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+msgid "Tonga"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+msgid "Turkey"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+msgid "Uganda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+msgid "United States"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+msgid "Viet Nam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+msgid "Yemen"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+msgid "_City:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
@@ -1052,6 +2009,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr ""
 
@@ -1060,7 +2018,7 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr ""
 
@@ -1069,7 +2027,7 @@ msgid "Add Anyway"
 msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1088,25 +2046,30 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-msgid "_Change Anyway"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr ""
 
@@ -1218,42 +2181,50 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr ""
 
@@ -1268,7 +2239,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr ""
 
@@ -1276,7 +2248,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr ""
 
@@ -1293,7 +2265,11 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1317,131 +2293,131 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr ""
 
@@ -1631,6 +2607,20 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
+#: addressbook/printing/e-contact-print.c:1091
+msgid "Print cards"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+msgid "Print card"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+msgid "Print envelope"
+msgstr ""
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1788,7 +2778,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
@@ -1797,147 +2787,137 @@ msgstr "Could not initialise Bonobo"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
+#: calendar/gui/calendar-commands.c:435
+#, c-format
+msgid "%d"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%m/%d/%Y"
+
+#. 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/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:586
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1708
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
-msgid "Transparent"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1945,69 +2925,56 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
-#: calendar/gui/calendar-model.c:1291
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
-#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
-#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
-#: widgets/misc/e-dateedit.c:1471
-msgid "None"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr ""
 
@@ -2027,27 +2994,80 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56
+msgid "Folder containing to-do items"
+msgstr ""
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/component-factory.c:409
+msgid "New _Task"
+msgstr ""
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2095,109 +3115,115 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -2205,12 +3231,11 @@ msgstr ""
 msgid "_Options..."
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2227,7 +3252,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr ""
 
@@ -2244,194 +3269,197 @@ msgid "10 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
+msgid "15 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
+msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
+msgid "Calendar and Tasks Settings"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr ""
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
+msgid "Create new appointments with a default _reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "Color for tasks due today"
-msgstr "Colours for display"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors for Tasks"
-msgstr "Colours for display"
+msgid "Hours"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends in month view"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
+msgid "O_verdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
+msgid "Show appointment _end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
+msgid "Su_n"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
+msgid "Time"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time _zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
+msgid "Time di_visions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Show appointment end times in week and month views"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
+#: ui/evolution-calendar.xml.h:33
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Task List"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
+msgid "_End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Time"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Time zone:"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
+msgid "_Other"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
+msgid "_Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
+msgid "_Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
+msgid "before the start of the appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cancel-comp.c:52
@@ -2494,72 +3522,67 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2605,39 +3628,32 @@ msgstr ""
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr ""
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Addressbook..."
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+msgid "Delegate To:"
 msgstr ""
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr ""
 
@@ -2645,162 +3661,174 @@ msgstr ""
 msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Date & Time"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
-msgid "Pri_vate"
+msgid "Con_fidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Date & Time"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
-msgid "Su_mmary:"
+msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Pri_vate"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
+msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Su_mmary:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:13
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr ""
 
@@ -2837,19 +3865,18 @@ msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
@@ -2894,12 +3921,12 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
@@ -2911,25 +3938,29 @@ msgid "Exceptions"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
+msgid "_Custom recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -2971,157 +4002,154 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:16
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:21
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
-#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
-#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
-#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
-#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:3
@@ -3157,20 +4185,20 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Summary"
-msgstr ""
-
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
-msgid "Task sort"
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+msgid "Summary"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
+msgid "Task sort"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:18
@@ -3184,144 +4212,236 @@ 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3306
-msgid "New _Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618
+msgid "Meeting Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+msgid "Meeting Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
+msgid "Meeting Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:638
+msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:643
+msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:648
+msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
-msgid "The message is not understandable."
+#: calendar/gui/e-itip-control.c:666
+msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:676
+msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:691
+msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:696
+msgid "Bad Task Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:714
+msgid "Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+msgid "Update complete\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:969
+msgid "Removal Complete"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+msgid "Item sent!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3359,43 +4479,26 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
-#: calendar/gui/e-tasks.c:629
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:252
-msgid "Category:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 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 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:230
-msgid "%d %B"
-msgstr ""
-
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3421,42 +4524,42 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
+msgid "Go To Today"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "September"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
+msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3612,12 +4715,6 @@ msgstr ""
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
-#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr ""
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3651,9 +4748,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
@@ -3665,7 +4761,7 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3701,6 +4797,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
@@ -3759,6 +4951,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
@@ -3796,7 +4989,7 @@ msgstr ""
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3819,12 +5012,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3938,13 +5131,13 @@ msgid "No plaintext to sign."
 msgstr ""
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr ""
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
-#: camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -3962,15 +5155,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4004,7 +5197,7 @@ msgid "Connection cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4015,7 +5208,7 @@ msgstr ""
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:382
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
@@ -4132,42 +5325,68 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4180,12 +5399,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4229,7 +5448,7 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4237,7 +5456,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4278,60 +5497,60 @@ msgstr ""
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 msgid "Scanning for new messages"
 msgstr ""
 
@@ -4344,7 +5563,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
@@ -4352,7 +5571,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr ""
 
@@ -4390,7 +5609,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4401,7 +5620,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -4413,12 +5632,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4508,7 +5727,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4520,7 +5739,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4587,20 +5806,20 @@ msgstr ""
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4610,12 +5829,12 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4658,13 +5877,13 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
 #, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4674,25 +5893,22 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
-msgid "Cannot summarise folder: %s: %s"
+msgid "Cannot summarize folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing folder"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
-msgid "Could not open folder to summarise: %s: %s"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -4795,6 +6011,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -4883,37 +6110,37 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
-msgid "No message with uid %s"
+msgid "Could not fetch message: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:296
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
-msgid "Retrieving POP message %d"
+msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
-msgid "Could not fetch message: %s"
+msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
-msgid "Could not retrieve message from POP server %s: %s"
+msgid "Retrieving POP message %d"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:37
@@ -4929,7 +6156,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5008,7 +6235,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr ""
 
@@ -5060,7 +6287,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5068,122 +6295,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5191,125 +6418,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-msgid "SMTP Authentication"
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5339,7 +6566,7 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr ""
 
@@ -5372,52 +6599,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5442,95 +6669,95 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr ""
 
@@ -5557,55 +6784,93 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+msgid "Body contains"
+msgstr ""
+
+#: default_user/searches.xml.h:2
+msgid "Body does not contain"
+msgstr ""
+
+#: default_user/searches.xml.h:3
+msgid "Body or subject contains"
+msgstr ""
+
+#: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr ""
+
+#: default_user/searches.xml.h:5
+msgid "Recipients contain"
+msgstr ""
+
+#: default_user/searches.xml.h:6
+msgid "Sender contains"
+msgstr ""
+
+#: default_user/searches.xml.h:7
+msgid "Subject contains"
+msgstr ""
+
+#: default_user/searches.xml.h:8
+msgid "Subject does not contain"
+msgstr ""
+
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
-#: widgets/misc/e-dateedit.c:1512
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr ""
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5613,13 +6878,13 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5709,7 +6974,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr ""
 
@@ -5721,11 +6986,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -5744,20 +7013,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5776,62 +7045,51 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
-msgid "Add"
-msgstr ""
-
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
-msgid "Edit"
-msgstr ""
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr ""
 
@@ -5855,190 +7113,191 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
+#: filter/libfilter-i18n.h:5
+msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+#: filter/libfilter-i18n.h:6
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Date sent"
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not sound like"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "does not start with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Do Not Exist"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Draft"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "ends with"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "Message Header"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Read"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Regex Match"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
-msgid "Sender"
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Set Status"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Size (kB)"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "Source Account"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
@@ -6070,14 +7329,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
 
@@ -6101,11 +7359,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6164,163 +7422,178 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+msgid "Folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr ""
 
 #: mail/component-factory.c:757
+msgid "New Mail Message"
+msgstr ""
+
+#: mail/component-factory.c:757
+msgid "New _Mail Message"
+msgstr ""
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:893
-msgid "Store search as vFolder"
+#: mail/folder-browser.c:909
+msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:64
+msgid "Getting Folder Information"
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6379,52 +7652,56 @@ msgid "Evolution News Editor"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+msgid "Mail Settings"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -6471,17 +7748,17 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6489,195 +7766,222 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:653
-#, c-format
-msgid "On %s, %s wrote:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+msgid "Do not ask me again."
+msgstr ""
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
-msgid "Connecting to server..."
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, c-format
+msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " Check for supported types "
+#: mail/mail-config.c:1809
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6687,282 +7991,341 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
+#: mail/mail-config.glade.h:31
+msgid "Each account must have a different name."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
+#: mail/mail-config.glade.h:35
+msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config.glade.h:54
-msgid "Mark messages as Read after"
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:57
+msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
-msgid "Prompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:58
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:68
+msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
+#: mail/mail-config.glade.h:69
+msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
+#: mail/mail-config.glade.h:86
+msgid "Use secure connection (_SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:87
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:91
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:92
+msgid "_Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+msgid "_Check for supported types"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+msgid "_Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "_Full Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
+msgid "_HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:100
+msgid "_Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+msgid "_Host:"
+msgstr ""
+
+#: mail/mail-config.glade.h:102
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
 #: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+msgid "_Log filter actions to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Username:"
+msgid "_Mark messages as Read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
+msgid "_Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:108
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "_Path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+msgid "_Remember this password"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "newswindow1"
+msgid "_Send mail in HTML format by default."
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-msgid "placeholder"
+msgid "_Signature file:"
 msgstr ""
 
 #: mail/mail-config.glade.h:114
+msgid "_Username:"
+msgstr ""
+
+#: mail/mail-config.glade.h:116
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:117
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr ""
 
@@ -7002,194 +8365,205 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, c-format
+msgid "%d selected"
+msgstr ""
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-local.c:460
 #, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr ""
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr ""
@@ -7208,200 +8582,220 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:227
+msgid "Fetching Mail"
+msgstr ""
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synchronise \"%s\""
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr ""
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr ""
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr ""
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr ""
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7419,80 +8813,85 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+msgid "(No subject)"
+msgstr ""
+
+#: mail/message-browser.c:127
+#, c-format
+msgid "%s - Message"
+msgstr ""
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2290
-msgid "Updating message list"
+#: mail/message-list.c:2312
+msgid "Generating message list"
 msgstr ""
 
 #: mail/message-list.etspec.h:2
@@ -7507,38 +8906,72 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr ""
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr ""
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
+#: mail/subscribe-dialog.c:174
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr ""
+
+#: mail/subscribe-dialog.c:1490
+msgid "No server has been selected"
+msgstr ""
+
+#: mail/subscribe-dialog.c:1547
+msgid "Please select a server."
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Synchronising \"%s\""
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Display options"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:8
+msgid "_Unsubscribe"
+msgstr ""
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -7549,49 +8982,66 @@ msgstr "Cannot initialise Evolution's mail summary component."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
-msgid "My Evolution Settings"
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1421
+msgid "Summary Settings"
 msgstr ""
 
 #: my-evolution/e-summary-rdf.c:281
@@ -7602,7 +9052,11 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr ""
 
@@ -7610,24 +9064,28 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr ""
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
+msgid "Print Summary"
 msgstr ""
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr ""
 
 #: my-evolution/main.c:52
@@ -7635,6 +9093,38 @@ msgstr ""
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
 
+#: my-evolution/metar.c:29
+msgid "�F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "�C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr ""
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -8786,107 +10276,121 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
+msgid " _Remove"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
+msgid "Add n_ew feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+msgid "Al_l stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr ""
+#, fuzzy
+msgid "All _folders:"
+msgstr "Synchronising \"%s\""
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
+msgid "News Feed Settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
+msgid "One mont_h"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
+msgid "Show _all tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
+msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
+msgid "Units: "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Synchronising \"%s\""
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
+msgid "_Display stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
+msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
+msgid "_Mail"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
+msgid "_News Feeds"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
+msgid "_One day"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
+msgid "_Refresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
+msgid "_Schedule"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+msgid "_Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "_Weather"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -8902,7 +10406,15 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr ""
 
@@ -8947,7 +10459,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8955,7 +10467,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8964,7 +10476,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8972,52 +10484,72 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr ""
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr ""
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9029,7 +10561,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -9039,11 +10571,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr ""
 
@@ -9073,7 +10605,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9116,7 +10648,7 @@ msgstr ""
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr ""
 
@@ -9124,284 +10656,309 @@ msgstr ""
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Cannot initialise Evolution's mail storage hash."
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 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:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr ""
 
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
-#, fuzzy
-msgid "My Evolution"
-msgstr "Cannot initialise the Evolution shell."
-
-#: shell/e-shell-view.c:1411
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:1644
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1646
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:479
-msgid "Rename"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:479
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts.c:984
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-shortcuts.c:987
-msgid "Contacts"
-msgstr ""
-
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr ""
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9421,10 +10978,6 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr ""
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr ""
@@ -9438,17 +10991,25 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
+msgstr ""
+
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+msgid "Select a File (step 1 of 2)"
 msgstr ""
 
 #: shell/importer/import.glade.h:6
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -9465,10 +11026,10 @@ msgid "Don't ask me again"
 msgstr ""
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9485,31 +11046,36 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr ""
 
@@ -9525,11 +11091,11 @@ msgstr ""
 msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr ""
 
@@ -9537,73 +11103,109 @@ msgstr ""
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send a mess to the selected contacts."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:26
+msgid "Send selected contacts to another person."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "_Contact Group"
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact List"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+msgid "_Forward Contact..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr ""
 
@@ -9612,107 +11214,115 @@ msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
+msgid "Create a New _Task"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
-msgid "Go To"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+msgid "Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
+msgid "Delete the appointment"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+msgid "Go To"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
+msgid "Go back"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
+msgid "Go forward"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
+#: ui/evolution-calendar.xml.h:19
+msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
+#: ui/evolution-calendar.xml.h:21
+msgid "New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Publish Free/Busy information for this calendar"
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+msgid "Print this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:27
-msgid "Show the working week"
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
+msgid "Show one day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:29
-msgid "_Appointment..."
+msgid "Show one month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:30
-msgid "_Calendar Settings..."
+msgid "Show one week"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "_Day"
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
+#: ui/evolution-calendar.xml.h:35
+msgid "_Appointment..."
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36
+msgid "_Calendar Settings..."
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:41
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
+#: ui/evolution-calendar.xml.h:42
+msgid "_Task..."
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
@@ -9725,15 +11335,16 @@ msgid "Close"
 msgstr "Colours"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr ""
+#, fuzzy
+msgid "Close this item"
+msgstr "Colours"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -9741,111 +11352,80 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-msgid "Save and Close"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
-msgid "Save this item to disk"
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:19
-msgid "_Action"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:6
-msgid "Save the list and close the dialog box"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
 msgstr ""
 
 #: ui/evolution-contact-list-editor.xml.h:7
-msgid "Se_nd list to other..."
+msgid "Save the list and close the dialog box"
 msgstr ""
 
 #: ui/evolution-contact-list-editor.xml.h:8
+msgid "Se_nd list to other..."
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr ""
 
@@ -9853,19 +11433,19 @@ msgstr ""
 msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -9877,15 +11457,10 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
-msgid "_Actions"
-msgstr ""
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr ""
@@ -9899,67 +11474,62 @@ msgid "Cancel the current mail operation"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:3
-#, fuzzy
-msgid "Compose"
-msgstr "Colours"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-global.xml.h:10
+msgid "New Message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
@@ -9983,88 +11553,96 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:24
+msgid "_Subscribe to Folders..."
+msgstr ""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+msgid "Cu_t"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr ""
 
@@ -10072,7 +11650,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr ""
 
@@ -10080,11 +11658,11 @@ msgstr ""
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr ""
 
@@ -10297,7 +11875,7 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10316,36 +11894,32 @@ msgstr ""
 msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
+msgid "Print this message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:66
-msgid "Print this message"
+msgid "Reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:67
-msgid "Reply"
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
-msgid "Reply to All"
+#: ui/evolution-mail-message.xml.h:70
+msgid "S_earch Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "S_earch Message"
+msgid "Save the message as a text file"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
-msgid "Save the message as a text file"
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:73
-msgid "Search for text in the body of the displayed message"
+msgid "Setup the page settings for your current printer"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:74
@@ -10388,68 +11962,52 @@ msgstr ""
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr ""
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-msgid "Customi_ze Toolbars..."
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr ""
 
@@ -10513,11 +12071,6 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr ""
@@ -10645,7 +12198,7 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr ""
 
@@ -10678,14 +12231,26 @@ msgid "Unsubscribe"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
-msgid "Cancel Task"
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
+msgid "Cancel Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
 msgstr ""
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -10693,39 +12258,27 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr ""
-
 #: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Copy selected task"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
+msgid "Cut selected task"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:9
-msgid "Paste task from the clipboard"
+msgid "Delete selected tasks"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
+msgid "Paste task from the clipboard"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr ""
 
@@ -10758,172 +12311,148 @@ msgstr ""
 msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr ""
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
-msgstr ""
-
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr ""
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
+#: ui/evolution.xml.h:42
+msgid "_Import File..."
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr ""
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr ""
+
+#: ui/my-evolution.xml.h:5
+msgid "Reload"
+msgstr ""
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
@@ -10958,6 +12487,25 @@ msgstr ""
 msgid "With Category"
 msgstr ""
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -10965,10 +12513,6 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr ""
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
@@ -11041,7 +12585,7 @@ msgstr ""
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11051,19 +12595,20 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
-msgid "Now"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
-msgid "Today"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -11146,34 +12691,31 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
 msgstr ""
 
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Colours"
+
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr ""
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr ""
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr ""
@@ -11191,10 +12733,14 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:460
+msgid "Find Now"
+msgstr ""
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -11218,7 +12764,16 @@ msgstr "Could not initialise Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#~ msgid "Colors"
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "Colours for display"
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Cannot initialise the Evolution shell."
+
+#, fuzzy
+#~ msgid "Compose"
 #~ msgstr "Colours"
 
 #, fuzzy
@@ -11234,10 +12789,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Close %s"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -11274,22 +12825,16 @@ msgstr "Could not initialise Bonobo"
 #~ "Rev\n"
 
 #~ 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."
+#~ "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."
+#~ "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\""
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr "Cannot initialise Evolution's mail storage hash."
author	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
commit	df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree	badb87b38dc4b74df00899b45d774054672cc19a /po/en_GB.po
parent	d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download	gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2 gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip